kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.12' into 1.13

Browse source 
* 1.12:
  Change all package versions to 1.12
  [CI] Add APIP 2.6 static checks
  [CI] Add tests for symfony 6.0
  Remove branch alias from the main composer.json
  Change branch aliases in all packages
  [Hot-fix] Do not fail scenario after 422 response page
This commit is contained in:
Mateusz Zalewski 2022-10-19 19:04:41 +02:00
commit 7e5d838675
No known key found for this signature in database
GPG key ID: 9BECA0BB71612E52
46 changed files with 243 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
.github/workflows/application.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
static-checks:
runs-on: ubuntu-latest
name: "Static checks (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }})"
name: "Static checks (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, API Platform ${{ matrix.api-platform }})"
timeout-minutes: 10
@ -33,6 +33,17 @@ jobs:
matrix:
php: ["8.0", "8.1"]
symfony: ["^5.4", "^6.0"]
api-platform: ["^2.7"]
include:
-
php: "8.1"
symfony: "~6.0.0"
api-platform: "^2.7"
-
php: "8.1"
symfony: "^6.0"
api-platform: "~2.6.0"
steps:
-
@ -181,10 +192,10 @@ jobs:
args: check
if: always() && steps.end-of-setup.outcome == 'success'
classes-specifictions:
classes-specifications:
runs-on: ubuntu-latest
name: "Classes specifications (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}), API Platform ${{ matrix.api-platform }})"
name: "Classes specifications (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, API Platform ${{ matrix.api-platform }})"
strategy:
fail-fast: false
matrix:
@ -193,6 +204,10 @@ jobs:
api-platform: ["^2.7"]
include:
-
php: "8.1"
symfony: "~6.0.0"
api-platform: "^2.7"
-
php: "8.1"
symfony: "^5.4"
@ -587,7 +602,23 @@ jobs:
php: "8.1"
symfony: "^5.4"
api-platform: "~2.6.0"
node: "14.x"
twig: "3.x"
mysql: "8.0"
dbal: "3"
-
php: "8.1"
symfony: "^6.0"
api-platform: "~2.6.0"
twig: "3.x"
mysql: "8.0"
dbal: "3"
-
php: "8.1"
symfony: "~6.0.0"
api-platform: "^2.7"
twig: "3.x"
mysql: "8.0"
dbal: "3"
@ -639,6 +670,12 @@ jobs:
if: matrix.api-platform != ''
run: composer require "api-platform/core:${{ matrix.api-platform }}" --no-update --no-scripts --no-interaction
-
name: Restrict Twig version
if: matrix.twig != ''
run: |
composer require "twig/twig:${{ matrix.twig }}" --no-update --no-scripts --no-interaction
-
name: Get Composer cache directory
id: composer-cache
@ -653,12 +690,6 @@ jobs:
restore-keys: |
${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-
-
name: Restrict Twig version
if: matrix.twig != ''
run: |
composer require "twig/twig:${{ matrix.twig }}" --no-update --no-scripts --no-interaction
-
name: Install PHP dependencies
run: composer update --no-interaction --no-scripts
@ -744,7 +775,6 @@ jobs:
-
name: Run CLI Behat
run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@cli&&~@todo" || vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="@cli&&~@todo" --rerun
continue-on-error: true
-
name: Run non-JS Behat
@ -774,6 +804,13 @@ jobs:
node: ["16.x", "18.x"]
mysql: ["5.7", "8.0"]
include:
-
php: "8.1"
symfony: "~6.0.0"
node: "18.x"
mysql: "8.0"
env:
APP_ENV: test_cached
DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?charset=utf8mb4&serverVersion=${{ matrix.mysql }}"

3
composer.json
View file

@ -241,9 +241,6 @@
}
},
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
},
"symfony": {
"allow-contrib": false
}

30
src/Sylius/Behat/Page/Admin/Crud/CreatePage.php
View file

