Merge pull request #87 from mirko-pagliai/develop

fixed

.github/workflows/ci.yml

@@ -90,17 +90,11 @@ jobs:
             coverage: none
             tools: cs2pr
 
-        - name: Cache Composer packages
-          id: composer-cache
-          uses: actions/cache@v2
-          with:
-            path: vendor
-            key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-            restore-keys: |
-              ${{ runner.os }}-php-
-
         - name: Composer install
-          run: composer stan-setup
+          run: composer update
+
+        - name: Composer show
+          run: composer show
 
         - name: Run PHP CodeSniffer
           continue-on-error: true
@@ -111,7 +105,7 @@ jobs:
 
         - name: Run psalm
           if: success() || failure()
-          run: vendor/bin/psalm.phar --output-format=github
+          run: vendor/bin/psalm.phar --output-format=github --php-version=8.0
 
         - name: Run phpstan
           if: success() || failure()

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 1.x branch
 ## 1.10 branch
+### 1.10.2
+* updated for CakePHP 4.4;
+* little fixes for `phpstan`, `psalm` and for the `composer.json` file.
+
 ### 1.10.1
 * ready for CakePHP 4.4.
 
@@ -48,7 +52,7 @@
 ## 1.8 branch
 ### 1.8.1
 * little fixes;
-* APIs are now generated by `phpDocumentor` and no longer by` apigen`.
+* APIs are now generated by `phpDocumentor` and no longer by `apigen`.
 
 ### 1.8.0
 * much of the code will be moved into the `php-thumber` package, so that it

composer.json

@@ -19,7 +19,9 @@
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.0",
-        "phpunit/phpunit": "^9.1|^9.5"
+        "phpunit/phpunit": "^9.1|^9.5",
+        "phpstan/phpstan": "^1.7",
+        "psalm/phar": "^4.24"
     },
     "autoload": {
         "psr-4": {
@@ -48,11 +50,14 @@
         "phpstan": "phpstan.phar analyse",
         "psalm": "psalm.phar --php-version=8.0",
         "stan": [
-            "@stan-setup",
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:\"^3.18|^4\" && mv composer.backup composer.json",
         "update-lowest": "@composer update --prefer-lowest"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

phpstan.neon

@@ -16,5 +16,5 @@ parameters:
     checkMissingIterableValueType: false
     treatPhpDocTypesAsCertain: false
 
-    excludes_analyse:
+    excludePaths:
         -  tests/test_app/

tests/TestCase/Command/ClearAllCommandTest.php

@@ -16,7 +16,7 @@
 
 use Cake\Console\ConsoleIo;
 use Cake\Console\Exception\StopException;
-use Cake\TestSuite\Stub\ConsoleOutput;
+use Cake\Console\TestSuite\StubConsoleOutput;
 use Exception;
 use MeTools\TestSuite\ConsoleIntegrationTestTrait;
 use Thumber\Cake\TestSuite\TestCase;
@@ -71,11 +71,11 @@ public function testExecuteOnFailure(): void
     {
         $this->expectException(StopException::class);
         $this->Command->ThumbManager = $this->getMockBuilder(ThumbManager::class)
-            ->setMethods(['_clear'])
+            ->onlyMethods(['_clear'])
             ->getMock();
         $this->Command->ThumbManager->method('_clear')
             ->will($this->throwException(new Exception()));
 
-        $this->Command->run([], new ConsoleIo(null, new ConsoleOutput()));
+        $this->Command->run([], new ConsoleIo(null, new StubConsoleOutput()));
     }
 }

tests/TestCase/Command/ClearCommandTest.php

@@ -16,7 +16,7 @@
 
 use Cake\Console\ConsoleIo;
 use Cake\Console\Exception\StopException;
-use Cake\TestSuite\Stub\ConsoleOutput;
+use Cake\Console\TestSuite\StubConsoleOutput;
 use Exception;
 use MeTools\TestSuite\ConsoleIntegrationTestTrait;
 use Thumber\Cake\TestSuite\TestCase;
@@ -96,11 +96,11 @@ public function testExecuteOnFailure(): void
     {
         $this->expectException(StopException::class);
         $this->Command->ThumbManager = $this->getMockBuilder(ThumbManager::class)
-            ->setMethods(['_clear'])
+            ->onlyMethods(['_clear'])
             ->getMock();
         $this->Command->ThumbManager->method('_clear')
             ->will($this->throwException(new Exception()));
 
-        $this->Command->run(['noExisting'], new ConsoleIo(null, new ConsoleOutput()));
+        $this->Command->run(['noExisting'], new ConsoleIo(null, new StubConsoleOutput()));
     }
 }

tests/TestCase/Middleware/ThumbnailMiddlewareTest.php

@@ -25,6 +25,7 @@
 
 /**
  * ThumbnailMiddlewareTest class
+ * @property \Cake\Http\Response $_response The response for the most recent request
  */
 class ThumbnailMiddlewareTest extends TestCase
 {

tests/bootstrap.php

@@ -76,4 +76,11 @@
 define('THUMBER_TARGET', Configure::read('Thumber.target', TMP . 'thumbs'));
 $_SERVER['PHP_SELF'] = '/';
 
+/**
+ * @todo to be removed in a later version
+ */
+if (!class_exists('Cake\Console\TestSuite\StubConsoleOutput')) {
+    class_alias('Cake\TestSuite\Stub\ConsoleOutput', 'Cake\Console\TestSuite\StubConsoleOutput');
+}
+
 echo 'Running tests for "' . getenv('THUMBER_DRIVER') . '" driver ' . PHP_EOL;

version

@@ -1 +1 @@
-1.10.1
+1.10.2