Upgrade/symfony64

.env

@@ -3,7 +3,7 @@
 #
 #  * .env                contains default values for the environment variables needed by the app
 #  * .env.local          uncommitted file with local overrides
-#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$.ENV       committed environment-specific defaults
 #  * .env.$APP_ENV.local uncommitted environment-specific overrides
 #
 # Real environment variables win over .env files.
@@ -20,7 +20,6 @@ MAPBOX_ACCESS_TOKEN="It's not stored here, but it's not like that's providing mu
 APP_ENV=dev
 #TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
 #TRUSTED_HOSTS='^(localhost|example\.com)$'
-
 ###< symfony/framework-bundle ###
 
 ###> symfony/mailer ###
@@ -32,7 +31,8 @@ MAILER_DSN=null://null
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db"
-# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4"
+# 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=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
@@ -82,9 +82,3 @@ MAILER_DSN=sendmail://default
 SECURE_SCHEME=https
 
 REDIS_URL=redis://localhost:6379
-
-###> symfony/lock ###
-# Choose one of the stores below
-# postgresql+advisory://db_user:db_password@localhost/db_name
-LOCK_DSN=redis://localhost:6379
-###< symfony/lock ###

.vscode/launch.json

@@ -5,21 +5,45 @@
     "version": "0.2.0",
     "configurations": [
         {
+            "name": "Listen for Xdebug",
             "type": "php",
             "request": "launch",
-            "name": "Listen for XDebug",
-            // "pathMappings": {
-            //   "/home/vagrant/code": "${workspaceFolder}",
-            // },
             "port": 9003,
-            "log": true,
+            "log": true
         },
         {
-            "type": "pwa-chrome",
+            "name": "Launch currently open script",
+            "type": "php",
+            "request": "launch",
+            "program": "${file}",
+            "cwd": "${fileDirname}",
+            "port": 0,
+            "runtimeArgs": [
+                "-dxdebug.start_with_request=yes"
+            ],
+            "env": {
+                "XDEBUG_MODE": "debug,develop",
+                "XDEBUG_CONFIG": "client_port=${port}"
+            }
+        },
+        {
+            "name": "Launch Built-in web server",
+            "type": "php",
             "request": "launch",
-            "name": "Launch Chrome against localhost",
-            "url": "http://omm.gothick.org.uk.local",
-            "webRoot": "${workspaceFolder}"
+            "runtimeArgs": [
+                "-dxdebug.mode=debug",
+                "-dxdebug.start_with_request=yes",
+                "-S",
+                "localhost:0"
+            ],
+            "program": "",
+            "cwd": "${workspaceRoot}",
+            "port": 9003,
+            "serverReadyAction": {
+                "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started",
+                "uriFormat": "http://localhost:%s",
+                "action": "openExternally"
+            }
         }
     ]
 }

Makefile

@@ -14,6 +14,9 @@ sf: ## List all Symfony commands
 cc: ## Clear the cache. DID YOU CLEAR YOUR CACHE????
 	@$(CONSOLE) cache:clear
 
+cac: ## Clear ALL caches
+	@$(CONSOLE) cache:pool:clear --all
+
 warmup: ## Warmup the cache
 	@$(CONSOLE) cache:warmup
 
@@ -64,6 +67,9 @@ test:
 testapp:
 	$(DOCKER_COMP) -f docker-compose.yml -f docker-compose.app.yml exec -u www-data app php -dxdebug.mode=coverage bin/phpunit --cache-directory /tmp/phpunitcache --testdox
 
+shellapp:
+	$(DOCKER_COMP) -f docker-compose.yml -f docker-compose.app.yml exec app bash
+
 # We're going to be doing this a lot for a while...
 testtags:
 	$(PHPUNIT) --group tags

bin/phpunit

@@ -1,23 +1,4 @@
 #!/usr/bin/env php
 <?php
 
-if (!ini_get('date.timezone')) {
-    ini_set('date.timezone', 'UTC');
-}
-
-if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    if (PHP_VERSION_ID >= 80000) {
-        require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
-    } else {
-        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
-        require PHPUNIT_COMPOSER_INSTALL;
-        PHPUnit\TextUI\Command::main();
-    }
-} else {
-    if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
-        echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
-        exit(1);
-    }
-
-    require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
-}
+require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';

composer.json

