Fix phpstan errors

Author: ADmad

composer.json

@@ -65,13 +65,8 @@
     "scripts": {
         "cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
         "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.8.0 psalm/phar:~4.26.0 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~2.1.17 && mv composer.backup composer.json",
         "phpstan": "phpstan analyse --memory-limit=3G src/",
-        "psalm": "psalm.phar --show-info=false",
-        "stan": [
-            "@phpstan",
-            "@psalm"
-        ],
         "test": "phpunit"
     },
     "config": {

phpstan-baseline.neon

@@ -9,8 +9,3 @@ parameters:
 			message: "#^Access to an undefined property Cake\\\\Controller\\\\Controller\\:\\:\\$Crud\\.$#"
 			count: 1
 			path: src/Listener/PaginationListener.php
-
-		-
-			message: "#^Call to an undefined method Cake\\\\Datasource\\\\EntityInterface\\:\\:visibleProperties\\(\\)\\.$#"
-			count: 1
-			path: src/Schema/JsonApi/DynamicEntitySchema.php

phpstan.neon

@@ -5,9 +5,10 @@ parameters:
 	level: 6
 	paths:
 		- src
-	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
 	universalObjectCratesClasses:
 		- Crud\Event\Subject
 	bootstrapFiles:
 		- vendor/cakephp/cakephp/src/Core/Exception/CakeException.php
+	ignoreErrors:
+		- identifier: missingType.iterableValue
+		- identifier: missingType.generics

src/Action/RelationshipsAction.php

@@ -365,7 +365,6 @@ protected function _patch(): void
 
         if (in_array($association->type(), [Association::MANY_TO_ONE, Association::ONE_TO_ONE], true)) {
             //Set the relationship to the corresponding entity
-            /** @psalm-suppress TypeDoesNotContainNull */
             if (array_key_exists('id', $data)) {
                 $entity->{$property} = $foreignTable->get($data['id']);
             } elseif ($data === null) {

src/Listener/JsonApiListener.php

@@ -1019,14 +1019,7 @@ protected function _deduplicateResultSet(Subject $subject): ResultSetInterface
             }
         }
 
-        if ($subject->entities instanceof ResultSet) {
-            $resultSet = clone $subject->entities;
-            $resultSet->unserialize(serialize($entities));
-        } else {
-            $resultSet = new ResultSetDecorator($entities);
-        }
-
-        return $resultSet;
+        return new ResultSet($entities);
     }
 
     /**
@@ -1059,7 +1052,6 @@ protected function _getFindResult(Subject $subject): EntityInterface|ResultSetIn
     protected function _getSingleEntity(Subject $subject): ?EntityInterface
     {
         if (!empty($subject->entities) && $subject->entities instanceof SelectQuery) {
-            /** @psalm-suppress InvalidReturnStatement */
             return (clone $subject->entities)->first();
         }
 
@@ -1267,7 +1259,6 @@ protected function _checkRequestData(): void
                 $validator->validateCreateDocument();
             }
 
-            /** @psalm-suppress TypeDoesNotContainType */
             if ($requestMethod === 'PATCH' || $requestMethod === 'DELETE') {
                 $validator->validateUpdateDocument();
             }
@@ -1303,9 +1294,6 @@ protected function _checkRequestData(): void
     protected function _getAssociationsList(?Table $table, array $associationTypes = []): array
     {
         $table = $table ?: $this->_controller()->fetchTable();
-        if (!$table instanceof Table) {
-            return [];
-        }
 
         $associations = $table->associations();
 

src/Listener/PaginationListener.php

@@ -95,7 +95,6 @@ protected function _getJsonApiPaginationResponse(array $pagination): array
             $query['sort'] = $request->getQuery('sort');
         }
 
-        /** @psalm-suppress UndefinedMagicPropertyFetch */
         $fullBase = (bool)$this->_controller()->Crud->getConfig('listeners.jsonApi.absoluteLinks');
 
         $baseUrl = $request->getAttributes()['params'];

src/Listener/SearchListener.php

@@ -50,7 +50,7 @@ public function injectSearch(EventInterface $event): void
         }
 
         $repository = $this->_controller()->fetchTable();
-        if ($repository instanceof Table && !$repository->behaviors()->has('Search')) {
+        if (!$repository->behaviors()->has('Search')) {
             throw new RuntimeException(
                 sprintf(
                     'Missing Search.Search behavior on %s',

src/Schema/JsonApi/DynamicEntitySchema.php

@@ -88,7 +88,6 @@ public function getType(): string
      *
      * @param \Cake\ORM\Entity $resource Entity
      * @return string
-     * @psalm-suppress MoreSpecificImplementedParamType
      * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     public function getId($resource): ?string
@@ -129,10 +128,7 @@ protected function getRepository(?EntityInterface $entity = null): Table
     protected function entityToShallowArray(EntityInterface $entity): array
     {
         $result = [];
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        $properties = method_exists($entity, 'getVisible')
-            ? $entity->getVisible()
-            : $entity->visibleProperties();
+        $properties = $entity->getVisible();
         foreach ($properties as $property) {
             if ($property[0] === '_') {
                 continue;
@@ -161,7 +157,6 @@ protected function entityToShallowArray(EntityInterface $entity): array
      * @param \Cake\Datasource\EntityInterface $resource Entity
      * @param \Neomerx\JsonApi\Contracts\Schema\ContextInterface $context The Context
      * @return array
-     * @psalm-suppress MoreSpecificImplementedParamType
      * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     public function getAttributes($resource, ContextInterface $context): iterable
@@ -206,7 +201,6 @@ public function getAttributes($resource, ContextInterface $context): iterable
      * @param \Cake\Datasource\EntityInterface $resource Entity object
      * @param \Neomerx\JsonApi\Contracts\Schema\ContextInterface $context The Context
      * @return array
-     * @psalm-suppress MoreSpecificImplementedParamType
      * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     public function getRelationships($resource, ContextInterface $context): iterable
@@ -284,7 +278,6 @@ public function getRelationships($resource, ContextInterface $context): iterable
      *
      * @param \Cake\ORM\Entity|null $resource Entity, null only to be compatible with the Neomerx method
      * @return string
-     * @psalm-suppress MoreSpecificImplementedParamType
      * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     public function getSelfSubUrl($resource = null): string
@@ -329,7 +322,6 @@ protected function getAssociationByProperty(string $name): ?Association
      * @param \Cake\Datasource\EntityInterface $resource Entity
      * @param string                           $name   Relationship name in lowercase singular or plural
      * @return \Neomerx\JsonApi\Contracts\Schema\LinkInterface
-     * @psalm-suppress MoreSpecificImplementedParamType
      * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     public function getRelationshipSelfLink($resource, string $name): LinkInterface
@@ -370,7 +362,6 @@ public function getRelationshipSelfLink($resource, string $name): LinkInterface
      * @param \Cake\Datasource\EntityInterface $resource Entity
      * @param string                           $name   Relationship name in lowercase singular or plural
      * @return \Neomerx\JsonApi\Contracts\Schema\LinkInterface
-     * @psalm-suppress MoreSpecificImplementedParamType
      * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     public function getRelationshipRelatedLink($resource, string $name): LinkInterface