update dependencies and fix linter warnings

nicolaasuni · nicolaasuni · commit 993db0bf2027 · 2025-11-28T14:24:20.000Z
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -28,7 +28,7 @@ jobs:
                 os: [ubuntu-latest]
                 coverage-extension: [pcov]
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
             - name: Use php ${{ matrix.php-version }}
               uses: shivammathur/setup-php@v2
               with:
diff --git a/Makefile b/Makefile
@@ -83,6 +83,9 @@ COMPOSER=$(PHP) -d "apc.enable_cli=0" $(shell which composer)
 # phpDocumentor executable file
 PHPDOC=$(shell which phpDocumentor)
 
+# phpstan version
+PHPSTANVER=2.1.32
+
 # --- MAKE TARGETS ---
 
 # Display general help about this command
@@ -170,7 +173,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/2.1.2/phpstan.phar \
+	curl --silent --show-error --fail --location --output ./vendor/phpstan.phar https://github.com/phpstan/phpstan/releases/download/${PHPSTANVER}/phpstan.phar \
 	&& chmod +x ./vendor/phpstan.phar
 
 # Generate source code documentation
@@ -212,6 +215,7 @@ endif
 .PHONY: lint
 lint:
 	./vendor/bin/phpcs --ignore="./vendor/" --standard=phpcs.xml src test
+	./vendor/bin/phpcbf --config-set ignore_non_auto_fixable_on_exit 1
 	./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
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.25
+2.0.27
diff --git a/composer.json b/composer.json
@@ -27,8 +27,8 @@
   "require-dev": {
     "pdepend/pdepend": "2.16.2",
     "phpmd/phpmd": "2.15.0",
-    "phpunit/phpunit": "12.2.0 || 11.5.7 || 10.5.40",
-    "squizlabs/php_codesniffer": "3.13.0"
+    "phpunit/phpunit": "12.4.4 || 11.5.44 || 10.5.58",
+    "squizlabs/php_codesniffer": "4.0.1"
   },
   "autoload": {
     "psr-4": {
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.1.0), php-mbstring, php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.24), ${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.26), ${misc:Depends}
 Description: PHP Unicode methods.
  PHP library containing Unicode methods.
diff --git a/resources/rpm/rpm.spec b/resources/rpm/rpm.spec
@@ -18,7 +18,7 @@ BuildArch: noarch
 
 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.24
+Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.26
 Requires:  php-pcre
 Requires:  php-mbstring
 
