Fixed issues raised by Scrutinizer

rougin · Jan 14, 2016 · d715413 · d715413
1 parent 1169501
commit d715413
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/src/Commands/RemoveWildfireCommand.php b/src/Commands/RemoveWildfireCommand.php
@@ -38,8 +38,7 @@ public function isEnabled()
      */
     protected function configure()
     {
-        $this
-            ->setName('remove:wildfire')
+        $this->setName('remove:wildfire')
             ->setDescription('Removes Wildfire');
     }
 

diff --git a/src/Common/File.php b/src/Common/File.php
@@ -13,7 +13,7 @@
 class File
 {
     /**
-     * @var File pointer
+     * @var resource
      */
     protected $file;
 

diff --git a/src/Common/Tools.php b/src/Common/Tools.php
@@ -14,6 +14,17 @@
  */
 class Tools
 {
+    /**
+     * Checks whether the header and footer file exists.
+     *
+     * @return bool
+     */
+    public static function hasLayout()
+    {
+        return file_exists(APPPATH.'views/layout/header.php')
+            && file_exists(APPPATH.'views/layout/footer.php');
+    }
+
     /**
      * "Ignites" the post installation process.
      * 
@@ -162,17 +173,6 @@ public static function isDoctrineEnabled()
         return file_exists(APPPATH.'libraries/Doctrine.php');
     }
 
-    /**
-     * Checks whether the header and footer file exists.
-     *
-     * @return bool
-     */
-    public static function hasLayout()
-    {
-        return file_exists(APPPATH.'views/layout/header.php')
-            && file_exists(APPPATH.'views/layout/footer.php');
-    }
-
     /**
      * Checks if Wildfire exists.
      *
@@ -196,17 +196,6 @@ public static function stripTableSchema($table)
             : $table;
     }
 
-    /**
-     * Strips the table schema from the table name.
-     * 
-     * @param  string $table
-     * @return string
-     */
-    public static function strip_table_schema($table)
-    {
-        return self::stripTableSchema($table);
-    }
-
     /**
      * Removes the specified library in the application.
      * 
@@ -257,4 +246,15 @@ public function removeLibrary($type)
             ? 'Wildfire is now successfully removed!'
             : 'Doctrine ORM is now successfully removed!';
     }
+
+    /**
+     * Strips the table schema from the table name.
+     * 
+     * @param  string $table
+     * @return string
+     */
+    public static function strip_table_schema($table)
+    {
+        return self::stripTableSchema($table);
+    }
 }
diff --git a/src/Validator/Validator.php b/src/Validator/Validator.php
@@ -46,10 +46,10 @@ class Validator implements ValidatorInterface
     protected $message = '';
 
     /**
-     * @param string $isDoctrine
-     * @param string $isWildfire
-     * @param string $isCamel
-     * @param array  $file
+     * @param boolean $isDoctrine
+     * @param boolean $isWildfire
+     * @param boolean $isCamel
+     * @param array   $file
      */
     public function __construct($isDoctrine, $isWildfire, $isCamel, $file)
     {