Merge pull request #116 from laminas/2.33.x-merge-up-into-3.0.x_yEJ9j7lh

Merge release 2.33.0 into 3.0.x
laminas · Nov 3, 2023 · bd02d3d · bd02d3d
2 parents 4c64265 + 3dbaa81
commit bd02d3d
Show file tree

Hide file tree

Showing 50 changed files with 294 additions and 258 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,2 +1,5 @@
 {
+  "ignore_php_platform_requirements": {
+    "8.3": true
+  }
 }
diff --git a/composer.json b/composer.json
@@ -32,19 +32,19 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-mbstring": "*",
         "laminas/laminas-servicemanager": "^3.21.0",
         "laminas/laminas-stdlib": "^3.13.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-uri": "^2.10",
+        "laminas/laminas-uri": "^2.11.0",
         "pear/archive_tar": "^1.4.14",
-        "phpunit/phpunit": "^10.1.3",
+        "phpunit/phpunit": "^10.4.2",
         "psalm/plugin-phpunit": "^0.18.4",
         "psr/http-factory": "^1.0.2",
-        "vimeo/psalm": "^5.11"
+        "vimeo/psalm": "^5.15.0"
     },
     "conflict": {
         "laminas/laminas-validator": "<2.10.1",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.11.0@c9b192ab8400fdaf04b2b13d110575adc879aa90">
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="src/AbstractDateDropdown.php">
     <MissingReturnType>
       <code>filterable</code>
     </MissingReturnType>
+    <MixedArgumentTypeCoercion>
+      <code>$value</code>
+    </MixedArgumentTypeCoercion>
     <PossiblyUnusedMethod>
       <code>setNullOnAllEmpty</code>
       <code>setNullOnEmpty</code>
@@ -360,6 +363,11 @@
       <code><![CDATA[$e->getCode()]]></code>
     </PossiblyInvalidArgument>
   </file>
+  <file src="src/DateTimeSelect.php">
+    <MixedArgumentTypeCoercion>
+      <code>$value</code>
+    </MixedArgumentTypeCoercion>
+  </file>
   <file src="src/Decompress.php">
     <DocblockTypeContradiction>
       <code>! is_string($value)</code>
@@ -718,6 +726,9 @@
     <ArgumentTypeCoercion>
       <code><![CDATA[$options['pluginManager']]]></code>
     </ArgumentTypeCoercion>
+    <InvalidArgument>
+      <code>array_values($processedParts)</code>
+    </InvalidArgument>
     <InvalidArrayAccess>
       <code>$spec[0]</code>
     </InvalidArrayAccess>
@@ -779,10 +790,6 @@
     <ParamNameMismatch>
       <code>$source</code>
     </ParamNameMismatch>
-    <PossiblyUnusedParam>
-      <code>$reference</code>
-      <code>$target</code>
-    </PossiblyUnusedParam>
     <PossiblyUnusedReturnValue>
       <code>self</code>
     </PossiblyUnusedReturnValue>
@@ -800,6 +807,10 @@
       <code>(string) $target</code>
       <code>(string) $value</code>
     </RedundantCastGivenDocblockType>
+    <UnusedParam>
+      <code>$reference</code>
+      <code>$target</code>
+    </UnusedParam>
   </file>
   <file src="src/Module.php">
     <MissingReturnType>
@@ -816,6 +827,9 @@
     </UnusedClass>
   </file>
   <file src="src/PregReplace.php">
+    <ArgumentTypeCoercion>
+      <code>$pattern</code>
+    </ArgumentTypeCoercion>
     <DocblockTypeContradiction>
       <code><![CDATA[! is_array($pattern) && ! is_string($pattern)]]></code>
       <code><![CDATA[! is_array($replacement) && ! is_string($replacement)]]></code>
@@ -1237,32 +1251,6 @@
       <code>1234</code>
       <code>1234</code>
     </InvalidArgument>
-    <PossiblyNullArgument>
-      <code><![CDATA[$this->newDir]]></code>
-      <code><![CDATA[$this->newDir]]></code>
-      <code><![CDATA[$this->newDirFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->newFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->oldFile]]></code>
-      <code><![CDATA[$this->origFile]]></code>
-      <code><![CDATA[$this->tmpPath]]></code>
-    </PossiblyNullArgument>
-    <PossiblyNullOperand>
-      <code><![CDATA[$this->tmpPath]]></code>
-      <code><![CDATA[$this->tmpPath]]></code>
-    </PossiblyNullOperand>
     <PossiblyUnusedMethod>
       <code>returnUnfilteredDataProvider</code>
     </PossiblyUnusedMethod>
@@ -1328,6 +1316,10 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/InflectorTest.php">
+    <DocblockTypeContradiction>
+      <code>assertNull</code>
+      <code>assertSame</code>
+    </DocblockTypeContradiction>
     <InvalidCast>
       <code>$rule</code>
       <code>$rule</code>
@@ -1368,9 +1360,6 @@
       <code>$rules</code>
       <code>$rules</code>
     </PossiblyFalseArgument>
-    <UnusedPsalmSuppress>
-      <code>UnusedVariable</code>
-    </UnusedPsalmSuppress>
     <UnusedVariable>
       <code>$filtered</code>
       <code>$rule</code>

diff --git a/src/AllowList.php b/src/AllowList.php
@@ -17,6 +17,7 @@
  *     ...
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class AllowList extends AbstractFilter
 {

diff --git a/src/BaseName.php b/src/BaseName.php
@@ -10,6 +10,7 @@
 /**
  * @psalm-type Options = array{}
  * @extends AbstractFilter<Options>
+ * @final
  */
 class BaseName extends AbstractFilter
 {

diff --git a/src/Boolean.php b/src/Boolean.php
@@ -25,6 +25,7 @@
  *     translations?: array,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class Boolean extends AbstractFilter
 {

diff --git a/src/Callback.php b/src/Callback.php
@@ -19,6 +19,7 @@
  *     ...
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class Callback extends AbstractFilter
 {

diff --git a/src/Compress/Bz2.php b/src/Compress/Bz2.php
@@ -25,6 +25,7 @@
  *     archive?: string|null,
  * }
  * @extends AbstractCompressionAlgorithm<Options>
+ * @final
  */
 class Bz2 extends AbstractCompressionAlgorithm
 {

diff --git a/src/Compress/Gz.php b/src/Compress/Gz.php
@@ -36,6 +36,7 @@
  *     archive?: string|null,
  * }
  * @extends AbstractCompressionAlgorithm<Options>
+ * @final
  */
 class Gz extends AbstractCompressionAlgorithm
 {

diff --git a/src/Compress/Tar.php b/src/Compress/Tar.php
@@ -30,6 +30,7 @@
  *     mode?: 'gz'|'bz2'|null,
  * }
  * @extends AbstractCompressionAlgorithm<Options>
+ * @final
  */
 class Tar extends AbstractCompressionAlgorithm
 {

diff --git a/src/Compress/Zip.php b/src/Compress/Zip.php
@@ -33,6 +33,7 @@
  *     target?: string|null,
  * }
  * @extends AbstractCompressionAlgorithm<Options>
+ * @final
  */
 class Zip extends AbstractCompressionAlgorithm
 {

diff --git a/src/DataUnitFormatter.php b/src/DataUnitFormatter.php
@@ -22,6 +22,7 @@
  *     prefixes?: list<string>,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 final class DataUnitFormatter extends AbstractFilter
 {

diff --git a/src/DateSelect.php b/src/DateSelect.php
@@ -12,6 +12,7 @@
  * }
  * @template TOptions of Options
  * @template-extends AbstractDateDropdown<TOptions>
+ * @final
  */
 class DateSelect extends AbstractDateDropdown
 {

diff --git a/src/DateTimeFormatter.php b/src/DateTimeFormatter.php
@@ -17,6 +17,7 @@
  *     ...
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class DateTimeFormatter extends AbstractFilter
 {

diff --git a/src/DateTimeSelect.php b/src/DateTimeSelect.php
@@ -16,6 +16,7 @@
  * }
  * @template TOptions of Options
  * @template-extends AbstractDateDropdown<TOptions>
+ * @final
  */
 class DateTimeSelect extends AbstractDateDropdown
 {

diff --git a/src/Decompress.php b/src/Decompress.php
@@ -8,6 +8,8 @@
 
 /**
  * Decompresses a given string
+ *
+ * @final
  */
 class Decompress extends Compress
 {

diff --git a/src/DenyList.php b/src/DenyList.php
@@ -17,6 +17,7 @@
  *     ...
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class DenyList extends AbstractFilter
 {

diff --git a/src/Digits.php b/src/Digits.php
@@ -14,6 +14,7 @@
 /**
  * @psalm-type Options = array{}
  * @extends AbstractFilter<Options>
+ * @final
  */
 class Digits extends AbstractFilter
 {

diff --git a/src/Dir.php b/src/Dir.php
@@ -10,6 +10,7 @@
 /**
  * @psalm-type Options = array{}
  * @extends AbstractFilter<Options>
+ * @final
  */
 class Dir extends AbstractFilter
 {

diff --git a/src/File/LowerCase.php b/src/File/LowerCase.php
@@ -16,6 +16,7 @@
 use function is_string;
 use function is_writable;
 
+/** @final */
 class LowerCase extends StringToLower
 {
     /**

diff --git a/src/File/Rename.php b/src/File/Rename.php
@@ -33,6 +33,7 @@
  * }
  * @template TOptions of Options
  * @template-extends Filter\AbstractFilter<TOptions>
+ * @final
  */
 class Rename extends Filter\AbstractFilter
 {

diff --git a/src/File/UpperCase.php b/src/File/UpperCase.php
@@ -14,6 +14,7 @@
 use function is_scalar;
 use function is_writable;
 
+/** @final */
 class UpperCase extends StringToUpper
 {
     /**

diff --git a/src/HtmlEntities.php b/src/HtmlEntities.php
@@ -26,6 +26,7 @@
  *     ...
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class HtmlEntities extends AbstractFilter
 {

diff --git a/src/Inflector.php b/src/Inflector.php
@@ -35,6 +35,7 @@
  *     pluginManager?: FilterPluginManager,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class Inflector extends AbstractFilter
 {

diff --git a/src/MonthSelect.php b/src/MonthSelect.php
@@ -12,6 +12,7 @@
  * }
  * @template TOptions of Options
  * @template-extends AbstractDateDropdown<TOptions>
+ * @final
  */
 class MonthSelect extends AbstractDateDropdown
 {

diff --git a/src/PregReplace.php b/src/PregReplace.php
@@ -25,6 +25,7 @@
  *     replacement?: string|list<string>,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class PregReplace extends AbstractFilter
 {

diff --git a/src/RealPath.php b/src/RealPath.php
@@ -29,6 +29,7 @@
  * }
  * @template TOptions of Options
  * @extends AbstractFilter<TOptions>
+ * @final
  */
 class RealPath extends AbstractFilter
 {

diff --git a/src/StringPrefix.php b/src/StringPrefix.php
@@ -15,6 +15,7 @@
  *     prefix?: null|string,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class StringPrefix extends AbstractFilter
 {

diff --git a/src/StringSuffix.php b/src/StringSuffix.php
@@ -15,6 +15,7 @@
  *     suffix?: null|string,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class StringSuffix extends AbstractFilter
 {

diff --git a/src/StringTrim.php b/src/StringTrim.php
@@ -16,6 +16,7 @@
  *     charlist?: string|null,
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class StringTrim extends AbstractFilter
 {

diff --git a/src/StripNewlines.php b/src/StripNewlines.php
@@ -11,6 +11,7 @@
 /**
  * @psalm-type Options = array{}
  * @extends AbstractFilter<Options>
+ * @final
  */
 class StripNewlines extends AbstractFilter
 {

diff --git a/src/StripTags.php b/src/StripTags.php
@@ -31,6 +31,7 @@
  *     ...
  * }
  * @extends AbstractFilter<Options>
+ * @final
  */
 class StripTags extends AbstractFilter
 {

diff --git a/src/ToFloat.php b/src/ToFloat.php
@@ -9,6 +9,7 @@
 /**
  * @psalm-type Options = array{}
  * @extends AbstractFilter<Options>
+ * @final
  */
 class ToFloat extends AbstractFilter
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ @@
      *     ...
      * }
      * @extends AbstractFilter<Options>
+     * @final
      */
     class AllowList extends AbstractFilter
     {
@@ Expand Down @@