Requires PHP 8.1+ ; Updated dependencies + fixes

nicolaasuni · nicolaasuni · commit 66f4b8c6e464 · 2024-12-26T14:16:09.000Z
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -23,7 +23,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ["8.0", "8.1", "8.2", "8.3"]
+                php-version: ["8.1", "8.2", "8.3", "8.4"]
                 experimental: [false]
                 os: [ubuntu-latest]
                 coverage-extension: [pcov]
@@ -50,7 +50,7 @@ jobs:
             - name: Run all tests
               run: make qa
             - name: Send coverage
-              uses: codecov/codecov-action@v3
+              uses: codecov/codecov-action@v5
               with:
                 flags: php-${{ matrix.php-version }}-${{ matrix.os }}
                 name: php-${{ matrix.php-version }}-${{ matrix.os }}
diff --git a/Makefile b/Makefile
@@ -170,7 +170,7 @@ endif
 deps: ensuretarget
 	rm -rf ./vendor/*
 	($(COMPOSER) install -vvv --no-interaction)
-	curl --silent --show-error --fail --location --output ./vendor/phpstan.phar https://github.com/phpstan/phpstan/releases/download/1.10.41/phpstan.phar \
+	curl --silent --show-error --fail --location --output ./vendor/phpstan.phar https://github.com/phpstan/phpstan/releases/download/2.0.4/phpstan.phar \
 	&& chmod +x ./vendor/phpstan.phar
 
 # Generate source code documentation
@@ -212,8 +212,8 @@ endif
 .PHONY: lint
 lint:
 	./vendor/bin/phpcs --ignore="./vendor/" --standard=phpcs.xml src test
-	./vendor/bin/phpmd src text codesize,unusedcode,naming,design --exclude vendor
-	./vendor/bin/phpmd test text unusedcode,naming,design
+	./vendor/bin/phpmd src text codesize,unusedcode,naming,design --exclude */vendor/*
+	./vendor/bin/phpmd test text unusedcode,naming,design --exclude */vendor/*
 	php -r 'exit((int)version_compare(PHP_MAJOR_VERSION, "7", ">"));' || ./vendor/phpstan.phar analyse
 
 # Run all tests and reports
@@ -261,7 +261,7 @@ tag:
 .PHONY: test
 test:
 	cp phpunit.xml.dist phpunit.xml
-	./vendor/bin/phpunit --migrate-configuration || true
+	#./vendor/bin/phpunit --migrate-configuration || true
 	XDEBUG_MODE=coverage ./vendor/bin/phpunit --stderr test
 
 # Remove all installed files
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.2.4
+4.2.5
diff --git a/composer.json b/composer.json
@@ -18,17 +18,17 @@
     }
   ],
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.1",
     "ext-date": "*",
     "ext-zlib": "*",
     "tecnickcom/tc-lib-color": "^2.2",
     "tecnickcom/tc-lib-pdf-encrypt": "^2.1"
   },
   "require-dev": {
-    "pdepend/pdepend": "2.13.0",
-    "phpmd/phpmd": "2.13.0",
-    "phpunit/phpunit": "10.1.2 || 9.6.13",
-    "squizlabs/php_codesniffer": "3.7.2"
+    "pdepend/pdepend": "2.16.2",
+    "phpmd/phpmd": "2.15.0",
+    "phpunit/phpunit": "11.5.2 || 10.5.40",
+    "squizlabs/php_codesniffer": "3.11.2"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,7 @@ parameters:
   paths:
     - src
     - test
-  scanDirectories:
+  excludePaths:
     - vendor
   ignoreErrors:
   reportUnmatchedIgnoredErrors: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
-	backupStaticAttributes="false"
 	bootstrap="vendor/autoload.php"
 	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
+	displayDetailsOnTestsThatTriggerDeprecations="true"
+	displayDetailsOnTestsThatTriggerErrors="true"
+	displayDetailsOnTestsThatTriggerNotices="true"
+	displayDetailsOnTestsThatTriggerWarnings="true"
+	displayDetailsOnPhpunitDeprecations="true"
 	processIsolation="false"
-	stopOnFailure="false"
-	verbose="true">
+	stopOnFailure="false">
 	<testsuites>
 		<testsuite name="tc-lib-pdf-page Test Suite">
 			<directory>./test</directory>
 		</testsuite>
 	</testsuites>
-	<filter>
-		<whitelist>
-			<directory suffix="php">src</directory>
-		</whitelist>
-	</filter>
+	<source>
+		<include>
+			<directory suffix=".php">src</directory>
+		</include>
+	</source>
+	<coverage>
+		<report>
+			<clover outputFile="target/coverage/coverage.xml"/>
+			<html outputDirectory="target/coverage" lowUpperBound="50" highLowerBound="90"/>
+		</report>
+	</coverage>
 	<logging>
-		<log type="coverage-html" target="target/coverage"/>
-		<log type="coverage-clover" target="target/coverage/coverage.xml"/>
-		<log type="junit" target="target/logs/junit.xml"/>
+		<junit outputFile="target/logs/junit.xml"/>
 	</logging>
 </phpunit>
diff --git a/resources/debian/compat b/resources/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/resources/debian/control b/resources/debian/control
@@ -10,6 +10,6 @@ Vcs-Git: https://github.com/~#VENDOR#~/~#PROJECT#~.git
 Package: ~#PKGNAME#~
 Provides: php-~#PROJECT#~
 Architecture: all
-Depends: php (>= 8.0.0), php-date, php-zip, php-tecnickcom-tc-lib-color (<< 3.0.0), php-tecnickcom-tc-lib-color (>= 2.2.6), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.1.9), ${misc:Depends}
+Depends: php (>= 8.1.0), php-date, php-zip, php-tecnickcom-tc-lib-color (<< 3.0.0), php-tecnickcom-tc-lib-color (>= 2.2.7), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.1.10), ${misc:Depends}
 Description: PHP PDF Page Library
  PHP library containing PDF page formats and definitions.
diff --git a/resources/rpm/rpm.spec b/resources/rpm/rpm.spec
@@ -16,13 +16,13 @@ URL:       https://github.com/%{gh_owner}/%{gh_project}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildArch: noarch
 
-Requires:  php(language) >= 8.0.0
+Requires:  php(language) >= 8.1.0
 Requires:  php-date
 Requires:  php-zlib
 Requires:  php-composer(%{c_vendor}/tc-lib-color) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-color) >= 2.2.6
+Requires:  php-composer(%{c_vendor}/tc-lib-color) >= 2.2.7
 Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 2.1.9
+Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 2.1.10
 
 Provides:  php-composer(%{c_vendor}/%{gh_project}) = %{version}
 Provides:  php-%{gh_project} = %{version}
diff --git a/src/Box.php b/src/Box.php
@@ -347,7 +347,7 @@ protected function getBox(array $dims): string
      *            'bci': PageBci,
      *          }> $dims Array of page dimensions.
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     protected function getBoxColorInfo(array $dims): string
     {
diff --git a/src/Page.php b/src/Page.php
@@ -38,7 +38,7 @@
  * @phpstan-import-type TransitionData from \Com\Tecnick\Pdf\Page\Box
  * @phpstan-import-type PageData from \Com\Tecnick\Pdf\Page\Box
  *
- * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings("PHPMD.TooManyPublicMethods")
  */
 class Page extends \Com\Tecnick\Pdf\Page\Region
 {
@@ -408,7 +408,7 @@ protected function replacePageTemplates(array $data): string
             "\n",
             str_replace(
                 [self::PAGE_TOT, self::PAGE_NUM],
-                [$this->group[$data['group']], $data['num']],
+                [(string) $this->group[$data['group']], (string) $data['num']],
                 $data['content']
             )
         );
