Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Maintenance] Bump demo to 1.14 #293

Merged
merged 5 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -88,7 +85,8 @@
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": false,
"symfony/flex": true
"symfony/flex": true,
"php-http/discovery": true
}
},
"extra": {
Expand Down
6 changes: 1 addition & 5 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,12 @@
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],
FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true],
];
5 changes: 0 additions & 5 deletions config/packages/_sylius.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
10 changes: 0 additions & 10 deletions config/packages/knp_snappy.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/packages/sylius_invoicing.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/packages/sylius_refund.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/routes.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
sylius_paypal_webhook:
resource: "@SyliusPayPalPlugin/Resources/config/webhook_routing.yaml"
4 changes: 0 additions & 4 deletions config/routes/sylius_admin.yaml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 0 additions & 9 deletions config/routes/sylius_invoicing.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/routes/sylius_refund.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions config/routes/sylius_shop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}))?$
1 change: 0 additions & 1 deletion config/services_test.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
40 changes: 0 additions & 40 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down
8 changes: 5 additions & 3 deletions tests/Behat/Resources/config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,26 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />

<service
id="sylius_demo.behat.context.ui.admin.managing_administrators_context"
class="Tests\Behat\Context\Ui\Admin\ManagingAdministratorsContext" public="true">
class="Tests\Behat\Context\Ui\Admin\ManagingAdministratorsContext">
<argument type="service" id="sylius.behat.notification_checker" />
<argument type="service" id="sylius.repository.admin_user" />
<argument type="service" id="sylius.behat.page.admin.administrator.update" />
</service>

<service
id="sylius_demo.behat.context.ui.admin.managing_channels_context"
class="Tests\Behat\Context\Ui\Admin\ManagingChannelsContext" public="true">
class="Tests\Behat\Context\Ui\Admin\ManagingChannelsContext">
<argument type="service" id="sylius.behat.page.admin.channel.create" />
<argument type="service" id="sylius.behat.notification_checker" />
</service>

<service
id="sylius_demo.behat.context.ui.shop.registration_context"
class="Tests\Behat\Context\Ui\Shop\RegistrationContext" public="true">
class="Tests\Behat\Context\Ui\Shop\RegistrationContext">
<argument type="service" id="sylius.behat.notification_checker" />
<argument type="service" id="router" />
<argument type="service" id="sylius.repository.shop_user" />
Expand Down
1 change: 0 additions & 1 deletion tests/Behat/Resources/config/suites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down