Applied fixes from StyleCI (#199)

sonata-project · May 26, 2016 · 705b37d · 705b37d
1 parent 83a5fbd
commit 705b37d
Show file tree

Hide file tree

Showing 59 changed files with 320 additions and 311 deletions.
diff --git a/Admin/CategoryAdmin.php b/Admin/CategoryAdmin.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the Sonata project.
+ * This file is part of the Sonata Project package.
  *
- * (c) Sonata Project <https://github.com/sonata-project/SonataClassificationBundle/>
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -48,11 +48,11 @@ protected function configureFormFields(FormMapper $formMapper)
             if ($this->getSubject()->getParent() !== null || $this->getSubject()->getId() === null) { // root category cannot have a parent
                 $formMapper
                   ->add('parent', 'sonata_category_selector', array(
-                      'category'      => $this->getSubject() ?: null,
+                      'category' => $this->getSubject() ?: null,
                       'model_manager' => $this->getModelManager(),
-                      'class'         => $this->getClass(),
-                      'required'      => true,
-                      'context'       => $this->getSubject()->getContext(),
+                      'class' => $this->getClass(),
+                      'required' => true,
+                      'context' => $this->getSubject()->getContext(),
                     ));
             }
         }
@@ -67,7 +67,7 @@ protected function configureFormFields(FormMapper $formMapper)
                 ))
                 ->add('position', 'integer', array(
                     'required' => false,
-                    'data'     => $position,
+                    'data' => $position,
                 ))
             ->end()
         ;
@@ -82,7 +82,7 @@ protected function configureFormFields(FormMapper $formMapper)
                         array(
                             'link_parameters' => array(
                                 'provider' => 'sonata.media.provider.image',
-                                'context'  => 'sonata_category',
+                                'context' => 'sonata_category',
                             ),
                         )
                     )

diff --git a/Admin/CollectionAdmin.php b/Admin/CollectionAdmin.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the Sonata project.
+ * This file is part of the Sonata Project package.
  *
- * (c) Sonata Project <https://github.com/sonata-project/SonataClassificationBundle/>
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -44,7 +44,7 @@ protected function configureFormFields(FormMapper $formMapper)
                 array(
                     'link_parameters' => array(
                         'provider' => 'sonata.media.provider.image',
-                        'context'  => 'sonata_collection',
+                        'context' => 'sonata_collection',
                     ),
                 )
             );

diff --git a/Admin/ContextAdmin.php b/Admin/ContextAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Admin/ContextAwareAdmin.php b/Admin/ContextAwareAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -63,29 +63,13 @@ public function getNewInstance()
         return $instance;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper)
-    {
-        $options = array();
-
-        if (1 === $this->getPersistentParameter('hide_context')) {
-            $options['disabled'] = true;
-        }
-
-        $datagridMapper
-            ->add('context', null, array(), null, $options)
-        ;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getPersistentParameters()
     {
         $parameters = array(
-            'context'      => '',
+            'context' => '',
             'hide_context' => $this->hasRequest() ? (int) $this->getRequest()->get('hide_context', 0) : 0,
         );
 
@@ -103,4 +87,20 @@ public function getPersistentParameters()
 
         return $parameters;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper)
+    {
+        $options = array();
+
+        if (1 === $this->getPersistentParameter('hide_context')) {
+            $options['disabled'] = true;
+        }
+
+        $datagridMapper
+            ->add('context', null, array(), null, $options)
+        ;
+    }
 }
