CS fixer conf & fixes

ogizanagi · ogizanagi · commit dd5d7b2d455a · 2015-10-29T00:06:22.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/build
+.php_cs.cache
 composer.lock
 phpunit.xml
 vendor/*
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,12 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(__DIR__)
+    ->exclude(array('vendor', 'build'))
+;
+
+return Symfony\CS\Config\Config::create()
+    ->setUsingCache(true)
+    ->fixers(array('-unalign_double_arrow', '-phpdoc_short_description'))
+    ->finder($finder)
+;
diff --git a/Configuration/Configurator.php b/Configuration/Configurator.php
@@ -462,7 +462,6 @@ private function introspectGettersAndSetters($entityConfiguration)
         return $entityConfiguration;
     }
 
-
     /**
      * Determines the template used to render each backend element. This is not
      * trivial because templates can depend on the entity displayed and they
diff --git a/Controller/AdminController.php b/Controller/AdminController.php
@@ -645,6 +645,7 @@ protected function createEntityForm($entity, array $entityProperties, $view)
                     $customMethodName, is_object($form) ? get_class($form) : gettype($form)
                 ));
             }
+
             return $form;
         }
 
diff --git a/DependencyInjection/EasyAdminExtension.php b/DependencyInjection/EasyAdminExtension.php
@@ -349,7 +349,7 @@ private function normalizeActionsConfiguration(array $actionsConfiguration, arra
                 // those options would be 'null' and the template would show some issues
                 if (array_key_exists($actionName, $defaultActionsConfiguration)) {
                     // remove null config options but maintain empty options (this allows to set an empty label for the action)
-                    $normalizedConfiguration = array_filter($normalizedConfiguration, function($element) { return null !== $element; });
+                    $normalizedConfiguration = array_filter($normalizedConfiguration, function ($element) { return null !== $element; });
                     $normalizedConfiguration = array_replace($defaultActionsConfiguration[$actionName], $normalizedConfiguration);
                 }
             }
@@ -605,8 +605,9 @@ private function normalizeFieldsConfiguration(array $fieldsConfiguration, $view,
     /**
      * Checks whether the given string is valid as a PHP method name.
      *
-     * @param  string  $name
-     * @return boolean
+     * @param string $name
+     *
+     * @return bool
      */
     private function isValidMethodName($name)
     {
diff --git a/Listener/ExceptionListener.php b/Listener/ExceptionListener.php
@@ -38,7 +38,6 @@ public function onKernelException(GetResponseForExceptionEvent $event)
             return $event->getException()->getMessage();
         }
 
-        /** @var \JavierEguiluz\Bundle\EasyAdminBundle\Exception\BaseException */
         $exception = $event->getException();
         $exceptionClassName = basename(str_replace('\\', '/', get_class($exception)));
 
diff --git a/Tests/Fixtures/AppTestBundle/Entity/Product.php b/Tests/Fixtures/AppTestBundle/Entity/Product.php
@@ -84,6 +84,7 @@ class Product
      *     <li><strong>Size</strong>: 13cm x 15cm x 6cm</li>
      *     <li><strong>Bluetooth</strong>: 4.1</li>
      * </ul></pre>
+     *
      * @var string
      * @ORM\Column(type="string")
      */
diff --git a/Tests/Listener/EntityNotFoundException.php b/Tests/Listener/EntityNotFoundException.php
@@ -3,8 +3,8 @@
 namespace JavierEguiluz\Bundle\EasyAdminBundle\Tests\Listener;
 
 /**
-* Test class for event listener test
-*/
+ * Test class for event listener test
+ */
 class EntityNotFoundException extends \Exception
 {
 }
