Merge pull request #108 from Coderberg/2.x

2.x
Coderberg · Jun 18, 2023 · 77b5841 · 77b5841
2 parents ff57496 + 08dcf18
commit 77b5841
Show file tree

Hide file tree

Showing 22 changed files with 1,233 additions and 1,096 deletions.
diff --git a/.env b/.env
@@ -23,8 +23,9 @@ APP_SECRET=6feff92fb5278f215ddca9545d19fcd3
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
-DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
-# DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
+DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
+# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
+# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mailer ###
@@ -35,9 +36,9 @@ MAILER_DSN=null://localhost
 
 ###> symfony/messenger ###
 # Choose one of the transports below
-# MESSENGER_TRANSPORT_DSN=doctrine://default
 # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
 # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
+MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
 # Select default language (en, ru, bg, nl)

diff --git a/.env.test b/.env.test
@@ -2,6 +2,6 @@
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
+PANTHER_APP_ENV=test
 PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mariadb:
-        image: mariadb:latest
+        image: mariadb:10.6.14
         ports:
           - 3306
         env:
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -52,9 +52,9 @@ jobs:
         run: |
           php bin/console app:install
         env:
-          DATABASE_URL: mysql://mariadb:mariadb@127.0.0.1:${{ job.services.mariadb.ports[3306] }}/mariadb?serverVersion=mariadb-10.6.4
+          DATABASE_URL: mysql://mariadb:mariadb@127.0.0.1:${{ job.services.mariadb.ports[3306] }}/mariadb?serverVersion=mariadb-10.6.14
       - name: Run Tests
         env:
           PANTHER_NO_SANDBOX: "1"
-          DATABASE_URL: mysql://mariadb:mariadb@127.0.0.1:${{ job.services.mariadb.ports[3306] }}/mariadb?serverVersion=mariadb-10.6.4
+          DATABASE_URL: mysql://mariadb:mariadb@127.0.0.1:${{ job.services.mariadb.ports[3306] }}/mariadb?serverVersion=mariadb-10.6.14
         run: php bin/phpunit --coverage-text
diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.2']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -56,4 +56,5 @@ jobs:
       - name: Run Tests
         env:
           DATABASE_URL: mysql://root:symfony@127.0.0.1:${{ job.services.mysql.ports[3306] }}/symfony?serverVersion=5.7
+          PANTHER_APP_ENV: test
         run: php bin/phpunit --coverage-text
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
@@ -52,4 +52,4 @@ jobs:
       - name: Run Tests
         env:
           DATABASE_URL: postgres://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports[5432] }}/postgres?charset=UTF-8
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --testsuite=main
diff --git a/composer.json b/composer.json
@@ -9,48 +9,48 @@
         "php": "^8.1",
         "ext-ctype": "*",
         "ext-gd": "*",
-        "doctrine/annotations": "^1.13",
+        "doctrine/annotations": "^2.0",
         "doctrine/doctrine-bundle": "^2.8",
         "doctrine/doctrine-migrations-bundle": "^3.2",
         "doctrine/orm": "^2.13",
         "endroid/qr-code": "^4.8",
         "gregwar/image": "master",
-        "knplabs/knp-paginator-bundle": "^5.6",
+        "knplabs/knp-paginator-bundle": "^6.2",
         "phpdocumentor/reflection-docblock": "^5.2",
         "scheb/2fa-bundle": "^6.8",
         "scheb/2fa-google-authenticator": "^6.8",
-        "symfony/asset": "^6.2",
-        "symfony/cache": "^6.2",
-        "symfony/console": "^6.2",
-        "symfony/dotenv": "^6.2",
-        "symfony/expression-language": "^6.2",
+        "symfony/asset": "^6.3",
+        "symfony/cache": "^6.3",
+        "symfony/console": "^6.3",
+        "symfony/dotenv": "^6.3",
+        "symfony/expression-language": "^6.3",
         "symfony/flex": "^2.2",
