From 6238fd39a0e171e31fc6512eb986d7459945ed79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Tue, 5 Nov 2024 08:14:40 +0100 Subject: [PATCH 1/5] Bump dependencies --- composer.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 21475f7..308c0d6 100644 --- a/composer.json +++ b/composer.json @@ -21,12 +21,9 @@ ], "require": { "php": "^8.1", - "sylius/sylius": "1.14.x-dev as 1.13.99", + "sylius/sylius": "1.14.x-dev", "symfony/flex": "^2.4", - "sylius/invoicing-plugin": "~0.25", - "sylius/refund-plugin": "^1.5", - "bugsnag/bugsnag-symfony": "^1.7", - "sylius/paypal-plugin": "^1.6" + "bugsnag/bugsnag-symfony": "^1.7" }, "require-dev": { "behat/behat": "^3.14", @@ -88,7 +85,8 @@ }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": false, - "symfony/flex": true + "symfony/flex": true, + "php-http/discovery": true } }, "extra": { From 70f9e182d41a85ef1ccbb43acc00889714bbb80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Tue, 5 Nov 2024 08:14:58 +0100 Subject: [PATCH 2/5] Remove unused configs --- .env | 6 ---- config/bundles.php | 5 ---- config/packages/_sylius.yaml | 5 ---- config/packages/knp_snappy.yaml | 10 ------- config/packages/sylius_invoicing.yaml | 2 -- config/packages/sylius_refund.yaml | 2 -- config/routes.yaml | 2 -- config/routes/sylius_admin.yaml | 4 --- config/routes/sylius_invoicing.yaml | 9 ------ config/routes/sylius_refund.yaml | 2 -- config/routes/sylius_shop.yaml | 6 ---- symfony.lock | 40 --------------------------- 12 files changed, 93 deletions(-) delete mode 100644 config/packages/knp_snappy.yaml delete mode 100644 config/packages/sylius_invoicing.yaml delete mode 100644 config/packages/sylius_refund.yaml delete mode 100644 config/routes/sylius_invoicing.yaml delete mode 100644 config/routes/sylius_refund.yaml diff --git a/.env b/.env index bee770a..3034b23 100644 --- a/.env +++ b/.env @@ -25,12 +25,6 @@ MAILER_URL=smtp://localhost ###> symfony/messenger ### # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages ###< symfony/messenger ### - -###> knplabs/knp-snappy-bundle ### -WKHTMLTOPDF_PATH=/usr/local/bin/wkhtmltopdf -WKHTMLTOIMAGE_PATH=/usr/local/bin/wkhtmltoimage -###< knplabs/knp-snappy-bundle ### - ###> lexik/jwt-authentication-bundle ### JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem diff --git a/config/bundles.php b/config/bundles.php index f116ac3..6d6ccfe 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -53,15 +53,10 @@ Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true], Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true], Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true], - FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true], - Knp\Bundle\SnappyBundle\KnpSnappyBundle::class => ['all' => true], - Sylius\InvoicingPlugin\SyliusInvoicingPlugin::class => ['all' => true], - Sylius\RefundPlugin\SyliusRefundPlugin::class => ['all' => true], Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true], SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true], SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], Bugsnag\BugsnagBundle\BugsnagBundle::class => ['all' => true], - Sylius\PayPalPlugin\SyliusPayPalPlugin::class => ['all' => true], BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true], League\FlysystemBundle\FlysystemBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], diff --git a/config/packages/_sylius.yaml b/config/packages/_sylius.yaml index 398af5d..fa5849c 100644 --- a/config/packages/_sylius.yaml +++ b/config/packages/_sylius.yaml @@ -1,14 +1,9 @@ imports: - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" } - - { resource: "@SyliusPayPalPlugin/Resources/config/config.yaml" } - parameters: fixtures_dir: "%kernel.project_dir%/src/Resources/fixtures" sylius_core.public_dir: '%kernel.project_dir%/public' diff --git a/config/packages/knp_snappy.yaml b/config/packages/knp_snappy.yaml deleted file mode 100644 index a55c25e..0000000 --- a/config/packages/knp_snappy.yaml +++ /dev/null @@ -1,10 +0,0 @@ -knp_snappy: - pdf: - enabled: true - binary: '%env(WKHTMLTOPDF_PATH)%' - options: - enable-local-file-access: true - image: - enabled: true - binary: '%env(WKHTMLTOIMAGE_PATH)%' - options: [] diff --git a/config/packages/sylius_invoicing.yaml b/config/packages/sylius_invoicing.yaml deleted file mode 100644 index 0075ab3..0000000 --- a/config/packages/sylius_invoicing.yaml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: "@SyliusInvoicingPlugin/Resources/config/config.yml" } diff --git a/config/packages/sylius_refund.yaml b/config/packages/sylius_refund.yaml deleted file mode 100644 index ce7ff8a..0000000 --- a/config/packages/sylius_refund.yaml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: "@SyliusRefundPlugin/Resources/config/app/config.yml" } diff --git a/config/routes.yaml b/config/routes.yaml index b69bca4..e69de29 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -1,2 +0,0 @@ -sylius_paypal_webhook: - resource: "@SyliusPayPalPlugin/Resources/config/webhook_routing.yaml" diff --git a/config/routes/sylius_admin.yaml b/config/routes/sylius_admin.yaml index 497dcca..1ba48d6 100644 --- a/config/routes/sylius_admin.yaml +++ b/config/routes/sylius_admin.yaml @@ -1,7 +1,3 @@ sylius_admin: resource: "@SyliusAdminBundle/Resources/config/routing.yml" prefix: /admin - -sylius_paypal_admin: - resource: "@SyliusPayPalPlugin/Resources/config/admin_routing.yml" - prefix: /admin diff --git a/config/routes/sylius_invoicing.yaml b/config/routes/sylius_invoicing.yaml deleted file mode 100644 index b8fbd60..0000000 --- a/config/routes/sylius_invoicing.yaml +++ /dev/null @@ -1,9 +0,0 @@ -sylius_invoicing_plugin_admin: - resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/admin_invoicing.yml" - prefix: /admin - -sylius_invoicing_plugin_shop: - resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/shop_invoicing.yml" - prefix: /{_locale} - requirements: - _locale: ^[a-z]{2}(?:_[A-Z]{2})?$ diff --git a/config/routes/sylius_refund.yaml b/config/routes/sylius_refund.yaml deleted file mode 100644 index 46e99b1..0000000 --- a/config/routes/sylius_refund.yaml +++ /dev/null @@ -1,2 +0,0 @@ -sylius_refund: - resource: "@SyliusRefundPlugin/Resources/config/routing.yml" diff --git a/config/routes/sylius_shop.yaml b/config/routes/sylius_shop.yaml index 3eae22e..9116420 100644 --- a/config/routes/sylius_shop.yaml +++ b/config/routes/sylius_shop.yaml @@ -12,9 +12,3 @@ sylius_shop_default_locale: methods: [GET] defaults: _controller: sylius.controller.shop.locale_switch::switchAction - -sylius_paypal: - resource: "@SyliusPayPalPlugin/Resources/config/shop_routing.yaml" - prefix: /{_locale} - requirements: - _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$ diff --git a/symfony.lock b/symfony.lock index 21394f6..1087d83 100644 --- a/symfony.lock +++ b/symfony.lock @@ -220,21 +220,6 @@ "knplabs/knp-menu-bundle": { "version": "v2.2.1" }, - "knplabs/knp-snappy": { - "version": "v1.1.0" - }, - "knplabs/knp-snappy-bundle": { - "version": "1.5", - "recipe": { - "repo": "github.com/symfony/recipes-contrib", - "branch": "master", - "version": "1.5", - "ref": "c81bdcf4a9d4e7b1959071457f9608631865d381" - }, - "files": [ - "config/packages/knp_snappy.yaml" - ] - }, "lakion/mink-debug-extension": { "version": "v1.2.3" }, @@ -359,18 +344,6 @@ "phar-io/version": { "version": "1.0.1" }, - "php-http/discovery": { - "version": "1.19", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "1.18", - "ref": "f45b5dd173a27873ab19f5e3180b2f661c21de02" - }, - "files": [ - "config/packages/http_discovery.yaml" - ] - }, "php-http/guzzle6-adapter": { "version": "v1.1.1" }, @@ -569,19 +542,6 @@ "sylius/grid-bundle": { "version": "v1.4.4" }, - "sylius/invoicing-plugin": { - "version": "0.5", - "recipe": { - "repo": "github.com/symfony/recipes-contrib", - "branch": "master", - "version": "0.5", - "ref": "4720bdeb3db9f81932523a640184244cf75da7f0" - }, - "files": [ - "config/packages/sylius_invoicing.yaml", - "config/routes/sylius_invoicing.yaml" - ] - }, "sylius/mailer-bundle": { "version": "v1.7.1" }, From f89ef96d0f04eef25a8d0e09e303579793b73829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Tue, 5 Nov 2024 08:22:24 +0100 Subject: [PATCH 3/5] Update builds and remove config --- .github/workflows/build.yml | 2 +- config/services_test.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0aa3020..b401889 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.1"] + php: ["8.3"] symfony: ["^6.4"] node: ["20.x"] mysql: ["8.0"] diff --git a/config/services_test.yaml b/config/services_test.yaml index 0df33bf..bc47848 100644 --- a/config/services_test.yaml +++ b/config/services_test.yaml @@ -1,7 +1,6 @@ imports: - { resource: "../tests/Behat/Resources/config/services.xml" } - { resource: "../vendor/sylius/calendar/tests/Behat/Resources/services.yaml" } - - { resource: "../vendor/sylius/invoicing-plugin/tests/Behat/Resources/services.xml" } - { resource: "../vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml" } # workaround needed for strange "test.client.history" problem From 125ff2d46c9f2be811d8627447058af3d13b5b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Tue, 5 Nov 2024 08:35:53 +0100 Subject: [PATCH 4/5] Add Behat bundle --- config/bundles.php | 1 + tests/Behat/Resources/config/services.xml | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/bundles.php b/config/bundles.php index 6d6ccfe..9e522b3 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -60,4 +60,5 @@ BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true], League\FlysystemBundle\FlysystemBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], + FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true], ]; diff --git a/tests/Behat/Resources/config/services.xml b/tests/Behat/Resources/config/services.xml index 19e86b1..603eaae 100644 --- a/tests/Behat/Resources/config/services.xml +++ b/tests/Behat/Resources/config/services.xml @@ -6,9 +6,11 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd" > + + + class="Tests\Behat\Context\Ui\Admin\ManagingAdministratorsContext"> @@ -16,14 +18,14 @@ + class="Tests\Behat\Context\Ui\Admin\ManagingChannelsContext"> + class="Tests\Behat\Context\Ui\Shop\RegistrationContext"> From 683e89fd8640fdb9f31a998f654cdb2394633e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Tue, 5 Nov 2024 08:40:00 +0100 Subject: [PATCH 5/5] Remove unused context --- tests/Behat/Resources/config/suites.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Behat/Resources/config/suites.yml b/tests/Behat/Resources/config/suites.yml index b9ca1bb..e36aa4d 100644 --- a/tests/Behat/Resources/config/suites.yml +++ b/tests/Behat/Resources/config/suites.yml @@ -77,7 +77,6 @@ default: - sylius.behat.context.hook.doctrine_orm - sylius.behat.context.hook.mailer - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext - - Tests\Sylius\InvoicingPlugin\Behat\Context\Hook\InvoicesContext - sylius.behat.context.setup.admin_security - sylius.behat.context.setup.admin_user