Fixed CI

Author: dantleech

Admin/Extension/FrontendLinkExtension.php

@@ -41,7 +41,7 @@ class FrontendLinkExtension extends AdminExtension
     private $translator;
 
     /**
-     * @param RouterInterface $router
+     * @param RouterInterface     $router
      * @param TranslatorInterface $translator
      */
     public function __construct(RouterInterface $router, TranslatorInterface $translator)
@@ -99,16 +99,15 @@ public function configureTabMenu(
                 'uri' => $uri,
                 'attributes' => array(
                     'class' => 'sonata-admin-menu-item',
-                    'role' => 'menuitem'
+                    'role' => 'menuitem',
                 ),
                 'linkAttributes' => array(
                     'class' => 'sonata-admin-frontend-link',
                     'role' => 'button',
                     'target' => '_blank',
-                    'title' => $this->translator->trans('admin.menu_frontend_link_title', array(), 'CmfRoutingBundle')
-                )
+                    'title' => $this->translator->trans('admin.menu_frontend_link_title', array(), 'CmfRoutingBundle'),
+                ),
             )
         );
     }
-
 }

Admin/RedirectRouteAdmin.php

@@ -21,8 +21,9 @@ class RedirectRouteAdmin extends Admin
 {
     protected $translationDomain = 'CmfRoutingBundle';
 
-     /**
-     * Root path for the route parent selection
+    /**
+     * Root path for the route parent selection.
+     *
      * @var string
      */
     protected $routeRoot;
@@ -54,7 +55,7 @@ protected function configureFormFields(FormMapper $formMapper)
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-            ->add('name',  'doctrine_phpcr_nodename')
+            ->add('name', 'doctrine_phpcr_nodename')
         ;
     }
 

Admin/RouteAdmin.php

@@ -24,19 +24,22 @@ class RouteAdmin extends Admin
     protected $translationDomain = 'CmfRoutingBundle';
 
     /**
-     * Root path for the route parent selection
+     * Root path for the route parent selection.
+     *
      * @var string
      */
     protected $routeRoot;
 
     /**
-     * Root path for the route content selection
+     * Root path for the route content selection.
+     *
      * @var string
      */
     protected $contentRoot;
 
     /**
-     * Full class name for content that can be referenced by a route
+     * Full class name for content that can be referenced by a route.
+     *
      * @var string
      */
     protected $contentClass;
@@ -163,7 +166,7 @@ protected function configureFieldsForDefaults($dynamicDefaults)
 
         //parse variable pattern and add defaults for tokens - taken from routecompiler
         /** @var $route Route */
