ProxyManager use locking when reading auto generated files

fixes #122
graphaware · Dec 11, 2017 · 040abb4 · 040abb4
1 parent a4e2b75
commit 040abb4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Proxy/ProxyFactory.php b/src/Proxy/ProxyFactory.php
@@ -129,10 +129,15 @@ public function __initializeProperty(\$propertyName)
 PROXY;
 
         $this->checkProxyDirectory();
-        file_put_contents($proxyFile, $content);
+        file_put_contents($proxyFile, $content, LOCK_EX);
 
         if (!class_exists($proxyClass)) {
+            // using locks to avoid reading a partially written file
+            $fo = fopen($proxyFile, 'r');
+            flock($fo, LOCK_SH);
             require $proxyFile;
+            flock($fo, LOCK_UN);
+            fclose($fo);
         }
 
         return $this->newProxyInstance($proxyClass);
@@ -197,7 +202,7 @@ private function newProxyInstance($proxyClass)
         if (!array_key_exists($proxyClass, $prototypes)) {
             $rc = @unserialize(sprintf('C:%d:"%s":0:{}', strlen($proxyClass), $proxyClass));
 
-            if (false === $rc) {
+            if (false === $rc || $rc instanceof \__PHP_Incomplete_Class) {
                 $rc = new \ReflectionClass($proxyClass);
                 return $rc->newInstanceWithoutConstructor();
             }