Merge branch '3.0' into 3.1

* 3.0: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [DoctrineBridge] added missing error code for constraint. [ClassLoader] Fix declared classes being computed when not needed [varDumper] Fix missing usage of ExceptionCaster::$traceArgs
Merge branch '2.8' into 3.0
2026-04-28 03:23:12 +02:00 · 2016-07-10 10:05:47 +02:00 · 2016-07-10 10:04:44 +02:00 · 2016-07-10 10:00:51 +02:00 · 2016-07-06 10:59:52 +02:00 · 2016-06-29 07:41:56 +02:00
4 changed files with 12 additions and 9 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,9 +43,9 @@ class ClassCollectionLoader

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

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

@@ -84,11 +84,14 @@ 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(), get_declared_traits());
+        }

        $files = array();
        $content = '';
@@ -58,8 +58,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
@@ -58,8 +58,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	817f09b4c3	Merge branch '3.0' into 3.1 * 3.0: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [DoctrineBridge] added missing error code for constraint. [ClassLoader] Fix declared classes being computed when not needed [varDumper] Fix missing usage of ExceptionCaster::$traceArgs	2016-07-10 10:05:47 +02:00
Nicolas Grekas	00c66ca2de	Merge branch '2.8' into 3.0 * 2.8: [HttpKernel] fixed internal subrequests having an if-modified-since-header [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener [Validator] Added additional MasterCard range to the CardSchemeValidator Make the exception message more clear. [Form] fixed bug - name in ButtonBuilder [DoctrineBridge] added missing error code for constraint. [ClassLoader] Fix declared classes being computed when not needed [varDumper] Fix missing usage of ExceptionCaster::$traceArgs Conflicts: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php src/Symfony/Component/ClassLoader/ClassCollectionLoader.php	2016-07-10 10:04:44 +02:00
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	0d0ac77c33	Merge branch '3.0' into 3.1 * 3.0: fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo	2016-06-29 07:41:56 +02:00
Fabien Potencier	8e8ba6337e	Merge branch '2.8' into 3.0 * 2.8: fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo	2016-06-29 07:40:00 +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