diff --git a/src/Region.php b/src/Region.php
@@ -102,14 +102,16 @@ public function add(array $data = []): array
         $data['currentRegion'] = 0;
         $data['pid'] = ++$this->pmaxid;
         $this->pid = $data['pid'];
-        $this->page[$this->pid] = $data;
-        if (isset($this->group[$data['group']])) {
-            ++$this->group[(int) $data['group']];
-        } else {
-            $this->group[(int) $data['group']] = 1;
+        $this->page[$this->pid] = $data; // @phpstan-ignore assign.propertyType
+        if (isset($data['group'])) {
+            if (isset($this->group[$data['group']])) {
+                ++$this->group[(int) $data['group']];
+            } else {
+                $this->group[(int) $data['group']] = 1;
+            }
         }
 
-        return $this->page[$this->pid];
+        return $this->page[$this->pid]; // @phpstan-ignore return.type
     }
 
     /**
diff --git a/src/Settings.php b/src/Settings.php
diff --git a/test/PageTest.php b/test/PageTest.php
diff --git a/test/SettingsTest.php b/test/SettingsTest.php

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ protected function getBox(array $dims): string`
`347`	`347`	`* 'bci': PageBci,`
`348`	`348`	`* }> $dims Array of page dimensions.`
`349`	`349`	`*`
`350`		`- * @SuppressWarnings(PHPMD.CyclomaticComplexity)`
	`350`	`+ * @SuppressWarnings("PHPMD.CyclomaticComplexity")`
`351`	`351`	`*/`
`352`	`352`	`protected function getBoxColorInfo(array $dims): string`
`353`	`353`	`{`