diff --git a/Tests/Listener/ExceptionListenerTest.php b/Tests/Listener/ExceptionListenerTest.php
@@ -50,9 +50,9 @@ public function testCatchBaseExceptions()
             array(
                 'entity' => array(
                     'name' => 'Test',
-                    'primary_key_field_name' => 'Test key'
+                    'primary_key_field_name' => 'Test key',
                 ),
-                'entity_id' => 2
+                'entity_id' => 2,
             )
         );
         $event = $this->getEventExceptionThatShouldBeCalledOnce($exception);
@@ -78,7 +78,7 @@ private function getEventExceptionThatShouldNotBeCalled($exception)
 
     public function testShouldNotCatchExceptionsWithSameName()
     {
-        $exception = new EntityNotFoundException;
+        $exception = new EntityNotFoundException();
         $event = $this->getEventExceptionThatShouldNotBeCalled($exception);
         $templating = $this->getTemplating();
         $debug = false;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/build`
	`1`	`+.php_cs.cache`
`2`	`2`	`composer.lock`
`3`	`3`	`phpunit.xml`
`4`	`4`	`vendor/*`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,6 @@ private function introspectGettersAndSetters($entityConfiguration)`
`462`	`462`	`return $entityConfiguration;`
`463`	`463`	`}`
`464`	`464`
`465`		`-`
`466`	`465`	`/**`
`467`	`466`	`* Determines the template used to render each backend element. This is not`
`468`	`467`	`* trivial because templates can depend on the entity displayed and they`
Original file line number	Diff line number	Diff line change
`@@ -645,6 +645,7 @@ protected function createEntityForm($entity, array $entityProperties, $view)`
`645`	`645`	`$customMethodName, is_object($form) ? get_class($form) : gettype($form)`
`646`	`646`	`));`
`647`	`647`	`}`
	`648`	`+`
`648`	`649`	`return $form;`
`649`	`650`	`}`
`650`	`651`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ private function normalizeActionsConfiguration(array $actionsConfiguration, arra`
`349`	`349`	`// those options would be 'null' and the template would show some issues`
`350`	`350`	`if (array_key_exists($actionName, $defaultActionsConfiguration)) {`
`351`	`351`	`// remove null config options but maintain empty options (this allows to set an empty label for the action)`
`352`		`- $normalizedConfiguration = array_filter($normalizedConfiguration, function($element) { return null !== $element; });`
	`352`	`+ $normalizedConfiguration = array_filter($normalizedConfiguration, function ($element) { return null !== $element; });`
`353`	`353`	`$normalizedConfiguration = array_replace($defaultActionsConfiguration[$actionName], $normalizedConfiguration);`
`354`	`354`	`}`
`355`	`355`	`}`
`@@ -605,8 +605,9 @@ private function normalizeFieldsConfiguration(array $fieldsConfiguration, $view,`
`605`	`605`	`/**`
`606`	`606`	`* Checks whether the given string is valid as a PHP method name.`
`607`	`607`	`*`
`608`		`- * @param string $name`
`609`		`- * @return boolean`
	`608`	`+ * @param string $name`
	`609`	`+ *`
	`610`	`+ * @return bool`
`610`	`611`	`*/`
`611`	`612`	`private function isValidMethodName($name)`
`612`	`613`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public function onKernelException(GetResponseForExceptionEvent $event)`
`38`	`38`	`return $event->getException()->getMessage();`
`39`	`39`	`}`
`40`	`40`
`41`		`- /** @var \JavierEguiluz\Bundle\EasyAdminBundle\Exception\BaseException */`
`42`	`41`	`$exception = $event->getException();`
`43`	`42`	`$exceptionClassName = basename(str_replace('\\', '/', get_class($exception)));`
`44`	`43`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`namespace JavierEguiluz\Bundle\EasyAdminBundle\Tests\Listener;`
`4`	`4`
`5`	`5`	`/**`
`6`		`-* Test class for event listener test`
`7`		`-*/`
	`6`	`+ * Test class for event listener test`
	`7`	`+ */`
`8`	`8`	`class EntityNotFoundException extends \Exception`
`9`	`9`	`{`
`10`	`10`	`}`