@ -14,9 +14,11 @@ declare(strict_types=1);
namespace Sylius\Behat\Page\Admin\Crud;
use Behat\Mink\Element\NodeElement;
use Behat\Mink\Exception\DriverException;
use Behat\Mink\Exception\ElementNotFoundException;
use Behat\Mink\Session;
use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;
use FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException;
use Symfony\Component\Routing\RouterInterface;
class CreatePage extends SymfonyPage implements CreatePageInterface
@ -55,6 +57,29 @@ class CreatePage extends SymfonyPage implements CreatePageInterface
return $this->routeName;
}
public function getMessageInvalidForm(): string
{
return $this->getDocument()->find('css', '.ui.icon.negative.message')->getText();
}
protected function verifyStatusCode(): void
{
try {
$statusCode = $this->getSession()->getStatusCode();
} catch (DriverException) {
return; // Ignore drivers which cannot check the response status code
}
if (($statusCode >= 200 && $statusCode <= 299) || $statusCode === 422) {
return;
}
$currentUrl = $this->getSession()->getCurrentUrl();
$message = sprintf('Could not open the page: "%s". Received an error status code: %s', $currentUrl, $statusCode);
throw new UnexpectedPageException($message);
}
/**
* @throws ElementNotFoundException
*/
@ -67,9 +92,4 @@ class CreatePage extends SymfonyPage implements CreatePageInterface
return $element;
}
public function getMessageInvalidForm(): string
{
return $this->getDocument()->find('css', '.ui.icon.negative.message')->getText();
}
}

20
src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php
View file

@ -14,9 +14,11 @@ declare(strict_types=1);
namespace Sylius\Behat\Page\Admin\Crud;
use Behat\Mink\Element\NodeElement;
use Behat\Mink\Exception\DriverException;
use Behat\Mink\Exception\ElementNotFoundException;
use Behat\Mink\Session;
use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;
use FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException;
use Sylius\Component\Core\Formatter\StringInflector;
use Symfony\Component\Routing\RouterInterface;
@ -77,6 +79,24 @@ class UpdatePage extends SymfonyPage implements UpdatePageInterface
return $this->getDocument()->find('css', '.ui.icon.negative.message')->getText();
}
protected function verifyStatusCode(): void
{
try {
$statusCode = $this->getSession()->getStatusCode();
} catch (DriverException) {
return; // Ignore drivers which cannot check the response status code
}
if (($statusCode >= 200 && $statusCode <= 299) || $statusCode === 422) {
return;
}
$currentUrl = $this->getSession()->getCurrentUrl();
$message = sprintf('Could not open the page: "%s". Received an error status code: %s', $currentUrl, $statusCode);
throw new UnexpectedPageException($message);
}
/**
* @throws ElementNotFoundException
*/

20
src/Sylius/Behat/Page/Shop/Account/AddressBook/CreatePage.php
View file

@ -13,7 +13,9 @@ declare(strict_types=1);
namespace Sylius\Behat\Page\Shop\Account\AddressBook;
use Behat\Mink\Exception\DriverException;
use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;
use FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException;
use Sylius\Behat\Service\JQueryHelper;
use Sylius\Component\Core\Model\AddressInterface;
@ -71,4 +73,22 @@ class CreatePage extends SymfonyPage implements CreatePageInterface
'province_validation_message' => '[data-test-validation-error]:contains("province")',
]);
}
protected function verifyStatusCode(): void
{
try {
$statusCode = $this->getSession()->getStatusCode();
} catch (DriverException) {
return; // Ignore drivers which cannot check the response status code
}
if (($statusCode >= 200 && $statusCode <= 299) || $statusCode === 422) {
return;
}
$currentUrl = $this->getSession()->getCurrentUrl();
$message = sprintf('Could not open the page: "%s". Received an error status code: %s', $currentUrl, $statusCode);
throw new UnexpectedPageException($message);
}
}

20
src/Sylius/Behat/Page/Shop/Account/AddressBook/UpdatePage.php
View file

