Merge branch '2.8' into 3.3

* 2.8: fixed years in copyright
Merge branch '2.7' into 2.8
2026-03-24 09:12:18 +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 9 additions and 20 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.
--- 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);
 }

 /**
@@ -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.
--- 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.
--- 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.
--- 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,12 +51,6 @@ namespace Symfony\Component\ClassLoader;
 class XcacheClassLoader
 {
    private $prefix;
-
-    /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
-     */
    private $decorated;

    /**
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