-        $route =  $this->subject;
+        $route = $this->subject;
         if ($route && $route->getVariablePattern()) {
             preg_match_all('#\{\w+\}#', $route->getVariablePattern(), $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
             foreach ($matches as $match) {

CmfRoutingBundle.php

@@ -21,7 +21,7 @@
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
 
 /**
- * Bundle class
+ * Bundle class.
  */
 class CmfRoutingBundle extends Bundle
 {
@@ -92,8 +92,8 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
         $container->addCompilerPass(
             $doctrineOrmCompiler::createXmlMappingDriver(
                 array(
-                    realpath(__DIR__ . '/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
-                    realpath(__DIR__ . '/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
+                    realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
+                    realpath(__DIR__.'/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
                 ),
                 array('cmf_routing.dynamic.persistence.orm.manager_name'),
                 'cmf_routing.backend_type_orm',
@@ -107,8 +107,8 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
      * DoctrineBundle (available only since DoctrineBundle 2.4 and Symfony 2.3)
      * Otherwise use the standalone one from CmfCoreBundle.
      *
-     * @return boolean|string the compiler pass to use or false if no suitable
-     *                        one was found
+     * @return bool|string the compiler pass to use or false if no suitable
+     *                     one was found
      */
     private function findDoctrineOrmCompiler()
     {
@@ -138,7 +138,7 @@ private function findDoctrineOrmCompiler()
      */
     private function buildBaseCompilerPass($compilerClass, $driverClass, $type)
     {
-        $arguments = array(array(realpath(__DIR__ . '/Resources/config/doctrine-base')), sprintf('.%s.xml', $type));
+        $arguments = array(array(realpath(__DIR__.'/Resources/config/doctrine-base')), sprintf('.%s.xml', $type));
         $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\DefaultFileLocator', $arguments);
         $driver = new Definition($driverClass, array($locator));
 

Controller/RedirectController.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-
 use Symfony\Cmf\Component\Routing\RedirectRouteInterface;
 
 /**
@@ -31,6 +30,7 @@ class RedirectController
      * @var RouterInterface
      */
     protected $router;
+
     /**
      * @param RouterInterface $router the router to use to build urls
      */
@@ -40,7 +40,7 @@ public function __construct(RouterInterface $router)
     }
 
     /**
-     * Action to redirect based on a RedirectRouteInterface route
+     * Action to redirect based on a RedirectRouteInterface route.
      *
      * @param RedirectRouteInterface $contentDocument
      *

DependencyInjection/Compiler/SetRouterPass.php

@@ -16,7 +16,6 @@
 
 /**
  * Changes the Router implementation.
- *
  */
 class SetRouterPass implements CompilerPassInterface
 {
@@ -26,6 +25,5 @@ public function process(ContainerBuilder $container)
         if ($container->hasParameter('cmf_routing.replace_symfony_router') && true === $container->getParameter('cmf_routing.replace_symfony_router')) {
             $container->setAlias('router', 'cmf_routing.router');
         }
-
     }
 }

DependencyInjection/Configuration.php

@@ -16,13 +16,13 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 /**
-* This class contains the configuration information for the bundle
-*
-* This information is solely responsible for how the different configuration
-* sections are normalized, and merged.
-*
-* @author David Buchmann
-*/
+ * This class contains the configuration information for the bundle.
+ *
+ * This information is solely responsible for how the different configuration
+ * sections are normalized, and merged.
+ *
+ * @author David Buchmann
+ */
 class Configuration implements ConfigurationInterface
 {
     /**

Doctrine/DoctrineProvider.php

@@ -44,9 +44,9 @@ abstract class DoctrineProvider
     protected $className;
 
     /**
-     * Limit to apply when calling getRoutesByNames() with null
+     * Limit to apply when calling getRoutesByNames() with null.
      *
-     * @var integer|null
+     * @var int|null
      */
     protected $routeCollectionLimit;
 
@@ -76,7 +76,7 @@ public function setManagerName($managerName)
      *
      * Setting the limit to null means no limit is applied.
      *
-     * @param integer|null $routeCollectionLimit
+     * @param int|null $routeCollectionLimit
      */
     public function setRouteCollectionLimit($routeCollectionLimit = null)
     {

Doctrine/Orm/ContentRepository.php

@@ -27,7 +27,7 @@
 class ContentRepository extends DoctrineProvider implements ContentRepositoryInterface
 {
     /**
-     * Determine target class and id for this content
+     * Determine target class and id for this content.
      *
      * @param mixed $identifier as produced by getContentId
      *
@@ -39,7 +39,7 @@ protected function getModelAndId($identifier)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * @param string $id The ID contains both model name and id, separated by a colon.
      */
@@ -51,27 +51,27 @@ public function findById($id)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getContentId($content)
     {
-        if (! is_object($content)) {
-            return null;
+        if (!is_object($content)) {
+            return;
         }
 
         try {
             $meta = $this->getObjectManager()->getClassMetadata(get_class($content));
             $ids = $meta->getIdentifierValues($content);
             if (0 !== count($ids)) {
-                throw new \Exception('Multi identifier values not supported in ' . get_class($content));
+                throw new \Exception('Multi identifier values not supported in '.get_class($content));
             }
 
             return implode(':', array(
                 get_class($content),
-                reset($ids)
+                reset($ids),
             ));
         } catch (\Exception $e) {
-            return null;
+            return;
         }
     }
 }

Doctrine/Orm/RouteProvider.php

@@ -16,14 +16,12 @@
 use Symfony\Cmf\Component\Routing\Candidates\CandidatesInterface;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
-
 use Symfony\Component\HttpFoundation\Request;
-
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\DoctrineProvider;
 
 /**
- * Provider loading routes from Doctrine
+ * Provider loading routes from Doctrine.
  *
  * This is <strong>NOT</strong> not a doctrine repository but just the route
  * provider for the NestedMatcher. (you could of course implement this
@@ -45,7 +43,7 @@ public function __construct(ManagerRegistry $managerRegistry, CandidatesInterfac
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getRouteCollectionForRequest(Request $request)
     {
@@ -65,7 +63,7 @@ public function getRouteCollectionForRequest(Request $request)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getRouteByName($name)
     {
@@ -82,7 +80,7 @@ public function getRouteByName($name)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getRoutesByNames($names = null)
     {