@ -13,7 +13,9 @@ declare(strict_types=1);
namespace Sylius\Behat\Page\Shop\Account\AddressBook;
use Behat\Mink\Exception\DriverException;
use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;
use FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException;
use Sylius\Behat\Service\JQueryHelper;
class UpdatePage extends SymfonyPage implements UpdatePageInterface
@ -92,6 +94,24 @@ class UpdatePage extends SymfonyPage implements UpdatePageInterface
]);
}
protected function verifyStatusCode(): void
{
try {
$statusCode = $this->getSession()->getStatusCode();
} catch (DriverException) {
return; // Ignore drivers which cannot check the response status code
}
if (($statusCode >= 200 && $statusCode <= 299) || $statusCode === 422) {
return;
}
$currentUrl = $this->getSession()->getCurrentUrl();
$message = sprintf('Could not open the page: "%s". Received an error status code: %s', $currentUrl, $statusCode);
throw new UnexpectedPageException($message);
}
private function waitForElement(int $timeout, string $elementName): void
{
$this->getDocument()->waitFor($timeout, fn () => $this->hasElement($elementName));

4
src/Sylius/Bundle/AddressingBundle/composer.json
View file

@ -28,7 +28,7 @@
"require": {
"php": "^8.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/addressing": "^1.6",
"sylius/addressing": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/intl": "^5.4 || ^6.0"
@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/AdminBundle/composer.json
View file

@ -33,8 +33,8 @@
"php": "^8.0",
"knplabs/knp-menu": "^3.1",
"knplabs/knp-menu-bundle": "^3.0",
"sylius/core-bundle": "^1.7",
"sylius/ui-bundle": "^1.6",
"sylius/core-bundle": "^1.12",
"sylius/ui-bundle": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/webpack-encore-bundle": "^1.15",
"twig/intl-extra": "^2.12",
@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/ApiBundle/composer.json
View file

@ -28,7 +28,7 @@
"api-platform/core": "^2.6",
"enshrined/svg-sanitize": "^0.15.4",
"lexik/jwt-authentication-bundle": "^2.11",
"sylius/core-bundle": "^1.7",
"sylius/core-bundle": "^1.12",
"symfony/messenger": "^5.4 || ^6.0"
},
"require-dev": {
@ -58,7 +58,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/AttributeBundle/composer.json
View file

@ -29,7 +29,7 @@
"php": "^8.0",
"ramsey/uuid": "^4.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/attribute": "^1.6",
"sylius/attribute": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
@ -48,7 +48,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/ChannelBundle/composer.json
View file

@ -26,7 +26,7 @@
],
"require": {
"php": "^8.0",
"sylius/channel": "^1.6",
"sylius/channel": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
@ -48,7 +48,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

42
src/Sylius/Bundle/CoreBundle/composer.json
View file

@ -39,31 +39,31 @@
"sylius-labs/association-hydrator": "^1.1 || ^1.2",
"sylius-labs/doctrine-migrations-extra-bundle": "^0.1.4 || ^0.2",
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
"sylius/addressing-bundle": "^1.6",
"sylius/attribute-bundle": "^1.6",
"sylius/channel-bundle": "^1.6",
"sylius/core": "^1.6 || dev-symfony-6",
"sylius/currency-bundle": "^1.6",
"sylius/customer-bundle": "^1.6",
"sylius/addressing-bundle": "^1.12",
"sylius/attribute-bundle": "^1.12",
"sylius/channel-bundle": "^1.12",
"sylius/core": "^1.12",
"sylius/currency-bundle": "^1.12",
"sylius/customer-bundle": "^1.12",
"sylius/fixtures-bundle": "^1.7.0 || ^1.8@beta",
"sylius/grid-bundle": "^1.11 || ^1.12@alpha",
"sylius/inventory-bundle": "^1.6",
"sylius/locale-bundle": "^1.6",
"sylius/money-bundle": "^1.6",
"sylius/order-bundle": "^1.6 || dev-symfony-6",
"sylius/payment-bundle": "^1.6 || dev-symfony-6",
"sylius/payum-bundle": "^1.6",
"sylius/product-bundle": "^1.6",
"sylius/promotion-bundle": "^1.6",
"sylius/inventory-bundle": "^1.12",
"sylius/locale-bundle": "^1.12",
"sylius/money-bundle": "^1.12",
"sylius/order-bundle": "^1.12",
"sylius/payment-bundle": "^1.12",
"sylius/payum-bundle": "^1.12",
"sylius/product-bundle": "^1.12",
"sylius/promotion-bundle": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"sylius/review-bundle": "^1.6",
"sylius/shipping-bundle": "^1.6",
"sylius/taxation-bundle": "^1.6",
"sylius/taxonomy-bundle": "^1.6",
"sylius/review-bundle": "^1.12",
"sylius/shipping-bundle": "^1.12",
"sylius/taxation-bundle": "^1.12",
"sylius/taxonomy-bundle": "^1.12",
"sylius/mailer-bundle": "^1.8 || ^2.0@beta",
"sylius/theme-bundle": "^2.1.1 || ^2.3",
"sylius/ui-bundle": "^1.6",
"sylius/user-bundle": "^1.6 || dev-symfony-6",
"sylius/ui-bundle": "^1.12",
"sylius/user-bundle": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/intl": "^5.4 || ^6.0",
"symfony/mailer": "^5.4 || ^6.0",
@ -92,7 +92,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/CurrencyBundle/composer.json
View file

@ -26,7 +26,7 @@
],
"require": {
"php": "^8.0",
"sylius/currency": "^1.6 || dev-symfony-6",
"sylius/currency": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/intl": "^5.4 || ^6.0",
@ -52,7 +52,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/CustomerBundle/composer.json
View file

@ -38,7 +38,7 @@
"php": "^8.0",
"doctrine/orm": "^2.13",
"egulias/email-validator": "^3.1",
"sylius/customer": "^1.6",
"sylius/customer": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0",
"webmozart/assert": "^1.9"
@ -61,7 +61,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/InventoryBundle/composer.json
View file

@ -27,7 +27,7 @@
],
"require": {
"php": "^8.0",
"sylius/inventory": "^1.6",
"sylius/inventory": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/templating": "^5.4 || ^6.0",
@ -52,7 +52,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/LocaleBundle/composer.json
View file

@ -27,7 +27,7 @@
],
"require": {
"php": "^8.0",
"sylius/locale": "^1.6",
"sylius/locale": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/templating": "^5.4 || ^6.0"
@ -52,7 +52,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/MoneyBundle/composer.json
View file

@ -40,7 +40,7 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^8.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"sylius/currency-bundle": "^1.6",
"sylius/currency-bundle": "^1.12",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/form": "^5.4 || ^6.0",
@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/OrderBundle/composer.json
View file

@ -30,8 +30,8 @@
"php": "^8.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
"sylius/money-bundle": "^1.6",
"sylius/order": "^1.6",
"sylius/money-bundle": "^1.12",
"sylius/order": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/templating": "^5.4 || ^6.0"
@ -55,7 +55,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/PaymentBundle/composer.json
View file

@ -27,7 +27,7 @@
],
"require": {
"php": "^8.0",
"sylius/payment": "^1.6",
"sylius/payment": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
@ -40,7 +40,7 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^8.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"sylius/locale-bundle": "^1.6",
"sylius/locale-bundle": "^1.12",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0"
},
@ -51,7 +51,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

10
src/Sylius/Bundle/PayumBundle/composer.json
View file

@ -32,10 +32,10 @@
"payum/payum": "^1.7.2",
"payum/payum-bundle": "^2.5",
"php-http/guzzle6-adapter": "^2.0",
"sylius/core": "^1.6 || dev-symfony-6",
"sylius/currency": "^1.6 || dev-symfony-6",
"sylius/order-bundle": "^1.6 || dev-symfony-6",
"sylius/payment-bundle": "^1.6 || dev-symfony-6",
"sylius/core": "^1.12",
"sylius/currency": "^1.12",
"sylius/order-bundle": "^1.12",
"sylius/payment-bundle": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha"
},
"require-dev": {
@ -49,7 +49,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

8
src/Sylius/Bundle/ProductBundle/composer.json
View file

@ -28,9 +28,9 @@
"require": {
"php": "^8.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/attribute-bundle": "^1.6",
"sylius/locale-bundle": "^1.6",
"sylius/product": "^1.6",
"sylius/attribute-bundle": "^1.12",
"sylius/locale-bundle": "^1.12",
"sylius/product": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
@ -51,7 +51,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/PromotionBundle/composer.json
View file

@ -30,8 +30,8 @@
"php": "^8.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/calendar": "^0.3 || ^0.4",
"sylius/money-bundle": "^1.6",
"sylius/promotion": "^1.6",
"sylius/money-bundle": "^1.12",
"sylius/promotion": "^1.12",
"sylius/registry": "^1.5",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"symfony/framework-bundle": "^5.4 || ^6.0"
@ -57,7 +57,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/ReviewBundle/composer.json
View file

@ -42,8 +42,8 @@
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/mailer-bundle": "^1.8 || ^2.0@beta",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"sylius/review": "^1.6",
"sylius/user-bundle": "^1.6 || dev-symfony-6",
"sylius/review": "^1.12",
"sylius/user-bundle": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
"conflict": {
@ -66,7 +66,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/ShippingBundle/composer.json
View file

@ -31,9 +31,9 @@
"php": "^8.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/calendar": "^0.3 || ^0.4",
"sylius/money-bundle": "^1.6",
"sylius/money-bundle": "^1.12",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"sylius/shipping": "^1.6",
"sylius/shipping": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
"conflict": {
@ -57,7 +57,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

6
src/Sylius/Bundle/ShopBundle/composer.json
View file

@ -27,8 +27,8 @@
],
"require": {
"php": "^8.0",
"sylius/core-bundle": "^1.7",
"sylius/ui-bundle": "^1.6",
"sylius/core-bundle": "^1.12",
"sylius/ui-bundle": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/security-bundle": "^5.4 || ^6.0",
"symfony/webpack-encore-bundle": "^1.15",
@ -50,7 +50,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/TaxationBundle/composer.json
View file

@ -32,7 +32,7 @@
"sylius/calendar": "^0.3 || ^0.4",
"sylius/registry": "^1.5",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"sylius/taxation": "^1.6",
"sylius/taxation": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
"conflict": {
@ -55,7 +55,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/TaxonomyBundle/composer.json
View file

@ -31,7 +31,7 @@
"php": "^8.0",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"sylius/taxonomy": "^1.6",
"sylius/taxonomy": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0"
},
"conflict": {
@ -50,7 +50,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Bundle/UiBundle/composer.json
View file

@ -62,7 +62,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Bundle/UserBundle/composer.json
View file

@ -44,7 +44,7 @@
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
"sylius/mailer-bundle": "^1.8 || ^2.0@beta",
"sylius/resource-bundle": "^1.9 || ^1.10@alpha",
"sylius/user": "^1.6 || dev-symfony-6",
"sylius/user": "^1.12",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/password-hasher": "^5.4 || 6.0",
"webmozart/assert": "^1.9"
@ -72,7 +72,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Addressing/composer.json
View file

@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Attribute/composer.json
View file

@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Channel/composer.json
View file

@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

34
src/Sylius/Component/Core/composer.json
View file

@ -32,24 +32,24 @@
"league/flysystem": "^2.4",
"payum/payum": "^1.7.2",
"php-http/guzzle6-adapter": "^2.0",
"sylius/addressing": "^1.6",
"sylius/attribute": "^1.6",
"sylius/channel": "^1.6",
"sylius/currency": "^1.6 || dev-symfony-6",
"sylius/customer": "^1.6",
"sylius/inventory": "^1.6",
"sylius/locale": "^1.6",
"sylius/order": "^1.6",
"sylius/payment": "^1.6",
"sylius/product": "^1.6",
"sylius/promotion": "^1.6",
"sylius/addressing": "^1.12",
"sylius/attribute": "^1.12",
"sylius/channel": "^1.12",
"sylius/currency": "^1.12",
"sylius/customer": "^1.12",
"sylius/inventory": "^1.12",
"sylius/locale": "^1.12",
"sylius/order": "^1.12",
"sylius/payment": "^1.12",
"sylius/product": "^1.12",
"sylius/promotion": "^1.12",
"sylius/registry": "^1.5",
"sylius/resource": "^1.9 || ^1.10@alpha",
"sylius/review": "^1.6",
"sylius/shipping": "^1.6",
"sylius/taxation": "^1.6",
"sylius/taxonomy": "^1.6",
"sylius/user": "^1.6 || dev-symfony-6",
"sylius/review": "^1.12",
"sylius/shipping": "^1.12",
"sylius/taxation": "^1.12",
"sylius/taxonomy": "^1.12",
"sylius/user": "^1.12",
"symfony/http-foundation": "^5.4 || ^6.0",
"symfony/mime": "^5.4 || ^6.0",
"symfony/string": "^5.4 || ^6.0",
@ -68,7 +68,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Currency/composer.json
View file

@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Customer/composer.json
View file

@ -45,7 +45,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Inventory/composer.json
View file

@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Locale/composer.json
View file

@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Order/composer.json
View file

@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Payment/composer.json
View file

@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

4
src/Sylius/Component/Product/composer.json
View file

@ -30,7 +30,7 @@
"require": {
"php": "^8.0",
"behat/transliterator": "^1.3",
"sylius/attribute": "^1.6",
"sylius/attribute": "^1.12",
"sylius/resource": "^1.9 || ^1.10@alpha",
"symfony/polyfill-iconv": "^1.17",
"webmozart/assert": "^1.9"
@ -48,7 +48,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Promotion/composer.json
View file

@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Review/composer.json
View file

@ -51,7 +51,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Shipping/composer.json
View file

@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Taxation/composer.json
View file

@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/Taxonomy/composer.json
View file

@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {

2
src/Sylius/Component/User/composer.json
View file

@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {