Merge pull request #154 from cygnite/analysis-qo0JwP

Apply fixes from StyleCI
cygnite · Mar 14, 2017 · b3a7347 · b3a7347
2 parents 6413b18 + ad04372
commit b3a7347
Show file tree

Hide file tree

Showing 33 changed files with 37 additions and 73 deletions.
diff --git a/src/Cygnite/Bootstrappers/Bootstrapper.php b/src/Cygnite/Bootstrappers/Bootstrapper.php
@@ -21,7 +21,7 @@ class Bootstrapper
      * Constructor
      * @param Paths $paths The paths to various folders
      */
-    public final function __construct(Paths $paths)
+    final public function __construct(Paths $paths)
     {
         $this->paths = $paths;
     }
@@ -58,4 +58,4 @@ public function all() : array
     {
         return $this->bootstrappers;
     }
-}
+}
diff --git a/src/Cygnite/Bootstrappers/BootstrapperDispatcher.php b/src/Cygnite/Bootstrappers/BootstrapperDispatcher.php
@@ -68,4 +68,4 @@ public function create(string $class) : BootstrapperInterface
 
         return $this->instances[$class];
     }
-}
+}
diff --git a/src/Cygnite/Bootstrappers/BootstrapperDispatcherInterface.php b/src/Cygnite/Bootstrappers/BootstrapperDispatcherInterface.php
@@ -6,4 +6,4 @@ interface BootstrapperDispatcherInterface
     public function execute();
 
     public function create(string $class);
-}
+}
diff --git a/src/Cygnite/Bootstrappers/BootstrapperInterface.php b/src/Cygnite/Bootstrappers/BootstrapperInterface.php
@@ -9,4 +9,4 @@ interface BootstrapperInterface
      *
      */
     public function run();
-}
+}
diff --git a/src/Cygnite/Bootstrappers/Paths.php b/src/Cygnite/Bootstrappers/Paths.php
@@ -69,4 +69,4 @@ public function all() : array
     {
         return $this->paths;
     }
