From 6d2dff1cfb1cf3326aef221b21cbb36fe759024a Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 15:46:50 +0400 Subject: [PATCH 1/9] v1.6.4 php84 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index c4417d5..04fba02 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=8.2", + "php": ">=8.4", "micro/kernel-app": "^1.6", "micro/autowire": "^1.6", "micro/plugin-configuration-helper": "^1.6", @@ -24,11 +24,11 @@ }, "require-dev": { "ergebnis/composer-normalize": "^2.29", - "phpunit/phpunit": "^10.1", - "vimeo/psalm": "^5.15", - "phpstan/phpstan": "^1.10", - "friendsofphp/php-cs-fixer": "^3.13", - "phpunit/php-code-coverage": "^10.1" + "phpunit/phpunit": "^12", + "vimeo/psalm": "^7", + "phpstan/phpstan": "^2", + "friendsofphp/php-cs-fixer": "^3", + "phpunit/php-code-coverage": "^12" }, "autoload": { "psr-4": { From f650fb940b4f9bb4dcbb3a45435ec398d24d2b71 Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 15:55:14 +0400 Subject: [PATCH 2/9] 1.6.4 fix github wf --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index f3af4d0..6ae2aa8 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -20,13 +20,13 @@ jobs: uses: shivammathur/setup-php@v2 with: coverage: none - php-version: 8.2 + php-version: 8.4 - name: Cache Composer packages id: composer-cache uses: actions/cache@v3 with: - php_version: 8.2 + php_version: 8.4 path: vendor key: ${{ runner.os }} restore-keys: | From 38ff385b28dbdf48fa618272a39557fffb881058 Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 15:57:13 +0400 Subject: [PATCH 3/9] 1.6.4 fix ergebnis/composer-normalize --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 04fba02..cdbee62 100755 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "micro/plugin-twig-webpack-encore": "^1.6" }, "require-dev": { - "ergebnis/composer-normalize": "^2.29", + "ergebnis/composer-normalize": "^2", "phpunit/phpunit": "^12", "vimeo/psalm": "^7", "phpstan/phpstan": "^2", From 4d3196eac2d75135485c760f6b34a7869d7322dc Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 16:05:15 +0400 Subject: [PATCH 4/9] 1.6.4 fix guthub actions --- composer.json | 2 +- tests/tools/php-cs-fixer/composer.json | 2 +- tests/tools/phpstan/composer.json | 2 +- tests/tools/psalm/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index cdbee62..ee5cdd6 100755 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "require-dev": { "ergebnis/composer-normalize": "^2", "phpunit/phpunit": "^12", - "vimeo/psalm": "^7", + "vimeo/psalm": "^6", "phpstan/phpstan": "^2", "friendsofphp/php-cs-fixer": "^3", "phpunit/php-code-coverage": "^12" diff --git a/tests/tools/php-cs-fixer/composer.json b/tests/tools/php-cs-fixer/composer.json index 45500a7..ce6eb43 100644 --- a/tests/tools/php-cs-fixer/composer.json +++ b/tests/tools/php-cs-fixer/composer.json @@ -1,5 +1,5 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "^3.16" + "friendsofphp/php-cs-fixer": "^3" } } diff --git a/tests/tools/phpstan/composer.json b/tests/tools/phpstan/composer.json index 2216211..7e2c7b9 100644 --- a/tests/tools/phpstan/composer.json +++ b/tests/tools/phpstan/composer.json @@ -1,5 +1,5 @@ { "require-dev": { - "phpstan/phpstan": "^1.10" + "phpstan/phpstan": "^2" } } diff --git a/tests/tools/psalm/composer.json b/tests/tools/psalm/composer.json index 9c35def..9356ebb 100644 --- a/tests/tools/psalm/composer.json +++ b/tests/tools/psalm/composer.json @@ -1,5 +1,5 @@ { "require-dev": { - "vimeo/psalm": "^5.11" + "vimeo/psalm": "^6" } } From c780e6c3cb8e1a5259d80bf6f9dbb78a4729b7f6 Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 16:07:40 +0400 Subject: [PATCH 5/9] 1.6.4 psalm fixes --- psalm.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/psalm.xml b/psalm.xml index d95a6c8..2610144 100644 --- a/psalm.xml +++ b/psalm.xml @@ -14,6 +14,11 @@ + + + + + From fab900983b21ec2d5c577a182e05642e6c07a4df Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 16:09:36 +0400 Subject: [PATCH 6/9] 1.6.4 psalm fixes --- psalm.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/psalm.xml b/psalm.xml index 2610144..e0a3cef 100644 --- a/psalm.xml +++ b/psalm.xml @@ -14,19 +14,15 @@ - + - + - - + + - - - - - + From e27c69a372e183165e914ceb2a8f8158d568e7e2 Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 16:15:26 +0400 Subject: [PATCH 7/9] 1.6.4 psalm fixes --- psalm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psalm.xml b/psalm.xml index e0a3cef..321b8f7 100644 --- a/psalm.xml +++ b/psalm.xml @@ -16,7 +16,7 @@ - + From 03e2720cc7a2669136708b8a5ddcf1228b8ca1be Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 16:18:54 +0400 Subject: [PATCH 8/9] 1.6.4 Fix override psalm error --- src/Blog/BlogPlugin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Blog/BlogPlugin.php b/src/Blog/BlogPlugin.php index 6717478..da28744 100644 --- a/src/Blog/BlogPlugin.php +++ b/src/Blog/BlogPlugin.php @@ -14,6 +14,7 @@ class BlogPlugin implements RouteProviderPluginInterface, TwigTemplatePluginInte { use TwigTemplatePluginTrait; + #[\Override] public function provideRoutes(HttpFacadeInterface $httpFacade): iterable { yield $httpFacade From 9ea8a5c2cd21aebfd834a95d357a4cc04022d24b Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Wed, 27 Aug 2025 16:24:56 +0400 Subject: [PATCH 9/9] 1.6.4 csfixer --- src/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Kernel.php b/src/Kernel.php index 36b2254..6159a8a 100755 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -8,12 +8,12 @@ $basedir = realpath(__DIR__.'/../'); if (!$basedir) { - throw new \RuntimeException('Base path can not be resolved.'); + throw new RuntimeException('Base path can not be resolved.'); } require_once $basedir.'/vendor/autoload.php'; -return function () use ($basedir): \Micro\Framework\Kernel\KernelInterface { +return function () use ($basedir): Micro\Framework\Kernel\KernelInterface { $applicationConfiguration = new class($basedir) extends DefaultApplicationConfiguration { private Dotenv $dotenv;