Update to PHP 8.4, Symfony 7.2, PHPUnit 10.5, PostgreSQL 15 and more

.env

@@ -9,22 +9,24 @@
 # Real environment variables win over .env files.
 #
 # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev
-APP_SECRET=48cddd5b9d580ca60a74b1e34be045b1
+APP_SECRET=
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # 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://postgres:password@127.0.0.1:5432/symfony?serverVersion=11&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://postgres:password@127.0.0.1:5432/symfony?serverVersion=15&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> sentry/sentry-symfony ###

.env.dev

@@ -1 +1,5 @@
-DATABASE_URL="postgresql://postgres:password@127.0.0.1:8432/symfony?serverVersion=11&charset=utf8"
+DATABASE_URL="postgresql://postgres:password@127.0.0.1:8432/symfony?serverVersion=15&charset=utf8"
+
+###> symfony/framework-bundle ###
+APP_SECRET=7ecd8da499dd78387f75a8ea0ab70b1b
+###< symfony/framework-bundle ###

.github/workflows/deployment.yml

@@ -14,11 +14,11 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.4'
 
       - name: Deploy
         uses: deployphp/action@v1
         with:
           private-key: ${{ secrets.PRIVATE_KEY }}
           dep: deploy
-          deployer-version: "v7.3.0"
+          deployer-version: "v7.5.8"

.github/workflows/pipeline.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:11
+        image: postgres:15
         env:
           POSTGRES_DB: 'symfony_test'
           POSTGRES_USER: 'postgres'
@@ -26,7 +26,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.4'
 
       - name: Cache Vendors
         uses: actions/cache@v2
@@ -54,7 +54,7 @@ jobs:
         run: bin/console cache:warmup --env=prod
 
       - name: Code Style PHP
-        run: vendor/bin/php-cs-fixer fix --dry-run
+        run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run
 
       - name: Cache Node Modules
         uses: actions/cache@v2
@@ -72,9 +72,6 @@ jobs:
       - name: PHPStan
         run: vendor/bin/phpstan analyse
 
-      - name: Psalm
-        run: vendor/bin/psalm --show-info=true
-
       - name: Setup Database
         run: bin/console doctrine:migration:migrate --env=test --no-interaction
 

.php-cs-fixer.dist.php

@@ -8,6 +8,7 @@
 return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
+        'global_namespace_import' => ['import_classes' => true],
     ])
     ->setFinder($finder)
 ;

.php-version

@@ -1 +1 @@
-8.2
+8.4

README.md

@@ -11,7 +11,7 @@ Setup
 
 **Requirements**
 
-* PHP 8.2
+* PHP 8.4
 * NPM
 * Composer
 * Docker Compose

assets/js/complexity-diff.js

@@ -7,12 +7,12 @@ export let ComplexityDiff = function () {
     $(document).on(
         'click',
         '.js-permalink-create',
-        this.handlePermalinkCreate.bind(this)
+        this.handlePermalinkCreate.bind(this),
     );
     $(document).on(
         'click',
         '.js-permalink-copy',
-        this.handlePermalinkCopy.bind(this)
+        this.handlePermalinkCopy.bind(this),
     );
 };
 
@@ -32,7 +32,7 @@ $.extend(ComplexityDiff.prototype, {
             })
             .catch(function (jqXHR) {
                 $('.js-permalink-input').val(
-                    "You can't create a permalink from broken code."
+                    "Whoops, can't create a permalink - is the code alright?",
                 );
             });
     },

assets/js/editor.js

@@ -29,12 +29,12 @@ export let Editor = function ($wrapper) {
     $wrapper.on(
         'click',
         '.js-calculate-complexities',
-        this.handleCalculate.bind(this)
+        this.handleCalculate.bind(this),
     );
     $wrapper.on(
         'click',
         '.js-simplify-code',
-        this.handleSimplifyCode.bind(this)
+        this.handleSimplifyCode.bind(this),
     );
 };
 
@@ -57,11 +57,11 @@ $.extend(Editor.prototype, {
                 self.setLevel(self.$wrapper, data.complexity_level);
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cyclomatic-complexity'),
-                    data.cyclomatic_complexity
+                    data.cyclomatic_complexity,
                 );
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cognitive-complexity'),
-                    data.cognitive_complexity
+                    data.cognitive_complexity,
                 );
                 self.$wrapper.removeClass('calculating');
             })
@@ -71,11 +71,11 @@ $.extend(Editor.prototype, {
                 self.setLevel(self.$wrapper, error.level);
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cyclomatic-complexity'),
-                    error
+                    error,
                 );
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cognitive-complexity'),
-                    error
+                    error,
                 );
                 self.$wrapper.removeClass('calculating');
             });
@@ -127,11 +127,11 @@ $.extend(Editor.prototype, {
                 self.replaceCode(data.code);
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cyclomatic-complexity'),
-                    data.cyclomatic_complexity
+                    data.cyclomatic_complexity,
                 );
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cognitive-complexity'),
-                    data.cognitive_complexity
+                    data.cognitive_complexity,
                 );
                 self.$wrapper.removeClass('calculating');
             })
@@ -143,11 +143,11 @@ $.extend(Editor.prototype, {
                 self.setLevel(self.$wrapper, error.level);
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cyclomatic-complexity'),
-                    error
+                    error,
                 );
                 self.replaceComplexity(
                     self.$wrapper.find('.js-cognitive-complexity'),
-                    error
+                    error,
                 );
                 self.$wrapper.removeClass('calculating');
             });

bin/check

