Merge branch '2.8' into 3.3

* 2.8: fixed years in copyright
Merge branch '2.7' into 2.8
2026-03-24 17:22:11 +01:00 · 2018-01-03 08:37:11 +01:00 · 2018-01-03 08:36:31 +01:00 · 2018-01-03 08:23:28 +01:00 · 2018-01-02 16:47:19 +01:00 · 2018-01-02 16:45:49 +01:00
9 changed files with 11 additions and 30 deletions
--- a/ApcClassLoader.php
+++ b/ApcClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\ApcClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);

 /**
 * ApcClassLoader implements a wrapping autoloader cached in APC for PHP 5.3.
@@ -61,8 +61,6 @@ class ApcClassLoader
    protected $decorated;

    /**
-     * Constructor.
-     *
     * @param string $prefix    The APC namespace prefix to use
     * @param object $decorated A class loader object that implements the findFile() method
     *
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\ClassLoader;

 if (\PHP_VERSION_ID >= 70000) {
-    @trigger_error('The '.__NAMESPACE__.'\ClassCollectionLoader class is deprecated since version 3.3 and will be removed in 4.0.', E_USER_DEPRECATED);
+    @trigger_error('The '.__NAMESPACE__.'\ClassCollectionLoader class is deprecated since Symfony 3.3 and will be removed in 4.0.', E_USER_DEPRECATED);
 }

 /**
@@ -245,7 +245,7 @@ REGEX;
                do {
                    $token = $tokens[++$i];
                    $output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
-                } while ($token[0] !== T_END_HEREDOC);
+                } while (T_END_HEREDOC !== $token[0]);
                $output .= "\n";
                $rawChunk = '';
            } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
@@ -324,8 +324,6 @@ REGEX;
    /**
     * Gets an ordered array of passed classes including all their dependencies.
     *
-     * @param array $classes
-     *
     * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed)
     *
     * @throws \InvalidArgumentException When a class can't be loaded
--- a/ClassLoader.php
+++ b/ClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\ClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);

 /**
 * ClassLoader implements an PSR-0 class loader.
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\ClassMapGenerator class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ClassMapGenerator class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);

 /**
 * ClassMapGenerator.
@@ -62,7 +62,7 @@ class ClassMapGenerator

            $path = $file->getRealPath() ?: $file->getPathname();

-            if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
+            if ('php' !== pathinfo($path, PATHINFO_EXTENSION)) {
                continue;
            }

--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2018 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/MapClassLoader.php
+++ b/MapClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\MapClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\MapClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);

 /**
 * A class loader that uses a mapping file to look up paths.
@@ -25,8 +25,6 @@ class MapClassLoader
    private $map = array();

    /**
-     * Constructor.
-     *
     * @param array $map A map where keys are classes and values the absolute file path
     */
    public function __construct(array $map)
--- a/Psr4ClassLoader.php
+++ b/Psr4ClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\Psr4ClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Psr4ClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);

 /**
 * A PSR-4 compatible class loader.
@@ -24,9 +24,6 @@ namespace Symfony\Component\ClassLoader;
 */
 class Psr4ClassLoader
 {
-    /**
-     * @var array
-     */
    private $prefixes = array();

    /**
--- a/WinCacheClassLoader.php
+++ b/WinCacheClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\WinCacheClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\WinCacheClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);

 /**
 * WinCacheClassLoader implements a wrapping autoloader cached in WinCache.
@@ -60,8 +60,6 @@ class WinCacheClassLoader
    protected $decorated;

    /**
-     * Constructor.
-     *
     * @param string $prefix    The WinCache namespace prefix to use
     * @param object $decorated A class loader object that implements the findFile() method
     *
--- a/XcacheClassLoader.php
+++ b/XcacheClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@trigger_error('The '.__NAMESPACE__.'\XcacheClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\XcacheClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);

 /**
 * XcacheClassLoader implements a wrapping autoloader cached in XCache for PHP 5.3.
@@ -51,17 +51,9 @@ namespace Symfony\Component\ClassLoader;
 class XcacheClassLoader
 {
    private $prefix;
-
-    /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
-     */
    private $decorated;

    /**
-     * Constructor.
-     *
     * @param string $prefix    The XCache namespace prefix to use
     * @param object $decorated A class loader object that implements the findFile() method
     *
Author	SHA1	Message	Date
Fabien Potencier	e17eb698fd	Merge branch '2.8' into 3.3 * 2.8: fixed years in copyright	2018-01-03 08:37:11 +01:00
Fabien Potencier	f87f46e5e1	Merge branch '2.7' into 2.8 * 2.7: fixed years in copyright	2018-01-03 08:36:31 +01:00
Fabien Potencier	78710673c0	fixed years in copyright	2018-01-03 08:23:28 +01:00
Nicolas Grekas	6295e4cd5c	Merge branch '2.8' into 3.3 * 2.8: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files Update LICENSE year... forever	2018-01-02 16:47:19 +01:00
Nicolas Grekas	a50bb5c44e	Merge branch '2.7' into 2.8 * 2.7: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files Update LICENSE year... forever	2018-01-02 16:45:49 +01:00
Kévin Dunglas	9dac4c57cf	Update LICENSE year... forever	2017-12-31 13:13:41 +01:00
Fabien Potencier	da1adbf5c0	fixed some deprecation messages	2017-12-31 06:50:45 +01:00
Fabien Potencier	ff0b32db69	Merge branch '2.7' into 2.8 * 2.7: fixed some deprecation messages	2017-12-31 06:04:01 +01:00
Fabien Potencier	59ab31e13c	fixed some deprecation messages	2017-12-31 05:55:05 +01:00
Nicolas Grekas	df173ac2af	Merge branch '2.8' into 3.3 * 2.8: [Intl] Make intl-data tests pass and save language aliases again Remove useless docblocks [PropertyInfo] Remove useless docblocks	2017-11-05 16:47:03 +01:00
Nicolas Grekas	5d7aa644f5	Merge branch '2.7' into 2.8 * 2.7: [Intl] Make intl-data tests pass and save language aliases again Remove useless docblocks	2017-11-05 16:25:56 +01:00
Nicolas Grekas	eb2590d94c	Remove useless docblocks	2017-10-29 10:49:53 +01:00
Nicolas Grekas	39e778f25a	Merge branch '2.8' into 3.3 * 2.8: [DI] minor docblock fixes	2017-10-24 16:05:06 +02:00
Nicolas Grekas	5990564047	Merge branch '2.7' into 2.8 * 2.7: [DI] minor docblock fixes	2017-10-24 15:48:52 +02:00
Nicolas Grekas	5d77753a96	[DI] minor docblock fixes	2017-10-24 13:40:19 +02:00
Nicolas Grekas	7572c904b2	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	f735c66436	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	f4278d53d1	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	9ae87e8c34	removed useless PHPDoc	2017-09-30 07:00:23 -07:00
Nicolas Grekas	a61248e1a8	Merge branch '2.8' into 3.3 * 2.8: [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction [Filesystem] mirror - fix copying content with same name as source/target. .php_cs.dist - simplify config [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces	2017-09-15 12:08:59 +02:00
Nicolas Grekas	13eed20cc4	Merge branch '2.7' into 2.8 * 2.7: [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction	2017-09-15 11:59:38 +02:00
SpacePossum	f8843095b2	[CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction	2017-09-15 11:46:57 +02:00
Fabien Potencier	151afda88c	Merge branch '2.7' into 2.8 * 2.7: Fix indent of methods	2017-07-05 09:50:35 +03:00
Dariusz	2c4235602f	Fix indent of methods	2017-07-04 23:00:55 +02:00