Fix errors reported by phpstan and psalm.

Author: ADmad

.editorconfig

@@ -15,4 +15,7 @@ end_of_line = crlf
 
 [*.yml]
 indent_style = space
-indent_size = 2
+indent_size = 2
+
+[*.neon]
+indent_style = tab

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
         php-version: '7.4'
         extensions: mbstring, intl
         coverage: none
-        tools: psalm:^4.6, phpstan:^0.12
+        tools: psalm:^4.7, phpstan:^0.12
 
     - name: Composer Install
       run: composer require cakephp/cakephp-codesniffer:^4.2

phpstan.neon

@@ -1,19 +1,21 @@
 parameters:
-    level: 6
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
-    ignoreErrors:
-        -
-            message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:callFinder\\(\\)\\.$#"
-            count: 1
-            path: src/Datasource/Query.php
+	level: 6
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
+	paths:
+		- src/
+	ignoreErrors:
+		-
+			message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:callFinder\\(\\)\\.$#"
+			count: 1
+			path: src/Datasource/Query.php
 
-        -
-            message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:getName\\(\\)\\.$#"
-            count: 1
-            path: src/Datasource/Query.php
+		-
+			message: "#^Call to an undefined method Cake\\\\Datasource\\\\RepositoryInterface\\:\\:getName\\(\\)\\.$#"
+			count: 1
+			path: src/Datasource/Query.php
 
-        -
-            message: "#^Cannot call method total\\(\\) on Cake\\\\Datasource\\\\ResultSetInterface\\|int\\<1, max\\>\\|int\\<min, \\-1\\>\\|true\\.$#"
-            count: 1
-            path: src/Datasource/Query.php
+		-
+			message: "#^Cannot call method total\\(\\) on Cake\\\\Datasource\\\\ResultSetInterface\\|int\\<min, \\-1\\>\\|int\\<1, max\\>\\|true\\.$#"
+			count: 1
+			path: src/Datasource/Query.php

psalm.xml

@@ -22,6 +22,8 @@
         <DocblockTypeContradiction errorLevel="info" />
         <RedundantConditionGivenDocblockType errorLevel="info" />
 
+        <UnsafeInstantiation errorLevel="info" />
+
         <UnresolvableInclude errorLevel="info" />
     </issueHandlers>
 </psalm>

src/Datasource/Marshaller.php

@@ -284,12 +284,9 @@ public function mergeMany($entities, array $data, array $options = []): array
             })
             ->toArray();
 
-        /** @psalm-suppress NullArrayOffset */
+        /** @psalm-suppress NullArrayOffset, InvalidArrayOffset */
         $new = $indexed[null] ?? [];
-        /**
-         * @psalm-suppress PossiblyNullArrayOffset
-         * @psalm-suppress NullArrayOffset
-         */
+        /** @psalm-suppress PossiblyNullArrayOffset, InvalidArrayOffset */
         unset($indexed[null]);
         $output = [];
 

src/Datasource/Query.php

@@ -328,22 +328,22 @@ public function action(int $action)
      *
      * Pages should start at 1.
      *
-     * @param int $page The page number you want.
+     * @param int $num The page number you want.
      * @param int $limit The number of rows you want in the page. If null
      *  the current limit clause will be used.
      * @return $this
      */
-    public function page(int $page, ?int $limit = null)
+    public function page(int $num, ?int $limit = null)
     {
-        if ($page < 1) {
+        if ($num < 1) {
             throw new InvalidArgumentException('Pages must start at 1.');
         }
 
         if ($limit !== null) {
             $this->limit($limit);
         }
 
-        $this->_parts['page'] = $page;
+        $this->_parts['page'] = $num;
 
         return $this;
     }
@@ -558,6 +558,7 @@ protected function _execute(): ResultSetInterface
             return new $decorator($this->__resultSet);
         }
 
+        /** @var \Cake\Datasource\ResultSetInterface */
         return $this->__resultSet = $this->_webservice->execute($this);
     }
 

src/Model/Endpoint.php

