Requires PHP 8.1+ ; Updated dependencies + fixes

nicolaasuni · nicolaasuni · commit 44d754ac7dd3 · 2024-12-26T09:07:27.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 @@
-2.0.17
+2.0.18
diff --git a/composer.json b/composer.json
@@ -19,16 +19,16 @@
     }
   ],
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.1",
     "ext-mbstring": "*",
     "ext-pcre": "*",
     "tecnickcom/tc-lib-unicode-data": "^2.0"
   },
   "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-unicode 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-mbstring, php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.17), ${misc:Depends}
+Depends: php (>= 8.1.0), php-mbstring, php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.18), ${misc:Depends}
 Description: PHP Unicode methods.
  PHP library containing Unicode methods.
diff --git a/resources/rpm/rpm.spec b/resources/rpm/rpm.spec
@@ -16,9 +16,9 @@ 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-composer(%{c_vendor}/tc-lib-unicode-data) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.17
+Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.18
 Requires:  php-pcre
 Requires:  php-mbstring
 
diff --git a/src/Bidi.php b/src/Bidi.php
@@ -159,7 +159,7 @@ public function __construct(
      * @param ?array<int>  $ordarr   Array of UTF-8 codepoints (if empty it will be generated from $str or $chrarr)
      * @param string $forcedir If 'R' forces RTL, if 'L' forces LTR
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     protected function setInput(
         ?string $str = null,
@@ -272,7 +272,7 @@ protected function getParagraphs(): array
     /**
      * Process the string
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     protected function process(): void
     {
diff --git a/src/Bidi/StepN.php b/src/Bidi/StepN.php
@@ -288,7 +288,7 @@ protected function processN1next(int &$jdx): string
      *
      * @param int $idx Start index
      */
-    protected function getNextN1Char(int $idx): int|float
+    protected function getNextN1Char(int $idx): int
     {
         $jdx = ($idx + 1);
         while (($jdx < $this->seq['length']) && ($this->seq['item'][$jdx]['type'] == 'NI')) {
diff --git a/src/Bidi/StepX.php b/src/Bidi/StepX.php
@@ -151,7 +151,7 @@ protected function processX(): void
      * @param int $pos Original character position in the input string
      * @param int $ord Char code
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     protected function processXcase(int $pos, int $ord): void
     {
diff --git a/src/Convert.php b/src/Convert.php
@@ -53,7 +53,7 @@ public function chr(int $ord): string
     public function ord(string $chr): int
     {
         $uni = unpack('N', mb_convert_encoding($chr, 'UCS-4BE', 'UTF-8'));
-        if ($uni === false) {
+        if (($uni === false) || (!isset($uni[1])) || (!is_int($uni[1]))) {
             throw new UniException('Error converting string');
         }
 
diff --git a/test/Bidi/StepITest.php b/test/Bidi/StepITest.php
@@ -18,6 +18,7 @@
 
 use Com\Tecnick\Unicode\Bidi\StepI;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Bidi Test
@@ -33,8 +34,6 @@
 class StepITest extends TestCase
 {
     /**
-     * @dataProvider stepIDataProvider
-     *
      * @param array{
      *        'e': int,
      *        'edir': string,
@@ -55,7 +54,10 @@ class StepITest extends TestCase
      *            'x': int,
      *          }>,
      *        } $seq     Isolated Sequence array
+     *
+     * @param mixed $expected Expected result
      */
+    #[DataProvider('stepIDataProvider')]
     public function testStepI(array $seq, mixed $expected): void
     {
         $stepi = new StepI($seq);
diff --git a/test/Bidi/StepLTest.php b/test/Bidi/StepLTest.php
@@ -18,6 +18,7 @@
 
 use Com\Tecnick\Unicode\Bidi\StepL;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Bidi Test
@@ -33,8 +34,6 @@
 class StepLTest extends TestCase
 {
     /**
-     * @dataProvider stepLDataProvider
-     *
      * @param array<int, array{
      *                'char': int,
      *                'i': int,
@@ -46,6 +45,7 @@ class StepLTest extends TestCase
      *                'x': int,
      *              }> $chardata
      */
+    #[DataProvider('stepLDataProvider')]
     public function testStepL(array $chardata, int $pel, int $maxlevel, mixed $expected): void
     {
         $stepl = new StepL($chardata, $pel, $maxlevel);
diff --git a/test/Bidi/StepNTest.php b/test/Bidi/StepNTest.php
@@ -18,6 +18,7 @@
 
 use Com\Tecnick\Unicode\Bidi\StepN;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Bidi Test
@@ -33,8 +34,6 @@
 class StepNTest extends TestCase
 {
     /**
-     * @dataProvider stepN0DataProvider
-     *
      * @param array{
      *        'e': int,
      *        'edir': string,
@@ -56,6 +55,7 @@ class StepNTest extends TestCase
      *          }>,
      *        } $seq     Isolated Sequence array
      */
+    #[DataProvider('stepN0DataProvider')]
     public function testStepN0(array $seq, mixed $expected): void
     {
         $stepn = new StepN($seq, false);
@@ -1533,8 +1533,6 @@ public static function stepN0DataProvider(): array
     }
 
     /**
-     * @dataProvider stepN1DataProvider
-     *
      * @param array{
      *        'e': int,
      *        'edir': string,
@@ -1556,6 +1554,7 @@ public static function stepN0DataProvider(): array
      *          }>,
      *        } $seq     Isolated Sequence array
      */
+    #[DataProvider('stepN1DataProvider')]
     public function testStepN1(array $seq, mixed $expected): void
     {
         $stepn = new \Com\Tecnick\Unicode\Bidi\StepN($seq, false);
@@ -2558,8 +2557,6 @@ public static function stepN1DataProvider(): array
     }
 
     /**
-     * @dataProvider stepN2DataProvider
-     *
      * @param array{
      *        'e': int,
      *        'edir': string,
@@ -2581,6 +2578,7 @@ public static function stepN1DataProvider(): array
      *          }>,
      *        } $seq     Isolated Sequence array
      */
+    #[DataProvider('stepN2DataProvider')]
     public function testStepN2(array $seq, mixed $expected): void
     {
         $stepn = new \Com\Tecnick\Unicode\Bidi\StepN($seq, false);
@@ -2663,8 +2661,6 @@ public static function stepN2DataProvider(): array
     }
 
     /**
-     * @dataProvider stepNDataProvider
-     *
      * @param array{
      *        'e': int,
      *        'edir': string,
@@ -2686,6 +2682,7 @@ public static function stepN2DataProvider(): array
      *          }>,
      *        } $seq     Isolated Sequence array
      */
+    #[DataProvider('stepNDataProvider')]
     public function testStepN(array $seq, mixed $expected): void
     {
         $stepn = new \Com\Tecnick\Unicode\Bidi\StepN($seq);
diff --git a/test/Bidi/StepWTest.php b/test/Bidi/StepWTest.php
diff --git a/test/Bidi/StepXTest.php b/test/Bidi/StepXTest.php
diff --git a/test/Bidi/StepXtenTest.php b/test/Bidi/StepXtenTest.php
diff --git a/test/BidiTest.php b/test/BidiTest.php
diff --git a/test/ConvertTest.php b/test/ConvertTest.php

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public function __construct(`
`159`	`159`	`* @param ?array<int> $ordarr Array of UTF-8 codepoints (if empty it will be generated from $str or $chrarr)`
`160`	`160`	`* @param string $forcedir If 'R' forces RTL, if 'L' forces LTR`
`161`	`161`	`*`
`162`		`- * @SuppressWarnings(PHPMD.CyclomaticComplexity)`
	`162`	`+ * @SuppressWarnings("PHPMD.CyclomaticComplexity")`
`163`	`163`	`*/`
`164`	`164`	`protected function setInput(`
`165`	`165`	`?string $str = null,`
`@@ -272,7 +272,7 @@ protected function getParagraphs(): array`
`272`	`272`	`/**`
`273`	`273`	`* Process the string`
`274`	`274`	`*`
`275`		`- * @SuppressWarnings(PHPMD.CyclomaticComplexity)`
	`275`	`+ * @SuppressWarnings("PHPMD.CyclomaticComplexity")`
`276`	`276`	`*/`
`277`	`277`	`protected function process(): void`
`278`	`278`	`{`