alpixel / AlpixelMenuBundle

Builder/MenuBuilder.php

Indentation +4 added lines, -4 removed lines

@@ -146,8 +146,8 @@ 
         $this->setKnpMenu($this->factory->createItem('root'));
 
         $menu = $this->entityManager
-                     ->getRepository('AlpixelMenuBundle:Menu')
-                     ->findOneMenuByMachineNameAndLocale($machineName, $locale);
+                        ->getRepository('AlpixelMenuBundle:Menu')
+                        ->findOneMenuByMachineNameAndLocale($machineName, $locale);
 
         $items = $menu->getItems()->toArray();
 
@@ -176,8 +176,8 @@ 
         if (($uri = $item->getUri()) !== null) {
             if($uri[0] == '/') {
                 $baseUri = $this->request->getBasePath().
-                           $this->request->getBaseURL().
-                           $uri;
+                            $this->request->getBaseURL().
+                            $uri;
                 $uri = $this->request->getSchemeAndHttpHost().$baseUri;
 
                 if ($baseUri === $this->currentUri) {

Controller/Admin/CRUD/MenuAdmin.php

Indentation -7 removed lines

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