diff --git a/Admin/TagAdmin.php b/Admin/TagAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Command/FixContextCommand.php b/Command/FixContextCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Controller/Api/CategoryController.php b/Controller/Api/CategoryController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -51,7 +51,7 @@ class CategoryController
     public function __construct(CategoryManagerInterface $categoryManager, FormFactoryInterface $formFactory)
     {
         $this->categoryManager = $categoryManager;
-        $this->formFactory     = $formFactory;
+        $this->formFactory = $formFactory;
     }
 
     /**
@@ -75,7 +75,7 @@ public function __construct(CategoryManagerInterface $categoryManager, FormFacto
      */
     public function getCategoriesAction(ParamFetcherInterface $paramFetcher)
     {
-        $page  = $paramFetcher->get('page');
+        $page = $paramFetcher->get('page');
         $count = $paramFetcher->get('count');
 
         /** @var PagerInterface $categoriesPager */

diff --git a/Controller/Api/CollectionController.php b/Controller/Api/CollectionController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -51,7 +51,7 @@ class CollectionController
     public function __construct(CollectionManagerInterface $collectionManager, FormFactoryInterface $formFactory)
     {
         $this->collectionManager = $collectionManager;
-        $this->formFactory       = $formFactory;
+        $this->formFactory = $formFactory;
     }
 
     /**
@@ -74,7 +74,7 @@ public function __construct(CollectionManagerInterface $collectionManager, FormF
      */
     public function getCollectionsAction(ParamFetcherInterface $paramFetcher)
     {
-        $page  = $paramFetcher->get('page');
+        $page = $paramFetcher->get('page');
         $count = $paramFetcher->get('count');
 
         /** @var PagerInterface $collectionsPager */

diff --git a/Controller/Api/ContextController.php b/Controller/Api/ContextController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -50,7 +50,7 @@ class ContextController
      */
     public function __construct(ContextManagerInterface $contextManager, FormFactoryInterface $formFactory)
     {
-        $this->contextManager  = $contextManager;
+        $this->contextManager = $contextManager;
         $this->formFactory = $formFactory;
     }
 
@@ -74,7 +74,7 @@ public function __construct(ContextManagerInterface $contextManager, FormFactory
      */
     public function getContextsAction(ParamFetcherInterface $paramFetcher)
     {
-        $page  = $paramFetcher->get('page');
+        $page = $paramFetcher->get('page');
         $count = $paramFetcher->get('count');
 
         /** @var PagerInterface $contextsPager */

diff --git a/Controller/Api/TagController.php b/Controller/Api/TagController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -50,7 +50,7 @@ class TagController
      */
     public function __construct(TagManagerInterface $tagManager, FormFactoryInterface $formFactory)
     {
-        $this->tagManager  = $tagManager;
+        $this->tagManager = $tagManager;
         $this->formFactory = $formFactory;
     }
 
@@ -74,7 +74,7 @@ public function __construct(TagManagerInterface $tagManager, FormFactoryInterfac
      */
     public function getTagsAction(ParamFetcherInterface $paramFetcher)
     {
-        $page  = $paramFetcher->get('page');
+        $page = $paramFetcher->get('page');
         $count = $paramFetcher->get('count');
 
         /** @var PagerInterface $tagsPager */

diff --git a/Controller/CategoryAdminController.php b/Controller/CategoryAdminController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -51,9 +51,9 @@ public function listAction(Request $request = null)
         $this->get('twig')->getExtension('form')->renderer->setTheme($formView, $this->admin->getFilterTheme());
 
         return $this->render($this->admin->getTemplate('list'), array(
-            'action'     => 'list',
-            'form'       => $formView,
-            'datagrid'   => $datagrid,
+            'action' => 'list',
+            'form' => $formView,
+            'datagrid' => $datagrid,
             'csrf_token' => $this->getCsrfToken('sonata.batch'),
         ));
     }
@@ -75,7 +75,7 @@ public function treeAction(Request $request)
         $rootCategories = $categoryManager->getRootCategories(false);
 
         if (!$currentContext) {
-            $mainCategory   = current($rootCategories);
+            $mainCategory = current($rootCategories);
             $currentContext = $mainCategory->getContext();
         } else {
             foreach ($rootCategories as $category) {
@@ -100,12 +100,12 @@ public function treeAction(Request $request)
         $this->get('twig')->getExtension('form')->renderer->setTheme($formView, $this->admin->getFilterTheme());
 
         return $this->render('SonataClassificationBundle:CategoryAdmin:tree.html.twig', array(
-            'action'           => 'tree',
-            'main_category'    => $mainCategory,
-            'root_categories'  => $rootCategories,
-            'current_context'  => $currentContext,
-            'form'             => $formView,
-            'csrf_token'       => $this->getCsrfToken('sonata.batch'),
+            'action' => 'tree',
+            'main_category' => $mainCategory,
+            'root_categories' => $rootCategories,
+            'current_context' => $currentContext,
+            'form' => $formView,
+            'csrf_token' => $this->getCsrfToken('sonata.batch'),
         ));
     }
 }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *