Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 2.33.0 into 3.0.x #116

Merged
merged 19 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.3": true
}
}
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
409 changes: 205 additions & 204 deletions composer.lock

Large diffs are not rendered by default.

57 changes: 23 additions & 34 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -718,6 +726,9 @@
<ArgumentTypeCoercion>
<code><![CDATA[$options['pluginManager']]]></code>
</ArgumentTypeCoercion>
<InvalidArgument>
<code>array_values($processedParts)</code>
</InvalidArgument>
<InvalidArrayAccess>
<code>$spec[0]</code>
</InvalidArrayAccess>
Expand Down Expand Up @@ -779,10 +790,6 @@
<ParamNameMismatch>
<code>$source</code>
</ParamNameMismatch>
<PossiblyUnusedParam>
<code>$reference</code>
<code>$target</code>
</PossiblyUnusedParam>
<PossiblyUnusedReturnValue>
<code>self</code>
</PossiblyUnusedReturnValue>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -1368,9 +1360,6 @@
<code>$rules</code>
<code>$rules</code>
</PossiblyFalseArgument>
<UnusedPsalmSuppress>
<code>UnusedVariable</code>
</UnusedPsalmSuppress>
<UnusedVariable>
<code>$filtered</code>
<code>$rule</code>
Expand Down
1 change: 1 addition & 0 deletions src/AllowList.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* ...
* }
* @extends AbstractFilter<Options>
* @final
*/
class AllowList extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/BaseName.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/**
* @psalm-type Options = array{}
* @extends AbstractFilter<Options>
* @final
*/
class BaseName extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/Boolean.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* translations?: array,
* }
* @extends AbstractFilter<Options>
* @final
*/
class Boolean extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/Callback.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* ...
* }
* @extends AbstractFilter<Options>
* @final
*/
class Callback extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/Compress/Bz2.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* archive?: string|null,
* }
* @extends AbstractCompressionAlgorithm<Options>
* @final
*/
class Bz2 extends AbstractCompressionAlgorithm
{
Expand Down
1 change: 1 addition & 0 deletions src/Compress/Gz.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
* archive?: string|null,
* }
* @extends AbstractCompressionAlgorithm<Options>
* @final
*/
class Gz extends AbstractCompressionAlgorithm
{
Expand Down
1 change: 1 addition & 0 deletions src/Compress/Tar.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
* mode?: 'gz'|'bz2'|null,
* }
* @extends AbstractCompressionAlgorithm<Options>
* @final
*/
class Tar extends AbstractCompressionAlgorithm
{
Expand Down
1 change: 1 addition & 0 deletions src/Compress/Zip.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
* target?: string|null,
* }
* @extends AbstractCompressionAlgorithm<Options>
* @final
*/
class Zip extends AbstractCompressionAlgorithm
{
Expand Down
1 change: 1 addition & 0 deletions src/DataUnitFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* prefixes?: list<string>,
* }
* @extends AbstractFilter<Options>
* @final
*/
final class DataUnitFormatter extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/DateSelect.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* }
* @template TOptions of Options
* @template-extends AbstractDateDropdown<TOptions>
* @final
*/
class DateSelect extends AbstractDateDropdown
{
Expand Down
1 change: 1 addition & 0 deletions src/DateTimeFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* ...
* }
* @extends AbstractFilter<Options>
* @final
*/
class DateTimeFormatter extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/DateTimeSelect.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* }
* @template TOptions of Options
* @template-extends AbstractDateDropdown<TOptions>
* @final
*/
class DateTimeSelect extends AbstractDateDropdown
{
Expand Down
2 changes: 2 additions & 0 deletions src/Decompress.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/**
* Decompresses a given string
*
* @final
*/
class Decompress extends Compress
{
Expand Down
1 change: 1 addition & 0 deletions src/DenyList.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* ...
* }
* @extends AbstractFilter<Options>
* @final
*/
class DenyList extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/Digits.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/**
* @psalm-type Options = array{}
* @extends AbstractFilter<Options>
* @final
*/
class Digits extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/Dir.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/**
* @psalm-type Options = array{}
* @extends AbstractFilter<Options>
* @final
*/
class Dir extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/File/LowerCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use function is_string;
use function is_writable;

/** @final */
class LowerCase extends StringToLower
{
/**
Expand Down
1 change: 1 addition & 0 deletions src/File/Rename.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
* }
* @template TOptions of Options
* @template-extends Filter\AbstractFilter<TOptions>
* @final
*/
class Rename extends Filter\AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/File/UpperCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use function is_scalar;
use function is_writable;

/** @final */
class UpperCase extends StringToUpper
{
/**
Expand Down
1 change: 1 addition & 0 deletions src/HtmlEntities.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* ...
* }
* @extends AbstractFilter<Options>
* @final
*/
class HtmlEntities extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/Inflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* pluginManager?: FilterPluginManager,
* }
* @extends AbstractFilter<Options>
* @final
*/
class Inflector extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/MonthSelect.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* }
* @template TOptions of Options
* @template-extends AbstractDateDropdown<TOptions>
* @final
*/
class MonthSelect extends AbstractDateDropdown
{
Expand Down
1 change: 1 addition & 0 deletions src/PregReplace.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* replacement?: string|list<string>,
* }
* @extends AbstractFilter<Options>
* @final
*/
class PregReplace extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/RealPath.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* }
* @template TOptions of Options
* @extends AbstractFilter<TOptions>
* @final
*/
class RealPath extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/StringPrefix.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* prefix?: null|string,
* }
* @extends AbstractFilter<Options>
* @final
*/
class StringPrefix extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/StringSuffix.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* suffix?: null|string,
* }
* @extends AbstractFilter<Options>
* @final
*/
class StringSuffix extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/StringTrim.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* charlist?: string|null,
* }
* @extends AbstractFilter<Options>
* @final
*/
class StringTrim extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/StripNewlines.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
/**
* @psalm-type Options = array{}
* @extends AbstractFilter<Options>
* @final
*/
class StripNewlines extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/StripTags.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* ...
* }
* @extends AbstractFilter<Options>
* @final
*/
class StripTags extends AbstractFilter
{
Expand Down
1 change: 1 addition & 0 deletions src/ToFloat.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/**
* @psalm-type Options = array{}
* @extends AbstractFilter<Options>
* @final
*/
class ToFloat extends AbstractFilter
{
Expand Down
Loading