Update terminal42/service-annotation-bundle (see #1988)

Description ----------- Requires `terminal42/service-annotation-bundle` 1.1 which no longer requires the marker interface or tag. see #1985 Commits ------- f0f39fa Update terminal42/service-annotation-bundle
contao · Jul 25, 2020 · ca3c8f2 · ca3c8f2
1 parent fab4608
commit ca3c8f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -111,7 +111,7 @@
         "symfony/web-profiler-bundle": "4.4.*",
         "symfony/yaml": "4.4.*",
         "terminal42/escargot": "^0.6.0",
-        "terminal42/service-annotation-bundle": "^1.0",
+        "terminal42/service-annotation-bundle": "^1.1",
         "toflar/psr6-symfony-http-cache-store": "^2.1",
         "true/punycode": "^2.1",
         "twig/twig": "^2.7",

diff --git a/core-bundle/composer.json b/core-bundle/composer.json
@@ -98,7 +98,7 @@
         "symfony/var-dumper": "4.4.*",
         "symfony/yaml": "4.4.*",
         "terminal42/escargot": "^0.6.0",
-        "terminal42/service-annotation-bundle": "^1.0",
+        "terminal42/service-annotation-bundle": "^1.1",
         "true/punycode": "^2.1",
         "twig/twig": "^2.7",
         "ua-parser/uap-php": "^3.9",

diff --git a/core-bundle/src/Controller/AbstractController.php b/core-bundle/src/Controller/AbstractController.php
@@ -15,9 +15,8 @@
 use Contao\CoreBundle\Framework\ContaoFramework;
 use FOS\HttpCacheBundle\Http\SymfonyResponseTagger;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as SymfonyAbstractController;
-use Terminal42\ServiceAnnotationBundle\ServiceAnnotationInterface;
 
-abstract class AbstractController extends SymfonyAbstractController implements ServiceAnnotationInterface
+abstract class AbstractController extends SymfonyAbstractController
 {
     public static function getSubscribedServices()
     {

diff --git a/core-bundle/src/Cron/LegacyCron.php b/core-bundle/src/Cron/LegacyCron.php
@@ -15,9 +15,8 @@
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\ServiceAnnotation\CronJob;
 use Contao\System;
-use Terminal42\ServiceAnnotationBundle\ServiceAnnotationInterface;
 
-class LegacyCron implements ServiceAnnotationInterface
+class LegacyCron
 {
     /**
      * @var ContaoFramework