bug #18312 [ClassLoader] Fix storing not-found classes in APC cache (nicolas-grekas)

Tobion · Tobion · commit 666dc41d0e6b · 2016-03-28T21:27:59.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [ClassLoader] Fix storing not-found classes in APC cache | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 106ed06 [ClassLoader] Fix storing not-found classes in APC cache
diff --git a/src/Symfony/Component/ClassLoader/ApcClassLoader.php b/src/Symfony/Component/ClassLoader/ApcClassLoader.php
@@ -122,8 +122,10 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        if (false === $file = apcu_fetch($this->prefix.$class)) {
-            apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class));
+        $file = apcu_fetch($this->prefix.$class, $success);
+
+        if (!$success) {
+            apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null);
         }
 
         return $file;
diff --git a/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
@@ -87,8 +87,10 @@ public function __construct($prefix)
      */
     public function findFile($class)
     {
-        if (false === $file = apcu_fetch($this->prefix.$class)) {
-            apcu_store($this->prefix.$class, $file = parent::findFile($class));
+        $file = apcu_fetch($this->prefix.$class, $success);
+
+        if (!$success) {
+            apcu_store($this->prefix.$class, $file = parent::findFile($class) ?: null);
         }
 
         return $file;
diff --git a/src/Symfony/Component/ClassLoader/DebugClassLoader.php b/src/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -74,7 +74,7 @@ public function unregister()
      */
     public function findFile($class)
     {
-        return $this->classFinder->findFile($class);
+        return $this->classFinder->findFile($class) ?: null;
     }
 
     /**
diff --git a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
@@ -123,8 +123,10 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        if (false === $file = wincache_ucache_get($this->prefix.$class)) {
-            wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class), 0);
+        $file = wincache_ucache_get($this->prefix.$class, $success);
+
+        if (!$success) {
+            wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null, 0);
         }
 
         return $file;
diff --git a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
@@ -126,7 +126,7 @@ public function findFile($class)
         if (xcache_isset($this->prefix.$class)) {
             $file = xcache_get($this->prefix.$class);
         } else {
-            $file = $this->decorated->findFile($class);
+            $file = $this->decorated->findFile($class) ?: null;
             xcache_set($this->prefix.$class, $file);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,10 @@ public function loadClass($class)`
`122`	`122`	`*/`
`123`	`123`	`public function findFile($class)`
`124`	`124`	`{`
`125`		`- if (false === $file = apcu_fetch($this->prefix.$class)) {`
`126`		`- apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class));`
	`125`	`+ $file = apcu_fetch($this->prefix.$class, $success);`
	`126`	`+`
	`127`	`+ if (!$success) {`
	`128`	`+ apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null);`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`return $file;`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,10 @@ public function __construct($prefix)`
`87`	`87`	`*/`
`88`	`88`	`public function findFile($class)`
`89`	`89`	`{`
`90`		`- if (false === $file = apcu_fetch($this->prefix.$class)) {`
`91`		`- apcu_store($this->prefix.$class, $file = parent::findFile($class));`
	`90`	`+ $file = apcu_fetch($this->prefix.$class, $success);`
	`91`	`+`
	`92`	`+ if (!$success) {`
	`93`	`+ apcu_store($this->prefix.$class, $file = parent::findFile($class) ?: null);`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`return $file;`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function unregister()`
`74`	`74`	`*/`
`75`	`75`	`public function findFile($class)`
`76`	`76`	`{`
`77`		`- return $this->classFinder->findFile($class);`
	`77`	`+ return $this->classFinder->findFile($class) ?: null;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,10 @@ public function loadClass($class)`
`123`	`123`	`*/`
`124`	`124`	`public function findFile($class)`
`125`	`125`	`{`
`126`		`- if (false === $file = wincache_ucache_get($this->prefix.$class)) {`
`127`		`- wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class), 0);`
	`126`	`+ $file = wincache_ucache_get($this->prefix.$class, $success);`
	`127`	`+`
	`128`	`+ if (!$success) {`
	`129`	`+ wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null, 0);`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`return $file;`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function findFile($class)`
`126`	`126`	`if (xcache_isset($this->prefix.$class)) {`
`127`	`127`	`$file = xcache_get($this->prefix.$class);`
`128`	`128`	`} else {`
`129`		`- $file = $this->decorated->findFile($class);`
	`129`	`+ $file = $this->decorated->findFile($class) ?: null;`
`130`	`130`	`xcache_set($this->prefix.$class, $file);`
`131`	`131`	`}`
`132`	`132`