Refactor(web-twig): Require compiler as separate dependency (refs #DS…

…-277)
lmc-eu · Jul 30, 2022 · 20cb419 · 20cb419
1 parent c63f13f
commit 20cb419
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/packages/web-twig/CHANGELOG.md b/packages/web-twig/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 <!-- There should always be "Unreleased" section at the beginning. -->
 ## Unreleased
+- Require compiler as separate dependency
 
 ## 1.8.0 - 2022-07-18
 - Update `Tag` - add sizes, split theme and color classes, allow elementType change

diff --git a/packages/web-twig/composer.json b/packages/web-twig/composer.json
@@ -3,7 +3,7 @@
   "type": "symfony-bundle",
   "description": "This is Symfony bundle with twig implementation Spirit Design System components and extends the twig implementation with an HTML syntax-like.",
   "license": "proprietary",
-  "repositories": [],
+  "minimum-stability": "dev",
   "authors": [
     {
       "name": "LMC, s.r.o."
@@ -21,6 +21,7 @@
   },
   "require": {
     "php": "^7.4",
+    "lmc/twigx-bundle": "dev-main",
     "symfony/config": "^3.4 ||^4.2 || ^5.0",
     "symfony/dependency-injection": "^3.4 || ^4.2 || ^5.0",
     "symfony/http-foundation": "^3.4 || ^4.2 || ^5.0",
@@ -54,5 +55,11 @@
       "@phpstan"
     ]
   },
-  "version": "1.8.0"
+  "version": "1.8.0",
+  "config": {
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "phpstan/extension-installer": true
+    }
+  }
 }
diff --git a/packages/web-twig/src/DependencyInjection/CompilerPass/OverrideServiceCompilerPass.php b/packages/web-twig/src/DependencyInjection/CompilerPass/OverrideServiceCompilerPass.php
@@ -4,9 +4,8 @@
 
 namespace Lmc\SpiritWebTwigBundle\DependencyInjection\CompilerPass;
 
-use Lmc\SpiritWebTwigBundle\Compiler\ComponentLexer;
 use Lmc\SpiritWebTwigBundle\DependencyInjection\SpiritWebTwigExtension;
-use Lmc\SpiritWebTwigBundle\Twig\PropsExtension;
+use Lmc\TwigXBundle\Compiler\ComponentLexer;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;

diff --git a/packages/web-twig/src/Resources/config/services.yml b/packages/web-twig/src/Resources/config/services.yml
@@ -3,16 +3,10 @@ services:
     autowire: true
     autoconfigure: true
 
-  Lmc\SpiritWebTwigBundle\Compiler\ComponentLexer:
-    arguments:
-      - '@twig'
-      - []
-      - '%spirit_web_twig.paths_alias%'
-
   Lmc\SpiritWebTwigBundle\Twig\PropsExtension:
     tags:
       - { name: twig.extension }
 
   Lmc\SpiritWebTwigBundle\Twig\SvgExtension:
     tags:
-      - { name: twig.extension }
+      - { name: twig.extension }
diff --git a/packages/web-twig/tests/DependencyInjection/CompilerPass/OverrideServiceCompilerPassTest.php b/packages/web-twig/tests/DependencyInjection/CompilerPass/OverrideServiceCompilerPassTest.php
@@ -7,7 +7,6 @@
 use Lmc\SpiritWebTwigBundle\DependencyInjection\SpiritWebTwigExtension;
 use Lmc\SpiritWebTwigBundle\Helper\DefinitionHelper;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Twig\Environment;

diff --git a/packages/web-twig/tests/Helper/TwigHelper.php b/packages/web-twig/tests/Helper/TwigHelper.php
@@ -4,10 +4,10 @@
 
 namespace Lmc\SpiritWebTwigBundle\Helper;
 
-use Lmc\SpiritWebTwigBundle\Compiler\ComponentLexer;
 use Lmc\SpiritWebTwigBundle\DependencyInjection\CompilerPass\OverrideServiceCompilerPass;
 use Lmc\SpiritWebTwigBundle\DependencyInjection\SpiritWebTwigExtension;
 use Lmc\SpiritWebTwigBundle\Twig\PropsExtension;
+use Lmc\TwigXBundle\Compiler\ComponentLexer;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;