Upgraded phpstan to ^2.0

Author: chives

.gitignore

@@ -7,6 +7,7 @@
 /features/fixtures/project/var/mysql/*
 !/features/fixtures/project/var/.gitkeep
 !/features/fixtures/project/var/data/.gitkeep
+/features/fixtures/project/config/reference.php
 /features/fixtures/project/config/parameters.yaml
 *.sqlite
 .phpcs-cache

Behat/Context/AdminUserManagementContext.php

@@ -15,6 +15,7 @@
 use Behat\Gherkin\Node\TableNode;
 use Behat\Mink\Driver\BrowserKitDriver;
 use FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException;
+use FriendsOfBehat\SymfonyExtension\Driver\SymfonyDriver;
 use FSi\Bundle\AdminSecurityBundle\Behat\Element\BatchAction;
 use FSi\Bundle\AdminSecurityBundle\Behat\Element\Datagrid;
 use FSi\Bundle\AdminSecurityBundle\Behat\Page\UserList;
@@ -125,7 +126,7 @@ private function performBatchAction(string $action, int $cellIndex): void
             ]
         ];
 
-        /** @var BrowserKitDriver $driver */
+        /** @var SymfonyDriver $driver */
         $driver = $this->getSession()->getDriver();
 
         $batchActionUrl = $batchActionNode->getAttribute('value');

Behat/Element/Form.php

@@ -17,7 +17,7 @@
 
 final class Form extends Element
 {
-    public function getField(string $locator): ?NodeElement
+    public function getField(string $locator): NodeElement
     {
         $field = $this->getElement('form')->findField($locator);
         if (null === $field) {

composer.json

@@ -15,7 +15,7 @@
         "beberlei/assert": "^3.3",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/orm": "^2.7|^3.0",
-        "doctrine/persistence": "^2.5|^3.0",
+        "doctrine/persistence": "^2.5.7|^3.0|^4.0",
         "fsi/admin-bundle" : "^4.0",
         "fsi/data" : "^1.0.2",
         "psr/clock": "^1.0",
@@ -36,19 +36,19 @@
         "behat/behat": "^3.11",
         "behat/mink": "^1.10",
         "behat/mink-selenium2-driver": "^1.6",
+        "behat/mink-browserkit-driver": "^2.0",
         "caciobanu/behat-deprecation-extension": "^2.1",
         "egulias/email-validator": "^3.2|^4.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "friends-of-behat/mink-browserkit-driver": "^1.6.1",
         "friends-of-behat/mink-extension": "^2.7.4",
         "friends-of-behat/page-object-extension": "^0.3.2",
         "friends-of-behat/symfony-extension": "^2.4.1",
         "fsi/resource-repository-bundle": "^2.2|^3.0.2|^4.0",
         "fsi/translatable": "^1.0",
         "ocramius/proxy-manager": "^2.5",
         "phpspec/phpspec": "^7.0|^8.0",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-beberlei-assert": "^1.0",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-beberlei-assert": "^2.0",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/dom-crawler": "^4.4|^5.4|^6.0|^7.0",
         "symfony/error-handler": "^4.4|^5.4|^6.0|^7.0",

features/fixtures/project/src/Time/Clock.php

@@ -17,32 +17,23 @@
 final class Clock implements ClockInterface
 {
     private static ?DateTimeImmutable $now = null;
-    private static ?DateTimeImmutable $traveledAt = null;
 
     public function now(): DateTimeImmutable
     {
         if (null === self::$now) {
             return new DateTimeImmutable();
         }
 
-        if (null === self::$traveledAt) {
-            return clone self::$now;
-        }
-
-        // TODO this works reliably only for short periods like under 60 seconds
-        $interval = self::$traveledAt->diff(new DateTimeImmutable());
-        return self::$now->add($interval);
+        return clone self::$now;
     }
 
     public function freeze(DateTimeImmutable $time): void
     {
         self::$now = $time;
-        self::$traveledAt = null;
     }
 
     public function return(): void
     {
         self::$now = null;
-        self::$traveledAt = null;
     }
 }

phpstan.neon

@@ -7,13 +7,11 @@ parameters:
     paths:
         - .
     excludePaths:
-        - DependencyInjection/Configuration
-        - '%rootDir%/../../../docker'
-        - '%rootDir%/../../../features/fixtures/project/config/reference.php'
-        - '%rootDir%/../../../features/fixtures/project/var'
-        - '%rootDir%/../../../spec'
-        - '%rootDir%/../../../var'
-        - '%rootDir%/../../../vendor'
+        - DependencyInjection/Configuration.php
+        - features/fixtures/project/config
+        - features/fixtures/project/var
+        - spec
+        - vendor
     ignoreErrors:
         - '#Property FSi\\Bundle\\AdminSecurityBundle\\EventListener\\EncodePasswordListener::\$passwordHasherFactory has unknown class Symfony\\Component\\PasswordHasher\\Hasher\\PasswordHasherFactoryInterface as its type\.#'
         - '#Parameter \$passwordHasherFactory of method FSi\\Bundle\\AdminSecurityBundle\\EventListener\\EncodePasswordListener::__construct\(\) has invalid type Symfony\\Component\\PasswordHasher\\Hasher\\PasswordHasherFactoryInterface\.#'
@@ -24,5 +22,11 @@ parameters:
           path: %currentWorkingDirectory%/FSiAdminSecurityBundle.php
         - message: '#Call to an undefined method Symfony\\Component\\HttpFoundation\\RequestStack\:\:get(Main|Master)Request\(\)\.#'
           path: %currentWorkingDirectory%/EventListener/LogoutUserListener.php
+        - message: '#Call to function method_exists\(\) with Symfony\\Component\\HttpFoundation\\RequestStack and ''get(Main|Master)Request'' will always evaluate to true\.#'
+          path: %currentWorkingDirectory%/EventListener/LogoutUserListener.php
+        - message: '#Call to function method_exists\(\) with Symfony\\Component\\Security\\Core\\User\\UserInterface and ''getUser(name|Identifier)'' will always evaluate to true\.#'
+          path: %currentWorkingDirectory%/Security/User/UserIdentifierHelper.php
+        - message: '#Call to function method_exists\(\) with Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface and ''getUser(name|Identifier)'' will always evaluate to true\.#'
+          path: %currentWorkingDirectory%/Security/User/UserIdentifierHelper.php
         - message: '#.*Symfony\\Component\\Routing\\RouteCollectionBuilder.*#'
           path: %currentWorkingDirectory%/features/fixtures/project/src/Kernel.php