[HttpKernel] fixed file profile storage when trying to read an empty …

…token
symfony · Oct 14, 2011 · cc76da1 · cc76da1
1 parent 7816290
commit cc76da1
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -81,7 +81,7 @@ public function find($ip, $url, $limit)
                 'ip'     => $csvIp,
                 'url'    => $csvUrl,
                 'time'   => $csvTime,
-                'parent' => $csvParent
+                'parent' => $csvParent,
             );
 
             $result[] = $row;
@@ -116,9 +116,7 @@ public function purge()
      */
     public function read($token)
     {
-        $file = $this->getFilename($token);
-
-        if (!file_exists($file)) {
+        if (!$token || !file_exists($file = $this->getFilename($token))) {
             return null;
         }
 
@@ -159,7 +157,7 @@ public function write(Profile $profile)
             $profile->getIp(),
             $profile->getUrl(),
             $profile->getTime(),
-            $profile->getParent() ? $profile->getParent()->getToken() : null
+            $profile->getParent() ? $profile->getParent()->getToken() : null,
         ));
         fclose($file);
 
@@ -171,7 +169,7 @@ public function write(Profile $profile)
             fclose($fp);
         }
 
-        return ! $exists;
+        return !$exists;
     }
 
     /**
@@ -205,7 +203,7 @@ protected function getChildrenFilename($token)
      */
     protected function getIndexFilename()
     {
-        return $this->folder.'/'.'index.csv';
+        return $this->folder.'/index.csv';
     }
 
     /**
@@ -246,6 +244,6 @@ protected function readLineFromFile($file)
             fseek($file, -2, SEEK_CUR);
         }
 
-        return $str === "" ? $this->readLineFromFile($file) : $str;
+        return $str === '' ? $this->readLineFromFile($file) : $str;
     }
 }