Revert "Merge pull request #1153 from csrdelft/php8-symfony6"

This reverts commit a81bb3f, reversing
changes made to b599a1d.

Author: NathanHuisman

.env.test

@@ -5,5 +5,5 @@ SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_WEB_SERVER_DIR=./htdocs/
 # --force-prefers-reduced-motion om panther scrollen direct te maken.
 PANTHER_CHROME_ARGUMENTS='--window-size=1400,1024 --force-prefers-reduced-motion'
-PANTHER_ERROR_SCREENSHOT_DIR='./var/error-screenshots'
+
 WIKI_URL=http://wiki.dev-csrdelft.nl

.github/workflows/ci.yml

@@ -61,9 +61,9 @@ jobs:
       - name: 💤 Shutdown Ubuntu MySQL (SUDO)
         run: sudo service mysql stop # Shutdown the Default MySQL, "sudo" is necessary, please not remove it
 
-      - uses: getong/mariadb-action@v1.11
+      - uses: getong/mariadb-action@v1.1
         with:
-          mariadb version: '10.11'
+          mariadb version: '10.3'
           mysql root password: ''
 
       - uses: actions/checkout@v3
@@ -89,7 +89,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: 8.2
           tools: composer:v2
           extensions: pdo_mysql
 
@@ -123,12 +123,12 @@ jobs:
           PANTHER_NO_SANDBOX: '1'
         run: php bin/phpunit
 
-      - name: 📤 Upload cache + logs + screenshots bij fout
+      - name: 📤 Upload screenshot van fout
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
-          name: debug
-          path: var
+          name: screenshot
+          path: screenshot
 
   deploy:
     name: Push naar productie
@@ -155,7 +155,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: 8.2
           tools: composer:v2
           extensions: pdo_mysql
 
@@ -213,7 +213,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: 8.2
           tools: composer:v2
           extensions: pdo_mysql
 

.gitignore

@@ -102,6 +102,7 @@ package-lock.json
 ###< phpunit/phpunit ###
 
 ###> symfony/phpunit-bridge ###
+.phpunit
 .phpunit.result.cache
 /phpunit.xml
 ###< symfony/phpunit-bridge ###

.idea/Projects.iml

@@ -1,22 +1,48 @@
 #!/usr/bin/env php
 <?php
 
+use CsrDelft\common\ContainerFacade;
 use CsrDelft\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\ErrorHandler\Debug;
 
-if (!is_dir(dirname(__DIR__).'/vendor')) {
-    throw new LogicException('Dependencies are missing. Try running "composer install".');
+if (false === in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.\PHP_SAPI.' SAPI'.\PHP_EOL;
 }
 
-if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
-    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
+set_time_limit(0);
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Application::class)) {
+    throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
+}
+
+$input = new ArgvInput();
+if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
+    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
+}
+
+if ($input->hasParameterOption('--no-debug', true)) {
+    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
 }
 
-require_once dirname(__DIR__).'/lib/defines.include.php';
-require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require __DIR__ . '/../config/bootstrap.php';
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']);
+$kernel->boot();
+$container = $kernel->getContainer();
+
+ContainerFacade::init($container);
 
-return function (array $context) {
-    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
 
-    return new Application($kernel);
-};
+$application = new Application($kernel);
+$application->run($input);

.idea/jsLibraryMappings.xml

@@ -1,23 +1,13 @@
 #!/usr/bin/env php
 <?php
 
-if (!ini_get('date.timezone')) {
-    ini_set('date.timezone', 'UTC');
+if (!file_exists(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);
 }
 
-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';
+if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
+    putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
 }
+
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';

.idea/php-test-framework.xml

@@ -42,46 +42,44 @@
 		"nelmio/cors-bundle": "^2.1",
 		"parsecsv/php-parsecsv": "^1.2",
 		"phpdocumentor/reflection-docblock": "^5.2",
-		"sentry/sentry-symfony": "^4.14",
-		"symfony/cache": "^6.0",
-		"symfony/config": "^6.0",
-		"symfony/dotenv": "^6.0",
+		"sensio/framework-extra-bundle": "^6.2",
+		"sentry/sentry-symfony": "^4.5",
+		"symfony/cache": "5.4.*",
+		"symfony/config": "5.4.*",
+		"symfony/dotenv": "5.4.*",
 		"symfony/flex": "^1.4",
