Merge branch 'phpstan:2.1.x' into Assert-and-throws-are-side-effects

Author: jack-worman

.github/workflows/static-analysis.yml

@@ -56,13 +56,6 @@ jobs:
         shell: bash
         run: "vendor/bin/simple-downgrade downgrade -c build/downgrade.php ${{ matrix.php-version }}"
 
-      - name: "Upload transformed sources"
-        if: matrix.php-version == '7.4'
-        uses: actions/upload-artifact@v3
-        with:
-          name: transformed-src
-          path: src
-
       - name: "PHPStan"
         run: "make phpstan"
 

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2016 Ondřej Mirtes
+Copyright (c) 2025 PHPStan s.r.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -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 \
@@ -88,6 +88,8 @@ lint:
 		--exclude tests/PHPStan/Rules/Properties/data/non-abstract-hooked-properties-in-class.php \
 		--exclude tests/PHPStan/Rules/Properties/data/hooked-properties-in-class.php \
 		--exclude tests/PHPStan/Rules/Properties/data/hooked-properties-without-bodies-in-class.php \
+		--exclude tests/PHPStan/Rules/Properties/data/readonly-property-hooks.php \
+		--exclude tests/PHPStan/Rules/Properties/data/readonly-property-hooks-in-interface.php \
 		--exclude tests/PHPStan/Rules/Classes/data/bug-12281.php \
 		--exclude tests/PHPStan/Rules/Traits/data/bug-12281.php \
 		--exclude tests/PHPStan/Rules/Classes/data/invalid-hooked-properties.php \
@@ -99,10 +101,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

composer.json

@@ -15,7 +15,7 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/file": "1.17.07.11",
-		"jetbrains/phpstorm-stubs": "dev-master#62a683f61d9ea11ef8caf8b2ad54e59e92b2c670",
+		"jetbrains/phpstorm-stubs": "dev-master#6c6bf204cbdf39006f12a6c923b8217444acd67f",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.1.4",
 		"nette/neon": "3.3.4",
@@ -24,7 +24,7 @@
 		"nette/utils": "^3.2.5",
 		"nikic/php-parser": "^5.4.0",
 		"ondram/ci-detector": "^3.4.0",
-		"ondrejmirtes/better-reflection": "6.51.0.1",
+		"ondrejmirtes/better-reflection": "6.53.0.0",
 		"phpstan/php-8-stubs": "0.4.9",
 		"phpstan/phpdoc-parser": "2.0.0",
 		"psr/http-message": "^1.1",