Merge branch '3.3' into 3.4

* 3.3: fixed years in copyright
Merge branch '2.8' into 3.3
2026-03-24 17:22:11 +01:00 · 2018-01-03 08:37:34 +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:46 +01:00
9 changed files with 9 additions and 9 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);
 }

 /**
--- 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.
--- 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.
Author	SHA1	Message	Date
Fabien Potencier	e63c126998	Merge branch '3.3' into 3.4 * 3.3: fixed years in copyright	2018-01-03 08:37:34 +01:00
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	192c1b0522	Merge branch '3.3' into 3.4 * 3.3: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files PHP CS Fixer: no need to exclude json file Update LICENSE year... forever	2018-01-02 16:47:46 +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	a447ad59a4	Merge branch '3.3' into 3.4 * 3.3: fixed some deprecation messages fixed some deprecation messages fixed some deprecation messages fixed some deprecation messages [2.7][DX] Use constant message contextualisation for deprecations	2017-12-31 07:07:31 +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