Remove usage of old deprecated features

Author: wouterj

app/config/routing.yml

@@ -8,29 +8,29 @@ _app:
     type: annotation
 
 home_redirect:
-    pattern: /
+    path: /
     defaults:
         _controller: lunetics_locale.switcher_controller:switchAction
         route: '/cms/routes/%locale%'
         statusCode: 301
         useReferrer: false
 
 admin_wo_locale:
-    pattern: /admin
+    path: /admin
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard
         permanent: true # this for 301
 
 admin_dashboard_wo_locale:
-    pattern: /admin/dashboard
+    path: /admin/dashboard
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard
         permanent: true # this for 301
 
 admin_dashboard:
-    pattern: /{_locale}/admin/
+    path: /{_locale}/admin/
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard

app/tests/AdminTest.php

@@ -93,12 +93,12 @@ protected function doTestReachableAdminRoutes($admin)
             $requirements = $route->getRequirements();
 
             // fix this one later
-            if (strpos($route->getPattern(), 'export')) {
+            if (strpos($route->getPath(), 'export')) {
                 continue;
             }
 
             // these don't all work atm
-            if (strpos($route->getPattern(), 'show')) {
+            if (strpos($route->getPath(), 'show')) {
                 continue;
             }
 
@@ -132,7 +132,7 @@ protected function doTestReachableAdminRoutes($admin)
 
             $this->assertResponseSuccess($res);
 
-            $this->testedPatterns[] = $route->getPattern();
+            $this->testedPatterns[] = $route->getPath();
         }
     }
 }

src/AppBundle/DataFixtures/PHPCR/LoadMenuData.php

@@ -16,12 +16,15 @@
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use PHPCR\Util\NodeHelper;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu;
 
-class LoadMenuData extends ContainerAware implements FixtureInterface, OrderedFixtureInterface
+class LoadMenuData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
+    use ContainerAwareTrait;
+
     public function getOrder()
     {
         return 60;

src/AppBundle/DataFixtures/PHPCR/LoadNewsData.php

@@ -15,12 +15,15 @@
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use PHPCR\Util\NodeHelper;
 use AppBundle\Document\DemoNewsContent;
 
-class LoadNewsData extends ContainerAware implements FixtureInterface, OrderedFixtureInterface
+class LoadNewsData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
+    use ContainerAwareTrait;
+
     public function getOrder()
     {
         return 50;

src/AppBundle/DataFixtures/PHPCR/LoadRoutingData.php

@@ -18,11 +18,14 @@
 use PHPCR\Util\NodeHelper;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 
-class LoadRoutingData extends ContainerAware implements FixtureInterface, OrderedFixtureInterface
+class LoadRoutingData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
+    use ContainerAwareTrait;
+
     public function getOrder()
     {
         return 21;

src/AppBundle/DataFixtures/PHPCR/LoadStaticPageData.php

@@ -18,11 +18,14 @@
 use PHPCR\Util\NodeHelper;
 use AppBundle\Document\DemoSeoContent;
 use Symfony\Cmf\Bundle\SeoBundle\Doctrine\Phpcr\SeoMetadata;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Yaml\Parser;
 
-class LoadStaticPageData extends ContainerAware implements FixtureInterface, OrderedFixtureInterface
+class LoadStaticPageData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
+    use ContainerAwareTrait;
+
     public function getOrder()
     {
         return 5;

src/AppBundle/EventListener/SandboxExceptionListener.php

@@ -12,7 +12,8 @@
 namespace AppBundle\EventListener;
 
 use PHPCR\RepositoryException;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -23,8 +24,10 @@
  * Exception listener that will handle not found exceptions and try to give the
  * first time installer some clues what is wrong.
  */
-class SandboxExceptionListener extends ContainerAware implements EventSubscriberInterface
+class SandboxExceptionListener implements EventSubscriberInterface, ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function onKernelException(GetResponseForExceptionEvent $event)
     {
         if (!$event->getException() instanceof NotFoundHttpException) {