@@ -7,14 +7,13 @@ symfony console lint:yaml config --parse-tags
 symfony console lint:twig templates
 symfony console lint:container
 
-symfony php vendor/bin/php-cs-fixer fix --dry-run
+PHP_CS_FIXER_IGNORE_ENV=1 symfony php vendor/bin/php-cs-fixer fix --dry-run
 npm run check-style
 
 npm audit
 
 symfony php vendor/bin/phpstan analyse
-symfony php vendor/bin/psalm --show-info=true
-symfony php vendor/bin/phpmd src ansi cleancode,codesize,design,naming,unusedcode,controversial
+symfony php vendor/bin/phpmd src ansi ruleset.xml --baseline-file phpmd-baseline.xml
 
 symfony php vendor/bin/phpunit
 XDEBUG_MODE=coverage symfony php vendor/bin/infection

bin/console

@@ -4,6 +4,10 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
+if (!is_dir(dirname(__DIR__).'/vendor')) {
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
+}
+
 if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
     throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }

docker-compose.yml → compose.yaml

@@ -1,8 +1,6 @@
-version: '3.1'
-
 services:
     database:
-        image: 'postgres:11'
+        image: 'postgres:15'
         ports:
             - '8432:5432'
         environment:

composer.json

@@ -3,54 +3,52 @@
     "description": "Slim web interface to diff complexity of code snippets",
     "type": "project",
     "license": "MIT",
-    "minimum-stability": "beta",
     "require": {
-        "php": "^8.2",
+        "php": "^8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-json": "*",
-        "doctrine/doctrine-bundle": "^2.9",
-        "doctrine/doctrine-migrations-bundle": "^3.2",
-        "doctrine/orm": "^2.15",
-        "niels-de-blaauw/php-doc-check": "^0.2",
-        "openai-php/symfony": "^0.4.1",
-        "pugx/shortid-php": "^1.1",
-        "sentry/sentry-symfony": "^4.8",
-        "symfony/asset": "^6.3",
-        "symfony/console": "^6.3",
-        "symfony/dotenv": "^6.3",
-        "symfony/flex": "^2.3",
-        "symfony/framework-bundle": "^6.3",
-        "symfony/monolog-bundle": "^3.8",
-        "symfony/runtime": "^6.3",
-        "symfony/twig-bundle": "^6.3",
-        "symfony/webpack-encore-bundle": "^1.17",
-        "symfony/yaml": "^6.3",
-        "twig/extra-bundle": "^3.6",
-        "twig/twig": "^3.6"
+        "doctrine/doctrine-bundle": "^2.13",
+        "doctrine/doctrine-migrations-bundle": "^3.4",
+        "doctrine/orm": "^2.20",
+        "niels-de-blaauw/php-doc-check": "^0.4.0",
+        "openai-php/symfony": "^0.8",
+        "pugx/shortid-php": "^1.3",
+        "sentry/sentry-symfony": "^4.14",
+        "symfony/asset": "^7.2",
+        "symfony/console": "^7.2",
+        "symfony/dotenv": "^7.2",
+        "symfony/flex": "^2.4",
+        "symfony/framework-bundle": "^7.2",
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/runtime": "^7.2",
+        "symfony/twig-bundle": "^7.2",
+        "symfony/webpack-encore-bundle": "^2.2",
+        "symfony/yaml": "^7.2",
+        "twig/extra-bundle": "^3.18",
+        "twig/twig": "^3.18"
     },
     "require-dev": {
-        "deployer/deployer": "^7.3",
-        "friendsofphp/php-cs-fixer": "^3.17",
+        "deployer/deployer": "^7.5",
+        "friendsofphp/php-cs-fixer": "^3.68",
         "infection/infection": "^0.27",
-        "pdepend/pdepend": "2.x-dev",
-        "phpmd/phpmd": "^2.13",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpstan/phpstan-symfony": "^1.3",
-        "phpunit/phpunit": "^9.6",
-        "spatie/phpunit-snapshot-assertions": "^4.2",
-        "symfony/browser-kit": "^6.3",
-        "symfony/css-selector": "^6.3",
-        "symfony/debug-bundle": "^6.3",
-        "symfony/stopwatch": "^6.3",
-        "symfony/var-dumper": "^6.3",
-        "symfony/web-profiler-bundle": "^6.3",
-        "vimeo/psalm": "^5.12"
+        "pdepend/pdepend": "^2.16",
+        "phpmd/phpmd": "^2.15",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0",
+        "phpunit/phpunit": "^10.5",
+        "spatie/phpunit-snapshot-assertions": "^5.1",
+        "symfony/browser-kit": "^7.2",
+        "symfony/css-selector": "^7.2",
+        "symfony/debug-bundle": "^7.2",
+        "symfony/stopwatch": "^7.2",
+        "symfony/var-dumper": "^7.2",
+        "symfony/web-profiler-bundle": "^7.2"
     },
     "config": {
         "platform": {
-            "php": "8.2.5"
+            "php": "8.4.2"
         },
         "preferred-install": {
             "*": "dist"
@@ -78,6 +76,8 @@
         "symfony/polyfill-ctype": "*",
         "symfony/polyfill-iconv": "*",
         "symfony/polyfill-mbstring": "*",
+        "symfony/polyfill-php84": "*",
+        "symfony/polyfill-php83": "*",
         "symfony/polyfill-php82": "*",
         "symfony/polyfill-php81": "*",
         "symfony/polyfill-php80": "*",
@@ -106,7 +106,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "6.3.*",
+            "require": "7.2.*",
             "docker": false
         }
     }