Update packages (#477)

- paragonie/halite updated from v5.1.2 to v5.1.3 patch See changes: paragonie/[email protected] Release notes: https://github.com/paragonie/halite/releases/tag/v5.1.3 - psalm/phar updated from 5.26.1 to 6.0.0 major See changes: psalm/phar@5.26.1...6.0.0 Release notes: https://github.com/psalm/phar/releases/tag/6.0.0 - roave/security-advisories updated from dev-latest@fb6b004 to dev-latest@43863a2 See changes: Roave/SecurityAdvisories@fb6b004...43863a2 - spaze/phpcs-phar updated from 3.11.2 to 3.11.3 patch See changes: spaze/[email protected] Release notes: https://github.com/spaze/phpcs-phar/releases/tag/3.11.3 - spaze/phpstan-disallowed-calls updated from v4.2.0 to v4.2.1 patch See changes: spaze/[email protected] Release notes: https://github.com/spaze/phpstan-disallowed-calls/releases/tag/v4.2.1 Run Psalm 6 on PHP 8.4 Partially reverts #463 Close #439 Close #462
spaze · Jan 27, 2025 · 55120b8 · 55120b8
2 parents d60ab64 + db9b03c
commit 55120b8
Show file tree

Hide file tree

Showing 19 changed files with 122 additions and 118 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -208,7 +208,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2

diff --git a/app/Makefile b/app/Makefile
@@ -45,10 +45,10 @@ phpstan-vendor:
 	vendor/phpstan/phpstan/phpstan -vvv --ansi analyse --configuration phpstan-vendor.neon
 
 psalm:
-	php8.3 vendor/bin/psalm.phar
+	vendor/bin/psalm.phar
 
 psalm-clear-cache:
-	php8.3 vendor/bin/psalm.phar --clear-cache
+	vendor/bin/psalm.phar --clear-cache
 
 tester:
 	vendor/nette/tester/src/tester -s -c tests/php-unix.ini -d zend.assertions=1 --colors 1 --coverage temp/coverage.html --coverage-src src/ tests/

diff --git a/app/composer.json b/app/composer.json
@@ -4,7 +4,7 @@
 	"description": "Source code for my site",
 	"license": "MIT",
 	"require": {
-		"php": "^8.3",
+		"php": "^8.4",
 		"ext-ctype": "*",
 		"ext-fileinfo": "*",
 		"ext-gd": "*",
@@ -60,7 +60,7 @@
 		"phpstan/phpstan": "^2.0",
 		"phpstan/phpstan-deprecation-rules": "^2.0",
 		"phpstan/phpstan-nette": "^2.0.2",
-		"psalm/phar": "^5.26.1",
+		"psalm/phar": "^6.0",
 		"roave/security-advisories": "dev-latest",
 		"shipmonk/composer-dependency-analyser": "^1.3",
 		"spaze/coding-standard": "^1.7.1",

diff --git a/app/composer.lock b/app/composer.lock
diff --git a/app/psalm.xml b/app/psalm.xml
@@ -77,11 +77,6 @@
 				<referencedProperty name="Nette\Forms\Form::$httpRequest" /> <!-- Marked as @internal -->
 			</errorLevel>
 		</PropertyNotSetInConstructor>
-		<UnsafeInstantiation>
-			<errorLevel type="suppress">
-				<file name="src/Test/TestCaseRunner.php" /> <!-- Correct params are figured for each TestCase child in MichalSpacekCz\Test\TestCaseRunner::run() -->
-			</errorLevel>
-		</UnsafeInstantiation>
 		<UnusedClass>
 			<errorLevel type="suppress">
 				<referencedClass name="*Presenter" />

diff --git a/app/src/DependencyInjection/DiServices.php b/app/src/DependencyInjection/DiServices.php
@@ -6,6 +6,7 @@
 use MichalSpacekCz\DependencyInjection\Exceptions\DiServicesConfigInvalidException;
 use Nette\Neon\Entity;
 use Nette\Neon\Neon;
+use Nette\Utils\Json;
 
 class DiServices
 {
@@ -74,7 +75,7 @@ private static function getString(string|Entity|array $item, string $file, strin
 		} elseif (is_string($item->value)) {
 			return $item->value;
 		}
-		$message = is_array($item) ? sprintf("Unsupported array '%s'", json_encode($item)) : sprintf("Unsupported item '%s'", get_debug_type($item));
+		$message = is_array($item) ? sprintf("Unsupported array '%s'", Json::encode($item)) : sprintf("Unsupported item '%s'", get_debug_type($item));
 		throw new DiServicesConfigInvalidException($file, $section, $message);
 	}