alpixel / AlpixelMenuBundle

Twig/DisplayLinkExtension.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
         if ($env === 'dev' && strpos($link, 'http') === false) {
             $dev = ($link[0] === '/') ? 'app_dev.php' : 'app_dev.php/';
-            $link = $dev.$link;
+            $link = $dev . $link;
         }
 
         return $link;

Controller/Admin/CRUD/MenuAdmin.php

Unused Use Statements -7 removed lines

@@ -74,10 +74,3 @@
                         'template' => 'AlpixelMenuBundle:CRUD:list__action_item.html.twig',
                     ],
 <<<<<<< HEAD
-=======
-                    'edit' => [],
->>>>>>> master
-                ],
-            ]);
-    }
-}

Spacing +3 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
     public function createQuery($context = 'list')
     {
         $query = parent::createQuery($context);
-        $query->addOrderBy($query->getRootAlias().'.locale', 'ASC');
+        $query->addOrderBy($query->getRootAlias() . '.locale', 'ASC');
 
         return $query;
     }
@@ -20,7 +20,7 @@ 
     protected function configureRoutes(RouteCollection $collection)
     {
         $collection->remove('create');
-        $collection->add('item', $this->getRouterIdParameter().'/item');
+        $collection->add('item', $this->getRouterIdParameter() . '/item');
     }
 
     protected function configureFormFields(FormMapper $formMapper)
@@ -73,11 +73,4 @@ 
                     'item' => [
                         'template' => 'AlpixelMenuBundle:CRUD:list__action_item.html.twig',
                     ],
-<<<<<<< HEAD
-=======
-                    'edit' => [],
->>>>>>> master
-                ],
-            ]);
-    }
-}
+<< << <<< HEAD

Controller/Admin/CRUD/ItemAdmin.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 
     protected function configureRoutes(RouteCollection $collection)
     {
-        $collection->add('move', $this->getRouterIdParameter().'/move/{position}');
+        $collection->add('move', $this->getRouterIdParameter() . '/move/{position}');
     }
 
     public function getPersistentParameters()
@@ -43,7 +43,7 @@ 
     {
         $id = $this->getRequest()->query->getInt('menu');
         $query = parent::createQuery($context);
-        $query->join($query->getRootAlias().'.menu', 'm')
+        $query->join($query->getRootAlias() . '.menu', 'm')
             ->where('m.id = :id')
             ->setParameters([
                 'id' => $id,
@@ -63,7 +63,7 @@ 
                     'label'         => 'Menu',
                     'required'      => true,
                     'property'      => 'name',
-                    'query_builder' => function (EntityRepository $entityRepository) use ($id) {
+                    'query_builder' => function(EntityRepository $entityRepository) use ($id) {
                         $query = $entityRepository->createQuerybuilder('m');
                         if ($id == null) {
                             return $query;
@@ -81,7 +81,7 @@ 
                 'label'         => 'Menu',
                 'required'      => true,
                 'property'      => 'name',
-                'query_builder' => function (EntityRepository $entityRepository) use ($id) {
+                'query_builder' => function(EntityRepository $entityRepository) use ($id) {
                     $query = $entityRepository->createQuerybuilder('m');
                     if ($id == null) {
                         return $query;