Merge branch '2.8' into 3.3

* 2.8: (22 commits) Tests and fix for issue in array model data in EntityType field with multiple=true [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible removed useless PHPDoc [Form] Fix FormInterface::submit() annotation PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4 HttpCache does not consider ESI resources in HEAD requests Fix translation for "This field was not expected" [Routing] Enhance Route(Collection) docblocks Added improvement for accuracy in MoneyToLocalizedStringTransformer. Removed unused private property Use correct verb form in the pull request template Use PHP_MAXPATHLEN in Filesystem. Added null as explicit return type (?TokenInterface) [FrameworkBundle] Fix Routing\DelegatingLoader Render all line breaks according to the exception message [Form] Fix phpdoc [DI] remove confusing code [Form] Fixed GroupSequence with "constraints" option [Validator] Clarify UUID validator behavior [Filesystem] Fixed makePathRelative ...
Merge branch '2.7' into 2.8
2026-03-25 09:42:20 +01:00 · 2017-10-02 08:42:24 +02:00 · 2017-10-01 23:00:16 +02:00 · 2017-09-30 07:00:25 -07:00 · 2017-09-30 07:00:23 -07:00 · 2017-09-11 13:43:11 -07:00
4 changed files with 3 additions and 8 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -34,11 +34,6 @@ class DebugClassLoader
    private static $php7Reserved = array('int', 'float', 'bool', 'string', 'true', 'false', 'null');
    private static $darwinCache = array('/' => array('/', array()));

-    /**
-     * Constructor.
-     *
-     * @param callable $classLoader A class loader
-     */
    public function __construct(callable $classLoader)
    {
        $this->classLoader = $classLoader;
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -204,7 +204,7 @@ class DebugClassLoaderTest extends TestCase

        $xError = array(
            'type' => E_USER_DEPRECATED,
-            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice.',
+            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice',
        );

        $this->assertSame($xError, $lastError);
--- a/Tests/Fixtures/DeprecatedClass.php
+++ b/Tests/Fixtures/DeprecatedClass.php
@@ -4,7 +4,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;

 /**
 * @deprecated but this is a test
- *             deprecation notice.
+ *             deprecation notice
 * @foobar
 */
 class DeprecatedClass
--- a/Tests/Fixtures/DeprecatedInterface.php
+++ b/Tests/Fixtures/DeprecatedInterface.php
@@ -4,7 +4,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;

 /**
 * @deprecated but this is a test
- *             deprecation notice.
+ *             deprecation notice
 * @foobar
 */
 interface DeprecatedInterface
Author	SHA1	Message	Date
Nicolas Grekas	eb95d9ce8f	Merge branch '2.8' into 3.3 * 2.8: (22 commits) Tests and fix for issue in array model data in EntityType field with multiple=true [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible removed useless PHPDoc [Form] Fix FormInterface::submit() annotation PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4 HttpCache does not consider ESI resources in HEAD requests Fix translation for "This field was not expected" [Routing] Enhance Route(Collection) docblocks Added improvement for accuracy in MoneyToLocalizedStringTransformer. Removed unused private property Use correct verb form in the pull request template Use PHP_MAXPATHLEN in Filesystem. Added null as explicit return type (?TokenInterface) [FrameworkBundle] Fix Routing\DelegatingLoader Render all line breaks according to the exception message [Form] Fix phpdoc [DI] remove confusing code [Form] Fixed GroupSequence with "constraints" option [Validator] Clarify UUID validator behavior [Filesystem] Fixed makePathRelative ...	2017-10-02 08:42:24 +02:00
Nicolas Grekas	eaaec993ca	Merge branch '2.7' into 2.8 * 2.7: (22 commits) Tests and fix for issue in array model data in EntityType field with multiple=true [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible removed useless PHPDoc [Form] Fix FormInterface::submit() annotation PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4 HttpCache does not consider ESI resources in HEAD requests Fix translation for "This field was not expected" [Routing] Enhance Route(Collection) docblocks Added improvement for accuracy in MoneyToLocalizedStringTransformer. Removed unused private property Use correct verb form in the pull request template Use PHP_MAXPATHLEN in Filesystem. Added null as explicit return type (?TokenInterface) [FrameworkBundle] Fix Routing\DelegatingLoader Render all line breaks according to the exception message [Form] Fix phpdoc [DI] remove confusing code [Form] Fixed GroupSequence with "constraints" option [Validator] Clarify UUID validator behavior [Filesystem] Fixed makePathRelative ...	2017-10-01 23:00:16 +02:00
Fabien Potencier	e12a6f1168	minor #24342 removed useless PHPDoc (OskarStark) This PR was squashed before being merged into the 2.7 branch (closes #24342). Discussion ---------- removed useless PHPDoc \| Q \| A \| ------------- \| --- \| Branch? \| 2.7 \| Bug fix? \| no \| New feature? \| no <!-- don't forget updating src/*/CHANGELOG.md files --> \| BC breaks? \| no \| Deprecations? \| no <!-- don't forget updating UPGRADE-.md files --> \| Tests pass? \| yes \| Fixed tickets \| \| License \| MIT \| Doc PR \| n/a Commits ------- 5ee9043d8b removed useless PHPDoc	2017-09-30 07:00:25 -07:00
Oskar Stark	34d945c4eb	removed useless PHPDoc	2017-09-30 07:00:23 -07:00
Fabien Potencier	3bea0cdeb5	Merge branch '2.8' into 3.3 * 2.8: [CS] Apply phpdoc_annotation_without_dot	2017-09-11 13:43:11 -07:00
Fabien Potencier	2827a6e8c2	Merge branch '2.7' into 2.8 * 2.7: [CS] Apply phpdoc_annotation_without_dot	2017-09-11 13:39:16 -07:00
Dariusz	9c5b622f5a	[CS] Apply phpdoc_annotation_without_dot	2017-09-11 13:37:52 -07:00