diff --git a/src/Bidi.php b/src/Bidi.php
@@ -168,11 +168,13 @@ protected function setInput(
         string $forcedir = ''
     ): void {
         if ($str === null) {
+            $str = '';
             if (($chrarr === null || $chrarr === []) && ($ordarr !== null && $ordarr !== [])) {
                 $chrarr = $this->conv->ordArrToChrArr($ordarr);
             }
-
-            $str = implode('', $chrarr);
+            if (!empty($chrarr)) {
+                $str = implode('', $chrarr);
+            }
         }
 
         if ($chrarr === null || $chrarr === []) {
diff --git a/src/Bidi/Shaping.php b/src/Bidi/Shaping.php
@@ -79,7 +79,7 @@ protected function process(): void
         $this->combineShadda();
         $this->removeDeletedChars();
         $this->seq['item'] = array_values($this->newchardata);
-        unset($this->newchardata);
+        $this->newchardata = []; // reset
     }
 
     /**
@@ -121,6 +121,7 @@ protected function combineShadda(): void
                 && ($nxt >= 0) && (isset(UniArabic::DIACRITIC[$nxt]))
             ) {
                 $this->newchardata[$idx]['char'] = -1;
+                // @phpstan-ignore assign.propertyType
                 $this->newchardata[($idx + 1)]['char'] = UniArabic::DIACRITIC[$nxt];
             }
         }
diff --git a/src/Bidi/Shaping/Arabic.php b/src/Bidi/Shaping/Arabic.php
@@ -212,8 +212,11 @@ protected function setFinalChar(int $idx, ?array $prevchar, array $thischar, arr
             && ($this->seq['item'][($idx - 2)]['char'] == UniArabic::LAM)
         ) {
             // Allah Word
+            // @phpstan-ignore assign.propertyType
             $this->newchardata[($idx - 2)]['char'] = -1;
+            // @phpstan-ignore assign.propertyType
             $this->newchardata[($idx - 1)]['char'] = -1;
+            // @phpstan-ignore assign.propertyType
             $this->newchardata[$idx]['char'] = UniArabic::LIGATURE_ALLAH_ISOLATED_FORM;
         } elseif (($prevchar !== null) && in_array($prevchar['char'], UniArabic::END)) {
             if (isset($arabicarr[$thischar['char']][0])) {
diff --git a/src/Bidi/StepL.php b/src/Bidi/StepL.php
@@ -151,14 +151,12 @@ protected function processL2(): void
                         //     (b) the Bidi_Mirrored property value of that character is true.
                         $chardatum['char'] = UniMirror::UNI[$chardatum['char']];
                     }
-
                     $reversed[] = $chardatum;
                 } else {
                     if ($reversed !== []) {
                         $ordered = array_merge($ordered, array_reverse($reversed));
                         $reversed = [];
                     }
-
                     $ordered[] = $chardatum;
                 }
             }
diff --git a/src/Bidi/StepN.php b/src/Bidi/StepN.php
@@ -191,13 +191,15 @@ protected function processInsideBrackets(int $open, int $close, string $odir): b
     protected function setBracketsType(int $open, int $close, string $type): void
     {
         $this->seq['item'][$open]['type'] = $type;
+        // @phpstan-ignore assign.propertyType
         $this->seq['item'][$close]['type'] = $type;
 
         // Any number of characters that had original bidirectional character type NSM
         // prior to the application of W1 that immediately follow a paired bracket which
         // changed to L or R under N0 should change to match the type of their preceding bracket.
         $next = ($close + 1);
         while (isset($this->seq['item'][$next]['otype']) && ($this->seq['item'][$next]['otype'] == 'NSM')) {
+            // @phpstan-ignore assign.propertyType
             $this->seq['item'][$next]['type'] = $type;
             ++$next;
         }
@@ -227,6 +229,7 @@ protected function processN1(int $idx): void
 
             if ($next === $prev) {
                 for ($bdx = $idx; (($bdx < $jdx) && ($bdx < $this->seq['length'])); ++$bdx) {
+                    // @phpstan-ignore assign.propertyType
                     $this->seq['item'][$bdx]['type'] = $next;
                 }
             }
diff --git a/src/Bidi/StepXten.php b/src/Bidi/StepXten.php
@@ -126,6 +126,8 @@ protected function isIsolateInitiator(int $ord): bool
 
     /**
      * Set level Isolated Level Run Sequences
+     *
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     protected function setIsolatedLevelRunSequences(): void
     {
@@ -170,16 +172,18 @@ protected function setIsolatedLevelRunSequences(): void
 
             // For each level run in the paragraph whose first character is not a PDI,
             // or is a PDI that does not match any isolate initiator
-            if ($this->chardata[$seq['start']]['pdimatch'] >= 0) {
-                $parent = $this->chardata[$seq['start']]['pdimatch'];
-
+            if (
+                (($parent = $this->chardata[$seq['start']]['pdimatch']) >= 0)
+                && (!empty($this->ilrs[$parent]))
+            ) {
                 $this->ilrs[$parent]['item'] = array_merge(
                     $this->ilrs[$parent]['item'],
                     $isorun['item']
                 );
 
                 $this->ilrs[$parent]['length'] += $isorun['length'];
                 $this->ilrs[$parent]['end'] += $isorun['end'];
+
                 if ($pdimatch >= 0) {
                     $this->chardata[$pdimatch]['pdimatch'] = $parent;
                 }
diff --git a/src/Convert/Encoding.php b/src/Convert/Encoding.php
@@ -119,7 +119,8 @@ public function toUTF8(string $str, null|string|array $enc = null): string
             $chrenc = null;
         }
 
-        return mb_convert_encoding($str, 'UTF-8', $chrenc);
+        $result = mb_convert_encoding($str, 'UTF-8', $chrenc);
+        return $result === false ? '' : $result;
     }
 
     /**
@@ -131,6 +132,7 @@ public function toUTF8(string $str, null|string|array $enc = null): string
      */
     public function toUTF16BE(string $str): string
     {
-        return mb_convert_encoding($str, 'UTF-16BE', 'UTF-8');
+        $result = mb_convert_encoding($str, 'UTF-16BE', 'UTF-8');
+        return $result === false ? '' : $result;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected function process(): void`
`79`	`79`	`$this->combineShadda();`
`80`	`80`	`$this->removeDeletedChars();`
`81`	`81`	`$this->seq['item'] = array_values($this->newchardata);`
`82`		`- unset($this->newchardata);`
	`82`	`+ $this->newchardata = []; // reset`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`
`@@ -121,6 +121,7 @@ protected function combineShadda(): void`
`121`	`121`	`&& ($nxt >= 0) && (isset(UniArabic::DIACRITIC[$nxt]))`
`122`	`122`	`) {`
`123`	`123`	`$this->newchardata[$idx]['char'] = -1;`
	`124`	`+ // @phpstan-ignore assign.propertyType`
`124`	`125`	`$this->newchardata[($idx + 1)]['char'] = UniArabic::DIACRITIC[$nxt];`
`125`	`126`	`}`
`126`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,14 +151,12 @@ protected function processL2(): void`
`151`	`151`	`// (b) the Bidi_Mirrored property value of that character is true.`
`152`	`152`	`$chardatum['char'] = UniMirror::UNI[$chardatum['char']];`
`153`	`153`	`}`
`154`		`-`
`155`	`154`	`$reversed[] = $chardatum;`
`156`	`155`	`} else {`
`157`	`156`	`if ($reversed !== []) {`
`158`	`157`	`$ordered = array_merge($ordered, array_reverse($reversed));`
`159`	`158`	`$reversed = [];`
`160`	`159`	`}`
`161`		`-`
`162`	`160`	`$ordered[] = $chardatum;`
`163`	`161`	`}`
`164`	`162`	`}`