OP-369 - Fixes for build

BitBagCommerce · Jul 26, 2024 · dd10297 · dd10297
1 parent b93e80e
commit dd10297
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 50 deletions.
diff --git 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
@@ -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,

diff --git a/tests/Application/.env.dist → tests/Application/.env b/tests/Application/.env.dist → 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 → tests/Application/.env.prod b/tests/Application/.env.prod.dist → 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
@@ -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
diff --git 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
@@ -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 → tests/Application/assets/shop/entry.js b/tests/Application/assets/shop/sentry.js → tests/Application/assets/shop/entry.js
diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file has been created by developers from BitBag.
+ * Feel free to contact us once you face any issues or want to start
+ * You can find more information about us on https://bitbag.io and write us
+ * an email on hello@bitbag.io.
+ */
+
+declare(strict_types=1);
+
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['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
diff --git a/tests/Application/config/sylius/1.13/bundles.php b/tests/Application/config/sylius/1.13/bundles.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file has been created by developers from BitBag.
+ * Feel free to contact us once you face any issues or want to start
+ * You can find more information about us on https://bitbag.io and write us
+ * an email on hello@bitbag.io.
+ */
+
 declare(strict_types=1);
 
 return [