Merge pull request #329 from FriendsOfCake/chore/maintainance

Maintenance

.editorconfig

@@ -11,3 +11,6 @@ trim_trailing_whitespace = true
 
 [*.yml]
 indent_size = 2
+
+[*.neon]
+indent_style = tab

.github/codecov:.yml

@@ -0,0 +1,7 @@
+codecov:
+  require_ci_to_pass: no
+
+coverage:
+  range: "90...100"
+
+comment: false

.github/workflows/ci.yml

@@ -17,11 +17,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2']
-        prefer-lowest: ['']
+        php-version: ['8.1', '8.2', '8.3']
+        dependencies: ['highest']
         include:
+          - php-version: '8.4'
+            dependencies: 'highest'
+            composer-options: '--ignore-platform-req=php'
           - php-version: '8.1'
-            prefer-lowest: 'prefer-lowest'
+            dependencies: 'lowest'
 
     steps:
     - uses: actions/checkout@v4
@@ -42,27 +45,27 @@ jobs:
         wkhtmltopdf --version
 
     - name: Composer install
-      run: |
-        if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
-          composer update --prefer-lowest --prefer-stable
-        else
-          composer install
-        fi
+      uses: ramsey/composer-install@v3
+      with:
+        dependency-versions: ${{ matrix.dependencies }}
+        composer-options: ${{ matrix.composer-options }}
 
     - name: Setup problem matchers for PHPUnit
       run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Run PHPUnit
       run: |
-        if [[ ${{ matrix.php-version }} == '8.1' ]]; then
-          vendor/bin/phpunit --coverage-clover=coverage.xml
+        if [[ ${{ matrix.php-version }} == '8.3' ]]; then
+          vendor/bin/phpunit --display-warnings --display-deprecations --display-incomplete --display-skipped --coverage-clover=coverage.xml
         else
-          vendor/bin/phpunit
+          vendor/bin/phpunit --display-warnings --display-deprecations
         fi
 
     - name: Code Coverage Report
-      if: matrix.php-version == '8.1'
-      uses: codecov/codecov-action@v3
+      if: matrix.php-version == '8.3'
+      uses: codecov/codecov-action@v4
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   cs-stan:
     uses: cakephp/.github/.github/workflows/cs-stan.yml@5.x

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.37" installed="1.10.37" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.15.0" installed="5.15.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="2.0.1" installed="2.0.1" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
 </phive>

phpstan.neon

@@ -1,8 +1,10 @@
 parameters:
-    level: 6
-    checkMissingIterableValueType: false
-    bootstrapFiles:
-        - vendor/cakephp/cakephp/src/Core/Exception/CakeException.php
-        - tests/bootstrap.php
-    paths:
-        - src
+	level: 8
+	bootstrapFiles:
+		- vendor/cakephp/cakephp/src/Core/Exception/CakeException.php
+		- tests/bootstrap.php
+	paths:
+		- src
+	ignoreErrors:
+		-
+			identifier: missingType.iterableValue

psalm.xml

@@ -5,7 +5,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />
@@ -32,5 +33,6 @@
         <RedundantConditionGivenDocblockType errorLevel="info" />
 
         <UnsafeInstantiation errorLevel="info" />
+        <RiskyTruthyFalsyComparison errorLevel="info" />
     </issueHandlers>
 </psalm>

src/Pdf/CakePdf.php

@@ -349,7 +349,6 @@ public function write(string $destination, bool $create = true, ?string $html =
         }
 
         $splFileInfo = $fileInfo->getPathInfo();
-        /** @phpstan-ignore-next-line */
         if ($splFileInfo === null) {
             throw new CakeException('Failed to retrieve path information');
         }
@@ -378,7 +377,6 @@ public function engine(array|string|null $name = null): ?AbstractPdfEngine
             $name = $name['className'];
         }
 
-        /** @var class-string<\CakePdf\Pdf\Engine\AbstractPdfEngine>|null $engineClassName */
         $engineClassName = App::className($name, 'Pdf/Engine', 'Engine');
         if ($engineClassName === null) {
             throw new CakeException(sprintf('Pdf engine "%s" not found', $name));
@@ -580,10 +578,10 @@ public function margin(
             $right = $left;
         }
 
-        $this->marginBottom($bottom);
-        $this->marginLeft($left);
-        $this->marginRight($right);
-        $this->marginTop($top);
+        $this->marginBottom($bottom); // @phpstan-ignore argument.type
+        $this->marginLeft($left); // @phpstan-ignore argument.type
+        $this->marginRight($right); // @phpstan-ignore argument.type
+        $this->marginTop($top); // @phpstan-ignore argument.type
 
         return $this;
     }

src/Pdf/Crypto/PdftkCrypto.php

@@ -84,6 +84,9 @@ public function encrypt(string $data): string
         ];
 
         $prochandle = proc_open($command, $descriptorspec, $pipes);
+        if ($prochandle === false) {
+            throw new CakeException('Unable to execute pdftk, proc_open() failed');
+        }
 
         fwrite($pipes[0], $data);
         fclose($pipes[0]);

src/Pdf/Engine/TexToPdfEngine.php

@@ -102,6 +102,10 @@ protected function _exec(string $cmd, string $input): array
         $result = ['stdout' => '', 'stderr' => '', 'return' => ''];
 
         $proc = proc_open($cmd, [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes);
+        if ($proc === false) {
+            throw new CakeException('Unable to execute latexpdf, proc_open() failed');
+        }
+
         fwrite($pipes[0], $input);
         fclose($pipes[0]);
 

src/Pdf/Engine/WkHtmlToPdfEngine.php

@@ -80,6 +80,10 @@ protected function _exec(string $cmd, string $input): array
         $cwd = $this->getConfig('cwd');
 
         $proc = proc_open($cmd, [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes, $cwd);
+        if ($proc === false) {
+            throw new CakeException('Unable to execute wkhtmltopdf, proc_open() failed');
+        }
+
         fwrite($pipes[0], $input);
         fclose($pipes[0]);
 
@@ -150,10 +154,6 @@ protected function _getCommand(): string
         }
         $command .= ' - -';
 
-        if ($this->_windowsEnvironment && PHP_MAJOR_VERSION < 8) {
-            $command = '"' . $command . '"';
-        }
-
         return $command;
     }
 

tests/TestCase/View/PdfViewTest.php

@@ -16,6 +16,8 @@
  */
 class PdfViewTest extends TestCase
 {
+    protected PdfView $View;
+
     /**
      * setup callback
      *