From a6dc424282da494f3d5daa314fedd10a146d4a57 Mon Sep 17 00:00:00 2001 From: Chemaclass Date: Sun, 16 Aug 2026 22:18:07 +0200 Subject: [PATCH 1/3] chore: bump phel-lang to 0.50.0 --- composer.json | 2 +- composer.lock | 187 +++++++++++++++++++++++++++++--------------------- 2 files changed, 110 insertions(+), 79 deletions(-) diff --git a/composer.json b/composer.json index 6735fd1..5ce7c85 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "type": "project", "require": { "php": ">=8.4", - "phel-lang/phel-lang": "^0.49" + "phel-lang/phel-lang": "^0.50" }, "require-dev": { "symfony/var-dumper": "^7.3" diff --git a/composer.lock b/composer.lock index 05aff89..9ea725d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "693722a040597c5e49bbc3293da739cd", + "content-hash": "d2672da236404ff9a8dc38200a79cc46", "packages": [ { "name": "amphp/amp", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "2f3ebed5a4f663968a0590dbb7654a8b32cb63cb" + "reference": "73c38b323ff8d790abf0f76c56fcc892bda4111a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/2f3ebed5a4f663968a0590dbb7654a8b32cb63cb", - "reference": "2f3ebed5a4f663968a0590dbb7654a8b32cb63cb", + "url": "https://api.github.com/repos/amphp/amp/zipball/73c38b323ff8d790abf0f76c56fcc892bda4111a", + "reference": "73c38b323ff8d790abf0f76c56fcc892bda4111a", "shasum": "" }, "require": { @@ -77,7 +77,7 @@ ], "support": { "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v3.1.2" + "source": "https://github.com/amphp/amp/tree/v3.1.3" }, "funding": [ { @@ -85,34 +85,42 @@ "type": "github" } ], - "time": "2026-06-21T13:59:44+00:00" + "time": "2026-07-19T17:59:20+00:00" }, { "name": "gacela-project/container", - "version": "0.10.0", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/gacela-project/container.git", - "reference": "db13556a11f6892c852ef0f26a9915aee2a3ba4e" + "reference": "e9ac0b6b5c6b0eb8724e04b8e9cbc829f43c6707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gacela-project/container/zipball/db13556a11f6892c852ef0f26a9915aee2a3ba4e", - "reference": "db13556a11f6892c852ef0f26a9915aee2a3ba4e", + "url": "https://api.github.com/repos/gacela-project/container/zipball/e9ac0b6b5c6b0eb8724e04b8e9cbc829f43c6707", + "reference": "e9ac0b6b5c6b0eb8724e04b8e9cbc829f43c6707", "shasum": "" }, "require": { - "php": ">=8.1", - "psr/container": ">=1.1" + "php": ">=8.3", + "psr/container": "^1.1 || ^2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.75", - "phpstan/phpstan": "^1.12", - "phpunit/phpunit": "^10.5", - "psalm/plugin-phpunit": "^0.18", - "symfony/var-dumper": "^5.4", - "vimeo/psalm": "^5.26" + "infection/infection": "^0.31 || ^0.34", + "phpbench/phpbench": "^1.4", + "phpstan/phpstan": "^2.2", + "phpunit/phpunit": "^12.5", + "symfony/var-dumper": "^6.4 || ^7.0", + "symfony/yaml": "^6.4 || ^7.0", + "vimeo/psalm": "^6.16" }, + "suggest": { + "symfony/yaml": "To load container definitions from .yaml/.yml files with loadFile(); not required — parse it yourself and use load()" + }, + "bin": [ + "bin/gacela-container" + ], "type": "library", "autoload": { "psr-4": { @@ -145,7 +153,7 @@ ], "support": { "issues": "https://github.com/gacela-project/container/issues", - "source": "https://github.com/gacela-project/container/tree/0.10.0" + "source": "https://github.com/gacela-project/container/tree/2.0.2" }, "funding": [ { @@ -153,56 +161,79 @@ "type": "custom" } ], - "time": "2026-07-19T22:59:58+00:00" + "time": "2026-08-06T08:42:24+00:00" }, { "name": "gacela-project/gacela", - "version": "1.19.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/gacela-project/gacela.git", - "reference": "611b04e178e72d8cf068a7102e29b0815320d33e" + "reference": "1f1e5fa2e8013f8574ab168d383b9908ba34c18e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gacela-project/gacela/zipball/611b04e178e72d8cf068a7102e29b0815320d33e", - "reference": "611b04e178e72d8cf068a7102e29b0815320d33e", + "url": "https://api.github.com/repos/gacela-project/gacela/zipball/1f1e5fa2e8013f8574ab168d383b9908ba34c18e", + "reference": "1f1e5fa2e8013f8574ab168d383b9908ba34c18e", "shasum": "" }, "require": { - "gacela-project/container": "^0.10.0", - "php": ">=8.1" + "gacela-project/container": "^2.0.2", + "php": ">=8.3" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8", "ergebnis/composer-normalize": "^2.50", "friendsofphp/php-cs-fixer": "^3.95", - "infection/infection": "^0.29", + "illuminate/config": "^11.28 || ^12.0", + "illuminate/console": "^11.28 || ^12.0", + "illuminate/container": "^11.28 || ^12.0", + "illuminate/contracts": "^11.28 || ^12.0", + "illuminate/events": "^11.28 || ^12.0", + "illuminate/support": "^11.28 || ^12.0", + "infection/infection": "^0.34", + "nikic/php-parser": "^5.4", "phpbench/phpbench": "^1.4", "phpmetrics/phpmetrics": "^2.9", "phpstan/phpstan": "^2.0", "phpstan/phpstan-strict-rules": "^2.0", - "phpunit/phpunit": "^10.5", - "psalm/plugin-phpunit": "^0.19.5", - "rector/rector": "^2.0", - "symfony/console": "^6.4", - "symfony/dependency-injection": "^6.4", - "symfony/var-dumper": "^6.4", + "phpunit/phpunit": "^12.5", + "psalm/plugin-phpunit": "^0.19.7", + "symfony/config": "^7.0 || ^8.0", + "symfony/console": "^7.0 || ^8.0", + "symfony/dependency-injection": "^7.0 || ^8.0", + "symfony/http-kernel": "^7.0 || ^8.0", + "symfony/var-dumper": "^7.0 || ^8.0", "vimeo/psalm": "^6.16" }, "suggest": { "gacela-project/gacela-env-config-reader": "Allows to read .env config files", "gacela-project/gacela-yaml-config-reader": "Allows to read yml/yaml config files", - "gacela-project/phpstan-extension": "A set of phpstan rules for Gacela", + "illuminate/support": "Allows to register Gacela\\LaravelBridge\\GacelaServiceProvider in a Laravel application", "phpunit/phpunit": "Allows to extend Gacela\\Framework\\Testing\\GacelaTestCase in your tests", - "symfony/console": "Allows to use vendor/bin/gacela script" + "symfony/console": "Allows to use vendor/bin/gacela script", + "symfony/http-kernel": "Allows to register Gacela\\SymfonyBridge\\GacelaBundle in a Symfony application" }, "bin": [ "bin/gacela" ], "type": "library", + "extra": { + "phpstan": { + "includes": [ + "phpstan-gacela.neon" + ] + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": true + } + }, "autoload": { "psr-4": { - "Gacela\\": "src/" + "Gacela\\": "src/", + "Gacela\\LaravelBridge\\": "laravel-bridge/src/", + "Gacela\\SymfonyBridge\\": "symfony-bridge/src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -231,7 +262,7 @@ ], "support": { "issues": "https://github.com/gacela-project/gacela/issues", - "source": "https://github.com/gacela-project/gacela/tree/1.19.0" + "source": "https://github.com/gacela-project/gacela/tree/2.3.0" }, "funding": [ { @@ -239,27 +270,27 @@ "type": "custom" } ], - "time": "2026-07-23T07:07:01+00:00" + "time": "2026-08-15T09:23:34+00:00" }, { "name": "phel-lang/phel-lang", - "version": "v0.49.0", + "version": "v0.50.0", "source": { "type": "git", "url": "https://github.com/phel-lang/phel-lang.git", - "reference": "6364aa687ebdc64a40215575f199b8196476f1b5" + "reference": "e11c7a08450ef85d0dcd44745cfed38162a14667" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phel-lang/phel-lang/zipball/6364aa687ebdc64a40215575f199b8196476f1b5", - "reference": "6364aa687ebdc64a40215575f199b8196476f1b5", + "url": "https://api.github.com/repos/phel-lang/phel-lang/zipball/e11c7a08450ef85d0dcd44745cfed38162a14667", + "reference": "e11c7a08450ef85d0dcd44745cfed38162a14667", "shasum": "" }, "require": { "amphp/amp": "^3.1", - "gacela-project/gacela": "^1.18", + "gacela-project/gacela": "^2.0", "php": ">=8.4", - "symfony/console": "^6.0|^7.0|^8.0", + "symfony/console": "^7.3|^8.0", "symfony/polyfill-mbstring": "^1.30", "symfony/routing": "^7.3|^8.0" }, @@ -268,6 +299,7 @@ "ergebnis/composer-normalize": "^2.50", "ext-readline": "*", "friendsofphp/php-cs-fixer": "^3.94", + "infection/infection": "^0.34", "phpbench/phpbench": "^1.6", "phpstan/phpstan": "^2.1", "phpstan/phpstan-deprecation-rules": "^2.0", @@ -275,7 +307,6 @@ "phpunit/phpunit": "^11.0|^12.0|^13.0", "psalm/plugin-phpunit": "^0.19|^0.20", "rector/rector": "^2.3", - "symfony/var-dumper": "^7.4|^8.0", "vimeo/psalm": "^6.16" }, "bin": [ @@ -315,7 +346,7 @@ ], "support": { "issues": "https://github.com/phel-lang/phel-lang/issues", - "source": "https://github.com/phel-lang/phel-lang/tree/v0.49.0" + "source": "https://github.com/phel-lang/phel-lang/tree/v0.50.0" }, "funding": [ { @@ -323,7 +354,7 @@ "type": "custom" } ], - "time": "2026-07-22T20:38:45+00:00" + "time": "2026-08-14T12:48:17+00:00" }, { "name": "psr/container", @@ -452,16 +483,16 @@ }, { "name": "symfony/console", - "version": "v8.1.1", + "version": "v8.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b711a8ab808b6c074c6b8caef70d0fd8d6b6d07d" + "reference": "68efa2ebfd9a362951eb5a8b09fd177c66ddec24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b711a8ab808b6c074c6b8caef70d0fd8d6b6d07d", - "reference": "b711a8ab808b6c074c6b8caef70d0fd8d6b6d07d", + "url": "https://api.github.com/repos/symfony/console/zipball/68efa2ebfd9a362951eb5a8b09fd177c66ddec24", + "reference": "68efa2ebfd9a362951eb5a8b09fd177c66ddec24", "shasum": "" }, "require": { @@ -528,7 +559,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v8.1.1" + "source": "https://github.com/symfony/console/tree/v8.1.4" }, "funding": [ { @@ -548,7 +579,7 @@ "type": "tidelift" } ], - "time": "2026-06-16T12:55:20+00:00" + "time": "2026-07-31T12:43:13+00:00" }, { "name": "symfony/deprecation-contracts", @@ -706,16 +737,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.38.1", + "version": "v1.41.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "e9247d281d694a5120554d9afaf54e070e88a603" + "reference": "bb899c1db0aa8127dc3afe8cda4a67eb24915f8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e9247d281d694a5120554d9afaf54e070e88a603", - "reference": "e9247d281d694a5120554d9afaf54e070e88a603", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/bb899c1db0aa8127dc3afe8cda4a67eb24915f8d", + "reference": "bb899c1db0aa8127dc3afe8cda4a67eb24915f8d", "shasum": "" }, "require": { @@ -764,7 +795,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.38.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.41.0" }, "funding": [ { @@ -784,7 +815,7 @@ "type": "tidelift" } ], - "time": "2026-05-26T05:58:03+00:00" + "time": "2026-07-28T08:25:59+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -958,16 +989,16 @@ }, { "name": "symfony/polyfill-php85", - "version": "v1.38.1", + "version": "v1.41.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php85.git", - "reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1" + "reference": "255fab485aaa1006ed411040c42aecd7b5302d7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1", - "reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1", + "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/255fab485aaa1006ed411040c42aecd7b5302d7a", + "reference": "255fab485aaa1006ed411040c42aecd7b5302d7a", "shasum": "" }, "require": { @@ -1014,7 +1045,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php85/tree/v1.38.1" + "source": "https://github.com/symfony/polyfill-php85/tree/v1.41.0" }, "funding": [ { @@ -1034,20 +1065,20 @@ "type": "tidelift" } ], - "time": "2026-05-26T02:25:22+00:00" + "time": "2026-07-01T12:47:55+00:00" }, { "name": "symfony/routing", - "version": "v8.1.0", + "version": "v8.1.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "fe0bfec72c8a806109fb9c3a5f2b898fe0c76eb3" + "reference": "1058d4e13bb81dd9a6f7565686df7e13b880cdbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/fe0bfec72c8a806109fb9c3a5f2b898fe0c76eb3", - "reference": "fe0bfec72c8a806109fb9c3a5f2b898fe0c76eb3", + "url": "https://api.github.com/repos/symfony/routing/zipball/1058d4e13bb81dd9a6f7565686df7e13b880cdbd", + "reference": "1058d4e13bb81dd9a6f7565686df7e13b880cdbd", "shasum": "" }, "require": { @@ -1094,7 +1125,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v8.1.0" + "source": "https://github.com/symfony/routing/tree/v8.1.2" }, "funding": [ { @@ -1114,7 +1145,7 @@ "type": "tidelift" } ], - "time": "2026-05-29T05:06:50+00:00" + "time": "2026-07-22T15:42:13+00:00" }, { "name": "symfony/service-contracts", @@ -1205,16 +1236,16 @@ }, { "name": "symfony/string", - "version": "v8.1.0", + "version": "v8.1.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "afd5944f4005862d961efb85c8bbd5c523c4e3c9" + "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/afd5944f4005862d961efb85c8bbd5c523c4e3c9", - "reference": "afd5944f4005862d961efb85c8bbd5c523c4e3c9", + "url": "https://api.github.com/repos/symfony/string/zipball/286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc", + "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc", "shasum": "" }, "require": { @@ -1271,7 +1302,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v8.1.0" + "source": "https://github.com/symfony/string/tree/v8.1.2" }, "funding": [ { @@ -1291,7 +1322,7 @@ "type": "tidelift" } ], - "time": "2026-05-29T05:06:50+00:00" + "time": "2026-07-28T07:35:25+00:00" } ], "packages-dev": [ @@ -1392,5 +1423,5 @@ "php": ">=8.4" }, "platform-dev": {}, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } From cb03659ef1034a1b6e0d8623c3f7f2d2846e836c Mon Sep 17 00:00:00 2001 From: Chemaclass Date: Mon, 17 Aug 2026 07:56:12 +0200 Subject: [PATCH 2/3] chore: bump phel-lang to 0.50.0 --- src/middleware.phel | 2 +- tests/middleware-test.phel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware.phel b/src/middleware.phel index 9b3d9a9..be93559 100644 --- a/src/middleware.phel +++ b/src/middleware.phel @@ -10,7 +10,7 @@ (try (handler request) (catch \Throwable e - (php/error_log (str "[err] " (php/-> e (getMessage)))) + (php/error_log (str "[err] " (.getMessage e))) (h/json-response 500 {:error "internal server error"})))) (defn wrap-logger diff --git a/tests/middleware-test.phel b/tests/middleware-test.phel index 11b7460..0e67122 100644 --- a/tests/middleware-test.phel +++ b/tests/middleware-test.phel @@ -4,7 +4,7 @@ (:require phel.test :refer [deftest is])) (deftest wrap-exception-catches-and-returns-500 - (let [boom (fn [_req] (throw (php/new \Exception "boom"))) + (let [boom (fn [_req] (throw (new \Exception "boom"))) res (mw/wrap-exception boom {})] (is (= 500 (:status res))) (is (= "internal server error" (:error (json/decode (:body res))))))) From 88aa0898d33bd9bd739d82dbe0ad88df9adb0eec Mon Sep 17 00:00:00 2001 From: Chemaclass Date: Mon, 17 Aug 2026 20:40:26 +0200 Subject: [PATCH 3/3] chore: bump phel-lang to 0.50.0 --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 9ea725d..6368f60 100644 --- a/composer.lock +++ b/composer.lock @@ -89,16 +89,16 @@ }, { "name": "gacela-project/container", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/gacela-project/container.git", - "reference": "e9ac0b6b5c6b0eb8724e04b8e9cbc829f43c6707" + "reference": "faa1e00cafca1e2d02938adaf204fc38abfbe64a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gacela-project/container/zipball/e9ac0b6b5c6b0eb8724e04b8e9cbc829f43c6707", - "reference": "e9ac0b6b5c6b0eb8724e04b8e9cbc829f43c6707", + "url": "https://api.github.com/repos/gacela-project/container/zipball/faa1e00cafca1e2d02938adaf204fc38abfbe64a", + "reference": "faa1e00cafca1e2d02938adaf204fc38abfbe64a", "shasum": "" }, "require": { @@ -153,7 +153,7 @@ ], "support": { "issues": "https://github.com/gacela-project/container/issues", - "source": "https://github.com/gacela-project/container/tree/2.0.2" + "source": "https://github.com/gacela-project/container/tree/2.1.0" }, "funding": [ { @@ -161,7 +161,7 @@ "type": "custom" } ], - "time": "2026-08-06T08:42:24+00:00" + "time": "2026-08-17T17:53:52+00:00" }, { "name": "gacela-project/gacela",