Fix automation bundle service definition (#149)

sulu · May 19, 2020 · 1ffad73 · 1ffad73
1 parent 3b40e7b
commit 1ffad73
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Resources/config/automation.xml b/Resources/config/automation.xml
@@ -4,7 +4,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <service id="sulu_content.content.automation.publish_handler"
-                 class="ContentPublishTaskHandler">
+                 class="Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Automation\ContentPublishTaskHandler">
             <argument type="service" id="sulu_content.content_manager"/>
             <argument type="service" id="doctrine.orm.entity_manager"/>
             <argument type="service" id="translator"/>
@@ -13,7 +13,7 @@
         </service>
 
         <service id="sulu_content.content.automation.unpublish_handler"
-                 class="ContentUnpublishTaskHandler">
+                 class="Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Automation\ContentUnpublishTaskHandler">
             <argument type="service" id="sulu_content.content_manager"/>
             <argument type="service" id="doctrine.orm.entity_manager"/>
             <argument type="service" id="translator"/>

diff --git a/Tests/Application/Kernel.php b/Tests/Application/Kernel.php
@@ -14,17 +14,21 @@
 namespace Sulu\Bundle\ContentBundle\Tests\Application;
 
 use Sulu\Bundle\AudienceTargetingBundle\SuluAudienceTargetingBundle;
+use Sulu\Bundle\AutomationBundle\SuluAutomationBundle;
 use Sulu\Bundle\ContentBundle\SuluContentBundle;
 use Sulu\Bundle\ContentBundle\Tests\Application\ExampleTestBundle\ExampleTestBundle;
 use Sulu\Bundle\TestBundle\Kernel\SuluTestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Task\TaskBundle\TaskBundle;
 
 class Kernel extends SuluTestKernel
 {
     public function registerBundles()
     {
         $bundles = parent::registerBundles();
         $bundles[] = new SuluContentBundle();
+        $bundles[] = new TaskBundle();
+        $bundles[] = new SuluAutomationBundle();
         $bundles[] = new ExampleTestBundle();
 
         foreach ($bundles as $key => $bundle) {

diff --git a/composer.json b/composer.json
@@ -42,12 +42,12 @@
         "phpstan/phpstan-symfony": "^0.12",
         "phpstan/phpstan-webmozart-assert": "^0.12",
         "sensiolabs-de/deptrac-shim": "^0.6.0",
+        "sulu/automation-bundle": "^2.0@dev",
         "symfony/browser-kit": "^4.3",
         "symfony/dotenv": "^4.3",
         "symfony/monolog-bundle": "^3.1",
         "symfony/phpunit-bridge": "^4.3",
-        "thecodingmachine/phpstan-strict-rules": "^0.12",
-        "sulu/automation-bundle": "^2.0@dev"
+        "thecodingmachine/phpstan-strict-rules": "^0.12"
     },
     "conflict": {
         "doctrine/persistence": "1.3.2"
@@ -71,6 +71,8 @@
             "@lint-composer",
             "@phpstan",
             "@lint-yaml",
+            "@lint-container",
+            "@lint-twig",
             "@lint-schema",
             "@deptract"
         ],
@@ -87,7 +89,9 @@
         "test-unit-coverage-checker": "@php Tests/coverage-checker.php \"line\" \"96.00\" \"Dimension/Domain\" \"Content/Domain\"",
         "test-functional": "@phpunit Tests/Functional --log-junit Tests/reports/functional/junit.xml",
         "lint-composer": "@composer validate --strict",
-        "lint-yaml": "Tests/Application/bin/adminconsole lint:yaml Resources/config",
+        "lint-yaml": "Tests/Application/bin/adminconsole lint:yaml Resources/config Tests/Application/config",
+        "lint-twig": "Tests/Application/bin/adminconsole lint:twig Tests/Application/templates",
+        "lint-container": "Tests/Application/bin/adminconsole lint:container",
         "lint-schema": "Tests/Application/bin/adminconsole doctrine:schema:validate",
         "deptract": "vendor/bin/deptrac",
         "phpstan": [