From 2ada026fb0570b888e60d7c9cb919101432cf18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Rozs=C3=ADval?= Date: Thu, 11 Jul 2024 16:29:42 +0200 Subject: [PATCH] refactor: remove wavevision/di-service-annotation --- Makefile | 4 - app/config/app/front.neon | 1 - app/config/app/services.neon | 1 - app/model/Forms/FormFactory.php | 4 - .../Addon/Controls/FeaturedAddon/Control.php | 4 - .../Controls/AddonList/Avatar/Control.php | 4 - .../AddonList/Description/Control.php | 4 - .../Base/Controls/AddonList/Name/Control.php | 4 - .../Controls/AddonList/Statistics/Control.php | 4 - .../Base/Controls/FlashMessages/Control.php | 4 - .../Base/Controls/Layout/Box/Control.php | 4 - .../Base/Controls/Layout/Footer/Control.php | 4 - .../Layout/Footer/Heading/Control.php | 4 - .../Layout/Footer/SocialLinks/Control.php | 4 - .../Layout/Footer/SubscribeForm/Control.php | 4 - .../Layout/Footer/SubscribeForm/Factory.php | 4 - .../Layout/Footer/SubscribeForm/Handler.php | 4 - .../Base/Controls/Layout/Header/Control.php | 4 - .../Controls/Layout/Header/Menu/Control.php | 4 - .../Base/Controls/Layout/Heading/Control.php | 4 - .../Front/Base/Controls/News/Control.php | 4 - .../Front/Base/Controls/News/LoadFromRss.php | 4 - .../Front/Base/Controls/Svg/Control.php | 4 - .../Front/Base/Controls/Tags/Control.php | 4 - app/modules/Front/Base/Controls/Tags/Tags.php | 4 - bin/extract-services | 21 - composer.json | 8 +- composer.lock | 450 +++--------------- 28 files changed, 75 insertions(+), 498 deletions(-) delete mode 100755 bin/extract-services diff --git a/Makefile b/Makefile index d0d7b4a1..198fbdbe 100644 --- a/Makefile +++ b/Makefile @@ -21,10 +21,6 @@ build: dev: $(ts-webpack) $(node)/webpack serve --config $(webpack)/webpack.dev.ts -di: reset - bin/extract-services - $(MAKE) reset - rm-cache: rm -rf $(temp)/cache diff --git a/app/config/app/front.neon b/app/config/app/front.neon index 8f36b35b..e278cdd1 100644 --- a/app/config/app/front.neon +++ b/app/config/app/front.neon @@ -1,4 +1,3 @@ -# Generated file, do not modify directly! services: - implement: App\Modules\Front\Addon\Controls\FeaturedAddon\ControlFactory inject: true diff --git a/app/config/app/services.neon b/app/config/app/services.neon index 926bc8e9..95e2008b 100644 --- a/app/config/app/services.neon +++ b/app/config/app/services.neon @@ -1,4 +1,3 @@ -# Generated file, do not modify directly! services: - factory: App\Model\Forms\FormFactory inject: true diff --git a/app/model/Forms/FormFactory.php b/app/model/Forms/FormFactory.php index 77bec263..5d423c2c 100644 --- a/app/model/Forms/FormFactory.php +++ b/app/model/Forms/FormFactory.php @@ -3,11 +3,7 @@ namespace App\Model\Forms; use Nette\SmartObject; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateInject=true) - */ class FormFactory { diff --git a/app/modules/Front/Addon/Controls/FeaturedAddon/Control.php b/app/modules/Front/Addon/Controls/FeaturedAddon/Control.php index 6b853576..8c4611c1 100644 --- a/app/modules/Front/Addon/Controls/FeaturedAddon/Control.php +++ b/app/modules/Front/Addon/Controls/FeaturedAddon/Control.php @@ -10,12 +10,8 @@ use App\Modules\Front\Base\Controls\AddonList\Name\NameComponent; use App\Modules\Front\Base\Controls\AddonList\Statistics\StatisticsComponent; use Nextras\Orm\Collection\ICollection; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\NetteWebpack\InjectNetteWebpack; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseControl { diff --git a/app/modules/Front/Base/Controls/AddonList/Avatar/Control.php b/app/modules/Front/Base/Controls/AddonList/Avatar/Control.php index 3a3f0728..79e34ca3 100644 --- a/app/modules/Front/Base/Controls/AddonList/Avatar/Control.php +++ b/app/modules/Front/Base/Controls/AddonList/Avatar/Control.php @@ -2,12 +2,8 @@ namespace App\Modules\Front\Base\Controls\AddonList\Avatar; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\PropsControl\PropsControl; -/** - * @DIService(generateComponent=true) - */ class Control extends PropsControl { diff --git a/app/modules/Front/Base/Controls/AddonList/Description/Control.php b/app/modules/Front/Base/Controls/AddonList/Description/Control.php index c86a0acc..803578e9 100644 --- a/app/modules/Front/Base/Controls/AddonList/Description/Control.php +++ b/app/modules/Front/Base/Controls/AddonList/Description/Control.php @@ -2,12 +2,8 @@ namespace App\Modules\Front\Base\Controls\AddonList\Description; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\PropsControl\PropsControl; -/** - * @DIService(generateComponent=true) - */ class Control extends PropsControl { diff --git a/app/modules/Front/Base/Controls/AddonList/Name/Control.php b/app/modules/Front/Base/Controls/AddonList/Name/Control.php index a607fd7c..fcc5a2c8 100644 --- a/app/modules/Front/Base/Controls/AddonList/Name/Control.php +++ b/app/modules/Front/Base/Controls/AddonList/Name/Control.php @@ -6,12 +6,8 @@ use App\Model\Database\ORM\GithubRelease\GithubRelease; use App\Model\UI\BasePropsControl; use Nextras\Orm\Collection\ICollection; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\PropsControl\ValidProps; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/AddonList/Statistics/Control.php b/app/modules/Front/Base/Controls/AddonList/Statistics/Control.php index 241b3394..23bec0a4 100644 --- a/app/modules/Front/Base/Controls/AddonList/Statistics/Control.php +++ b/app/modules/Front/Base/Controls/AddonList/Statistics/Control.php @@ -4,13 +4,9 @@ use App\Modules\Front\Base\Controls\Svg\SvgComponent; use App\Modules\Front\Base\Controls\Svg\SvgProps; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\PropsControl\PropsControl; use Wavevision\PropsControl\ValidProps; -/** - * @DIService(generateComponent=true) - */ class Control extends PropsControl { diff --git a/app/modules/Front/Base/Controls/FlashMessages/Control.php b/app/modules/Front/Base/Controls/FlashMessages/Control.php index e01586dd..162d6b76 100644 --- a/app/modules/Front/Base/Controls/FlashMessages/Control.php +++ b/app/modules/Front/Base/Controls/FlashMessages/Control.php @@ -3,11 +3,7 @@ namespace App\Modules\Front\Base\Controls\FlashMessages; use App\Model\UI\BaseControl; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseControl { diff --git a/app/modules/Front/Base/Controls/Layout/Box/Control.php b/app/modules/Front/Base/Controls/Layout/Box/Control.php index c9743c0d..80e20271 100644 --- a/app/modules/Front/Base/Controls/Layout/Box/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Box/Control.php @@ -3,11 +3,7 @@ namespace App\Modules\Front\Base\Controls\Layout\Box; use App\Model\UI\BasePropsControl; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/Layout/Footer/Control.php b/app/modules/Front/Base/Controls/Layout/Footer/Control.php index 057974ec..b360a906 100644 --- a/app/modules/Front/Base/Controls/Layout/Footer/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Footer/Control.php @@ -7,12 +7,8 @@ use App\Modules\Front\Base\Controls\Layout\Footer\SocialLinks\SocialLinksComponent; use App\Modules\Front\Base\Controls\Layout\Footer\SocialLinks\SocialLinksProps; use App\Modules\Front\Base\Controls\Layout\Footer\SubscribeForm\SubscribeFormComponent; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\NetteWebpack\InjectFormatAssetName; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseRenderControl { diff --git a/app/modules/Front/Base/Controls/Layout/Footer/Heading/Control.php b/app/modules/Front/Base/Controls/Layout/Footer/Heading/Control.php index 1149bbfb..0cf1ad1e 100644 --- a/app/modules/Front/Base/Controls/Layout/Footer/Heading/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Footer/Heading/Control.php @@ -3,11 +3,7 @@ namespace App\Modules\Front\Base\Controls\Layout\Footer\Heading; use App\Model\UI\BasePropsControl; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/Control.php b/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/Control.php index dac39d54..a3442e8c 100644 --- a/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/Control.php @@ -4,12 +4,8 @@ use App\Model\UI\BasePropsControl; use App\Modules\Front\Base\Controls\Svg\SvgComponent; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\PropsControl\ValidProps; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Control.php b/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Control.php index 21e8d465..f2e7835b 100644 --- a/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Control.php @@ -7,11 +7,7 @@ use App\Modules\Front\Base\Controls\Layout\Footer\Heading\HeadingComponent; use App\Modules\Front\Base\Controls\Layout\Footer\Heading\HeadingProps; use Nette\Forms\Form; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseRenderControl { diff --git a/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Factory.php b/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Factory.php index 9fed38d9..8a4ae5a2 100644 --- a/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Factory.php +++ b/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Factory.php @@ -6,11 +6,7 @@ use App\Model\Forms\InjectFormFactory; use Nette\Forms\Container; use Nette\SmartObject; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateInject=true) - */ class Factory { diff --git a/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Handler.php b/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Handler.php index f53f44ae..706e41a9 100644 --- a/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Handler.php +++ b/app/modules/Front/Base/Controls/Layout/Footer/SubscribeForm/Handler.php @@ -4,11 +4,7 @@ use Nette\Forms\Form; use Nette\SmartObject; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateInject=true) - */ class Handler { diff --git a/app/modules/Front/Base/Controls/Layout/Header/Control.php b/app/modules/Front/Base/Controls/Layout/Header/Control.php index 12e6fc08..82e56d1c 100644 --- a/app/modules/Front/Base/Controls/Layout/Header/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Header/Control.php @@ -6,12 +6,8 @@ use App\Modules\Front\Base\Controls\Layout\Header\Menu\MenuComponent; use App\Modules\Front\Base\Controls\Layout\Header\Menu\MenuLink; use App\Modules\Front\Base\Controls\Layout\Header\Menu\MenuProps; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\NetteWebpack\InjectFormatAssetName; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseRenderControl { diff --git a/app/modules/Front/Base/Controls/Layout/Header/Menu/Control.php b/app/modules/Front/Base/Controls/Layout/Header/Menu/Control.php index e7cadbf3..52718e04 100644 --- a/app/modules/Front/Base/Controls/Layout/Header/Menu/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Header/Menu/Control.php @@ -3,11 +3,7 @@ namespace App\Modules\Front\Base\Controls\Layout\Header\Menu; use App\Model\UI\BasePropsControl; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/Layout/Heading/Control.php b/app/modules/Front/Base/Controls/Layout/Heading/Control.php index 072b6ca8..9f64cc78 100644 --- a/app/modules/Front/Base/Controls/Layout/Heading/Control.php +++ b/app/modules/Front/Base/Controls/Layout/Heading/Control.php @@ -3,11 +3,7 @@ namespace App\Modules\Front\Base\Controls\Layout\Heading; use App\Model\UI\BasePropsControl; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/News/Control.php b/app/modules/Front/Base/Controls/News/Control.php index acbc8358..0d8e853a 100644 --- a/app/modules/Front/Base/Controls/News/Control.php +++ b/app/modules/Front/Base/Controls/News/Control.php @@ -5,11 +5,7 @@ use App\Model\UI\BaseRenderControl; use App\Modules\Front\Base\Controls\Svg\SvgComponent; use App\Modules\Front\Base\Controls\Svg\SvgProps; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseRenderControl { diff --git a/app/modules/Front/Base/Controls/News/LoadFromRss.php b/app/modules/Front/Base/Controls/News/LoadFromRss.php index 6e42de73..b93ca49a 100644 --- a/app/modules/Front/Base/Controls/News/LoadFromRss.php +++ b/app/modules/Front/Base/Controls/News/LoadFromRss.php @@ -6,11 +6,7 @@ use Nette\SmartObject; use Nette\Utils\DateTime; use SimpleXMLElement; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateInject=true) - */ class LoadFromRss { diff --git a/app/modules/Front/Base/Controls/Svg/Control.php b/app/modules/Front/Base/Controls/Svg/Control.php index 7fbf505b..20cbfeb2 100644 --- a/app/modules/Front/Base/Controls/Svg/Control.php +++ b/app/modules/Front/Base/Controls/Svg/Control.php @@ -3,14 +3,10 @@ namespace App\Modules\Front\Base\Controls\Svg; use App\Model\UI\BasePropsControl; -use Wavevision\DIServiceAnnotation\DIService; use Wavevision\PropsControl\ValidProps; use Wavevision\Utils\Arrays; use Wavevision\Utils\Path; -/** - * @DIService(generateComponent=true) - */ class Control extends BasePropsControl { diff --git a/app/modules/Front/Base/Controls/Tags/Control.php b/app/modules/Front/Base/Controls/Tags/Control.php index 77f4c3a6..faf701bf 100644 --- a/app/modules/Front/Base/Controls/Tags/Control.php +++ b/app/modules/Front/Base/Controls/Tags/Control.php @@ -3,11 +3,7 @@ namespace App\Modules\Front\Base\Controls\Tags; use App\Model\UI\BaseRenderControl; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateComponent=true) - */ class Control extends BaseRenderControl { diff --git a/app/modules/Front/Base/Controls/Tags/Tags.php b/app/modules/Front/Base/Controls/Tags/Tags.php index a8574bcd..6424054c 100644 --- a/app/modules/Front/Base/Controls/Tags/Tags.php +++ b/app/modules/Front/Base/Controls/Tags/Tags.php @@ -6,11 +6,7 @@ use App\Model\Database\ORM\Tag\Tag; use Nette\SmartObject; use Nextras\Orm\Entity\IEntity; -use Wavevision\DIServiceAnnotation\DIService; -/** - * @DIService(generateInject=true) - */ class Tags { diff --git a/bin/extract-services b/bin/extract-services deleted file mode 100755 index 3ff3bba5..00000000 --- a/bin/extract-services +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env php -path('app'); -$configDir = $appDir->path('config', 'app'); - -Runner::run((new Configuration( - (string)$appDir, - $configDir->string('services.neon')) -)->setFileMapping( - [ - 'App\Modules\Front' => $configDir->string('front.neon') - ] -)); diff --git a/composer.json b/composer.json index ec035100..8e9d9706 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,10 @@ } ], "repositories": [ - {"type": "vcs", "url": "https://github.com/holyfork/wavevision-props-control"} + { + "type": "vcs", + "url": "https://github.com/holyfork/wavevision-props-control" + } ], "require": { "php": ">=8.1", @@ -58,8 +61,7 @@ "ninjify/nunjuck": "^0.4", "ninjify/qa": "^0.14", "phpstan/phpstan": "^1.4.0", - "phpstan/phpstan-nette": "^1.0.0", - "wavevision/di-service-annotation": "^4.0" + "phpstan/phpstan-nette": "^1.0.0" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 6e1f4c37..17b03f11 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1b31b7d4dba79759632af7e02f68b6ac", + "content-hash": "938afdcb4f3ad305d5acf9651e291031", "packages": [ { "name": "contributte/application", @@ -1581,16 +1581,16 @@ }, { "name": "nette/neon", - "version": "v3.4.1", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "457bfbf0560f600b30d9df4233af382a478bb44d" + "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/457bfbf0560f600b30d9df4233af382a478bb44d", - "reference": "457bfbf0560f600b30d9df4233af382a478bb44d", + "url": "https://api.github.com/repos/nette/neon/zipball/c8481c104431c8d94cc88424a1e21f47f8c93280", + "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280", "shasum": "" }, "require": { @@ -1643,9 +1643,9 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.4.1" + "source": "https://github.com/nette/neon/tree/v3.4.3" }, - "time": "2023-09-27T08:59:11+00:00" + "time": "2024-06-26T14:53:59+00:00" }, { "name": "nette/php-generator", @@ -2472,16 +2472,16 @@ }, { "name": "symfony/console", - "version": "v6.4.7", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", - "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", "shasum": "" }, "require": { @@ -2546,7 +2546,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.7" + "source": "https://github.com/symfony/console/tree/v6.4.9" }, "funding": [ { @@ -2562,7 +2562,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2633,16 +2633,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -2692,7 +2692,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -2708,20 +2708,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", "shasum": "" }, "require": { @@ -2770,7 +2770,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" }, "funding": [ { @@ -2786,20 +2786,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", "shasum": "" }, "require": { @@ -2851,7 +2851,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" }, "funding": [ { @@ -2867,20 +2867,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -2931,7 +2931,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -2947,7 +2947,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/service-contracts", @@ -3034,16 +3034,16 @@ }, { "name": "symfony/string", - "version": "v6.4.7", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" + "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", - "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", + "url": "https://api.github.com/repos/symfony/string/zipball/76792dbd99690a5ebef8050d9206c60c59e681d7", + "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7", "shasum": "" }, "require": { @@ -3100,7 +3100,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.7" + "source": "https://github.com/symfony/string/tree/v6.4.9" }, "funding": [ { @@ -3116,7 +3116,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-06-28T09:25:38+00:00" }, { "name": "tracy/tracy", @@ -3518,223 +3518,22 @@ }, "time": "2022-02-04T12:51:07+00:00" }, - { - "name": "doctrine/annotations", - "version": "1.14.3", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^1 || ^2", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" - }, - "time": "2023-02-01T09:20:38+00:00" - }, - { - "name": "doctrine/deprecations", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/doctrine/deprecations.git", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" - }, - "suggest": { - "psr/log": "Allows logging deprecations via PSR-3 logger implementation" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", - "homepage": "https://www.doctrine-project.org/", - "support": { - "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.3" - }, - "time": "2024-01-30T19:34:25+00:00" - }, - { - "name": "doctrine/lexer", - "version": "2.1.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", - "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^1.0", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.21" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" - ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.1" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2024-02-05T11:35:39+00:00" - }, { "name": "nette/tester", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/nette/tester.git", - "reference": "328d7b64579cdbc82e0e01d92ea9c58b9cf0a327" + "reference": "ee0a4b8402a8c1831db547ec0a56d18196906b51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tester/zipball/328d7b64579cdbc82e0e01d92ea9c58b9cf0a327", - "reference": "328d7b64579cdbc82e0e01d92ea9c58b9cf0a327", + "url": "https://api.github.com/repos/nette/tester/zipball/ee0a4b8402a8c1831db547ec0a56d18196906b51", + "reference": "ee0a4b8402a8c1831db547ec0a56d18196906b51", "shasum": "" }, "require": { - "php": ">=8.0 <8.4" + "php": "8.0 - 8.3" }, "require-dev": { "ext-simplexml": "*", @@ -3790,9 +3589,9 @@ ], "support": { "issues": "https://github.com/nette/tester/issues", - "source": "https://github.com/nette/tester/tree/v2.5.2" + "source": "https://github.com/nette/tester/tree/v2.5.3" }, - "time": "2024-01-08T11:41:26+00:00" + "time": "2024-06-18T18:44:12+00:00" }, { "name": "nextras/orm-phpstan", @@ -4106,16 +3905,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.0", + "version": "1.29.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", "shasum": "" }, "require": { @@ -4147,22 +3946,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" }, - "time": "2024-05-06T12:04:23+00:00" + "time": "2024-05-31T08:52:43+00:00" }, { "name": "phpstan/phpstan", - "version": "1.11.2", + "version": "1.11.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0d5d4294a70deb7547db655c47685d680e39cfec" + "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d5d4294a70deb7547db655c47685d680e39cfec", - "reference": "0d5d4294a70deb7547db655c47685d680e39cfec", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52d2bbfdcae7f895915629e4694e9497d0f8e28d", + "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d", "shasum": "" }, "require": { @@ -4207,25 +4006,25 @@ "type": "github" } ], - "time": "2024-05-24T13:23:04+00:00" + "time": "2024-07-06T11:17:41+00:00" }, { "name": "phpstan/phpstan-nette", - "version": "1.3.0", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-nette.git", - "reference": "8af94743efcc6d1e685f2ffd7ab279e39c96429c" + "reference": "1cdc8a09fd0066a3472a5eefc522ceaff5a8781d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-nette/zipball/8af94743efcc6d1e685f2ffd7ab279e39c96429c", - "reference": "8af94743efcc6d1e685f2ffd7ab279e39c96429c", + "url": "https://api.github.com/repos/phpstan/phpstan-nette/zipball/1cdc8a09fd0066a3472a5eefc522ceaff5a8781d", + "reference": "1cdc8a09fd0066a3472a5eefc522ceaff5a8781d", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.10" + "phpstan/phpstan": "^1.11.6" }, "conflict": { "nette/application": "<2.3.0", @@ -4243,7 +4042,7 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "~9.5.28" }, "type": "phpstan-extension", "extra": { @@ -4266,58 +4065,9 @@ "description": "Nette Framework class reflection extension for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-nette/issues", - "source": "https://github.com/phpstan/phpstan-nette/tree/1.3.0" - }, - "time": "2024-04-20T06:40:32+00:00" - }, - { - "name": "psr/cache", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "shasum": "" - }, - "require": { - "php": ">=8.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], - "support": { - "source": "https://github.com/php-fig/cache/tree/3.0.0" + "source": "https://github.com/phpstan/phpstan-nette/tree/1.3.2" }, - "time": "2021-02-03T23:26:27+00:00" + "time": "2024-06-25T11:48:34+00:00" }, { "name": "slevomat/coding-standard", @@ -4459,66 +4209,6 @@ } ], "time": "2024-05-22T21:24:41+00:00" - }, - { - "name": "wavevision/di-service-annotation", - "version": "4.0.1", - "source": { - "type": "git", - "url": "https://github.com/wavevision/di-service-annotation.git", - "reference": "55bdbb0deca692d4d6dca21ce977fbef6edf4d91" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wavevision/di-service-annotation/zipball/55bdbb0deca692d4d6dca21ce977fbef6edf4d91", - "reference": "55bdbb0deca692d4d6dca21ce977fbef6edf4d91", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.8", - "nette/finder": "^2.5", - "php": ">=7.4", - "wavevision/utils": "^2.13" - }, - "require-dev": { - "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^9.4", - "wavevision/coding-standard": "^5.2" - }, - "type": "library", - "extra": { - "phpstan": [] - }, - "autoload": { - "psr-4": { - "Wavevision\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Wavevision s.r.o.", - "email": "info@wavevision.com" - }, - { - "name": "Jakub Filla", - "email": "jakub.filla@wavevision.com" - }, - { - "name": "Vít Rozsíval", - "email": "vit@wavevision.com" - } - ], - "description": "Register DI services using annotation for Nette Framework.", - "support": { - "issues": "https://github.com/wavevision/di-service-annotation/issues", - "source": "https://github.com/wavevision/di-service-annotation/tree/4.0.1" - }, - "time": "2020-10-21T14:38:58+00:00" } ], "aliases": [ @@ -4547,5 +4237,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.2.0" }