diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5222bae..5a90725 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,14 +21,16 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.0", "8.1"] - symfony: ["^5.4","^6.0"] - sylius: ["~1.12.0"] - node: ["14.x"] - mysql: ["5.7", "8.0"] + php: ["8.0", "8.1", "8.2", "8.3"] + symfony: ["^5.4","^6.4"] + sylius: ["~1.12.0", "~1.13.0"] + node: ["^14.0"] + mysql: ["8"] exclude: - - sylius: "~1.13.0" - php: "^8.0" + - sylius: "~1.13.0" + php: "8.0" + - symfony: "^6.4" + php: "8.0" env: APP_ENV: test @@ -139,7 +141,7 @@ jobs: name: Prepare test application assets run: | (cd tests/Application && bin/console assets:install public -vvv) - (cd tests/Application && yarn build) + (cd tests/Application && yarn encore dev) - name: Prepare test application cache diff --git a/composer.json b/composer.json index 2aaf5b6..476113e 100644 --- a/composer.json +++ b/composer.json @@ -27,18 +27,16 @@ "friends-of-behat/variadic-extension": "^1.3", "phpspec/phpspec": "^7.0", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "1.4", + "phpstan/phpstan": "^1.4", "phpstan/phpstan-doctrine": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "sensiolabs/security-checker": "^6.0", "symfony/browser-kit": "^5.4 || ^6.0", "symfony/debug-bundle": "^5.4 || ^6.0", "symfony/dotenv": "^5.4 || ^6.0", - "symfony/web-profiler-bundle": "5.4 | ^6.0", - "vimeo/psalm": "4.7.1" + "symfony/web-profiler-bundle": "5.4 | ^6.0" }, "config": { "sort-packages": true, @@ -50,7 +48,8 @@ } }, "conflict": { - "behat/mink-selenium2-driver": ">=1.7.0" + "behat/mink-selenium2-driver": ">=1.7.0", + "symfony/validator": "^6.4.7" }, "autoload": { "psr-4": { diff --git a/tests/Application/.env.dist b/tests/Application/.env similarity index 97% rename from tests/Application/.env.dist rename to tests/Application/.env index 091f4b0..0790399 100644 --- a/tests/Application/.env.dist +++ b/tests/Application/.env @@ -12,7 +12,7 @@ APP_SECRET=EDITME # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url # For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db" # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls -DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=5.5 +DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=8&charset=utf8mb4 ###< doctrine/doctrine-bundle ### ###> lexik/jwt-authentication-bundle ### diff --git a/tests/Application/.env.prod.dist b/tests/Application/.env.prod similarity index 96% rename from tests/Application/.env.prod.dist rename to tests/Application/.env.prod index 53d96e1..72d5b83 100644 --- a/tests/Application/.env.prod.dist +++ b/tests/Application/.env.prod @@ -12,7 +12,7 @@ APP_SECRET=EDITME # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url # For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db" # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls -DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=5.5 +DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=8&charset=utf8mb4 ###< doctrine/doctrine-bundle ### ###> symfony/mailer ### diff --git a/tests/Application/.env.test b/tests/Application/.env.test new file mode 100644 index 0000000..160a969 --- /dev/null +++ b/tests/Application/.env.test @@ -0,0 +1,5 @@ +APP_SECRET=EDITME + +DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=8&charset=utf8mb4 + +MAILER_DSN=null://null diff --git a/tests/Application/.env.test.dist b/tests/Application/.env.test.dist deleted file mode 100644 index b867fd6..0000000 --- a/tests/Application/.env.test.dist +++ /dev/null @@ -1,20 +0,0 @@ -# This file is a "template" of which env vars needs to be defined in your configuration or in an .env file -# Set variables here that may be different on each deployment target of the app, e.g. development, staging, production. -# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration - -###> symfony/framework-bundle ### -APP_ENV=test -APP_DEBUG=1 -APP_SECRET=EDITME -###< symfony/framework-bundle ### - -###> doctrine/doctrine-bundle ### -# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url -# For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db" -# Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls -DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=5.5 -###< doctrine/doctrine-bundle ### - -###> symfony/mailer ### -MAILER_DSN=null://null -###> symfony/messenger ### diff --git a/tests/Application/.env.test.local b/tests/Application/.env.test.local index 48b5274..3fa33ba 100644 --- a/tests/Application/.env.test.local +++ b/tests/Application/.env.test.local @@ -1 +1 @@ -DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db +DATABASE_URL=mysql://root@127.0.0.1/sylius_%kernel.environment%?serverVersion=8.0 diff --git a/tests/Application/.gitignore b/tests/Application/.gitignore index 63254e9..f813e3a 100644 --- a/tests/Application/.gitignore +++ b/tests/Application/.gitignore @@ -10,9 +10,3 @@ /vendor /node_modules - -/.env -/.env.prod -/.env.staging -/.env.test -/.env.test_cached diff --git a/tests/Application/assets/shop/sentry.js b/tests/Application/assets/shop/entry.js similarity index 100% rename from tests/Application/assets/shop/sentry.js rename to tests/Application/assets/shop/entry.js diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php index 489d689..6742876 100644 --- a/tests/Application/config/bundles.php +++ b/tests/Application/config/bundles.php @@ -1,5 +1,14 @@ ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], diff --git a/tests/Application/config/packages/security_checker.yaml b/tests/Application/config/packages/security_checker.yaml deleted file mode 100644 index 0f9cf00..0000000 --- a/tests/Application/config/packages/security_checker.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - SensioLabs\Security\SecurityChecker: - public: false - - SensioLabs\Security\Command\SecurityCheckerCommand: - arguments: ['@SensioLabs\Security\SecurityChecker'] - public: false - tags: - - { name: console.command, command: 'security:check' } diff --git a/tests/Application/config/sylius/1.13/bundles.php b/tests/Application/config/sylius/1.13/bundles.php index 5d54121..e615f85 100644 --- a/tests/Application/config/sylius/1.13/bundles.php +++ b/tests/Application/config/sylius/1.13/bundles.php @@ -1,5 +1,12 @@