Upgrade to PHPStan 2.0

Author: mbabker

composer.json

@@ -60,11 +60,11 @@
         "doctrine/orm": "^2.14.0 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.14.0",
         "nesbot/carbon": "^2.71 || ^3.0",
-        "phpstan/phpstan": "^1.11",
-        "phpstan/phpstan-doctrine": "^1.4",
-        "phpstan/phpstan-phpunit": "^1.4",
+        "phpstan/phpstan": "^2.1.1",
+        "phpstan/phpstan-doctrine": "^2.0.1",
+        "phpstan/phpstan-phpunit": "^2.0.3",
         "phpunit/phpunit": "^9.6",
-        "rector/rector": "^1.1",
+        "rector/rector": "^2.0.6",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
         "symfony/phpunit-bridge": "^6.0 || ^7.0",

phpstan-baseline.neon

@@ -12,12 +12,12 @@ parameters:
         - tests/bootstrap.php
     treatPhpDocTypesAsCertain: false
     ignoreErrors:
+        -
+            identifier: trait.unused
         - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ is never written, only read\.$#'
         - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ is never read, only written\.$#'
         - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ is unused\.$#'
         - '#^Method Gedmo\\(?:[^\\]+\\)*Mapping\\Driver[^:]+::readExtendedMetadata\(\) with return type void returns [\w\|<>\s,]+ but should not return anything\.$#'
-        - '#^Method Gedmo\\Uploadable\\Mapping\\Validator::validateConfiguration\(\) with return type void returns array<string, mixed> but should not return anything\.$#'
-        - '#^Result of static method Gedmo\\Uploadable\\Mapping\\Validator::validateConfiguration\(\) \(void\) is used\.$#'
         - '#^Result of method Gedmo\\Mapping\\Driver::readExtendedMetadata\(\) \(void\) is used\.$#'
     excludePaths:
         # Deprecated and unused class, interface does not exist as of 4.0

phpstan.neon.dist

@@ -28,10 +28,10 @@
 /**
  * The AbstractTrackingListener provides generic functions for all listeners.
  *
- * @phpstan-template TConfig of array
- * @phpstan-template TEventAdapter of AdapterInterface
+ * @template TConfig of array
+ * @template TEventAdapter of AdapterInterface
  *
- * @phpstan-extends MappedEventSubscriber<TConfig, TEventAdapter>
+ * @template-extends MappedEventSubscriber<TConfig, TEventAdapter>
  *
  * @author Gediminas Morkevicius <[email protected]>
  */
@@ -207,9 +207,9 @@ public function prePersist(EventArgs $args)
     /**
      * Get the value for an updated field.
      *
-     * @param ClassMetadata    $meta
-     * @param string           $field
-     * @param AdapterInterface $eventAdapter
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
+     * @param TEventAdapter         $eventAdapter
      *
      * @return mixed
      */
@@ -218,10 +218,10 @@ abstract protected function getFieldValue($meta, $field, $eventAdapter);
     /**
      * Updates a field.
      *
-     * @param object           $object
-     * @param AdapterInterface $eventAdapter
-     * @param ClassMetadata    $meta
-     * @param string           $field
+     * @param object                $object
+     * @param TEventAdapter         $eventAdapter
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
      *
      * @return void
      */

src/AbstractTrackingListener.php

@@ -34,8 +34,9 @@ class BlameableListener extends AbstractTrackingListener
     /**
      * Get the user value to set on a blameable field
      *
-     * @param ClassMetadata $meta
-     * @param string        $field
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
+     * @param BlameableAdapter      $eventAdapter
      *
      * @return mixed
      */

src/Blameable/BlameableListener.php

@@ -119,8 +119,8 @@ public function readExtendedMetadata($meta, array &$config)
     /**
      * Checks if $field type is valid
      *
-     * @param ClassMetadata $meta
-     * @param string        $field
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
      *
      * @return bool
      */

src/Blameable/Mapping/Driver/Xml.php

@@ -125,8 +125,8 @@ protected function _loadMappingFile($file)
     /**
      * Checks if $field type is valid
      *
-     * @param ClassMetadata $meta
-     * @param string        $field
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
      *
      * @return bool
      */

src/Blameable/Mapping/Driver/Yaml.php

@@ -13,7 +13,6 @@
 use Gedmo\AbstractTrackingListener;
 use Gedmo\Exception\InvalidArgumentException;
 use Gedmo\IpTraceable\Mapping\Event\IpTraceableAdapter;
-use Gedmo\Mapping\Event\AdapterInterface;
 
 /**
  * The IpTraceable listener handles the update of
@@ -35,9 +34,9 @@ class IpTraceableListener extends AbstractTrackingListener
     /**
      * Get the ipValue value to set on a ip field
      *
-     * @param ClassMetadata    $meta
-     * @param string           $field
-     * @param AdapterInterface $eventAdapter
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
+     * @param IpTraceableAdapter    $eventAdapter
      *
      * @return string|null
      */

src/IpTraceable/IpTraceableListener.php

@@ -121,8 +121,8 @@ public function readExtendedMetadata($meta, array &$config)
     /**
      * Checks if $field type is valid
      *
-     * @param ClassMetadata $meta
-     * @param string        $field
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
      *
      * @return bool
      */

src/IpTraceable/Mapping/Driver/Xml.php

@@ -121,8 +121,8 @@ protected function _loadMappingFile($file)
     /**
      * Checks if $field type is valid
      *
-     * @param ClassMetadata $meta
-     * @param string        $field
+     * @param ClassMetadata<object> $meta
+     * @param string                $field
      *
      * @return bool
      */