-}
+}
diff --git a/src/Cygnite/Common/UrlManager/Url.php b/src/Cygnite/Common/UrlManager/Url.php
@@ -40,7 +40,7 @@ public function __construct(Manager $urlManager)
      */
     public static function __callStatic($method, $arguments = [])
     {
-        if (method_exists(static::$urlManager, $method)){
+        if (method_exists(static::$urlManager, $method)) {
             return call_user_func_array([static::$urlManager, $method], $arguments);
         }
 
@@ -53,7 +53,7 @@ public static function __callStatic($method, $arguments = [])
      */
     public function __call($method, $arguments)
     {
-        if (method_exists(static::$urlManager, $method)){
+        if (method_exists(static::$urlManager, $method)) {
             return call_user_func_array([static::$urlManager, $method], $arguments);
         }
 

diff --git a/src/Cygnite/Container/Container.php b/src/Cygnite/Container/Container.php
@@ -588,6 +588,5 @@ public function makeInstance(string $namespace, $arguments = [])
      */
     public function createProxy($namespace)
     {
-
     }
 }
diff --git a/src/Cygnite/Container/ContainerAwareInterface.php b/src/Cygnite/Container/ContainerAwareInterface.php
@@ -18,7 +18,7 @@
  */
 interface ContainerAwareInterface
 {
-	/**
+    /**
      * Set value to container.
      *
      * @param $key

diff --git a/src/Cygnite/Container/Dependency/Builder.php b/src/Cygnite/Container/Dependency/Builder.php
@@ -167,7 +167,6 @@ public function propertyInjection($classInstance, $controller)
         $controller = "\\\\";
 
         if (array_key_exists($controller, $this->definitions)) {
-
             list($reflection, $reflectionClass) = $this->setReflectionClassAttributes($controller);
 
             foreach ($dependencies as $classProperty => $class) {

diff --git a/src/Cygnite/Container/Injector.php b/src/Cygnite/Container/Injector.php
@@ -99,4 +99,4 @@ public function setContainer($container)
 
         return $this;
     }
-}
+}
diff --git a/src/Cygnite/FormBuilder/Form.php b/src/Cygnite/FormBuilder/Form.php
@@ -144,7 +144,7 @@ public function addElement(string $type, string $key, array $array = []) : FormI
 
         if ($type == 'openTag') {
             $key = $key.'_'.mt_rand(1, 2000);
-        } else if ($type == 'closeTag') {
+        } elseif ($type == 'closeTag') {
             $key = $key.'_'.mt_rand(2000, 4000);
         }
 
@@ -174,18 +174,17 @@ public function addElements(array $elements = []) : FormInterface
     public function createForm() : FormInterface
     {
         foreach ($this->value as $key => $val) {
-
             if (in_array($val['type'], $this->validMethods)) {
                 $method = $val['type'];
                 unset($val['type']);
                 (!method_exists($this, $method)) ?: $this->{$method}($key, $val);
             } else {
-                  $this->input($key, $val);
+                $this->input($key, $val);
             }
 
             if (isset($val['type']) && in_array($val['type'], $this->validArray)) {
                 $this->setValidationError($key, $val);
-            } else if (!isset($val['type']) && in_array($method, $this->validArray)) {
+            } elseif (!isset($val['type']) && in_array($method, $this->validArray)) {
                 $this->setValidationError($key, $val);
             }
         }

diff --git a/src/Cygnite/FormBuilder/Html/Elements.php b/src/Cygnite/FormBuilder/Html/Elements.php
@@ -157,12 +157,10 @@ private function composeElement($key, $attributes, $extra = [], $hasCloseTag = f
 
         $val = '';
         if ($hasCloseTag) {
-
             if (is_object($this->entity)) {
-
                 if (method_exists($this->entity, 'get'.Inflector::camelize($key))) {
                     $val = $this->entity->{'get'.Inflector::camelize($key)}();
-                } else if (property_exists($this->entity, $key)) {
+                } elseif (property_exists($this->entity, $key)) {
                     $property = (new \ReflectionClass($this->entity))->getProperty($key);
                     if ($property->isPublic()) {
                         $val = $property->getValue();
@@ -288,9 +286,7 @@ protected function attributes($attributes)
         $elementStr = '';
 
         foreach ($attributes as $key => $value) {
-
-             $elementStr .= ($key !== 0) ? "{$key}='{$value}' " : $value;
-
+            $elementStr .= ($key !== 0) ? "{$key}='{$value}' " : $value;
         }
 
         return $elementStr;
@@ -336,7 +332,6 @@ protected function highlightErrorElement($key, $attributes)
             $this->validator instanceof ValidatorInterface &&
             $this->validator->hasError($key)
         ) {
-
             preg_match_all("#class='([^\s]+)'#", $this->attributes($attributes), $matches);
             $elClass = "class='".implode(' ', array_merge([$this->errorInputClass], $matches[1]))."'";
             unset($attributes['class']);

diff --git a/src/Cygnite/Foundation/Application.php b/src/Cygnite/Foundation/Application.php
@@ -437,7 +437,7 @@ public function attachEvents()
      */
     public function beforeBootingApplication()
     {
-        if (!$this->activateEventMiddleWare() ) {
+        if (!$this->activateEventMiddleWare()) {
             return false;
         }
 
@@ -458,7 +458,7 @@ public function beforeBootingApplication()
      */
     public function afterBootingApplication()
     {
-        if (!$this->activateEventMiddleWare() ) {
+        if (!$this->activateEventMiddleWare()) {
             return false;
         }
 

diff --git a/src/Cygnite/Foundation/Http/Kernel.php b/src/Cygnite/Foundation/Http/Kernel.php
@@ -64,7 +64,7 @@ public function setRouter($request)
         $this->container->set('request', $request);
         $this->container->make(\Cygnite\Router\Router::class);
         $this->container->get('router')->setRequest($request);
-        $this->router = $this->container->get('router');        
+        $this->router = $this->container->get('router');
     }
 
     /**
@@ -169,7 +169,6 @@ public function getMiddleware() : array
 
     public function registerBootstrappers()
     {
-
     }
 
     /**

diff --git a/src/Cygnite/Mvc/Controller/ServiceController.php b/src/Cygnite/Mvc/Controller/ServiceController.php
@@ -28,7 +28,6 @@ class ServiceController extends AbstractBaseController implements ServiceControl
 
     public function __construct()
     {
-
     }
 
 

diff --git a/src/Cygnite/Mvc/View/Composer.php b/src/Cygnite/Mvc/View/Composer.php
@@ -209,7 +209,6 @@ public function template($view, array $param = [], $return = false)
         | then we will render twig template with parameters
         */
         if (is_object(static::$twigEnvironment) && is_object($this->get('twig_template'))) {
-
             return ($return) ?
                 $this->get('twig_template')->render($param) :
                 $this->get('twig_template')->display($param);

diff --git a/src/Cygnite/Mvc/View/View.php b/src/Cygnite/Mvc/View/View.php
@@ -27,7 +27,7 @@
  *
  * @author Sanjoy Dey <dey.sanjoy0@gmail.com>
  */
-class View extends Composer implements ViewInterface,\ArrayAccess
+class View extends Composer implements ViewInterface, \ArrayAccess
 {
     use ControllerViewBridgeTrait;
 
@@ -467,7 +467,6 @@ public function widget() : Widget
     public function createAssetCollection($class) : Asset
     {
         $a = AssetCollection::make($this->getContainer(), function ($collection) use ($class) {
-
             (new $class($collection->asset()))->register();
 
             return $collection->asset();

diff --git a/src/Cygnite/Mvc/View/Widget.php b/src/Cygnite/Mvc/View/Widget.php
@@ -135,7 +135,8 @@ protected function setupModule()
         if (string_has($this->getWidgetName(), ':')) {
             $exp = [];
             $exp = explode(':', $this->getWidgetName());
-            $moduleName = $exp[0]; $view = $exp[1];
+            $moduleName = $exp[0];
+            $view = $exp[1];
             $path = $this->getWidgetPath($view, $moduleName, true);
             $this->setWidgetName(null);
             $this->setModule(false);

diff --git a/src/Cygnite/Router/Router.php b/src/Cygnite/Router/Router.php
@@ -14,7 +14,9 @@
 use Cygnite\Pipeline\Pipeline;
 use Cygnite\Http\Requests\Request;
 use Cygnite\Container\ContainerAwareInterface;
-use Cygnite\Router\Controller\{ControllerController, RouteController, ResourceController};
+use Cygnite\Router\Controller\ControllerController;
+use Cygnite\Router\Controller\RouteController;
+use Cygnite\Router\Controller\ResourceController;
 
 /*
  * Cygnite Router
@@ -72,7 +74,8 @@ class Router implements RouterInterface
     private $afterRouter;
     private $routeBasePath = '';
     private $after = [];
-    protected $resourceController, $routeController;
+    protected $resourceController;
+    protected $routeController;
     protected $middleware;
 
     /**
@@ -792,7 +795,6 @@ public function dispatch($request)
             $this->getCurrentUri() == '/' . self::$indexPage
         ) {
             if ($defaultController != '') {
-
                 $this->getRouteControllerInstance();
 
                 list($controller, $action) = $this->getControllerAndAction(

diff --git a/src/Cygnite/Validation/Validator.php b/src/Cygnite/Validation/Validator.php
@@ -167,7 +167,7 @@ public function run()
                 // Executes rule for min and max validation.
                 if (string_has($rule, ':') && strstr($rule, 'max') || strstr($rule, 'min')) {
                     $isValid = $this->doValidateMinMax($rule, $key, $isValid);
-                } else if (string_has($rule, ':') && (!strstr($rule, 'max') && !strstr($rule, 'min'))) {
+                } elseif (string_has($rule, ':') && (!strstr($rule, 'max') && !strstr($rule, 'min'))) {
                     // Executes rule for other than min, max validation with ":" keyword in rule.
                     $isValid = $this->validateRulesHasPlaceHolder($key, $rule, $isValid);
                 } else {
@@ -287,7 +287,7 @@ protected function required(string $key) : bool
                 ucfirst($this->convertToFieldName($key)).' is required';
 
             return false;
-        } else if (is_array($val) && count($val) < 1) {
+        } elseif (is_array($val) && count($val) < 1) {
             $this->errors[$key.self::ERROR] =
                 ucfirst($this->convertToFieldName($key)).' is required';
 
@@ -777,7 +777,7 @@ protected function isDate($key) : bool
         if ((!is_string($value) && !is_numeric($value)) || strtotime($value) === false) {
             $this->errors[$key.self::ERROR] = $this->convertToFieldName($key).' must be a valid date.';
             return false;
-        } else if (checkdate($date['month'], $date['day'], $date['year'])) {
+        } elseif (checkdate($date['month'], $date['day'], $date['year'])) {
             return true;
         }
 

diff --git a/tests/Cygnite/Alias/AliasManagerTest.php b/tests/Cygnite/Alias/AliasManagerTest.php
@@ -56,5 +56,3 @@ public function testRemoveMethod()
         $this->assertFalse($alias->has('bar'));
     }
 }
-
-
diff --git a/tests/Cygnite/AssetManager/AssetTest.php b/tests/Cygnite/AssetManager/AssetTest.php
@@ -54,8 +54,8 @@ public function testStaticCallToJsScript()
     public function testStaticCallToCss()
     {
         $css = $this->asset->style('public/assets/cygnite.css', 'static');
-        $this->assertEquals(trim(preg_replace('/\s+/',' ', '<link rel="stylesheet" type="text/css" static 
-                                    title= "" href="http://localhost/cygnite/public/assets/cygnite.css" />')), trim(preg_replace('/\s+/',' ', $css)));
+        $this->assertEquals(trim(preg_replace('/\s+/', ' ', '<link rel="stylesheet" type="text/css" static 
+                                    title= "" href="http://localhost/cygnite/public/assets/cygnite.css" />')), trim(preg_replace('/\s+/', ' ', $css)));
     }
 
 

diff --git a/tests/Cygnite/Bootstrappers/BootstrapperDispatcherTest.php b/tests/Cygnite/Bootstrappers/BootstrapperDispatcherTest.php
@@ -20,7 +20,6 @@ public function setUp()
 
     public function testPathInstance()
     {
-
         $bootDispatcher = $this->getMockBuilder('Cygnite\Bootstrappers\BootstrapperDispatcher')->setConstructorArgs([$this->container, new Paths([])])->getMock();
         $this->assertInstanceOf('Cygnite\Bootstrappers\BootstrapperDispatcher', $bootDispatcher);
     }
@@ -49,5 +48,3 @@ public function testBootstrapperDispatcherReturnsBootstrapperObject()
         $this->assertInstanceOf('\Cygnite\Bootstrappers\Bootstrapper', $dispatcher->getBootstrapper());
     }
 }
-
-
diff --git a/tests/Cygnite/Bootstrappers/BootstrapperTest.php b/tests/Cygnite/Bootstrappers/BootstrapperTest.php
@@ -34,5 +34,3 @@ public function testReturnsPathsObject()
         $this->assertInstanceof(\Cygnite\Bootstrappers\Paths::class, $bootstrapper->getPaths());
     }
 }
-
-
diff --git a/tests/Cygnite/Bootstrappers/PathsTest.php b/tests/Cygnite/Bootstrappers/PathsTest.php
@@ -32,8 +32,4 @@ public function testAllMethodReturnsArrayOfPaths()
             "baz" => 'baz bar'
         ], $p->all());
     }
-
-
 }
-
-
diff --git a/tests/Cygnite/Common/EncryptTest.php b/tests/Cygnite/Common/EncryptTest.php
@@ -12,9 +12,7 @@ class EncryptTest extends TestCase
 
     public function setUp()
     {
-
         if (version_compare(PHP_VERSION, '7.0.0') <= 0) {
-
             $this->markTestSkipped(
                 'mcrypt_create_iv() function deprecated in PHP 7.1'
             );

diff --git a/tests/Cygnite/Console/Commands/GreetCommand.php b/tests/Cygnite/Console/Commands/GreetCommand.php
@@ -54,8 +54,4 @@ public function process()
 
         $this->info("Hello $name!!".PHP_EOL);
     }
-
 }
-
-
-
diff --git a/tests/Cygnite/Console/ConsoleApplicationTest.php b/tests/Cygnite/Console/ConsoleApplicationTest.php
@@ -42,6 +42,3 @@ public function resetCommandStack()
         $this->commandsStack = [];
     }
 }
-
-
-