Merge pull request #37 from PhilETaylor/opcache

Propose Opcache invalidation on file operations

Author: nibra

src/File.php

@@ -91,6 +91,8 @@ public static function copy($src, $dest, $path = null, $useStreams = false)
 throw new FilesystemException(sprintf('%1$s(%2$s, %3$s): %4$s', __METHOD__, $src, $dest, $stream->getError()));
 }
 
+self::invalidateFileCache($dest);
+
 return true;
 }
 
@@ -99,6 +101,8 @@ public static function copy($src, $dest, $path = null, $useStreams = false)
 throw new FilesystemException(__METHOD__ . ': Copy failed.');
 }
 
+self::invalidateFileCache($dest);
+
 return true;
 }
 
@@ -136,6 +140,8 @@ public static function delete($file)
 {
 throw new FilesystemException(__METHOD__ . ': Failed deleting ' . $filename);
 }
+
+self::invalidateFileCache($file);
 }
 
 return true;
@@ -177,6 +183,8 @@ public static function move($src, $dest, $path = '', $useStreams = false)
 throw new FilesystemException(__METHOD__ . ': ' . $stream->getError());
 }
 
+self::invalidateFileCache($dest);
+
 return true;
 }
 
@@ -185,6 +193,8 @@ public static function move($src, $dest, $path = '', $useStreams = false)
 throw new FilesystemException(__METHOD__ . ': Rename failed.');
 }
 
+self::invalidateFileCache($dest);
+
 return true;
 }
 
@@ -218,6 +228,8 @@ public static function write($file, &$buffer, $useStreams = false, $appendToFile
 $stream->set('chunksize', (1024 * 1024));
 $stream->writeFile($file, $buffer, $appendToFile);
 
+self::invalidateFileCache($file);
+
 return true;
 }
 
@@ -226,10 +238,16 @@ public static function write($file, &$buffer, $useStreams = false, $appendToFile
 // Set the required flag to only append to the file and not overwrite it
 if ($appendToFile === true)
 {
-return \is_int(file_put_contents($file, $buffer, \FILE_APPEND));
+$res = \is_int(file_put_contents($file, $buffer, \FILE_APPEND));
 }
+else
+{
+$res = \is_int(file_put_contents($file, $buffer));
+}
+
+self::invalidateFileCache($file);
 
-return \is_int(file_put_contents($file, $buffer));
+return $res;
 }
 
 /**
@@ -266,6 +284,8 @@ public static function upload($src, $dest, $useStreams = false)
 throw new FilesystemException(sprintf('%1$s(%2$s, %3$s): %4$s', __METHOD__, $src, $dest, $stream->getError()));
 }
 
+self::invalidateFileCache($dest);
+
 return true;
 }
 
@@ -274,6 +294,8 @@ public static function upload($src, $dest, $useStreams = false)
 // Short circuit to prevent file permission errors
 if (Path::setPermissions($dest))
 {
+self::invalidateFileCache($dest);
+
 return true;
 }
 
@@ -282,4 +304,25 @@ public static function upload($src, $dest, $useStreams = false)
 
 throw new FilesystemException(__METHOD__ . ': Failed to move file.');
 }
+
+/**
+ * Invalidate any opcache for a newly written file immediately, if opcache* functions exist and if this was a PHP file.
+ *
+ * @param string $file The path to the file just written to, to flush from opcache
+ *
+ * @return void
+ */
+public static function invalidateFileCache($file)
+{
+if (function_exists('opcache_invalidate'))
+{
+$info = pathinfo($file);
+
+if (isset($info['extension']) && $info['extension'] === 'php')
+{
+// Force invalidation to be absolutely sure the opcache is cleared for this file.
+opcache_invalidate($file, true);
+}
+}
+}
 }