-        "symfony/form": "^6.2",
-        "symfony/framework-bundle": "^6.2",
-        "symfony/google-mailer": "^6.2",
-        "symfony/http-client": "^6.2",
-        "symfony/intl": "^6.2",
-        "symfony/lock": "^6.2",
-        "symfony/mailer": "^6.2",
-        "symfony/messenger": "^6.2",
-        "symfony/monolog-bridge": "^6.2",
+        "symfony/form": "^6.3",
+        "symfony/framework-bundle": "^6.3",
+        "symfony/google-mailer": "^6.3",
+        "symfony/http-client": "^6.3",
+        "symfony/intl": "^6.3",
+        "symfony/lock": "^6.3",
+        "symfony/mailer": "^6.3",
+        "symfony/messenger": "^6.3",
+        "symfony/monolog-bridge": "^6.3",
         "symfony/monolog-bundle": "^3.8",
-        "symfony/notifier": "^6.2",
-        "symfony/process": "^6.2",
-        "symfony/property-access": "^6.2",
-        "symfony/property-info": "^6.2",
-        "symfony/proxy-manager-bridge": "^6.2",
-        "symfony/rate-limiter": "^6.2",
-        "symfony/runtime": "^6.2",
+        "symfony/notifier": "^6.3",
+        "symfony/process": "^6.3",
+        "symfony/property-access": "^6.3",
+        "symfony/property-info": "^6.3",
+        "symfony/proxy-manager-bridge": "^6.3",
+        "symfony/rate-limiter": "^6.3",
+        "symfony/runtime": "^6.3",
         "symfony/security-bundle": "^6.1",
-        "symfony/serializer": "^6.2",
-        "symfony/string": "^6.2",
-        "symfony/translation": "^6.2",
-        "symfony/twig-bundle": "^6.2",
-        "symfony/validator": "^6.2",
-        "symfony/web-link": "^6.2",
-        "symfony/webpack-encore-bundle": "^1.13",
-        "symfony/yaml": "^6.2",
+        "symfony/serializer": "^6.3",
+        "symfony/string": "^6.3",
+        "symfony/translation": "^6.3",
+        "symfony/twig-bundle": "^6.3",
+        "symfony/validator": "^6.3",
+        "symfony/web-link": "^6.3",
+        "symfony/webpack-encore-bundle": "^2.0",
+        "symfony/yaml": "^6.3",
         "symfonycasts/verify-email-bundle": "^1.10",
         "twig/extra-bundle": "^3.4",
         "twig/intl-extra": "^3.4",
@@ -59,20 +59,20 @@
         "voku/portable-ascii": "^1.6"
     },
     "require-dev": {
+        "coderberg/google-authenticator": "^1.2",
         "dbrekelmans/bdi": "^1.0",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
-        "friendsofphp/php-cs-fixer": "^3.2",
-        "phpgangsta/googleauthenticator": "dev-master",
-        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "^3.17",
+        "phpunit/phpunit": "^9.6",
         "rector/rector": "^0.14.5",
-        "symfony/browser-kit": "^6.2",
-        "symfony/css-selector": "^6.2",
-        "symfony/debug-bundle": "^6.2",
-        "symfony/maker-bundle": "^1.31",
+        "symfony/browser-kit": "^6.3",
+        "symfony/css-selector": "^6.3",
+        "symfony/debug-bundle": "^6.3",
+        "symfony/maker-bundle": "^1.48",
         "symfony/panther": "^2.0",
-        "symfony/phpunit-bridge": "^6.1",
-        "symfony/stopwatch": "^6.1",
-        "symfony/web-profiler-bundle": "^6.1"
+        "symfony/phpunit-bridge": "^6.3",
+        "symfony/stopwatch": "^6.3",
+        "symfony/web-profiler-bundle": "^6.3"
     },
     "config": {
         "platform": {
@@ -125,7 +125,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "6.2.*"
+            "require": "6.3.*"
         }
     }
 }