refactor: remove wavevision/di-service-annotation

contributte · Sep 20, 2024 · 2ada026 · 2ada026
1 parent 4ade7e7
commit 2ada026
Show file tree

Hide file tree

Showing 28 changed files with 75 additions and 498 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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": {