smalot / drush-cerbere

lib/Cerbere/Model/Hacked/HackedFileHasher.php

Doc Comments +1 added lines

@@ -13,6 +13,7 @@
    * Returns a hash of the given filename.
    *
    * Ignores file line endings
+   * @param string $filename
    */
   public function hash($filename) {
     if (file_exists($filename)) {

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
    * @return string|false
    */
   public function getCache($filename) {
-    $cache = false;//cache_get($this->getCacheKey($filename), HACKED_CACHE_TABLE);
+    $cache = false; //cache_get($this->getCacheKey($filename), HACKED_CACHE_TABLE);
 
     if (!empty($cache->data)) {
       return $cache->data;

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
     if (file_exists($filename)) {
       if ($hash = $this->getCache($filename)) {
         return $hash;
-      }
-      else {
+      } else {
         $hash = $this->performHash($filename);
         $this->setCache($filename, $hash);
 

lib/Cerbere/Model/Hacked/HackedProjectWebFilesDownloader.php

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
    *
    * If the file has already been downloaded, returns the the local path.
    *
-   * @param $url
+   * @param string $url
    *   The URL of the file on the server.
    *
    * @return string

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
 
     try {
       $this->extractArchive($local_file, $dir);
-    }
-    catch (\Exception $e) {
+    } catch (\Exception $e) {
       echo $e->getMessage() . "\n";
       return FALSE;
     }

lib/Cerbere/Model/Hacked/HackedFileGroup.php

Braces +7 added lines, -4 removed lines

@@ -174,8 +174,12 @@ 
    */
   public static function isBinary($file) {
     if (file_exists($file)) {
-      if (!is_file($file)) return 0;
-      if (!is_readable($file)) return 1;
+      if (!is_file($file)) {
+        return 0;
+      }
+      if (!is_readable($file)) {
+        return 1;
+      }
 
       $fh  = fopen($file, "r");
       $blk = fread($fh, 512);
@@ -213,8 +217,7 @@ 
           if (is_dir($dir . DIRECTORY_SEPARATOR . $file) && $recurse) {
             // Give priority to files in this folder by merging them in after any subdirectory files.
             $files = array_merge(self::scanDirectory($dir . DIRECTORY_SEPARATOR . $file, $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1), $files);
-          }
-          elseif ($depth >= $min_depth && preg_match($mask, $file)) {
+          } elseif ($depth >= $min_depth && preg_match($mask, $file)) {
             // Always use this match over anything already set in $files with the same $$key.
             $filename = $dir . DIRECTORY_SEPARATOR . $file;
             $basename = basename($file);

lib/Cerbere/Model/Hacked/HackedProjectWebDownloader.php

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
   protected function removeDir($path) {
     if (is_file($path) || is_link($path)) {
       @unlink($path);
-    }
-    elseif (is_dir($path)) {
+    } elseif (is_dir($path)) {
       $d = dir($path);
 
       while (($entry = $d->read()) !== FALSE) {

lib/Cerbere/Model/Hacked/HackedProject.php

Braces +6 added lines, -12 removed lines

@@ -211,14 +211,11 @@ 
     foreach ($this->remote_files->getFiles() as $file) {
       if ($this->remote_files->getFileHash($file) == $this->local_files->getFileHash($file)) {
         $results['same'][] = $file;
-      }
-      elseif (!$this->local_files->fileExists($file)) {
+      } elseif (!$this->local_files->fileExists($file)) {
         $results['missing'][] = $file;
-      }
-      elseif (!$this->local_files->isReadable($file)) {
+      } elseif (!$this->local_files->isReadable($file)) {
         $results['access_denied'][] = $file;
-      }
-      else {
+      } else {
         $results['different'][] = $file;
       }
     }
@@ -265,14 +262,11 @@ 
 
     if ($report['counts']['access_denied'] > 0) {
       $report['status'] = self::STATUS_PERMISSION_DENIED;
-    }
-    elseif ($report['counts']['missing'] > 0) {
+    } elseif ($report['counts']['missing'] > 0) {
       $report['status'] = self::STATUS_HACKED;
-    }
-    elseif ($report['counts']['different'] > 0) {
+    } elseif ($report['counts']['different'] > 0) {
       $report['status'] = self::STATUS_HACKED;
-    }
-    elseif ($report['counts']['same'] > 0) {
+    } elseif ($report['counts']['same'] > 0) {
       $report['status'] = self::STATUS_UNHACKED;
     }
 

lib/Cerbere/Model/Hacked/HackedFileIgnoreEndingsHasher.php

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
     if (!HackedFileGroup::isBinary($filename)) {
       $file = file($filename, FILE_IGNORE_NEW_LINES);
       return sha1(serialize($file));
-    }
-    else {
+    } else {
       return sha1_file($filename);
     }
   }