Merge branch '2.7' into 2.8

* 2.7: removed dots at the end of @param and @return fixed typo
removed dots at the end of @param and @return
2026-04-25 01:38:14 +02:00 · 2016-06-29 07:29:29 +02:00 · 2016-06-28 08:24:06 +02:00 · 2016-03-30 12:37:34 +02:00 · 2016-03-30 12:21:35 +02:00 · 2016-03-28 10:34:42 +02:00
5 changed files with 20 additions and 14 deletions
@@ -59,8 +59,8 @@ class ApcClassLoader
    /**
     * Constructor.
     *
-     * @param string $prefix    The APC namespace prefix to use.
-     * @param object $decorated A class loader object that implements the findFile() method.
+     * @param string $prefix    The APC namespace prefix to use
+     * @param object $decorated A class loader object that implements the findFile() method
     *
     * @throws \RuntimeException
     * @throws \InvalidArgumentException
@@ -122,8 +122,10 @@ class ApcClassLoader
     */
    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;
@@ -92,8 +92,10 @@ class ApcUniversalClassLoader extends UniversalClassLoader
     */
    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;
@@ -89,7 +89,7 @@ class DebugClassLoader
     */
    public function findFile($class)
    {
-        return $this->classFinder->findFile($class);
+        return $this->classFinder->findFile($class) ?: null;
    }

    /**
@@ -60,8 +60,8 @@ class WinCacheClassLoader
    /**
     * Constructor.
     *
-     * @param string $prefix    The WinCache namespace prefix to use.
-     * @param object $decorated A class loader object that implements the findFile() method.
+     * @param string $prefix    The WinCache namespace prefix to use
+     * @param object $decorated A class loader object that implements the findFile() method
     *
     * @throws \RuntimeException
     * @throws \InvalidArgumentException
@@ -123,8 +123,10 @@ class WinCacheClassLoader
     */
    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;
@@ -60,8 +60,8 @@ class XcacheClassLoader
    /**
     * Constructor.
     *
-     * @param string $prefix    The XCache namespace prefix to use.
-     * @param object $decorated A class loader object that implements the findFile() method.
+     * @param string $prefix    The XCache namespace prefix to use
+     * @param object $decorated A class loader object that implements the findFile() method
     *
     * @throws \RuntimeException
     * @throws \InvalidArgumentException
@@ -126,7 +126,7 @@ class XcacheClassLoader
        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);
        }
Author	SHA1	Message	Date
Fabien Potencier	a99a6b0c71	Merge branch '2.7' into 2.8 * 2.7: removed dots at the end of @param and @return fixed typo	2016-06-29 07:29:29 +02:00
Fabien Potencier	f94075a8ab	removed dots at the end of @param and @return	2016-06-28 08:24:06 +02:00
Fabien Potencier	f1cf312c81	Merge branch '2.7' into 2.8 * 2.7: [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes [Debug] Fix case sensitivity checks [Debug] Fix handling of php7 throwables fix high deps tests [Process] remove dead code [WebProfilerBundle] Add missing use statement. [ClassLoader] Fix storing not-found classes in APC cache [Form] cs fixes in date types [phpunit] disable prophecy	2016-03-30 12:37:34 +02:00
Fabien Potencier	7e758508e0	Merge branch '2.3' into 2.7 * 2.3: [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes [Debug] Fix handling of php7 throwables [Process] remove dead code [ClassLoader] Fix storing not-found classes in APC cache [Form] cs fixes in date types	2016-03-30 12:21:35 +02:00
Nicolas Grekas	0a01933a8d	[ClassLoader] Fix storing not-found classes in APC cache	2016-03-28 10:34:42 +02:00