Merge remote-tracking branch 'upstream/final' into final

arcfieldOSS · arcfieldOSS · commit 74ceb4cc6348 · 2015-12-27T12:57:13.000-08:00
# Conflicts:
#	phpfastcache/3.0.0/abstract.php
#	phpfastcache/3.0.0/drivers/files.php
diff --git a/phpfastcache/3.0.0/abstract.php b/phpfastcache/3.0.0/abstract.php
@@ -281,10 +281,10 @@ protected function readfile($file) {
 
             }
             if (flock($file_handle, LOCK_SH | LOCK_NB)) {
-            while (!feof($file_handle)) {
-                $line = fgets($file_handle);
-                $string .= $line;
-            }
+                while (!feof($file_handle)) {
+                    $line = fgets($file_handle);
+                    $string .= $line;
+                }
             } else {
                 throw new Exception("Can't Read File",96);
             }

Original file line number	Diff line number	Diff line change
`@@ -281,10 +281,10 @@ protected function readfile($file) {`
`281`	`281`
`282`	`282`	`}`
`283`	`283`	`if (flock($file_handle, LOCK_SH \| LOCK_NB)) {`
`284`		`- while (!feof($file_handle)) {`
`285`		`- $line = fgets($file_handle);`
`286`		`- $string .= $line;`
`287`		`- }`
	`284`	`+ while (!feof($file_handle)) {`
	`285`	`+ $line = fgets($file_handle);`
	`286`	`+ $string .= $line;`
	`287`	`+ }`
`288`	`288`	`} else {`
`289`	`289`	`throw new Exception("Can't Read File",96);`
`290`	`290`	`}`