csfixed

hiqdev · May 28, 2016 · 397a0e5 · 397a0e5
1 parent 1a534a0
commit 397a0e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.php_cs b/.php_cs
@@ -24,7 +24,8 @@ return PhpCsFixer\Config::create()
         'unalign_equals'                             => false, /// Unalign equals symbols in consecutive lines
         'phpdoc_no_empty_return'                     => false, /// @return void and @return null annotations should be omitted from phpdocs
         'empty_return'                               => false, /// A return statement wishing to return nothing should be simply "return"
-        'return'                                     => false, /// An empty line feed should precede a return statement
+        'blank_line_before_return'                   => false, /// n empty line feed should precede a return statement
+        'phpdoc_align'                               => false, /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically
         'phpdoc_params'                              => false, /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically
         'phpdoc_scalar'                              => false, /// Scalar types should always be written in the same form. "int", not "integer"; "bool", not "boolean"
         'phpdoc_separation'                          => false, /// Annotations of a different type are separated by a single blank line

diff --git a/.../unit/controllers/PhpCsControllerTest.php → tests/unit/console/PhpCsControllerTest.php b/.../unit/controllers/PhpCsControllerTest.php → tests/unit/console/PhpCsControllerTest.php
@@ -9,9 +9,9 @@
  * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\phpcsfixer\tests\unit\controllers;
+namespace hidev\phpcsfixer\tests\unit\console;
 
-use hidev\phpcsfixer\controllers\PhpCsController;
+use hidev\phpcsfixer\console\PhpCsController;
 
 /**
  * Tests for PhpCsController.

diff --git a/.../controllers/PhpCsFixerControllerTest.php → ...unit/console/PhpCsFixerControllerTest.php b/.../controllers/PhpCsFixerControllerTest.php → ...unit/console/PhpCsFixerControllerTest.php
@@ -9,9 +9,9 @@
  * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\phpcsfixer\tests\unit\controllers;
+namespace hidev\phpcsfixer\tests\unit\console;
 
-use hidev\phpcsfixer\controllers\PhpCsFixerController;
+use hidev\phpcsfixer\console\PhpCsFixerController;
 
 /**
  * Tests for PhpCsFixerController.