Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: phpstan/phpstan-src
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 922859e197fcc1fd85166ca8b2748f19c64cdb9e
Choose a base ref
..
head repository: phpstan/phpstan-src
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75c4610ae0419d7051331fb34a621ccc8b7dad6a
Choose a head ref
Showing with 981 additions and 365 deletions.
  1. +4 −4 Makefile
  2. +72 −72 composer.lock
  3. +10 −0 conf/config.neon
  4. +1 −16 phpstan-baseline.neon
  5. +8 −8 resources/functionMap.php
  6. +6 −6 resources/functionMap_php80delta.php
  7. +9 −4 src/Analyser/MutatingScope.php
  8. +5 −2 src/Analyser/TypeSpecifier.php
  9. +4 −0 src/Rules/Comparison/ImpossibleCheckTypeFunctionCallRule.php
  10. +2 −0 src/Type/ObjectType.php
  11. +0 −1 src/Type/Php/ArgumentBasedFunctionReturnTypeExtension.php
  12. +159 −0 src/Type/Php/ArrayChangeKeyCaseFunctionReturnTypeExtension.php
  13. +36 −24 src/Type/Php/HashFunctionsReturnTypeExtension.php
  14. +1 −15 src/Type/Php/IsAFunctionTypeSpecifyingExtension.php
  15. +1 −15 src/Type/Php/IsSubclassOfFunctionTypeSpecifyingExtension.php
  16. +8 −9 src/Type/Php/MinMaxFunctionReturnTypeExtension.php
  17. +70 −0 src/Type/Php/OpenSslEncryptParameterOutTypeExtension.php
  18. +32 −6 src/Type/TypeCombinator.php
  19. +32 −4 tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
  20. +3 −1 tests/PHPStan/Analyser/TypeSpecifierTest.php
  21. +98 −0 tests/PHPStan/Analyser/nsrt/array-change-key-case.php
  22. +43 −0 tests/PHPStan/Analyser/nsrt/bug-12107.php
  23. +19 −0 tests/PHPStan/Analyser/nsrt/bug-12182.php
  24. +140 −0 tests/PHPStan/Analyser/nsrt/bug-12312.php
  25. +68 −0 tests/PHPStan/Analyser/nsrt/bug-12386.php
  26. +7 −4 tests/PHPStan/Analyser/nsrt/hash-functions-74.php
  27. +4 −3 tests/PHPStan/Analyser/nsrt/hash-functions-80.php
  28. +24 −15 tests/PHPStan/Analyser/nsrt/hash-functions.php
  29. +1 −1 tests/PHPStan/Analyser/nsrt/instanceof-class-string.php
  30. +8 −8 tests/PHPStan/Analyser/nsrt/instanceof.php
  31. +73 −0 tests/PHPStan/Analyser/nsrt/openssl-encrypt.php
  32. +0 −10 tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php
  33. +0 −7 tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php
  34. +0 −130 tests/PHPStan/Rules/Comparison/data/bug-3979.php
  35. +7 −0 tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php
  36. +26 −0 tests/PHPStan/Rules/Functions/data/bug-10960.php
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
build: cs tests phpstan

tests:
php vendor/bin/paratest --runner WrapperRunner --no-coverage
XDEBUG_MODE=off php vendor/bin/paratest --runner WrapperRunner --no-coverage

tests-integration:
php vendor/bin/paratest --runner WrapperRunner --no-coverage --group exec
@@ -18,7 +18,7 @@ tests-golden-reflection:
php vendor/bin/paratest --runner WrapperRunner --no-coverage tests/PHPStan/Reflection/ReflectionProviderGoldenTest.php

lint:
php vendor/bin/parallel-lint --colors \
XDEBUG_MODE=off php vendor/bin/parallel-lint --colors \
--exclude tests/PHPStan/Analyser/data \
--exclude tests/PHPStan/Analyser/nsrt \
--exclude tests/PHPStan/Rules/Methods/data \
@@ -80,10 +80,10 @@ lint:
src tests

cs:
composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
composer install --working-dir build-cs && XDEBUG_MODE=off php build-cs/vendor/bin/phpcs

cs-fix:
php build-cs/vendor/bin/phpcbf
XDEBUG_MODE=off php build-cs/vendor/bin/phpcbf

phpstan:
php bin/phpstan clear-result-cache -q && php -d memory_limit=448M bin/phpstan
Loading