-		"symfony/form": "^6.0",
-		"symfony/framework-bundle": "^6.0",
-		"symfony/http-foundation": "^6.0",
-		"symfony/mime": "^6.0",
+		"symfony/form": "5.4.*",
+		"symfony/framework-bundle": "5.4.*",
+		"symfony/http-foundation": "5.4.*",
+		"symfony/mime": "5.4.*",
 		"symfony/monolog-bundle": "^3.5",
-		"symfony/property-access": "^6.0",
-		"symfony/property-info": "^6.0",
-		"symfony/proxy-manager-bridge": "^6.0",
-		"symfony/routing": "^6.0",
-		"symfony/security-bundle": "^6.0",
-		"symfony/security-csrf": "^6.0",
-		"symfony/serializer": "^6.0",
-		"symfony/templating": "^6.0",
-		"symfony/translation": "^6.0",
-		"symfony/twig-bundle": "^6.0",
-		"symfony/uid": "^6.0",
-		"symfony/var-dumper": "^6.0",
-		"symfony/yaml": "^6.0",
+		"symfony/property-access": "5.4.*",
+		"symfony/property-info": "5.4.*",
+		"symfony/proxy-manager-bridge": "5.4.*",
+		"symfony/routing": "5.4.*",
+		"symfony/security-bundle": "5.4.*",
+		"symfony/security-csrf": "5.4.*",
+		"symfony/serializer": "5.4.*",
+		"symfony/templating": "5.4.*",
+		"symfony/translation": "5.4.*",
+		"symfony/twig-bundle": "5.4.*",
+		"symfony/uid": "5.4.*",
+		"symfony/var-dumper": "5.4.*",
+		"symfony/yaml": "5.4.*",
 		"tecnickcom/tcpdf": "^6.4",
 		"twig/cssinliner-extra": "^3.3",
 		"twig/extra-bundle": "^3.2",
 		"twig/intl-extra": "^3.2",
 		"twig/string-extra": "^3.5",
-		"zumba/json-serializer": "^3.0",
-		"symfony/runtime": "^6.0",
-		"symfony/console": "^6.0"
+		"zumba/json-serializer": "^3.0"
 	},
 	"config": {
 		"platform": {
 			"php": "8.2"
 		},
 		"allow-plugins": {
 			"symfony/flex": true,
-			"php-http/discovery": true,
-			"symfony/runtime": true
+			"php-http/discovery": true
 		}
 	},
 	"autoload": {
@@ -93,22 +91,21 @@
 	"include-path": ["lib/"],
 	"require-dev": {
 		"doctrine/doctrine-fixtures-bundle": "^3.3",
-		"fakerphp/faker": "^1.23",
 		"symfony/maker-bundle": "^1.19",
-		"symfony/phpunit-bridge": "^5.1",
-		"phpunit/phpunit": "^10.0",
-		"spatie/phpunit-snapshot-assertions": "^5.0",
-		"symfony/browser-kit": "^6.0",
-		"symfony/css-selector": "^6.0",
+		"fakerphp/faker": "^1.23",
+		"symfony/phpunit-bridge": "^7.1",
+		"phpunit/phpunit": ">9",
+		"spatie/phpunit-snapshot-assertions": "^4.0",
+		"symfony/browser-kit": "^5.0",
+		"symfony/css-selector": "^5.0",
 		"symfony/panther": "^2.0",
 		"vimeo/psalm": "^5.0",
 		"weirdan/doctrine-psalm-plugin": "2.9",
 		"psalm/plugin-symfony": "5.2.5",
 		"symfony/stopwatch": "^5.4",
 		"symfony/web-profiler-bundle": "^5.4",
 		"rector/rector": "^1.2",
-		"dbrekelmans/bdi": "^1.3",
-		"psalm/plugin-phpunit": "^0.19.0"
+		"dbrekelmans/bdi": "^1.3"
 	},
 	"scripts": {
 		"serve": [
@@ -119,7 +116,7 @@
 		"generator": "@php bin/dev/generate.php",
 		"flushcache": "@console stek:cache:flush",
 		"analyze": "@php vendor/vimeo/psalm/psalm",
-		"test": "@php bin/phpunit",
+		"test": "@php vendor/phpunit/phpunit/phpunit --bootstrap ./phpunit.init.php tests",
 		"console": "@php bin/console",
 		"update-prod": [
 			"@php -r \"exit(exec('git rev-parse --abbrev-ref HEAD') == 'master' ? 'Branch is master' . PHP_EOL : 1);\"",