diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 497639ed..b51ffd98 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -23,7 +23,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: composer:v2
+          tools: composer:v2, cs2pr
 
       - name: Install PHP Dependencies
         run: composer install --prefer-dist
@@ -32,7 +32,7 @@ jobs:
         run:  composer phpunit
 
       - name: Run phpcs
-        run: composer cs
+        run: composer cs:ci
 
       - name: Run PHPStan
-        run: composer static
\ No newline at end of file
+        run: composer static
diff --git a/.gitignore b/.gitignore
index bd3ab1e1..067390d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 node_modules
 .DS_Store
+.php-cs-fixer.cache
 npm-debug.log
 /vendor/
 /logs/*
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 00000000..df8b0a6c
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,15 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/test')
+    ->in(__DIR__ . '/app')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PER-CS2.0' => true,
+        'declare_strict_types' => true,
+        'no_unused_imports' => true,
+    ])
+    ->setFinder($finder);
\ No newline at end of file
diff --git a/app/config.php b/app/config.php
index 6404bd1d..27558bab 100644
--- a/app/config.php
+++ b/app/config.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use ahinkle\PackagistLatestVersion\PackagistLatestVersion;
 use DI\Bridge\Slim\Bridge;
 use Doctrine\DBAL\Types\Type;
@@ -10,7 +12,6 @@
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Doctrine\ORM\Tools\Console\EntityManagerProvider\SingleManagerProvider;
 use Github\Client;
-use Jenssegers\Agent\Agent;
 use League\CommonMark\Extension\CommonMarkCoreExtension;
 use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;
 use League\CommonMark\Extension\GithubFlavoredMarkdownExtension;
@@ -52,7 +53,6 @@
 use PhpSchool\Website\Online\CloudWorkshopRepository;
 use PhpSchool\Website\Online\Command\DownloadComposerPackageList;
 use PhpSchool\Website\Online\Middleware\ExerciseRunnerRateLimiter;
-use PhpSchool\Website\Online\Middleware\Styles;
 use PhpSchool\Website\Online\PathGenerator;
 use PhpSchool\Website\Online\ProblemFileConverter;
 use PhpSchool\Website\Online\ProjectUploader;
@@ -101,6 +101,7 @@
 use Symfony\Component\RateLimiter\Storage\CacheStorage;
 use Symfony\Contracts\Cache\CacheInterface;
 use Tuupola\Middleware\JwtAuthentication;
+
 use function DI\factory;
 use function DI\get;
 
@@ -121,7 +122,7 @@
         $app =  Bridge::create($c);
         $app->addRoutingMiddleware();
 
-        $app->add(function (Request $request, RequestHandler $handler) use($c) : Response {
+        $app->add(function (Request $request, RequestHandler $handler) use ($c): Response {
             /** @var Session $session */
             $session  = $this->get(Session::class);
 
@@ -139,7 +140,7 @@
     }),
     'cache' => factory(function (ContainerInterface $c): CacheInterface {
         if (!$c->get('config')['enableCache']) {
-            return new NullAdapter;
+            return new NullAdapter();
         }
 
         $redisConnection = new \Predis\Client(['host' => $c->get('config')['redisHost']]);
@@ -157,10 +158,10 @@
 
         return new RedisAdapter($redisConnection, 'default');
     }),
