Added fixes to issues that are raised by Scrutinizer

rougin · Dec 1, 2015 · 4c742c6 · 4c742c6
1 parent e0f6d8a
commit 4c742c6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/src/Common/AbstractCommand.php b/src/Common/AbstractCommand.php
@@ -2,9 +2,9 @@
 
 namespace Rougin\Combustor\Common;
 
+use Twig_Environment;
 use Rougin\Describe\Describe;
 use Symfony\Component\Console\Command\Command;
-use Twig_Environment;
 
 /**
  * Abstract Command

diff --git a/src/Common/File.php b/src/Common/File.php
@@ -62,7 +62,7 @@ public function putContents($content)
      * @param  integer $mode
      * @return boolean
      */
-    public function chmod(int $mode)
+    public function chmod($mode)
     {
         return chmod($this->path, $mode);
     }

diff --git a/src/Generator/ModelGenerator.php b/src/Generator/ModelGenerator.php
@@ -60,19 +60,17 @@ public function generate()
             $accessor = 'get_'.$field;
             $mutator = 'set_'.$field;
 
-            if ($this->data['isCamel']) {
-                $this->data['camel'][$field] = array(
-                    'field' => lcfirst(camelize($field)),
-                    'accessor' => lcfirst(camelize($accessor)),
-                    'mutator' => lcfirst(camelize($mutator))
-                );
-            } else {
-                $this->data['underscore'][$field] = array(
-                    'field' => lcfirst(underscore($field)),
-                    'accessor' => lcfirst(underscore($accessor)),
-                    'mutator' => lcfirst(underscore($mutator))
-                );
-            }
+            $this->data['camel'][$field] = [
+                'field' => lcfirst(camelize($field)),
+                'accessor' => lcfirst(camelize($accessor)),
+                'mutator' => lcfirst(camelize($mutator))
+            ];
+
+            $this->data['underscore'][$field] = [
+                'field' => lcfirst(underscore($field)),
+                'accessor' => lcfirst(underscore($accessor)),
+                'mutator' => lcfirst(underscore($mutator))
+            ];
 
             if ($column->isForeignKey()) {
                 $field = $column->getField();

diff --git a/src/Generator/ViewGenerator.php b/src/Generator/ViewGenerator.php
@@ -99,19 +99,17 @@ public function generate()
             $accessor = 'get_'.$field;
             $mutator = 'set_'.$field;
 
-            if ($this->data['isCamel']) {
-                $this->data['camel'][$field] = array(
-                    'field' => lcfirst(camelize($field)),
-                    'accessor' => lcfirst(camelize($accessor)),
-                    'mutator' => lcfirst(camelize($mutator))
-                );
-            } else {
-                $this->data['underscore'][$field] = array(
-                    'field' => lcfirst(underscore($field)),
-                    'accessor' => lcfirst(underscore($accessor)),
-                    'mutator' => lcfirst(underscore($mutator))
-                );
-            }
+            $this->data['camel'][$field] = [
+                'field' => lcfirst(camelize($field)),
+                'accessor' => lcfirst(camelize($accessor)),
+                'mutator' => lcfirst(camelize($mutator))
+            ];
+
+            $this->data['underscore'][$field] = [
+                'field' => lcfirst(underscore($field)),
+                'accessor' => lcfirst(underscore($accessor)),
+                'mutator' => lcfirst(underscore($mutator))
+            ];
 
             if ($column->isForeignKey()) {
                 $referencedTable = Tools::stripTableSchema(