Upgrade code to be Symfony 6 compatible

.github/workflows/test-integration.yml

@@ -8,7 +8,7 @@ jobs:
       run:
         working-directory: /var/www/html/
     container:
-      image:  ghcr.io/openconext/openconext-basecontainers/php82-apache2-node16-composer2:latest
+      image:  ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest
       volumes:
         - .:/var/www/html
 

.gitignore

@@ -6,8 +6,7 @@
 ###########################
 
 /.web-server-pid
-/config/packages/parameters.yml
-/config/packages/parameters.yaml
+/config/openconext/parameters.yaml
 /build/
 /var/*
 !/var/cache
@@ -58,23 +57,14 @@ homestead/vendor
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
-
-###> phpunit/phpunit ###
-/phpunit.xml
-.phpunit.result.cache
-###< phpunit/phpunit ###
-
 ###> squizlabs/php_codesniffer ###
 /.phpcs-cache
 /phpcs.xml
 ###< squizlabs/php_codesniffer ###
-
-###> symfony/phpunit-bridge ###
-.phpunit
-.phpunit.result.cache
-/phpunit.xml
-###< symfony/phpunit-bridge ###
-
 ###> behat/symfony2-extension ###
 behat.yml
 ###< behat/symfony2-extension ###
+
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.0.0
+Make the project Symfony 6 and PHP 8.2 compatible.
+Many changes were made to achieve this goal. Some highlights:
+- The Homestead dev-env is removed you can now use OpenConext-devconf instead
+- Acceptance tests now run on GitHub Actions (Travis is no longer used)
+- Styling was brushed up
+
 # 1.4.3
 Make the project compatible with Stepup-build
 - Added a composer archive section 

README.md

@@ -18,13 +18,13 @@ Locale user preference
 ----------------------
 
 The default locale is based on the user agent. When the user switches its locale the selected preference is stored inside a
-browser cookie (stepup_locale). The cookie is set on naked domain of the requested domain (for gssp.stepup.example.com this is example.com).
+browser cookie (stepup_locale). The cookie is set on naked domain of the requested domain (for demogssp.dev.openconext.local this is example.com).
 
 Authentication and registration flows
 -------------------------------------
 
 The application provides internal (SpBundle) and a remote service provider. Instructions for this are given 
-on the homepage of this example project [Homepage](https://gssp.stepup.example.com/app_dev.php/).
+on the homepage of this example project [Homepage](https://demogssp.dev.openconext.local/).
 
 ![flow](docs/flow.png)
 <!---
@@ -68,7 +68,7 @@ One of the benefits of using this repository is that it contains many pre-config
 2) Change the project configuration variables:
     * composer.json name and description
     * this readme.md file
-    * Replace 'gssp.stepup.example.com' in all files with your own hostename
+    * Replace 'demogssp.dev.openconext.local' in all files with your own hostename
 3) Install the copied project. (See [Development environment](#) section of this README.md file)
 4) Implement your authentication & registration logic in DefaultController::registrationAction and DefaultController::authenticateAction. 
 5) Feel free to rename and change this example clone for your needs.
@@ -84,60 +84,46 @@ Development environment
 
 The purpose of the development environment is only for running the different test and metric tools.
 
-To get started, first setup the development environment. The dev. env. is a virtual machine. Every task described is run
-from that machine.  
+To get started, first setup the development environment. The development environment is a docker container. That is
+controlled via the [OpenConext-devconf](https://github.com/OpenConext/OpenConext-devconf/) project.
+
+Every task described below should be run from that container.
 
 Requirements
 -------------------
-- vagrant 2.2.x
-    - vagrant-hostsupdater (1.1.1.160, global)
-    - vagrant-vbguest (0.19.0, global)
-- Virtualbox
-- Composer
+- Docker
+- OpenConext-devconf
 
 Install
 -------------------
-**Create a .env file**
-
-1. `$ cp .env.ci .env`
-1. Edit the `.env` file with the editor of your choice and update the `APP_SECRET` to a value of your liking. See [Symfony docs](https://symfony.com/doc/current/reference/configuration/framework.html#secret) for more details about this secret. 
-
-
 **Copy the parameters.yaml**
 
-`$ cp config/packages/parameters.yaml.dist config/packages/parameters.yaml`
-
-**Bring up Homestead**
+`$ cp config/openconext/parameters.yaml.dist config/openconext/parameters.yaml`
 
-```
-$ cd homestead
-$ composer install
-$ cd ..
-$ vagrant up
-```
-
-If everything goes as intended, you can develop in the virtual machine.
+**Bring up the container in dev-mode**
+From you dev-conf installation start the `stepup` dev-env with AzureMFA in dev mode
 
-**Upgrade Homestead regularly**
+For example:
 
-Issues described in the previous section can be prevented if the base box is up to date.
-
-For detailed instructions, please visit the excellent Homestead [documentation pages](https://laravel.com/docs/5.8/homestead#updating-homestead).
+```bash
+cd stepup
+./start-dev-env.sh demogssp:../../OpenConext-stepup/Stepup-gssp-example
+```
 
 **Building frontend assets:**
 
-`$ yarn encore dev` 
+`$ yarn encore dev`
 
-or 
+or
 
-`$ yarn encore prod` 
+`$ yarn encore prod`
 
-for production 
+for production
 
 
 If everything goes as planned you can go to:
 
-[https://gssp.stepup.example.com](https://gssp.stepup.example.com/app_dev.php)
+[https://demogssp.dev.openconext.local](https://demogssp.dev.openconext.local/)
 
 Debugging
 -------------------

public/scss/application.scss → assets/scss/application.scss

@@ -12,6 +12,11 @@ $fa-font-path: "../../fonts";
 @import "base/mixins";
 @import "utilities/media_queries";
 @import "components/header";
+@import "components/button";
+@import "components/form";
+@import "components/alerts";
+@import "components/icon_legend";
+@import "components/table";
 @import "components/navigation";
 @import "components/footer";
 @import "pages/base";

public/scss/components/alerts.scss → assets/scss/components/alerts.scss

@@ -26,3 +26,8 @@ div.alert {
     padding-right: 0.25em;
   }
 }
+
+pre {
+  font-family: "Roboto Mono", Sans-serif;
+  font-size: small;
+}

bin/console

@@ -2,30 +2,16 @@
 <?php
 use Surfnet\Gssp\Infrastructure\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\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_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 dirname(__DIR__).'/config/bootstrap.php';
-if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
-    if (class_exists(Debug::class)) {
-        Debug::enable();
-    }
-}
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$application = new Application($kernel);
-$application->run($input);
+
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require_once dirname(__DIR__).'/config/bootstrap.php';
+
+return function (array $context) {
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+
+    return new Application($kernel);
+};

ci/qa/behat

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+./vendor/bin/behat --config ./ci/qa/behat.yml --tags '~@skip' $1

behat.yml → ci/qa/behat.yml

@@ -3,22 +3,17 @@ default:
         progress:
             paths: false
     extensions:
-        Behat\Symfony2Extension:
+        FriendsOfBehat\SymfonyExtension:
+            bootstrap: tests/Functional/Features/bootstrap/bootstrap.php
             kernel:
-                bootstrap: tests/Functional/Features/bootstrap/bootstrap.php
                 class: Surfnet\Gssp\Infrastructure\Kernel
+                environment: test
+                debug: false
         Behat\MinkExtension:
-            base_url: https://gssp.stepup.example.com
-            default_session: 'symfony2'
-            goutte:
-               guzzle_parameters:
-                    curl.CURLOPT_SSL_VERIFYPEER: false
-                    curl.CURLOPT_CERTINFO: false
-                    ssl.certificate_authority: false
-                    verify: false
+            base_url: https://demogssp.dev.openconext.local/
             sessions:
-                symfony2:
-                    symfony2: ~
+                symfony:
+                    symfony: ~
         Behatch\Extension: ~
     suites:
         default:

ci/qa/docheader

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+./vendor/bin/docheader --no-ansi check src/ tests/
+

ci/qa/lint

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+./bin/console lint:yaml config --no-ansi
+
+# https://github.com/overtrue/phplint
+./vendor/bin/phplint --no-ansi -n --no-progress --configuration=ci/qa/phplint.yaml $1