@@ -414,7 +414,7 @@ public function getPrimaryKey()
     {
         if ($this->_primaryKey === null) {
             $schema = $this->getSchema();
-            $key = (array)$schema->primaryKey();
+            $key = $schema->primaryKey();
             if (count($key) === 1) {
                 $key = $key[0];
             }
@@ -886,53 +886,53 @@ public function exists($conditions): bool
      * returns the same resource after a successful save or false in case
      * of any error.
      *
-     * @param \Cake\Datasource\EntityInterface $resource the resource to be saved
+     * @param \Cake\Datasource\EntityInterface $entity the resource to be saved
      * @param array|\ArrayAccess $options The options to use when saving.
      * @return \Cake\Datasource\EntityInterface|false
      */
-    public function save(EntityInterface $resource, $options = [])
+    public function save(EntityInterface $entity, $options = [])
     {
         $options = new ArrayObject((array)$options + [
                 'checkRules' => true,
                 'checkExisting' => false,
             ]);
 
-        if ($resource->getErrors()) {
+        if ($entity->getErrors()) {
             return false;
         }
 
-        if ($resource->isNew() === false && !$resource->isDirty()) {
-            return $resource;
+        if ($entity->isNew() === false && !$entity->isDirty()) {
+            return $entity;
         }
 
         $primaryColumns = (array)$this->getPrimaryKey();
 
-        if ($options['checkExisting'] && $primaryColumns && $resource->isNew() && $resource->has($primaryColumns)) {
+        if ($options['checkExisting'] && $primaryColumns && $entity->isNew() && $entity->has($primaryColumns)) {
             $alias = $this->getAlias();
             $conditions = [];
-            foreach ($resource->extract($primaryColumns) as $k => $v) {
+            foreach ($entity->extract($primaryColumns) as $k => $v) {
                 $conditions["$alias.$k"] = $v;
             }
-            $resource->setNew(!$this->exists($conditions));
+            $entity->setNew(!$this->exists($conditions));
         }
 
-        $mode = $resource->isNew() ? RulesChecker::CREATE : RulesChecker::UPDATE;
-        if ($options['checkRules'] && !$this->checkRules($resource, $mode, $options)) {
+        $mode = $entity->isNew() ? RulesChecker::CREATE : RulesChecker::UPDATE;
+        if ($options['checkRules'] && !$this->checkRules($entity, $mode, $options)) {
             return false;
         }
 
-        $event = $this->dispatchEvent('Model.beforeSave', compact('resource', 'options'));
+        $event = $this->dispatchEvent('Model.beforeSave', compact('entity', 'options'));
 
         if ($event->isStopped()) {
             return $event->getResult();
         }
 
-        $data = $resource->extract($this->getSchema()->columns(), true);
+        $data = $entity->extract($this->getSchema()->columns(), true);
 
-        if ($resource->isNew()) {
+        if ($entity->isNew()) {
             $query = $this->query()->create();
         } else {
-            $query = $this->query()->update()->where($resource->extract($primaryColumns));
+            $query = $this->query()->update()->where($entity->extract($primaryColumns));
         }
         $query->set($data);
 
@@ -941,14 +941,14 @@ public function save(EntityInterface $resource, $options = [])
             return false;
         }
 
-        if ($resource->isNew() && ($result instanceof EntityInterface)) {
+        if ($entity->isNew() && ($result instanceof EntityInterface)) {
             return $result;
         }
 
         /** @psalm-var class-string<\Cake\Datasource\EntityInterface> $className */
-        $className = get_class($resource);
+        $className = get_class($entity);
 
-        return new $className($resource->toArray(), [
+        return new $className($entity->toArray(), [
             'markNew' => false,
             'markClean' => true,
         ]);
@@ -957,14 +957,14 @@ public function save(EntityInterface $resource, $options = [])
     /**
      * Delete a single resource.
      *
-     * @param \Cake\Datasource\EntityInterface $resource The resource to remove.
+     * @param \Cake\Datasource\EntityInterface $entity The resource to remove.
      * @param array|\ArrayAccess $options The options for the delete.
      * @return bool
      */
-    public function delete(EntityInterface $resource, $options = []): bool
+    public function delete(EntityInterface $entity, $options = []): bool
     {
         $primaryKeys = (array)$this->getPrimaryKey();
-        $values = $resource->extract($primaryKeys);
+        $values = $entity->extract($primaryKeys);
 
         return (bool)$this->query()->delete()->where(array_combine($primaryKeys, $values))->execute();
     }

src/Model/EndpointLocator.php

@@ -20,14 +20,14 @@ class EndpointLocator extends AbstractLocator
      * Set an Endpoint instance to the locator.
      *
      * @param string $alias The alias to set.
-     * @param \Muffin\Webservice\Model\Endpoint $object The table to set.
+     * @param \Muffin\Webservice\Model\Endpoint $repository The repository to set.
      * @return \Muffin\Webservice\Model\Endpoint
      * @psalm-suppress MoreSpecificImplementedParamType
      * @psalm-suppress MoreSpecificReturnType
      */
-    public function set(string $alias, RepositoryInterface $object): Endpoint
+    public function set(string $alias, RepositoryInterface $repository): Endpoint
     {
-        return $this->instances[$alias] = $object;
+        return $this->instances[$alias] = $repository;
     }
 
     /**