@@ -2,20 +2,24 @@
     "type": "project",
     "license": "proprietary",
     "repositories": [
-	{
+    {
 	    "type": "vcs",
 	    "url": "https://github.com/gothick/geotools"
 	},
     {
         "type": "vcs",
         "url": "https://github.com/gothick/geolocation-php-api"
+    },
+    {
+        "type": "vcs",
+        "url": "https://github.com/gothick/BeelabTagBundle"
     }
     ],
     "require": {
         "php": ">=8.3.0",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "beelab/tag-bundle": "dev-master",
+        "beelab/tag-bundle": "2.x-dev",
         "composer/package-versions-deprecated": "^1.11",
         "doctrine/doctrine-bundle": "^2.11",
         "doctrine/doctrine-migrations-bundle": "^3.0",
@@ -38,48 +42,48 @@
         "nesbot/carbon": "^2.42",
         "phpdocumentor/reflection-docblock": "^5.2",
         "predis/predis": "^3.3",
-        "sensio/framework-extra-bundle": "^6.2",
         "sibyx/phpgpx": "@RC",
         "spatie/guzzle-rate-limiter-middleware": "^2.0",
+        "symfony/flex": "^2.10",
         "symfony/apache-pack": "^1.0",
-        "symfony/asset": "5.4.*",
-        "symfony/beanstalkd-messenger": "5.4.*",
-        "symfony/browser-kit": "^5.4",
-        "symfony/console": "5.4.*",
-        "symfony/css-selector": "^5.4",
-        "symfony/debug-bundle": "^5.4",
-        "symfony/doctrine-messenger": "5.4.*",
-        "symfony/dotenv": "5.4.*",
-        "symfony/expression-language": "5.4.*",
-        "symfony/flex": "^1.3.1",
-        "symfony/form": "5.4.*",
-        "symfony/framework-bundle": "5.4.*",
-        "symfony/http-client": "5.4.*",
-        "symfony/intl": "5.4.*",
-        "symfony/mailer": "5.4.*",
-        "symfony/messenger": "5.4.*",
-        "symfony/mime": "5.4.*",
-        "symfony/monolog-bundle": "^3.1",
-        "symfony/notifier": "5.4.*",
-        "symfony/process": "5.4.*",
-        "symfony/property-access": "5.4.*",
-        "symfony/property-info": "5.4.*",
-        "symfony/proxy-manager-bridge": "5.4.*",
-        "symfony/rate-limiter": "5.4.*",
-        "symfony/runtime": "5.4.*",
-        "symfony/security-bundle": "5.4.*",
-        "symfony/serializer": "5.4.*",
-        "symfony/stopwatch": "^5.4",
-        "symfony/string": "5.4.*",
-        "symfony/translation": "5.4.*",
-        "symfony/twig-bundle": "^5.4",
-        "symfony/ux-chartjs": "^2.0",
-        "symfony/validator": "5.4.*",
-        "symfony/var-dumper": "^5.4",
-        "symfony/web-link": "5.4.*",
-        "symfony/web-profiler-bundle": "^5.4",
-        "symfony/webpack-encore-bundle": "^1.12",
-        "symfony/yaml": "5.4.*",
+        "symfony/monolog-bundle": "^3.11",
+        "symfony/ux-chartjs": "^2.32",
+        "symfony/webpack-encore-bundle": "^2.4",
+
+        "symfony/asset": "6.4.*",
+        "symfony/beanstalkd-messenger": "6.4.*",
+        "symfony/browser-kit": "6.4.*",
+        "symfony/console": "6.4.*",
+        "symfony/css-selector": "6.4.*",
+        "symfony/debug-bundle": "6.4.*",
+        "symfony/doctrine-messenger": "6.4.*",
+        "symfony/dotenv": "6.4.*",
+        "symfony/expression-language": "6.4.*",
+        "symfony/form": "6.4.*",
+        "symfony/framework-bundle": "6.4.*",
+        "symfony/http-client": "6.4.*",
+        "symfony/intl": "6.4.*",
+        "symfony/mailer": "6.4.*",
+        "symfony/messenger": "6.4.*",
+        "symfony/mime": "6.4.*",
+        "symfony/notifier": "6.4.*",
+        "symfony/process": "6.4.*",
+        "symfony/property-access": "6.4.*",
+        "symfony/property-info": "6.4.*",
+        "symfony/proxy-manager-bridge": "6.4.*",
+        "symfony/rate-limiter": "6.4.*",
+        "symfony/runtime": "6.4.*",
+        "symfony/security-bundle": "6.4.*",
+        "symfony/serializer": "6.4.*",
+        "symfony/stopwatch": "6.4.*",
+        "symfony/string": "6.4.*",
+        "symfony/translation": "6.4.*",
+        "symfony/twig-bundle": "6.4.*",
+        "symfony/validator": "6.4.*",
+        "symfony/var-dumper": "6.4.*",
+        "symfony/web-link": "6.4.*",
+        "symfony/web-profiler-bundle": "6.4.*",
+        "symfony/yaml": "6.4.*",
         "twig/extra-bundle": "^3.4",
         "twig/intl-extra": "^3.1",
         "twig/markdown-extra": "^3.4",
@@ -91,13 +95,13 @@
         "dama/doctrine-test-bundle": "^8.2",
         "deployer/deployer": "^7.1",
         "dg/bypass-finals": "^1.9",
-        "doctrine/doctrine-fixtures-bundle": "^3.4",
-        "liip/test-fixtures-bundle": "^2.0.0-alpha1",
+        "doctrine/doctrine-fixtures-bundle": "^4.3",
+        "liip/test-fixtures-bundle": "^3.1.0",
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^12.5",
         "rector/rector": "^2.3",
-        "symfony/maker-bundle": "^1.23",
-        "symfony/phpunit-bridge": "^5.4"
+        "symfony/maker-bundle": "^1.65",
+        "symfony/phpunit-bridge": "^6.4"
     },
     "config": {
         "optimize-autoloader": true,
@@ -148,7 +152,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "5.4.*"
+            "require": "6.4.*"
         }
     }
 }