Merge pull request #111 from kalessil/SCA-Dec-2015

Php Inspections (EA Extended): Static Code Analysis

Author: j0k3r

data/bin/sandbox_installer.php

@@ -26,7 +26,7 @@
 $seen = array();
 foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(sfConfig::get('sf_root_dir')), RecursiveIteratorIterator::CHILD_FIRST) as $path => $item)
 {
-  if ($item->isDir() && !$item->isLink() && !isset($seen[$path]))
+  if (!isset($seen[$path]) && $item->isDir() && !$item->isLink())
   {
     touch($item->getRealPath().'/.sf');
   }

lib/cache/sfFileCache.class.php

@@ -277,13 +277,13 @@ protected function write($path, $data, $timeout)
     $current_umask = umask();
     umask(0000);
 
-    if (!is_dir(dirname($path)))
+    $cacheDir = dirname($path);
+    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
     {
-      // create directory structure if needed
-      mkdir(dirname($path), 0777, true);
+      throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
     }
 
-    $tmpFile = tempnam(dirname($path), basename($path));
+    $tmpFile = tempnam($cacheDir, basename($path));
 
     if (!$fp = @fopen($tmpFile, 'wb'))
     {

lib/cache/sfSQLiteCache.class.php

@@ -142,7 +142,7 @@ public function clean($mode = sfCache::ALL)
     {
       $res = $this->dbh->exec("DELETE FROM cache".(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
 
-      if ($res);
+      if ($res)
       {
         return (boolean) $this->dbh->changes();
       }

lib/command/sfAnsiColorFormatter.class.php

@@ -98,7 +98,7 @@ public function formatSection($section, $text, $size = null, $style = 'INFO')
     $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
     $width = 9 + strlen($this->format('', $style));
 
-    return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
+    return sprintf(">> %-${width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
   }
 
   /**

lib/config/sfConfigCache.class.php

@@ -333,15 +333,13 @@ protected function loadConfigHandlers()
   protected function writeCacheFile($config, $cache, $data)
   {
     $current_umask = umask(0000);
-    if (!is_dir(dirname($cache)))
+    $cacheDir      = dirname($cache);
+    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
     {
-      if (false === @mkdir(dirname($cache), 0777, true))
-      {
-        throw new sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', dirname($cache), $config));
-      }
+        throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
     }
 
-    $tmpFile = tempnam(dirname($cache), basename($cache));
+    $tmpFile = tempnam($cacheDir, basename($cache));
 
     if (!$fp = @fopen($tmpFile, 'wb'))
     {

lib/database/sfPDODatabase.class.php

@@ -42,7 +42,7 @@ public function connect()
       $password   = $this->getParameter('password');
       $persistent = $this->getParameter('persistent');
 
-      $options = ($persistent) ? array(PDO::ATTR_PERSISTENT => true) : array();
+      $options = $persistent ? array(PDO::ATTR_PERSISTENT => true) : array();
 
       $this->connection = new $pdo_class($dsn, $username, $password, $options);
 

lib/debug/sfWebDebugPanelMemory.class.php

@@ -20,7 +20,7 @@ class sfWebDebugPanelMemory extends sfWebDebugPanel
 {
   public function getTitle()
   {
-    $totalMemory = sprintf('%.1f', (memory_get_peak_usage(true) / 1024));
+    $totalMemory = sprintf('%.1f', memory_get_peak_usage(true) / 1024);
 
     return '<img src="'.$this->webDebug->getOption('image_root_path').'/memory.png" alt="Memory" /> '.$totalMemory.' KB';
   }

lib/generator/sfGeneratorManager.class.php

@@ -80,12 +80,13 @@ public function save($path, $content)
   {
     $path = $this->getBasePath().DIRECTORY_SEPARATOR.$path;
 
-    if (!is_dir(dirname($path)))
+    $cacheDir = dirname($path);
+    if (!is_dir($cacheDir))
     {
       $current_umask = umask(0000);
-      if (false === @mkdir(dirname($path), 0777, true))
+      if (!@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
       {
-        throw new sfCacheException(sprintf('Failed to make cache directory "%s".', dirname($path)));
+        throw new \sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
       }
       umask($current_umask);
     }

lib/helper/TagHelper.php

@@ -34,7 +34,7 @@ function tag($name, $options = array(), $open = false)
     return '';
   }
 
-  return '<'.$name._tag_options($options).(($open) ? '>' : ' />');
+  return '<'.$name._tag_options($options).($open ? '>' : ' />');
 }
 
 function content_tag($name, $content = '', $options = array())

lib/helper/TextHelper.php

@@ -45,8 +45,8 @@ function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_
     $old_encoding = mb_internal_encoding();
     @mb_internal_encoding(mb_detect_encoding($text));
   }
-  $strlen = ($mbstring) ? 'mb_strlen' : 'strlen';
-  $substr = ($mbstring) ? 'mb_substr' : 'substr';
+  $strlen = $mbstring ? 'mb_strlen' : 'strlen';
+  $substr = $mbstring ? 'mb_substr' : 'substr';
 
   if ($strlen($text) > $length)
   {