Merge branch '3.3' into 3.4

* 3.3: [Serializer] Fix extra attributes when no group specified [Intl] Make intl-data tests pass and save language aliases again [Console] Fix CommandTester::setInputs() docblock [Serializer] readd default argument value [VarDumper] fix trailling comma when dumping an exception Remove useless docblocks [FrameworkBundle] Fix docblocks [PropertyInfo] Remove useless docblocks
2026-04-25 17:58:16 +02:00 · 2017-11-05 17:10:10 +01:00 · 2017-10-24 16:12:06 +02:00 · 2017-10-02 08:49:52 +02:00 · 2017-09-15 12:12:22 +02:00 · 2017-08-03 11:34:20 +02:00
10 changed files with 11 additions and 11 deletions
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

 /**
 * ApcClassLoader implements a wrapping autoloader cached in APC for PHP 5.3.
@@ -12,7 +12,7 @@
 namespace Symfony\Component\ClassLoader;

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

 /**
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

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

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

 /**
 * ClassMapGenerator.
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 Fabien Potencier
+Copyright (c) 2004-2017 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
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

 /**
 * A class loader that uses a mapping file to look up paths.
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

 /**
 * A PSR-4 compatible class loader.
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

 /**
 * WinCacheClassLoader implements a wrapping autoloader cached in WinCache.
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-@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);
+@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);

 /**
 * XcacheClassLoader implements a wrapping autoloader cached in XCache for PHP 5.3.
@@ -20,7 +20,7 @@
        "php": "^5.5.9|>=7.0.8"
    },
    "require-dev": {
-        "symfony/finder": "~2.8|~3.0",
+        "symfony/finder": "~2.8|~3.0|~4.0",
        "symfony/polyfill-apcu": "~1.1"
    },
    "suggest": {
@@ -34,7 +34,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "3.3-dev"
+            "dev-master": "3.4-dev"
        }
    }
 }
Author	SHA1	Message	Date
Nicolas Grekas	e8d36a7b55	Merge branch '3.3' into 3.4 * 3.3: [Serializer] Fix extra attributes when no group specified [Intl] Make intl-data tests pass and save language aliases again [Console] Fix CommandTester::setInputs() docblock [Serializer] readd default argument value [VarDumper] fix trailling comma when dumping an exception Remove useless docblocks [FrameworkBundle] Fix docblocks [PropertyInfo] Remove useless docblocks	2017-11-05 17:10:10 +01:00
Nicolas Grekas	e327469117	Merge branch '3.3' into 3.4 * 3.3: [DI] minor docblock fixes	2017-10-24 16:12:06 +02:00
Nicolas Grekas	2141b7653a	Merge branch '3.3' into 3.4 * 3.3: (23 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 [PHPUnitBridge] don't remove when set to empty string 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 ...	2017-10-02 08:49:52 +02:00
Nicolas Grekas	295a2897de	Merge branch '3.3' into 3.4 * 3.3: [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. Removed unnecessary getDefinition() call. .php_cs.dist - simplify config [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces	2017-09-15 12:12:22 +02:00
Nicolas Grekas	1635a4c8fe	Merge branch '3.3' into 3.4 * 3.3: Removed useless argument $definition Fix comment [Config] Fix checking class existence freshness bumped Symfony version to 3.3.7 updated VERSION for 3.3.6 updated CHANGELOG for 3.3.6 Bump minimal PHP version to ^5.5.9\|>=7.0.8	2017-08-03 11:34:20 +02:00
Nicolas Grekas	379123b6b8	Merge branch '3.3' into 3.4 * 3.3: Fix optional cache warmers are always instantiated whereas they should be lazy-loaded add some \ on PHP_VERSION_ID for 2.8 [Di] Remove closure-proxy arguments [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string	2017-06-02 11:54:06 +02:00
Fabien Potencier	9ff12bbe71	Merge branch '3.3' into 3.4 * 3.3: (31 commits) Using FQ name for PHP_VERSION_ID [EventDispatcher] Handle laziness internally instead of relying on ClosureProxyArgument Fix CacheCollectorPass priority [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 [Routing] Allow GET requests to be redirected. Fixes #23004 [DI] Deal with inlined non-shared services [Cache] Ignore missing annotations.php [DI] Autowiring exception thrown when inlined service is removed Improving deprecation message when hitting the "deprecated type" lookup, but an alias is available Harden the debugging of Twig filters and functions Fixing a bug where an autowiring exception was thrown even when that service was removed Remove extra arg in call to TraceableAdapter::start() Support unknown compiler log format [Config] Allow empty globs Fix decorating TagAware adapters in dev [Profiler] Fix clicking on links inside toggle [Profiler] Fix text selection on exception pages bumped Symfony version to 3.3.1 updated VERSION for 3.3.0 updated CHANGELOG for 3.3.0 ...	2017-06-01 14:02:15 -07:00
Nicolas Grekas	6bf941dc4e	[3.4] Allow 4.* deps	2017-05-24 11:02:43 +02:00
Kévin Dunglas	cf3e7ac373	Allow individual bridges, bundles and components to be used with 4.0	2017-05-18 14:56:12 +02:00
Fabien Potencier	8c7ae3c4e3	updated version to 3.4	2017-05-17 18:21:40 +02:00