.gitlab-ci.yml

@@ -38,6 +38,12 @@ test-php8.0:
     PHP: "php8.0"
   <<: *test_defaults
 
+test-php8.1:
+  stage: test
+  variables:
+    PHP: "php8.1"
+  <<: *test_defaults
+
 linting:
   stage: test
   allow_failure: true

composer.json

@@ -19,6 +19,7 @@
         "mockery/mockery": "^1.4",
         "phpstan/phpstan": "^1.0.0",
         "phpstan/phpstan-phpunit": "^1.0.0",
+        "phpunit/phpunit": "^9.5",
         "symfony/browser-kit": "^5.2",
         "symfony/http-client": "^5.2",
         "symfony/monolog-bundle": "^3.7",
@@ -43,14 +44,14 @@
     },
     "scripts": {
         "test": [
-            "@php vendor/bin/simple-phpunit"
+            "@php vendor/bin/phpunit"
         ],
         "phpstan": [
-            "@php vendor/bin/simple-phpunit --atleast-version 0",
+            "@php vendor/bin/phpunit --atleast-version 0",
             "@php vendor/bin/phpstan analyze --ansi"
         ],
         "psalm": [
-            "@php vendor/bin/simple-phpunit --atleast-version 0",
+            "@php vendor/bin/phpunit --atleast-version 0",
             "@php vendor/bin/psalm"
         ],
         "lint": [
@@ -65,7 +66,7 @@
             "@php vendor/bin/php-cs-fixer --ansi fix --dry-run --diff"
         ],
         "coverage": [
-            "@php vendor/bin/simple-phpunit --coverage-html _coverage"
+            "@php vendor/bin/phpunit --coverage-html _coverage"
         ]
     }
 }

phpstan.neon

@@ -7,8 +7,6 @@ parameters:
     paths:
         - src
         - tests
-    bootstrapFiles:
-        - vendor/bin/.phpunit/phpunit-9-0/vendor/autoload.php
     excludePaths:
         - tests/bootstrap.php
     ignoreErrors:

phpunit.xml.dist

@@ -11,9 +11,7 @@
     <ini name="error_reporting" value="-1"/>
     <server name="APP_ENV" value="test" force="true"/>
     <server name="SHELL_VERBOSITY" value="-1"/>
-    <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
-    <server name="SYMFONY_PHPUNIT_VERSION" value="9"/>
-    <server name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+    <server name="SYMFONY_DEPRECATIONS_HELPER" value='max[direct]=0&amp;quiet[]=indirect'/>
     <server name="KERNEL_CLASS" value="Dbp\Relay\BasePersonConnectorLdapBundle\Tests\Kernel"/>
   </php>
   <testsuites>

psalm.xml

 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
     errorLevel="5"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

src/DependencyInjection/Configuration.php

@@ -10,7 +10,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('dbp_relay_base_person_connector_ldap');
 

src/Service/LDAPApi.php

@@ -378,7 +378,7 @@ class LDAPApi implements LoggerAwareInterface, ServiceSubscriberInterface
         return $this->currentPerson;
     }
 
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return [
             UserSessionInterface::class,

src/TestUtils/PersonForExternalServiceSubscriber.php

@@ -10,7 +10,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class PersonForExternalServiceSubscriber implements EventSubscriberInterface
 {
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             PersonForExternalServiceEvent::NAME => 'onEvent',

src/TestUtils/PersonFromUserItemSubscriber.php

@@ -10,7 +10,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class PersonFromUserItemSubscriber implements EventSubscriberInterface
 {
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             PersonFromUserItemPreEvent::NAME => 'onPre',

src/TestUtils/PersonUserItemSubscriber.php

@@ -9,7 +9,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class PersonUserItemSubscriber implements EventSubscriberInterface
 {
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             PersonUserItemPreEvent::NAME => 'onPre',