-    LoggerInterface::class => factory(function (ContainerInterface $c): LoggerInterface{
+    LoggerInterface::class => factory(function (ContainerInterface $c): LoggerInterface {
         $settings = $c->get('config')['logger'];
         $logger = new Logger($settings['name']);
-        $logger->pushProcessor(new UidProcessor);
+        $logger->pushProcessor(new UidProcessor());
         $logger->pushHandler(new StreamHandler($settings['path'], Logger::DEBUG));
         return $logger;
     }),
@@ -168,7 +169,7 @@
     SessionStorageInterface::class => get(Session::class),
 
     Session::class => function (ContainerInterface $c): Session {
-        return new Session;
+        return new Session();
     },
 
     FormHandlerFactory::class => function (ContainerInterface $c): FormHandlerFactory {
@@ -230,7 +231,7 @@
     Login::class => \DI\factory(function (ContainerInterface $c): Login {
         return new Login(
             $c->get(AdminAuthenticationService::class),
-            $c->get(FormHandlerFactory::class)->create(new LoginInputFilter),
+            $c->get(FormHandlerFactory::class)->create(new LoginInputFilter()),
             $c->get('config')['jwtSecret']
         );
     }),
@@ -365,7 +366,7 @@
     },
 
     'form.event' => function (ContainerInterface $c): FormHandler {
-        return $c->get(FormHandlerFactory::class)->create(new EventInputFilter);
+        return $c->get(FormHandlerFactory::class)->create(new EventInputFilter());
     },
 
     EventAll::class => function (ContainerInterface $c): EventAll {
@@ -474,7 +475,7 @@
 
     Generator::class => function (ContainerInterface $c): Generator {
         return new Generator(
-            new Parser(null, new class implements \Mni\FrontYAML\Markdown\MarkdownParser {
+            new Parser(null, new class () implements \Mni\FrontYAML\Markdown\MarkdownParser {
                 public function parse($markdown): string
                 {
                     return (new Parsedown())->parse($markdown);
@@ -523,7 +524,7 @@ public function parse($markdown): string
         );
     },
 
-    JwtAuthentication::class => function (ContainerInterface $c): JwtAuthentication  {
+    JwtAuthentication::class => function (ContainerInterface $c): JwtAuthentication {
         return new JwtAuthentication([
             'secret' => $c->get('config')['jwtSecret'],
             'path' => '/api/admin',
@@ -566,7 +567,7 @@ public function parse($markdown): string
                     'src/User/Entity',
                 ],
                 'auto_generate_proxies' => true,
-                'proxy_dir' =>  __DIR__.'/../cache/proxies',
+                'proxy_dir' =>  __DIR__ . '/../cache/proxies',
             ],
             'connection' => [
                 'driver'   => 'pdo_mysql',
diff --git a/composer.json b/composer.json
index 786123d1..69687763 100644
--- a/composer.json
+++ b/composer.json
@@ -61,11 +61,11 @@
     }
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.6",
     "phpunit/phpunit": "^9.5",
     "weirdan/doctrine-psalm-plugin": "^1.0",
     "doctrine/data-fixtures": "^1.5",
-    "phpstan/phpstan": "^1.9"
+    "phpstan/phpstan": "^1.9",
+    "friendsofphp/php-cs-fixer": "^3.51"
   },
   "scripts" : {
     "test": [
@@ -73,8 +73,9 @@
       "@cs"
     ],
     "phpunit": "phpunit",
-    "cs" : "phpcs",
-    "cs-fix": "phpcbf",
+    "cs" : "php-cs-fixer fix --dry-run --allow-risky=yes",
+    "cs:ci" : "php-cs-fixer fix --dry-run --allow-risky=yes --format=checkstyle | cs2pr",
+    "cs-fix": "php-cs-fixer --allow-risky=yes fix",
     "static": "phpstan --ansi analyse --level max src",
     "app:cc": "php bin/app clear-cache",
     "app:gen:blog": "php bin/app generate-blog",
diff --git a/composer.lock b/composer.lock
index 7239633d..3543ac09 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e82b3fe07c060412174d3c6596582201",
+    "content-hash": "36667f33b4e3741c4c9fdcfb66f63d63",
     "packages": [
         {
             "name": "ahinkle/packagist-latest-version",
@@ -9024,6 +9024,98 @@
             },
             "time": "2022-03-02T22:36:06+00:00"
         },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.51.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "127fa74f010da99053e3f5b62672615b72dd6efd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd",
+                "reference": "127fa74f010da99053e3f5b62672615b72dd6efd",
+                "shasum": ""
+            },
+            "require": {
+                "composer/semver": "^3.4",
+                "composer/xdebug-handler": "^3.0.3",
+                "ext-filter": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": "^7.4 || ^8.0",
+                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
+                "symfony/console": "^5.4 || ^6.0 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.28",
+                "symfony/polyfill-php80": "^1.28",
+                "symfony/polyfill-php81": "^1.28",
+                "symfony/process": "^5.4 || ^6.0 || ^7.0",
+                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "facile-it/paraunit": "^1.3 || ^2.0",
+                "justinrainbow/json-schema": "^5.2",
+                "keradus/cli-executor": "^2.1",
+                "mikey179/vfsstream": "^1.6.11",
+                "php-coveralls/php-coveralls": "^2.7",
+                "php-cs-fixer/accessible-object": "^1.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
+                "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2",
+                "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
+                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "keywords": [
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-02-28T19:50:06+00:00"
+        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.11.1",
@@ -10004,6 +10096,56 @@
             ],
             "time": "2024-02-23T13:14:51+00:00"
         },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
         {
             "name": "sebastian/cli-parser",
             "version": "1.0.2",
@@ -10969,84 +11111,298 @@
             "time": "2020-09-28T06:39:44+00:00"
         },
         {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.9.0",
+            "name": "symfony/event-dispatcher",
+            "version": "v7.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/834c28d533dd0636f910909d01b9ff45cc094b5e",
+                "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e",
                 "shasum": ""
             },
             "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
+                "php": ">=8.2",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<6.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^6.4|^7.0"
             },
-            "bin": [
-                "bin/phpcbf",
-                "bin/phpcs"
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
             ],
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-23T15:02:46+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.x-dev"
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Greg Sherwood",
-                    "role": "Former lead"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
                 },
                 {
-                    "name": "Juliette Reinders Folmer",
-                    "role": "Current lead"
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-23T14:45:45+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
-                    "name": "Contributors",
-                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
             "keywords": [
-                "phpcs",
-                "standards",
-                "static analysis"
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
             ],
             "support": {
-                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
-                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
-                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
-                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/PHPCSStandards",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
                     "type": "github"
                 },
                 {
-                    "url": "https://github.com/jrfnl",
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-29T20:11:03+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v7.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/983900d6fddf2b0cbaacacbbad07610854bd8112",
+                "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a way to profile code",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v7.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
                     "type": "github"
                 },
                 {
-                    "url": "https://opencollective.com/php_codesniffer",
-                    "type": "open_collective"
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-02-16T15:06:51+00:00"
+            "time": "2024-01-23T15:02:46+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/phpcs.xml b/phpcs.xml
deleted file mode 100644
index 847eb5dc..00000000
--- a/phpcs.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="PHP School coding standard">
-    <description>PHP School coding standard</description>
-
-    <!-- display progress -->
-    <arg value="p"/>
-    <arg name="colors"/>
-
-    <!-- inherit rules from: -->
-    <rule ref="PSR12">
-        <exclude name="Generic.Files.LineLength"/>
-    </rule>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
-
-    <!-- Paths to check -->
-    <file>src</file>
-    <file>test</file>
-</ruleset>
\ No newline at end of file
diff --git a/src/Action/Admin/ClearCache.php b/src/Action/Admin/ClearCache.php
index 6e42d715..4fd6f6af 100644
--- a/src/Action/Admin/ClearCache.php
+++ b/src/Action/Admin/ClearCache.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -12,9 +14,7 @@ class ClearCache
 {
     use JsonUtils;
 
-    public function __construct(private readonly CacheItemPoolInterface $cache)
-    {
-    }
+    public function __construct(private readonly CacheItemPoolInterface $cache) {}
 
     public function __invoke(Request $request, Response $response): MessageInterface
     {
diff --git a/src/Action/Admin/Event/All.php b/src/Action/Admin/Event/All.php
index d14b13bc..86f9d0cc 100644
--- a/src/Action/Admin/Event/All.php
+++ b/src/Action/Admin/Event/All.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Event;
 
 use PhpSchool\Website\Action\JsonUtils;
-use PhpSchool\Website\PhpRenderer;
 use PhpSchool\Website\Repository\EventRepository;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
diff --git a/src/Action/Admin/Event/Create.php b/src/Action/Admin/Event/Create.php
index d05af5ee..aae814e6 100644
--- a/src/Action/Admin/Event/Create.php
+++ b/src/Action/Admin/Event/Create.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Event;
 
 use PhpSchool\Website\Action\JsonUtils;
diff --git a/src/Action/Admin/Event/Delete.php b/src/Action/Admin/Event/Delete.php
index 5a6c2bcd..6cc8c5ee 100644
--- a/src/Action/Admin/Event/Delete.php
+++ b/src/Action/Admin/Event/Delete.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Event;
 
 use PhpSchool\Website\Action\JsonUtils;
diff --git a/src/Action/Admin/Event/Update.php b/src/Action/Admin/Event/Update.php
index e50830ab..9210000d 100644
--- a/src/Action/Admin/Event/Update.php
+++ b/src/Action/Admin/Event/Update.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Event;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -24,8 +26,7 @@ class Update
     public function __construct(
         private readonly EventRepository $repository,
         private readonly FormHandler $formHandler,
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response, string $id): MessageInterface
     {
diff --git a/src/Action/Admin/Login.php b/src/Action/Admin/Login.php
index c8b648d5..60dc50b7 100644
--- a/src/Action/Admin/Login.php
+++ b/src/Action/Admin/Login.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -26,8 +28,7 @@ public function __construct(
         private readonly AdminAuthenticationService $authenticationService,
         private readonly FormHandler $formHandler,
         private readonly string $jwtSecret,
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response): MessageInterface
     {
diff --git a/src/Action/Admin/Workshop/All.php b/src/Action/Admin/Workshop/All.php
index 415a10d9..1ea323e4 100644
--- a/src/Action/Admin/Workshop/All.php
+++ b/src/Action/Admin/Workshop/All.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use DateInterval;
diff --git a/src/Action/Admin/Workshop/Approve.php b/src/Action/Admin/Workshop/Approve.php
index 05932f0b..548a1d5b 100644
--- a/src/Action/Admin/Workshop/Approve.php
+++ b/src/Action/Admin/Workshop/Approve.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -23,8 +25,7 @@ public function __construct(
         private readonly CacheItemPoolInterface $cache,
         private readonly EmailNotifier $emailNotifier,
         private readonly LoggerInterface $logger
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response, string $id): MessageInterface
     {
diff --git a/src/Action/Admin/Workshop/Delete.php b/src/Action/Admin/Workshop/Delete.php
index ee6983df..0678cfc0 100644
--- a/src/Action/Admin/Workshop/Delete.php
+++ b/src/Action/Admin/Workshop/Delete.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -23,8 +25,7 @@ public function __construct(
         private readonly WorkshopInstallRepository $installRepository,
         private readonly WorkshopFeed $workshopFeed,
         private readonly CacheItemPoolInterface $cache,
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response, string $id): MessageInterface
     {
diff --git a/src/Action/Admin/Workshop/Promote.php b/src/Action/Admin/Workshop/Promote.php
index eb93c9b2..d4c744ae 100644
--- a/src/Action/Admin/Workshop/Promote.php
+++ b/src/Action/Admin/Workshop/Promote.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -19,8 +21,7 @@ public function __construct(
         private readonly WorkshopRepository $repository,
         private readonly WorkshopFeed $workshopFeed,
         private readonly CacheItemPoolInterface $cache,
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response, string $id): MessageInterface
     {
diff --git a/src/Action/Admin/Workshop/RegenerateFeed.php b/src/Action/Admin/Workshop/RegenerateFeed.php
index b1535a6f..d81ddc66 100644
--- a/src/Action/Admin/Workshop/RegenerateFeed.php
+++ b/src/Action/Admin/Workshop/RegenerateFeed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use PhpSchool\Website\Action\JsonUtils;
diff --git a/src/Action/Admin/Workshop/Requests.php b/src/Action/Admin/Workshop/Requests.php
index 716178d7..b1026020 100644
--- a/src/Action/Admin/Workshop/Requests.php
+++ b/src/Action/Admin/Workshop/Requests.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use PhpSchool\Website\Action\JsonUtils;
diff --git a/src/Action/Admin/Workshop/View.php b/src/Action/Admin/Workshop/View.php
index 34f0c652..156261a3 100644
--- a/src/Action/Admin/Workshop/View.php
+++ b/src/Action/Admin/Workshop/View.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Admin\Workshop;
 
 use DateInterval;
diff --git a/src/Action/BlogPost.php b/src/Action/BlogPost.php
index 391979c9..f67b52f7 100644
--- a/src/Action/BlogPost.php
+++ b/src/Action/BlogPost.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use PhpSchool\Website\Repository\DoctrineORMBlogRepository;
@@ -10,9 +12,7 @@ class BlogPost
 {
     use JsonUtils;
 
-    public function __construct(private DoctrineORMBlogRepository $repository)
-    {
-    }
+    public function __construct(private DoctrineORMBlogRepository $repository) {}
 
     public function __invoke(Request $request, Response $response, string $slug): Response
     {
diff --git a/src/Action/BlogPosts.php b/src/Action/BlogPosts.php
index 808ecdbb..76757840 100644
--- a/src/Action/BlogPosts.php
+++ b/src/Action/BlogPosts.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use PhpSchool\Website\Repository\DoctrineORMBlogRepository;
@@ -10,9 +12,7 @@ class BlogPosts
 {
     use JsonUtils;
 
-    public function __construct(private readonly DoctrineORMBlogRepository $repository)
-    {
-    }
+    public function __construct(private readonly DoctrineORMBlogRepository $repository) {}
 
     public function __invoke(Request $request, Response $response): Response
     {
diff --git a/src/Action/Events.php b/src/Action/Events.php
index 18506e9a..f5b893bf 100644
--- a/src/Action/Events.php
+++ b/src/Action/Events.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use PhpSchool\Website\Repository\EventRepository;
diff --git a/src/Action/JsonUtils.php b/src/Action/JsonUtils.php
index 375f7ee9..212b9c74 100644
--- a/src/Action/JsonUtils.php
+++ b/src/Action/JsonUtils.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use Psr\Http\Message\ResponseInterface as Response;
diff --git a/src/Action/Online/ComposerPackageAdd.php b/src/Action/Online/ComposerPackageAdd.php
index e7aa288a..2bb0685e 100644
--- a/src/Action/Online/ComposerPackageAdd.php
+++ b/src/Action/Online/ComposerPackageAdd.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use ahinkle\PackagistLatestVersion\PackagistLatestVersion;
diff --git a/src/Action/Online/ComposerPackageSearch.php b/src/Action/Online/ComposerPackageSearch.php
index ab59faed..83bfbde6 100644
--- a/src/Action/Online/ComposerPackageSearch.php
+++ b/src/Action/Online/ComposerPackageSearch.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\Website\Action\JsonUtils;
diff --git a/src/Action/Online/ResetState.php b/src/Action/Online/ResetState.php
index 77b623cd..33ece4cb 100644
--- a/src/Action/Online/ResetState.php
+++ b/src/Action/Online/ResetState.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -13,8 +15,7 @@ class ResetState
 
     public function __construct(
         private readonly StudentWorkshopState $studentState,
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response): Response
     {
diff --git a/src/Action/Online/RunExercise.php b/src/Action/Online/RunExercise.php
index 7fbeb8f2..159cb635 100644
--- a/src/Action/Online/RunExercise.php
+++ b/src/Action/Online/RunExercise.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\PhpWorkshop\Event\CgiExecuteEvent;
@@ -36,8 +38,7 @@ public function __construct(
         private readonly ProjectUploader $projectUploader,
         private readonly StudentWorkshopState $studentState,
         private readonly SessionStorageInterface $session,
-    ) {
-    }
+    ) {}
 
     public function __invoke(
         Request $request,
diff --git a/src/Action/Online/TourComplete.php b/src/Action/Online/TourComplete.php
index fa098c0d..8ad917f0 100644
--- a/src/Action/Online/TourComplete.php
+++ b/src/Action/Online/TourComplete.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -17,8 +19,7 @@ class TourComplete
     public function __construct(
         private readonly SessionStorageInterface $session,
         private readonly StudentRepository $studentRepository
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response): Response
     {
diff --git a/src/Action/Online/VerifyExercise.php b/src/Action/Online/VerifyExercise.php
index dab8abc9..6e258fc0 100644
--- a/src/Action/Online/VerifyExercise.php
+++ b/src/Action/Online/VerifyExercise.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\PhpWorkshop\Input\Input;
@@ -24,8 +26,7 @@ public function __construct(
         private readonly SessionStorageInterface $session,
         private readonly StudentWorkshopState $studentState,
         private readonly VueResultsRenderer $resultsRenderer
-    ) {
-    }
+    ) {}
 
     public function __invoke(
         Request $request,
diff --git a/src/Action/Online/WorkshopExercise.php b/src/Action/Online/WorkshopExercise.php
index 7fb387bd..5cbcbac4 100644
--- a/src/Action/Online/WorkshopExercise.php
+++ b/src/Action/Online/WorkshopExercise.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
@@ -10,7 +12,6 @@
 use PhpSchool\Website\Online\CloudInstalledWorkshop;
 use PhpSchool\Website\Online\CloudWorkshopRepository;
 use PhpSchool\Website\Online\ProblemFileConverter;
-use PhpSchool\Website\Online\StudentWorkshopState;
 use PhpSchool\Website\User\SessionStorageInterface;
 use PhpSchool\Website\User\StudentDTO;
 use Psr\Http\Message\MessageInterface;
@@ -55,8 +56,7 @@ public function __construct(
         private readonly CloudWorkshopRepository $installedWorkshops,
         private readonly ProblemFileConverter $problemFileConverter,
         private readonly SessionStorageInterface $session
-    ) {
-    }
+    ) {}
 
     public function __invoke(
         Request $request,
@@ -83,7 +83,7 @@ public function __invoke(
                 'name' => $exercise->getName(),
                 'slug' => $this->slug($exercise->getName()),
                 'description' => $exercise->getDescription(),
-                'type' => $exercise->getType()
+                'type' => $exercise->getType()->getValue()
             ],
             'problem' => $this->problemFileConverter->htmlFromExercise($exercise),
             'totalExerciseCount' => $this->installedWorkshops->totalExerciseCount(),
@@ -137,7 +137,7 @@ private function addInitialCode(array $data, ExerciseInterface $exercise): array
         }
 
         $data['initial_files'] = array_map(
-            fn (SolutionFile $file) => [
+            fn(SolutionFile $file) => [
                 'name' => $file->getRelativePath(),
                 'content' => $file->getContents(),
             ],
diff --git a/src/Action/Online/Workshops.php b/src/Action/Online/Workshops.php
index f7bdd979..dfeab990 100644
--- a/src/Action/Online/Workshops.php
+++ b/src/Action/Online/Workshops.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action\Online;
 
 use PhpSchool\Website\Action\JsonUtils;
@@ -15,8 +17,7 @@ class Workshops
     public function __construct(
         private readonly CloudWorkshopRepository $installedWorkshops,
         private readonly WorkshopRepository $workshopRepository
-    ) {
-    }
+    ) {}
 
     public function __invoke(Request $request, Response $response): Response
     {
diff --git a/src/Action/RedirectUtils.php b/src/Action/RedirectUtils.php
index 131b8e42..5e8d2729 100644
--- a/src/Action/RedirectUtils.php
+++ b/src/Action/RedirectUtils.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use Psr\Http\Message\MessageInterface;
diff --git a/src/Action/SlackInvite.php b/src/Action/SlackInvite.php
index f27de8dd..51688ffc 100644
--- a/src/Action/SlackInvite.php
+++ b/src/Action/SlackInvite.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use GuzzleHttp\Client;
@@ -10,9 +12,7 @@ class SlackInvite
 {
     use JsonUtils;
 
-    public function __construct(private readonly Client $client, private readonly string $slackApiToken)
-    {
-    }
+    public function __construct(private readonly Client $client, private readonly string $slackApiToken) {}
 
     public function __invoke(Request $request, Response $response): Response
     {
diff --git a/src/Action/StudentLogin.php b/src/Action/StudentLogin.php
index f9068555..d34739c1 100644
--- a/src/Action/StudentLogin.php
+++ b/src/Action/StudentLogin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Action/StudentLogout.php b/src/Action/StudentLogout.php
index d2be441c..5672699b 100644
--- a/src/Action/StudentLogout.php
+++ b/src/Action/StudentLogout.php
@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
-use Doctrine\ORM\EntityManagerInterface;
 use PhpSchool\Website\User\Session;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\ResponseInterface as Response;
diff --git a/src/Action/SubmitWorkshop.php b/src/Action/SubmitWorkshop.php
index 2785a410..d7742fd3 100644
--- a/src/Action/SubmitWorkshop.php
+++ b/src/Action/SubmitWorkshop.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use PhpSchool\Website\Exception\WorkshopCreationException;
diff --git a/src/Action/TrackDownloads.php b/src/Action/TrackDownloads.php
index ecdc5182..1e23c3f8 100644
--- a/src/Action/TrackDownloads.php
+++ b/src/Action/TrackDownloads.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Action;
 
 use PhpSchool\Website\Entity\WorkshopInstall;
diff --git a/src/Blog/Generator.php b/src/Blog/Generator.php
index 01ad24de..97c66795 100644
--- a/src/Blog/Generator.php
+++ b/src/Blog/Generator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Blog;
 
 use GlobIterator;
diff --git a/src/Blog/Post.php b/src/Blog/Post.php
index dd7e3852..09a1a8af 100644
--- a/src/Blog/Post.php
+++ b/src/Blog/Post.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Blog;
 
 class Post
diff --git a/src/Blog/PostMeta.php b/src/Blog/PostMeta.php
index aac65700..e2db8d5d 100644
--- a/src/Blog/PostMeta.php
+++ b/src/Blog/PostMeta.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Blog;
 
 use DateTime;
diff --git a/src/Command/ClearCache.php b/src/Command/ClearCache.php
index b7d9bcc7..3f11f93b 100644
--- a/src/Command/ClearCache.php
+++ b/src/Command/ClearCache.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Command;
 
 use PhpSchool\Website\Cache;
diff --git a/src/Command/CreateAdminUser.php b/src/Command/CreateAdminUser.php
index 1ca72083..39a9eaf8 100644
--- a/src/Command/CreateAdminUser.php
+++ b/src/Command/CreateAdminUser.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
-use PhpSchool\Website\Cache;
 use PhpSchool\Website\User\Entity\Admin;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/src/Command/GenerateBlog.php b/src/Command/GenerateBlog.php
index 05128b34..1bb92dbf 100644
--- a/src/Command/GenerateBlog.php
+++ b/src/Command/GenerateBlog.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Command;
 
 use Exception;
diff --git a/src/ContainerFactory.php b/src/ContainerFactory.php
index cae265d9..3de8a769 100644
--- a/src/ContainerFactory.php
+++ b/src/ContainerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website;
 
 use DI\ContainerBuilder;
diff --git a/src/Entity/BlogPost.php b/src/Entity/BlogPost.php
index eee5ead8..5ac72475 100644
--- a/src/Entity/BlogPost.php
+++ b/src/Entity/BlogPost.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Entity;
 
 use DateTime;
diff --git a/src/Entity/Event.php b/src/Entity/Event.php
index cf866685..ca52bd38 100644
--- a/src/Entity/Event.php
+++ b/src/Entity/Event.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Entity;
 
 use DateTime;
diff --git a/src/Entity/Workshop.php b/src/Entity/Workshop.php
index b0d12d8b..e54d5a8c 100644
--- a/src/Entity/Workshop.php
+++ b/src/Entity/Workshop.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Entity;
 
 use DateTime;
diff --git a/src/Entity/WorkshopInstall.php b/src/Entity/WorkshopInstall.php
index 926517e7..eb62f770 100644
--- a/src/Entity/WorkshopInstall.php
+++ b/src/Entity/WorkshopInstall.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Entity;
 
 use DateTime;
diff --git a/src/Exception/WorkshopCreationException.php b/src/Exception/WorkshopCreationException.php
index dd0231f6..05c88453 100644
--- a/src/Exception/WorkshopCreationException.php
+++ b/src/Exception/WorkshopCreationException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Exception;
 
 use RuntimeException;
@@ -9,9 +11,7 @@ class WorkshopCreationException extends RuntimeException
     /**
      * @param array<string, array<array<mixed>|string>> $errors
      */
-    public function __construct(private array $errors)
-    {
-    }
+    public function __construct(private array $errors) {}
 
     /**
      * @return array<string, array<array<mixed>|string>>
diff --git a/src/Form/FormHandler.php b/src/Form/FormHandler.php
index 2d4890c7..6d9562ae 100644
--- a/src/Form/FormHandler.php
+++ b/src/Form/FormHandler.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Form;
 
 use Laminas\InputFilter\InputFilter;
-use Laminas\InputFilter\InputFilterInterface;
 use PhpSchool\Website\Action\JsonUtils;
 use PhpSchool\Website\Action\RedirectUtils;
 use Psr\Http\Message\MessageInterface;
diff --git a/src/Form/FormHandlerFactory.php b/src/Form/FormHandlerFactory.php
index d4d2909b..09de4b8f 100644
--- a/src/Form/FormHandlerFactory.php
+++ b/src/Form/FormHandlerFactory.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Form;
 
 use Laminas\InputFilter\InputFilter;
 use PhpSchool\Website\User\Session;
-use Laminas\InputFilter\InputFilterInterface;
 
 class FormHandlerFactory
 {
diff --git a/src/InputFilter/Event.php b/src/InputFilter/Event.php
index 599b9b28..026a0996 100644
--- a/src/InputFilter/Event.php
+++ b/src/InputFilter/Event.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\InputFilter;
 
 use Laminas\Filter\File\RenameUpload;
@@ -9,7 +11,6 @@
 use Laminas\Validator\File\Size;
 use Laminas\Validator\File\UploadFile;
 use Laminas\InputFilter\FileInput;
-use Laminas\InputFilter\Input;
 use Laminas\Validator\StringLength;
 use Laminas\Validator\Uri;
 
diff --git a/src/InputFilter/Login.php b/src/InputFilter/Login.php
index 396218c1..e6b59a73 100644
--- a/src/InputFilter/Login.php
+++ b/src/InputFilter/Login.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\InputFilter;
 
 use Laminas\InputFilter\InputFilter;
diff --git a/src/InputFilter/SubmitWorkshop.php b/src/InputFilter/SubmitWorkshop.php
index 38e11075..43a64614 100644
--- a/src/InputFilter/SubmitWorkshop.php
+++ b/src/InputFilter/SubmitWorkshop.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\InputFilter;
 
 use Github\Client;
diff --git a/src/InputFilter/WorkshopComposerJson.php b/src/InputFilter/WorkshopComposerJson.php
index da5bbe31..162da074 100644
--- a/src/InputFilter/WorkshopComposerJson.php
+++ b/src/InputFilter/WorkshopComposerJson.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\InputFilter;
 
 use Laminas\InputFilter\InputFilter;
diff --git a/src/Middleware/Session.php b/src/Middleware/Session.php
index 722be7b6..401584c1 100644
--- a/src/Middleware/Session.php
+++ b/src/Middleware/Session.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Middleware;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/src/Online/CloudInstalledWorkshop.php b/src/Online/CloudInstalledWorkshop.php
index 272683ad..9d33dbd2 100644
--- a/src/Online/CloudInstalledWorkshop.php
+++ b/src/Online/CloudInstalledWorkshop.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use PhpSchool\PhpWorkshop\Application;
diff --git a/src/Online/CloudWorkshopRepository.php b/src/Online/CloudWorkshopRepository.php
index 76139862..e26bbc70 100644
--- a/src/Online/CloudWorkshopRepository.php
+++ b/src/Online/CloudWorkshopRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use Composer\InstalledVersions;
@@ -57,7 +59,7 @@ public function totalExerciseCount(): int
     {
         /** @var int $total */
         $total = collect($this->findAll())
-            ->map(fn (CloudInstalledWorkshop $worksop) => count($worksop->findAllExercises()))
+            ->map(fn(CloudInstalledWorkshop $workshop) => count($workshop->findAllExercises()))
             ->sum();
 
         return $total;
diff --git a/src/Online/Command/DownloadComposerPackageList.php b/src/Online/Command/DownloadComposerPackageList.php
index 182bb750..a9190f64 100644
--- a/src/Online/Command/DownloadComposerPackageList.php
+++ b/src/Online/Command/DownloadComposerPackageList.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online\Command;
 
 use GuzzleHttp\Client;
@@ -13,9 +15,7 @@ class DownloadComposerPackageList
     private const COMPOSER_PACKAGES_FILE_LOCATION = __DIR__ . '/../../../var/packages.json';
     private const COMPOSER_PACKAGES_NEW_FILE_LOCATION = __DIR__ . '/../../../var/packages-new.json';
 
-    public function __construct(private Client $client, private LoggerInterface $logger)
-    {
-    }
+    public function __construct(private Client $client, private LoggerInterface $logger) {}
 
     public function __invoke(OutputInterface $output): void
     {
diff --git a/src/Online/Middleware/ExerciseRunnerRateLimiter.php b/src/Online/Middleware/ExerciseRunnerRateLimiter.php
index 05dcd735..8f1c140d 100644
--- a/src/Online/Middleware/ExerciseRunnerRateLimiter.php
+++ b/src/Online/Middleware/ExerciseRunnerRateLimiter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online\Middleware;
 
 use PhpSchool\Website\User\SessionStorageInterface;
diff --git a/src/Online/PathGenerator.php b/src/Online/PathGenerator.php
index 64d65316..a5790c47 100644
--- a/src/Online/PathGenerator.php
+++ b/src/Online/PathGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use PhpSchool\PhpWorkshop\Utils\Path;
diff --git a/src/Online/ProblemFileConverter.php b/src/Online/ProblemFileConverter.php
index d015c219..cd47ab47 100644
--- a/src/Online/ProblemFileConverter.php
+++ b/src/Online/ProblemFileConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use League\CommonMark\MarkdownConverterInterface;
diff --git a/src/Online/ProjectUploader.php b/src/Online/ProjectUploader.php
index 6802601d..9b802575 100644
--- a/src/Online/ProjectUploader.php
+++ b/src/Online/ProjectUploader.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use PhpSchool\PhpWorkshop\Solution\DirectorySolution;
@@ -11,9 +13,7 @@
 
 class ProjectUploader
 {
-    public function __construct(private readonly PathGenerator $pathGenerator)
-    {
-    }
+    public function __construct(private readonly PathGenerator $pathGenerator) {}
 
     public function upload(Request $request, StudentDTO $student): DirectorySolution
     {
diff --git a/src/Online/StudentCloudState.php b/src/Online/StudentCloudState.php
index 9435fd7e..acab54dc 100644
--- a/src/Online/StudentCloudState.php
+++ b/src/Online/StudentCloudState.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use PhpSchool\PhpWorkshop\UserState\UserState;
@@ -39,7 +41,7 @@ public function getTotalCompletedExercises(): int
         /** @var int $total */
         $total = collect($this->workshopState)
             ->pluck('completedExercises')
-            ->map(fn (array $completed) => count($completed))
+            ->map(fn(array $completed) => count($completed))
             ->sum();
 
         return $total;
diff --git a/src/Online/StudentWorkshopState.php b/src/Online/StudentWorkshopState.php
index 72edf91f..06b40339 100644
--- a/src/Online/StudentWorkshopState.php
+++ b/src/Online/StudentWorkshopState.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use PhpSchool\PhpWorkshop\UserState\UserState;
 use PhpSchool\Website\User\Entity\Student;
-use PhpSchool\Website\User\Session;
 use PhpSchool\Website\User\SessionStorageInterface;
 use PhpSchool\Website\User\StudentDTO;
 use PhpSchool\Website\User\StudentRepository;
diff --git a/src/Online/VueResultsRenderer.php b/src/Online/VueResultsRenderer.php
index ca248a79..cdbab89a 100644
--- a/src/Online/VueResultsRenderer.php
+++ b/src/Online/VueResultsRenderer.php
@@ -1,11 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Online;
 
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Result\FailureInterface;
-use PhpSchool\PhpWorkshop\Result\Cli\FailureInterface as CliFailure;
-use PhpSchool\PhpWorkshop\Result\Cgi\FailureInterface as CgiFailure;
 use PhpSchool\PhpWorkshop\Result\ResultGroupInterface;
 use PhpSchool\PhpWorkshop\Result\ResultInterface;
 use PhpSchool\PhpWorkshop\Result\SuccessInterface;
diff --git a/src/Repository/DoctrineORMBlogRepository.php b/src/Repository/DoctrineORMBlogRepository.php
index 473a47ed..c8e38000 100644
--- a/src/Repository/DoctrineORMBlogRepository.php
+++ b/src/Repository/DoctrineORMBlogRepository.php
@@ -1,11 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use PhpSchool\Website\Entity\BlogPost;
-use PhpSchool\Website\Entity\Event;
-use PhpSchool\Website\Entity\Workshop;
 use RuntimeException;
 
 /**
diff --git a/src/Repository/DoctrineORMEventRepository.php b/src/Repository/DoctrineORMEventRepository.php
index a7c10a1d..10508178 100644
--- a/src/Repository/DoctrineORMEventRepository.php
+++ b/src/Repository/DoctrineORMEventRepository.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use PhpSchool\Website\Entity\Event;
-use PhpSchool\Website\Entity\Workshop;
 use RuntimeException;
 
 /**
diff --git a/src/Repository/DoctrineORMWorkshopInstallRepository.php b/src/Repository/DoctrineORMWorkshopInstallRepository.php
index 98258925..d14df5cb 100644
--- a/src/Repository/DoctrineORMWorkshopInstallRepository.php
+++ b/src/Repository/DoctrineORMWorkshopInstallRepository.php
@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
-use DateTime;
 use Doctrine\ORM\EntityRepository;
 use PhpSchool\Website\Entity\Workshop;
 use PhpSchool\Website\Entity\WorkshopInstall;
diff --git a/src/Repository/DoctrineORMWorkshopRepository.php b/src/Repository/DoctrineORMWorkshopRepository.php
index 986ce23d..6d3f1423 100644
--- a/src/Repository/DoctrineORMWorkshopRepository.php
+++ b/src/Repository/DoctrineORMWorkshopRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
 use Doctrine\ORM\EntityRepository;
diff --git a/src/Repository/EventRepository.php b/src/Repository/EventRepository.php
index 7255bcca..a1e03122 100644
--- a/src/Repository/EventRepository.php
+++ b/src/Repository/EventRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
 use PhpSchool\Website\Entity\Event;
diff --git a/src/Repository/WorkshopInstallRepository.php b/src/Repository/WorkshopInstallRepository.php
index 7f46fb1b..8ae2249e 100644
--- a/src/Repository/WorkshopInstallRepository.php
+++ b/src/Repository/WorkshopInstallRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
 use PhpSchool\Website\Entity\Workshop;
diff --git a/src/Repository/WorkshopRepository.php b/src/Repository/WorkshopRepository.php
index e270b83f..d70a3e3d 100644
--- a/src/Repository/WorkshopRepository.php
+++ b/src/Repository/WorkshopRepository.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Repository;
 
 use PhpSchool\Website\Entity\Workshop;
-use RuntimeException;
 
 interface WorkshopRepository
 {
diff --git a/src/Service/WorkshopCreator.php b/src/Service/WorkshopCreator.php
index 78027c78..1b156d8b 100644
--- a/src/Service/WorkshopCreator.php
+++ b/src/Service/WorkshopCreator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Service;
 
 use PhpSchool\Website\Entity\Workshop;
diff --git a/src/TestUtils/BaseFilesystemTest.php b/src/TestUtils/BaseFilesystemTest.php
index 4385e32a..05c146f2 100644
--- a/src/TestUtils/BaseFilesystemTest.php
+++ b/src/TestUtils/BaseFilesystemTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\TestUtils;
 
 use PhpSchool\PhpWorkshop\Utils\Path;
diff --git a/src/User/Adapter/Doctrine.php b/src/User/Adapter/Doctrine.php
index 41342516..316709e7 100644
--- a/src/User/Adapter/Doctrine.php
+++ b/src/User/Adapter/Doctrine.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User\Adapter;
 
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/User/AdminAuthenticationService.php b/src/User/AdminAuthenticationService.php
index 006025d6..8ea50c52 100644
--- a/src/User/AdminAuthenticationService.php
+++ b/src/User/AdminAuthenticationService.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 use Laminas\Authentication\Adapter\AbstractAdapter;
diff --git a/src/User/ArraySession.php b/src/User/ArraySession.php
index a3688add..73490ee2 100644
--- a/src/User/ArraySession.php
+++ b/src/User/ArraySession.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 class ArraySession implements SessionStorageInterface
@@ -7,9 +9,7 @@ class ArraySession implements SessionStorageInterface
     /**
      * @param array<string, mixed> $data
      */
-    public function __construct(private array $data = [])
-    {
-    }
+    public function __construct(private array $data = []) {}
 
     public function get(string $key, mixed $default = null): mixed
     {
diff --git a/src/User/DoctrineORMStudentRepository.php b/src/User/DoctrineORMStudentRepository.php
index 13c9043c..99447a8c 100644
--- a/src/User/DoctrineORMStudentRepository.php
+++ b/src/User/DoctrineORMStudentRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 use Doctrine\ORM\EntityRepository;
diff --git a/src/User/Entity/Admin.php b/src/User/Entity/Admin.php
index 1ac4b252..c7f305a2 100644
--- a/src/User/Entity/Admin.php
+++ b/src/User/Entity/Admin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/User/Entity/Student.php b/src/User/Entity/Student.php
index 762f07ec..c1b86d49 100644
--- a/src/User/Entity/Student.php
+++ b/src/User/Entity/Student.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User\Entity;
 
 use DateTime;
diff --git a/src/User/Middleware/StudentAuthenticator.php b/src/User/Middleware/StudentAuthenticator.php
index ebd38b2f..3e28e534 100644
--- a/src/User/Middleware/StudentAuthenticator.php
+++ b/src/User/Middleware/StudentAuthenticator.php
@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User\Middleware;
 
 use GuzzleHttp\Psr7\Response;
 use PhpSchool\Website\Action\RedirectUtils;
 use PhpSchool\Website\User\SessionStorageInterface;
 use PhpSchool\Website\User\StudentDTO;
-use PhpSchool\Website\User\StudentRepository;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface as RequestHandler;
diff --git a/src/User/Middleware/StudentRefresher.php b/src/User/Middleware/StudentRefresher.php
index 4908268d..8d47afaf 100644
--- a/src/User/Middleware/StudentRefresher.php
+++ b/src/User/Middleware/StudentRefresher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User\Middleware;
 
 use PhpSchool\Website\Action\RedirectUtils;
diff --git a/src/User/Session.php b/src/User/Session.php
index eff91b72..f0bd1efb 100644
--- a/src/User/Session.php
+++ b/src/User/Session.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 /**
diff --git a/src/User/SessionStorageInterface.php b/src/User/SessionStorageInterface.php
index 23c0494f..c6dbd75c 100644
--- a/src/User/SessionStorageInterface.php
+++ b/src/User/SessionStorageInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 interface SessionStorageInterface
diff --git a/src/User/StudentDTO.php b/src/User/StudentDTO.php
index af1864e9..ced10c88 100644
--- a/src/User/StudentDTO.php
+++ b/src/User/StudentDTO.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 use DateTime;
@@ -21,8 +23,7 @@ public function __construct(
         public readonly DateTime $joinDate,
         public readonly bool $tourComplete,
         public readonly StudentCloudState $workshopState
-    ) {
-    }
+    ) {}
 
     /**
      * @return array{
diff --git a/src/User/StudentRepository.php b/src/User/StudentRepository.php
index 943abd72..7892fa8b 100644
--- a/src/User/StudentRepository.php
+++ b/src/User/StudentRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\User;
 
 use PhpSchool\Website\User\Entity\Student;
diff --git a/src/Workshop/EmailNotifier.php b/src/Workshop/EmailNotifier.php
index 3e494f0a..3d1ba76d 100644
--- a/src/Workshop/EmailNotifier.php
+++ b/src/Workshop/EmailNotifier.php
@@ -1,12 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website\Workshop;
 
 use PhpSchool\Website\Entity\Workshop;
-use RuntimeException;
 use SendGrid;
-use SendGrid\Mail\Personalization;
-use SendGrid\Mail\Mail;
 
 class EmailNotifier
 {
@@ -28,11 +27,7 @@ public function __construct(SendGrid $sendGrid, string $phpSchoolEmail)
         $this->phpSchoolEmail = $phpSchoolEmail;
     }
 
-    public function approved(Workshop $workshop): void
-    {
-    }
+    public function approved(Workshop $workshop): void {}
 
-    public function new(Workshop $workshop): void
-    {
-    }
+    public function new(Workshop $workshop): void {}
 }
diff --git a/src/WorkshopFeed.php b/src/WorkshopFeed.php
index 944036fc..2d234835 100644
--- a/src/WorkshopFeed.php
+++ b/src/WorkshopFeed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\Website;
 
 use PhpSchool\Website\Entity\Workshop;
diff --git a/test/Action/SubmitWorkshopTest.php b/test/Action/SubmitWorkshopTest.php
index 4e4dc261..5ad9044c 100644
--- a/test/Action/SubmitWorkshopTest.php
+++ b/test/Action/SubmitWorkshopTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Action;
 
 use GuzzleHttp\Psr7\Response;
@@ -8,12 +10,10 @@
 use PhpSchool\Website\Entity\Workshop;
 use PhpSchool\Website\Exception\WorkshopCreationException;
 use PhpSchool\Website\Form\FormHandler;
-use PhpSchool\Website\PhpRenderer;
 use PhpSchool\Website\Service\WorkshopCreator;
 use PhpSchool\Website\User\Session;
 use PhpSchool\Website\Workshop\EmailNotifier;
 use PHPUnit\Framework\TestCase;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\NullLogger;
 use Psr\Log\Test\TestLogger;
@@ -62,7 +62,7 @@ public function testSubmitReturnsErrorResponseIfFormInvalid(): void
                     'field2' => ['error2'],
                 ]
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -114,7 +114,7 @@ public function testSubmitReturnsErrorResponseIfWorkshopCannotBeCreated(): void
                     'field2' => ['error2'],
                 ]
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -162,7 +162,7 @@ public function testErrorIsLoggedIfEmailNotificationEmailNotSent(): void
 
         $this->assertEquals(200, $actualResponse->getStatusCode());
         $this->assertEquals('application/json', $actualResponse->getHeaderLine('Content-Type'));
-        $this->assertEquals(['success' => true], json_decode($actualResponse->getBody(), true));
+        $this->assertEquals(['success' => true], json_decode($actualResponse->getBody()->__toString(), true));
         $this->assertTrue($logger->hasErrorThatContains('Email could not be sent. Error: "Could not send"'));
     }
 
@@ -204,7 +204,7 @@ public function testSuccessfulCreation(): void
 
         $this->assertEquals(200, $actualResponse->getStatusCode());
         $this->assertEquals('application/json', $actualResponse->getHeaderLine('Content-Type'));
-        $this->assertEquals(['success' => true], json_decode($actualResponse->getBody(), true));
+        $this->assertEquals(['success' => true], json_decode($actualResponse->getBody()->__toString(), true));
         $this->assertEmpty($logger->records);
     }
 }
diff --git a/test/Action/TrackDownloadsTest.php b/test/Action/TrackDownloadsTest.php
index 392dd915..5ec1123c 100644
--- a/test/Action/TrackDownloadsTest.php
+++ b/test/Action/TrackDownloadsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Action;
 
 use GuzzleHttp\Psr7\Response;
@@ -42,7 +44,7 @@ public function testUnknownWorkshopReturnsError(): void
                 'status' => 'error',
                 'message' => 'Workshop: "non-existent-workshop" not found.'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -86,6 +88,6 @@ public function testNewWorkshopInstallIsCreated(): void
 
         $this->assertEquals(200, $actualResponse->getStatusCode());
         $this->assertEquals('application/json', $actualResponse->getHeaderLine('Content-Type'));
-        $this->assertEquals(['success' => true], json_decode($actualResponse->getBody(), true));
+        $this->assertEquals(['success' => true], json_decode($actualResponse->getBody()->__toString(), true));
     }
 }
diff --git a/test/Asset/CliExerciseImpl.php b/test/Asset/CliExerciseImpl.php
index ef59ea16..db3c87cc 100644
--- a/test/Asset/CliExerciseImpl.php
+++ b/test/Asset/CliExerciseImpl.php
@@ -1,11 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Asset;
 
 use PhpSchool\PhpWorkshop\Exercise\CliExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
-use PhpSchool\PhpWorkshop\Exercise\ProvidesSolution;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\Solution\SolutionInterface;
 
@@ -59,7 +60,5 @@ public function getType(): ExerciseType
         return ExerciseType::CLI();
     }
 
-    public function configure(ExerciseDispatcher $dispatcher): void
-    {
-    }
+    public function configure(ExerciseDispatcher $dispatcher): void {}
 }
diff --git a/test/Asset/ExerciseImpl.php b/test/Asset/ExerciseImpl.php
index 9fb765fd..dc56a3c8 100644
--- a/test/Asset/ExerciseImpl.php
+++ b/test/Asset/ExerciseImpl.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Asset;
 
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
@@ -40,7 +42,5 @@ public function getType(): ExerciseType
         return ExerciseType::CLI();
     }
 
-    public function configure(ExerciseDispatcher $dispatcher): void
-    {
-    }
+    public function configure(ExerciseDispatcher $dispatcher): void {}
 }
diff --git a/test/Cloud/Action/ExerciseTest.php b/test/Cloud/Action/ExerciseTest.php
index 84f71083..0c43f897 100644
--- a/test/Cloud/Action/ExerciseTest.php
+++ b/test/Cloud/Action/ExerciseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud\Action;
 
 use GuzzleHttp\Psr7\Response;
@@ -11,7 +13,6 @@
 use PhpSchool\Website\Online\CloudInstalledWorkshop;
 use PhpSchool\Website\Online\CloudWorkshopRepository;
 use PhpSchool\Website\Online\ProblemFileConverter;
-use PhpSchool\Website\PhpRenderer;
 use PhpSchool\Website\TestUtils\BaseFilesystemTest;
 use PhpSchool\Website\User\ArraySession;
 use PhpSchool\WebsiteTest\Asset\CliExerciseImpl;
diff --git a/test/Cloud/Action/RunExerciseTest.php b/test/Cloud/Action/RunExerciseTest.php
index 4c07917f..5bf995cb 100644
--- a/test/Cloud/Action/RunExerciseTest.php
+++ b/test/Cloud/Action/RunExerciseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud\Action;
 
 use GuzzleHttp\Psr7\Response;
@@ -48,7 +50,7 @@ public function testErrorIsReturnedIfWorkshopDoesNotExist(): void
                 'success' => false,
                 'error' => 'Cannot find workshop'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -83,7 +85,7 @@ public function testErrorIsReturnedIfExerciseDoesNotExist(): void
                 'success' => false,
                 'error' => 'Cannot find exercise'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -112,7 +114,7 @@ public function testErrorIsReturnedIfUploaderThrowsException(): void
                 'success' => false,
                 'error' => 'Some error'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -149,7 +151,7 @@ public function testWithDefaultEntryPoint(): void
                 'success' => true,
                 'runs' => []
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
         $this->assertFileDoesNotExist($solution->getBaseDirectory());
     }
@@ -188,7 +190,7 @@ public function testRunFail(): void
                 'success' => false,
                 'runs' => []
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
         $this->assertFileDoesNotExist($solution->getBaseDirectory());
     }
diff --git a/test/Cloud/Action/TourCompleteTest.php b/test/Cloud/Action/TourCompleteTest.php
index 47a7298e..3320df9c 100644
--- a/test/Cloud/Action/TourCompleteTest.php
+++ b/test/Cloud/Action/TourCompleteTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud\Action;
 
 use GuzzleHttp\Psr7\Response;
@@ -72,6 +74,6 @@ public function testStudentIsUpdated(): void
 
         $response = $action->__invoke($this->createMock(ServerRequestInterface::class), new Response());
 
-        $this->assertEquals(['success' => true], json_decode($response->getBody(), true));
+        $this->assertEquals(['success' => true], json_decode($response->getBody()->__toString(), true));
     }
 }
diff --git a/test/Cloud/Action/VerifyExerciseTest.php b/test/Cloud/Action/VerifyExerciseTest.php
index f078bf9e..0a956770 100644
--- a/test/Cloud/Action/VerifyExerciseTest.php
+++ b/test/Cloud/Action/VerifyExerciseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud\Action;
 
 use GuzzleHttp\Psr7\Response;
@@ -52,7 +54,7 @@ public function testErrorIsReturnedIfWorkshopDoesNotExist(): void
                 'success' => false,
                 'error' => 'Cannot find workshop'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -88,7 +90,7 @@ public function testErrorIsReturnedIfExerciseDoesNotExist(): void
                 'success' => false,
                 'error' => 'Cannot find exercise'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -117,7 +119,7 @@ public function testErrorIsReturnedIfUploaderThrowsException(): void
                 'success' => false,
                 'error' => 'Some error'
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
     }
 
@@ -156,7 +158,7 @@ public function testWithDefaultEntryPoint(): void
                 'success' => true,
                 'results' => []
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
         $this->assertFileDoesNotExist($solution->getBaseDirectory());
     }
@@ -196,7 +198,7 @@ public function testWithCustomEntryPoint(): void
                 'success' => true,
                 'results' => []
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
         $this->assertFileDoesNotExist($solution->getBaseDirectory());
     }
@@ -239,7 +241,7 @@ public function testVerifyFail(): void
                 'success' => false,
                 'results' => []
             ],
-            json_decode($actualResponse->getBody(), true)
+            json_decode($actualResponse->getBody()->__toString(), true)
         );
         $this->assertFileDoesNotExist($solution->getBaseDirectory());
     }
diff --git a/test/Cloud/CloudInstalledWorkshopTest.php b/test/Cloud/CloudInstalledWorkshopTest.php
index e7bdb11c..3273d991 100644
--- a/test/Cloud/CloudInstalledWorkshopTest.php
+++ b/test/Cloud/CloudInstalledWorkshopTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud;
 
 use PhpSchool\PhpWorkshop\Application;
diff --git a/test/Cloud/CloudWorkshopRepositoryTest.php b/test/Cloud/CloudWorkshopRepositoryTest.php
index 726cf820..9a2dd279 100644
--- a/test/Cloud/CloudWorkshopRepositoryTest.php
+++ b/test/Cloud/CloudWorkshopRepositoryTest.php
@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud;
 
-use Composer\InstalledVersions;
 use PhpSchool\Website\Online\CloudInstalledWorkshop;
 use PhpSchool\Website\Online\CloudWorkshopRepository;
 use PhpSchool\Website\Entity\Workshop;
diff --git a/test/Cloud/ProjectUploaderTest.php b/test/Cloud/ProjectUploaderTest.php
index 487d9a1a..f4228194 100644
--- a/test/Cloud/ProjectUploaderTest.php
+++ b/test/Cloud/ProjectUploaderTest.php
@@ -1,18 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud;
 
 use GuzzleHttp\Psr7\ServerRequest;
 use PhpSchool\PhpWorkshop\Solution\SolutionFile;
-use PhpSchool\PhpWorkshop\Utils\System;
 use PhpSchool\Website\Online\PathGenerator;
 use PhpSchool\Website\Online\ProjectUploader;
 use PhpSchool\Website\Online\StudentCloudState;
 use PhpSchool\Website\TestUtils\BaseFilesystemTest;
 use PhpSchool\Website\User\StudentDTO;
-use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\Uuid;
-use Symfony\Component\Filesystem\Filesystem;
 
 class ProjectUploaderTest extends BaseFilesystemTest
 {
@@ -170,7 +169,7 @@ public function testScriptsAreCorrectlyWrittenInGeneratedPath(): void
                 $path . '/folder/nested/file3.php',
                 $path . '/solution.php',
             ],
-            array_map(fn (SolutionFile $f) => $f->getAbsolutePath(), $result->getFiles())
+            array_map(fn(SolutionFile $f) => $f->getAbsolutePath(), $result->getFiles())
         );
 
         $this->assertFileExists($path . '/solution.php');
@@ -216,7 +215,7 @@ public function testComposerDependenciesAreInstalledIfDependenciesAreSpecified()
 
         $this->assertEquals(
             [$path . '/composer.json', $path . '/solution.php'],
-            array_map(fn (SolutionFile $f) => $f->getAbsolutePath(), $result->getFiles())
+            array_map(fn(SolutionFile $f) => $f->getAbsolutePath(), $result->getFiles())
         );
 
         $this->assertFileExists($path . '/solution.php');
@@ -266,7 +265,7 @@ public function testWithAlternateEntryPoint(): void
                 $path . '/folder/nested/file3.php',
                 $path . '/program.php',
             ],
-            array_map(fn (SolutionFile $f) => $f->getAbsolutePath(), $result->getFiles())
+            array_map(fn(SolutionFile $f) => $f->getAbsolutePath(), $result->getFiles())
         );
 
         $this->assertFileExists($path . '/program.php');
diff --git a/test/Cloud/StudentCloudStateTest.php b/test/Cloud/StudentCloudStateTest.php
index c0e90f76..e847fd84 100644
--- a/test/Cloud/StudentCloudStateTest.php
+++ b/test/Cloud/StudentCloudStateTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud;
 
 use PhpSchool\Website\Online\StudentCloudState;
diff --git a/test/Cloud/StudentWorkshopStateTest.php b/test/Cloud/StudentWorkshopStateTest.php
index 3e2e3fdb..7c38eb94 100644
--- a/test/Cloud/StudentWorkshopStateTest.php
+++ b/test/Cloud/StudentWorkshopStateTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Cloud;
 
 use PhpSchool\Website\Online\StudentCloudState;
diff --git a/test/Cloud/_files/fw_di_config.php b/test/Cloud/_files/fw_di_config.php
index 5c615c4b..c57896d4 100644
--- a/test/Cloud/_files/fw_di_config.php
+++ b/test/Cloud/_files/fw_di_config.php
@@ -1,7 +1,7 @@
 <?php
 
-use PhpSchool\PhpWorkshop\Exercise\CliExercise;
-use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
+declare(strict_types=1);
+
 use PhpSchool\WebsiteTest\Asset\CliExerciseImpl;
 
 return [
@@ -16,7 +16,7 @@
         );
     },
     'my-service' => function () {
-        return new class {
+        return new class () {
             public $name = 'my-service';
         };
     },
diff --git a/test/InputFilter/EventTest.php b/test/InputFilter/EventTest.php
index 79fcaa65..53446780 100644
--- a/test/InputFilter/EventTest.php
+++ b/test/InputFilter/EventTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\InputFilter;
 
 use PhpSchool\Website\InputFilter\Event;
diff --git a/test/InputFilter/LoginTest.php b/test/InputFilter/LoginTest.php
index 5f8633c6..11d6a933 100644
--- a/test/InputFilter/LoginTest.php
+++ b/test/InputFilter/LoginTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\InputFilter;
 
 use PhpSchool\Website\InputFilter\Login;
diff --git a/test/InputFilter/SubmitWorkshopTest.php b/test/InputFilter/SubmitWorkshopTest.php
index 65a2fe86..e33c3968 100644
--- a/test/InputFilter/SubmitWorkshopTest.php
+++ b/test/InputFilter/SubmitWorkshopTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\InputFilter;
 
 use Github\Api\Repo;
diff --git a/test/InputFilter/WorkshopComposerJsonTest.php b/test/InputFilter/WorkshopComposerJsonTest.php
index 496c630a..45db9a35 100644
--- a/test/InputFilter/WorkshopComposerJsonTest.php
+++ b/test/InputFilter/WorkshopComposerJsonTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\InputFilter;
 
 use PhpSchool\Website\InputFilter\WorkshopComposerJson;
diff --git a/test/Repository/DoctrineORMEventRepositoryTest.php b/test/Repository/DoctrineORMEventRepositoryTest.php
index eedd8007..6b1d2cc9 100644
--- a/test/Repository/DoctrineORMEventRepositoryTest.php
+++ b/test/Repository/DoctrineORMEventRepositoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository;
 
 use PhpSchool\Website\Entity\Event;
@@ -17,7 +19,7 @@ public function testFindPreviousEventsReturnsOnlyEventsInThePast(): void
 
         $this->assertEquals(
             ['Event 5', 'Event 4', 'Event 3', 'Event 2', 'Event 1'],
-            array_map(fn (Event $event) => $event->getName(), $events)
+            array_map(fn(Event $event) => $event->getName(), $events)
         );
     }
 
@@ -31,7 +33,7 @@ public function testFindUpcomingEventsReturnsOnlyEventsInTheFuture(): void
 
         $this->assertEquals(
             ['Event 6', 'Event 7', 'Event 8', 'Event 9', 'Event 10'],
-            array_map(fn (Event $event) => $event->getName(), $events)
+            array_map(fn(Event $event) => $event->getName(), $events)
         );
     }
 
@@ -45,7 +47,7 @@ public function testFindAll(): void
 
         $this->assertEquals(
             ['Event 10', 'Event 9', 'Event 8', 'Event 7', 'Event 6', 'Event 5', 'Event 4', 'Event 3', 'Event 2', 'Event 1'],
-            array_map(fn (Event $event) => $event->getName(), $events)
+            array_map(fn(Event $event) => $event->getName(), $events)
         );
     }
 
@@ -63,7 +65,7 @@ public function testFindById(): void
 
         $this->assertEquals(
             'Event 1',
-            $this->getRepository(Event::class)->findById($fixture->event1Id)->getName()
+            $this->getRepository(Event::class)->findById($fixture->event1Id->toString())->getName()
         );
     }
 
@@ -103,7 +105,7 @@ public function testRemove(): void
 
         $this->assertEquals(
             ['Event 10', 'Event 9', 'Event 8', 'Event 7', 'Event 6', 'Event 5', 'Event 4', 'Event 3', 'Event 2'],
-            array_map(fn (Event $event) => $event->getName(), $events)
+            array_map(fn(Event $event) => $event->getName(), $events)
         );
     }
 }
diff --git a/test/Repository/DoctrineORMRepositoryTest.php b/test/Repository/DoctrineORMRepositoryTest.php
index 59f8afb4..e272c036 100644
--- a/test/Repository/DoctrineORMRepositoryTest.php
+++ b/test/Repository/DoctrineORMRepositoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository;
 
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
diff --git a/test/Repository/DoctrineORMStudentRepositoryTest.php b/test/Repository/DoctrineORMStudentRepositoryTest.php
index 46c886af..a315320e 100644
--- a/test/Repository/DoctrineORMStudentRepositoryTest.php
+++ b/test/Repository/DoctrineORMStudentRepositoryTest.php
@@ -1,10 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository;
 
-use PhpSchool\Website\Entity\Event;
 use PhpSchool\Website\User\Entity\Student;
-use PhpSchool\WebsiteTest\Repository\Fixtures\Events;
 use PhpSchool\WebsiteTest\Repository\Fixtures\Students;
 
 class DoctrineORMStudentRepositoryTest extends DoctrineORMRepositoryTest
diff --git a/test/Repository/DoctrineORMWorkshopRepositoryTest.php b/test/Repository/DoctrineORMWorkshopRepositoryTest.php
index 142748ae..8b490ab3 100644
--- a/test/Repository/DoctrineORMWorkshopRepositoryTest.php
+++ b/test/Repository/DoctrineORMWorkshopRepositoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository;
 
 use PhpSchool\Website\Entity\Workshop;
@@ -52,7 +54,7 @@ public function testFindById(): void
 
         $this->assertEquals(
             'learnyouphp',
-            $this->getRepository(Workshop::class)->findById($fixture->learnYouPhpId)->getCode()
+            $this->getRepository(Workshop::class)->findById($fixture->learnYouPhpId->toString())->getCode()
         );
     }
 
diff --git a/test/Repository/Fixtures/ApprovedAndUnApprovedWorkshops.php b/test/Repository/Fixtures/ApprovedAndUnApprovedWorkshops.php
index c823de37..27a06529 100644
--- a/test/Repository/Fixtures/ApprovedAndUnApprovedWorkshops.php
+++ b/test/Repository/Fixtures/ApprovedAndUnApprovedWorkshops.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository\Fixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
diff --git a/test/Repository/Fixtures/Events.php b/test/Repository/Fixtures/Events.php
index 194d86f7..42a35441 100644
--- a/test/Repository/Fixtures/Events.php
+++ b/test/Repository/Fixtures/Events.php
@@ -1,11 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository\Fixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use PhpSchool\Website\Entity\Event;
-use PhpSchool\Website\Entity\Workshop;
 use Ramsey\Uuid\UuidInterface;
 
 class Events implements FixtureInterface
diff --git a/test/Repository/Fixtures/Students.php b/test/Repository/Fixtures/Students.php
index af71ee5f..2be2987f 100644
--- a/test/Repository/Fixtures/Students.php
+++ b/test/Repository/Fixtures/Students.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Repository\Fixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
diff --git a/test/Service/WorkshopCreatorTest.php b/test/Service/WorkshopCreatorTest.php
index d9d21ce2..dc44281a 100644
--- a/test/Service/WorkshopCreatorTest.php
+++ b/test/Service/WorkshopCreatorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\Service;
 
 use PhpSchool\Website\Entity\Workshop;
diff --git a/test/User/ArraySessionTest.php b/test/User/ArraySessionTest.php
index 87eec151..7220177e 100644
--- a/test/User/ArraySessionTest.php
+++ b/test/User/ArraySessionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\User;
 
 use PhpSchool\Website\User\ArraySession;
diff --git a/test/User/Entity/StudentTest.php b/test/User/Entity/StudentTest.php
index 1057f3af..da21cb81 100644
--- a/test/User/Entity/StudentTest.php
+++ b/test/User/Entity/StudentTest.php
@@ -1,11 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\User\Entity;
 
 use PhpSchool\PhpWorkshop\UserState\UserState;
 use PhpSchool\Website\Online\StudentCloudState;
 use PhpSchool\Website\User\Entity\Student;
-use PhpSchool\Website\User\StudentDTO;
 use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
diff --git a/test/User/Middleware/StudentAuthenticatorTest.php b/test/User/Middleware/StudentAuthenticatorTest.php
index b3e6094c..55eee233 100644
--- a/test/User/Middleware/StudentAuthenticatorTest.php
+++ b/test/User/Middleware/StudentAuthenticatorTest.php
@@ -1,11 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\User\Middleware;
 
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\ServerRequest;
 use PhpSchool\Website\Online\StudentCloudState;
-use PhpSchool\Website\User\Entity\Student;
 use PhpSchool\Website\User\Middleware\StudentAuthenticator;
 use PhpSchool\Website\User\SessionStorageInterface;
 use PhpSchool\Website\User\StudentDTO;
@@ -137,7 +138,7 @@ private function getStudent(): StudentDTO
 
     private function getRequestHandler(): RequestHandlerInterface
     {
-        return new class implements RequestHandlerInterface {
+        return new class () implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return new Response();
diff --git a/test/User/Middleware/StudentRefresherTest.php b/test/User/Middleware/StudentRefresherTest.php
index 0d22ed0e..28388ce8 100644
--- a/test/User/Middleware/StudentRefresherTest.php
+++ b/test/User/Middleware/StudentRefresherTest.php
@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\User\Middleware;
 
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\ServerRequest;
 use PhpSchool\Website\Online\StudentCloudState;
 use PhpSchool\Website\User\Entity\Student;
-use PhpSchool\Website\User\Middleware\StudentAuthenticator;
 use PhpSchool\Website\User\Middleware\StudentRefresher;
 use PhpSchool\Website\User\SessionStorageInterface;
 use PhpSchool\Website\User\StudentDTO;
@@ -83,7 +84,7 @@ private function getStudent(): StudentDTO
 
     private function getRequestHandler(): RequestHandlerInterface
     {
-        return new class implements RequestHandlerInterface {
+        return new class () implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return new Response();
diff --git a/test/User/SessionTest.php b/test/User/SessionTest.php
index 89e6af10..d37eb885 100644
--- a/test/User/SessionTest.php
+++ b/test/User/SessionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\User;
 
 use PhpSchool\Website\User\Session;
@@ -56,11 +58,11 @@ public function testClearAll(): void
         $this->assertNull($session->get('a'));
     }
 
-//    public function testDestroy(): void
-//    {
-//        @session_start();
-//        $this->assertEquals(PHP_SESSION_ACTIVE, session_status());
-//        @Session::destroy(); // silence headers already sent warning
-//        $this->assertEquals(PHP_SESSION_NONE, session_status());
-//    }
+    //    public function testDestroy(): void
+    //    {
+    //        @session_start();
+    //        $this->assertEquals(PHP_SESSION_ACTIVE, session_status());
+    //        @Session::destroy(); // silence headers already sent warning
+    //        $this->assertEquals(PHP_SESSION_NONE, session_status());
+    //    }
 }
diff --git a/test/User/StudentDTOTest.php b/test/User/StudentDTOTest.php
index b1666290..f2f6cc53 100644
--- a/test/User/StudentDTOTest.php
+++ b/test/User/StudentDTOTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PhpSchool\WebsiteTest\User;
 
 use PhpSchool\Website\Online\StudentCloudState;