Skip to content

Commit 588459d

Browse files
authored
refactor #203 Drop support for Sylius 1.8 (Zales0123)
This PR was merged into the 1.0-dev branch. Discussion ---------- Commits ------- 1271658 Drop support for Sylius 1.8
2 parents d2bc75e + 1271658 commit 588459d

File tree

15 files changed

+13
-225
lines changed

15 files changed

+13
-225
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,9 @@ jobs:
2222
node: ["10.x"]
2323
mysql: ["5.7", "8.0"]
2424
symfony: ["^4.4", "^5.2"]
25-
sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]
25+
sylius: ["~1.9.0", "~1.10.0"]
2626

2727
exclude:
28-
-
29-
sylius: "~1.8.0"
30-
symfony: "^5.2"
31-
-
32-
php: "8.0"
33-
sylius: "~1.8.0"
3428
-
3529
php: "8.0"
3630
sylius: "~1.9.0"

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"require": {
88
"php": "^7.4 || ^8.0",
99

10-
"sylius/sylius": "^1.8",
10+
"sylius/sylius": "^1.9",
1111
"phpseclib/phpseclib": "^2.0",
1212
"sylius-labs/doctrine-migrations-extra-bundle": "^0.1.3",
1313
"doctrine/doctrine-migrations-bundle": "^3.0"
@@ -25,7 +25,7 @@
2525
"friends-of-behat/mink-debug-extension": "^2.0",
2626
"friends-of-behat/symfony-extension": "^2.1",
2727
"friends-of-behat/variadic-extension": "^1.3",
28-
"friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
28+
"friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
2929
"phpspec/phpspec": "^6.1",
3030
"phpstan/phpstan": "0.12.98",
3131
"phpstan/phpstan-doctrine": "0.12.33",

tests/Application/Kernel.php

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,6 @@ protected function getContainerBaseClass(): string
7676
return parent::getContainerBaseClass();
7777
}
7878

79-
protected function getContainerLoader(ContainerInterface $container): LoaderInterface
80-
{
81-
/** @var ContainerBuilder $container */
82-
Assert::isInstanceOf($container, ContainerBuilder::class);
83-
84-
$locator = new FileLocator($this, $this->getProjectDir() . '/Resources');
85-
$resolver = new LoaderResolver(array(
86-
new XmlFileLoader($container, $locator),
87-
new YamlFileLoader($container, $locator),
88-
new IniFileLoader($container, $locator),
89-
new PhpFileLoader($container, $locator),
90-
new GlobFileLoader($container, $locator),
91-
new DirectoryLoader($container, $locator),
92-
new ClosureLoader($container),
93-
));
94-
95-
return new DelegatingLoader($resolver);
96-
}
97-
9879
private function isTestEnvironment(): bool
9980
{
10081
return 0 === strpos($this->getEnvironment(), 'test');

tests/Application/config/routes/sylius_shop.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@ sylius_shop_default_locale:
1212
methods: [GET]
1313
defaults:
1414
_controller: sylius.controller.shop.locale_switch:switchAction
15+
16+
sylius_shop_request_password_reset_token_redirect:
17+
path: /.well-known/change-password
18+
methods: [GET]
19+
controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
20+
defaults:
21+
route: sylius_shop_request_password_reset_token
22+
permanent: false

tests/Application/config/sylius/1.10/packages/security.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
sylius.security.admin_regex: "^/%sylius_admin.path_name%"
33
sylius.security.api_regex: "^/api"
44
sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|new-api|api/.*|api$|media/.*)[^/]++"
5-
sylius.security.new_api_route: "/new-api"
5+
sylius.security.new_api_route: "/api/v2"
66
sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
77
sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin"
88
sylius.security.new_api_admin_regex: "^%sylius.security.new_api_admin_route%"

tests/Application/config/sylius/1.8/bundles.php

Lines changed: 0 additions & 8 deletions
This file was deleted.

tests/Application/config/sylius/1.8/packages/_sylius.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/Application/config/sylius/1.8/packages/dev/jms_serializer.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/Application/config/sylius/1.8/packages/framework.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/Application/config/sylius/1.8/packages/jms_serializer.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)