PHP 8 & Symfony 6

.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

@@ -18,7 +18,7 @@ jobs:
       - name: Enable Corepack
         run: corepack enable
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
           cache: yarn
@@ -38,7 +38,7 @@ jobs:
         run: yarn run production
 
       - name: 📤 Upload dist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: js
           path: htdocs/dist
@@ -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.1
+      - uses: getong/mariadb-action@v1.11
         with:
-          mariadb version: '10.3'
+          mariadb version: '10.11'
           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
 
@@ -98,7 +98,7 @@ jobs:
         run: composer install
 
       - name: 📥 Download JS
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: js
           path: htdocs/dist
@@ -123,12 +123,12 @@ jobs:
           PANTHER_NO_SANDBOX: '1'
         run: php bin/phpunit
 
-      - name: 📤 Upload screenshot van fout
+      - name: 📤 Upload cache + logs + screenshots bij fout
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: screenshot
-          path: screenshot
+          name: debug
+          path: var
 
   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
 
@@ -179,7 +179,7 @@ jobs:
           mv bin/ci/.gitignore.prod .gitignore
 
       - name: 📥 Download JS
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: js
           path: productie/htdocs/dist
@@ -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,7 +102,6 @@ package-lock.json
 ###< phpunit/phpunit ###
 
 ###> symfony/phpunit-bridge ###
-.phpunit
 .phpunit.result.cache
 /phpunit.xml
 ###< symfony/phpunit-bridge ###

.symfony.local.yaml

@@ -0,0 +1,3 @@
+http:
+  document_root: htdocs/
+  passthru: index.php

bin/console

@@ -1,48 +1,22 @@
 #!/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 (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_dir(dirname(__DIR__).'/vendor')) {
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
 }
 
-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');
+if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
+    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }
 
-require __DIR__ . '/../config/bootstrap.php';
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']);
-$kernel->boot();
-$container = $kernel->getContainer();
-
-ContainerFacade::init($container);
+require_once dirname(__DIR__).'/lib/defines.include.php';
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
-if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
-
-    if (class_exists(Debug::class)) {
-        Debug::enable();
-    }
-}
+return function (array $context) {
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
 
-$application = new Application($kernel);
-$application->run($input);
+    return new Application($kernel);
+};

bin/phpunit

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