Merge branch '2.7' into 2.8

* 2.7: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [ClassLoader] Fix declared classes being computed when not needed
[ClassLoader] Fix declared classes being computed when not needed
2026-04-26 02:08:05 +02:00 · 2016-07-10 10:00:51 +02:00 · 2016-07-06 10:59:52 +02:00 · 2016-06-29 07:29:29 +02:00 · 2016-06-28 08:24:06 +02:00
4 changed files with 18 additions and 12 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
@@ -43,12 +43,12 @@ class ClassCollectionLoader

        self::$loaded[$name] = true;

-        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
-        if (function_exists('get_declared_traits')) {
-            $declared = array_merge($declared, get_declared_traits());
-        }
-
        if ($adaptive) {
+            $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+            if (function_exists('get_declared_traits')) {
+                $declared = array_merge($declared, get_declared_traits());
+            }
+
            // don't include already declared classes
            $classes = array_diff($classes, $declared);

@@ -87,11 +87,17 @@ class ClassCollectionLoader
            }
        }

-        if (!$reload && is_file($cache)) {
+        if (!$reload && file_exists($cache)) {
            require_once $cache;

            return;
        }
+        if (!$adaptive) {
+            $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+            if (function_exists('get_declared_traits')) {
+                $declared = array_merge($declared, get_declared_traits());
+            }
+        }

        $files = array();
        $content = '';
@@ -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
@@ -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
Author	SHA1	Message	Date
Nicolas Grekas	22035eb867	Merge branch '2.7' into 2.8 * 2.7: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [ClassLoader] Fix declared classes being computed when not needed	2016-07-10 10:00:51 +02:00
Nicolas Grekas	bec3ae4363	[ClassLoader] Fix declared classes being computed when not needed	2016-07-06 10:59:52 +02:00
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