symfony
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 1 addition & 2 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 1 addition & 2 deletions
diff --git a/‎.php_cs.dist
Lines changed: 6 additions & 7 deletions b/‎.php_cs.dist
Lines changed: 6 additions & 7 deletions
diff --git a/‎CHANGELOG-4.0.md
Lines changed: 143 additions & 0 deletions b/‎CHANGELOG-4.0.md
Lines changed: 143 additions & 0 deletions
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | master / 2.7, 2.8, 3.3, or 3.4 <!-- see comment below -->
+| Branch?       | master for features / 2.7 up to 4.0 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
 | BC breaks?    | yes/no
@@ -14,6 +14,5 @@
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-- Please fill in this template according to the PR you're about to submit.
 - Replace this comment by a description of what your PR is solving.
 -->
@@ -8,6 +8,8 @@ return PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        '@PHPUnit48Migration:risky' => true,
+        'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
         'array_syntax' => array('syntax' => 'long'),
         'protected_to_private' => false,
     ))
@@ -30,16 +32,13 @@ return PhpCsFixer\Config::create()
             ))
             // file content autogenerated by `var_export`
             ->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
-            // autogenerated xmls
-            ->notPath('Symfony/Component/Console/Tests/Fixtures/application_1.xml')
-            ->notPath('Symfony/Component/Console/Tests/Fixtures/application_2.xml')
-            // yml
-            ->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
             // test template
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit heredoc test
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
-            // purposefully invalid JSON
-            ->notPath('Symfony/Component/Asset/Tests/fixtures/manifest-invalid.json')
+            // explicit trigger_error tests
+            ->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt')
+            ->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt')
+            ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
     )
 ;
@@ -7,6 +7,149 @@ in 4.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.0.0...v4.0.1
 
+* 4.0.2 (2017-12-15)
+
+ * bug #25489 [FrameworkBundle] remove esi/ssi renderers if inactive (dmaicher)
+ * bug #25502 Fixing wrong class_exists on interface (weaverryan)
+ * bug #25427 Preserve percent-encoding in URLs when performing redirects in the UrlMatcher (mpdude)
+ * bug #25480 [FrameworkBundle] add missing validation options to XSD file (xabbuh)
+ * bug #25487 [Console] Fix a bug when passing a letter that could be an alias (Simperfit)
+ * bug #25425 When available use AnnotationRegistry::registerUniqueLoader (jrjohnson)
+ * bug #25474 [DI] Optimize Container::get() for perf (nicolas-grekas)
+ * bug #24594 [Translation] Fix InvalidArgumentException when using untranslated plural forms from .po files (BjornTwachtmann)
+ * bug #25233 [TwigBridge][Form] Fix hidden currency element with Bootstrap 3 theme (julienfalque)
+ * bug #25413 [HttpKernel] detect deprecations thrown by container initialization during tests (nicolas-grekas)
+ * bug #25408 [Debug] Fix catching fatal errors in case of nested error handlers (nicolas-grekas)
+ * bug #25330 [HttpFoundation] Support 0 bit netmask in IPv6 (`::/0`) (stephank)
+ * bug #25378 [VarDumper] Fixed file links leave blank pages when ide is configured (antalaron)
+ * bug #25410 [HttpKernel] Fix logging of post-terminate errors/exceptions (nicolas-grekas)
+ * bug #25409 [Bridge/Doctrine] Drop "memcache" type (nicolas-grekas)
+ * bug #25417 [Process] Dont rely on putenv(), it fails on ZTS PHP (nicolas-grekas)
+ * bug #25333 [DI] Impossible to set an environment variable and then an array as container parameter (Phantas0s)
+ * bug #25447 [Process] remove false-positive BC breaking exception on Windows (nicolas-grekas)
+ * bug #25381 [DI] Add context to service-not-found exceptions thrown by service locators (nicolas-grekas)
+ * bug #25438 [Yaml] empty lines don't count for indent detection (xabbuh)
+ * bug #25412 Extend Argon2i support check to account for sodium_compat (mbabker)
+ * bug #25392 [HttpFoundation] Fixed default user-agent (3.X -> 4.X) (lyrixx)
+ * bug #25389 [Yaml] fix some edge cases with indented blocks (xabbuh)
+ * bug #25396 [Form] Fix debug:form command definition (yceruto)
+ * bug #25398 [HttpFoundation] don't prefix cookies with "Set-Cookie:" (pableu)
+ * bug #25354 [DI] Fix non-string class handling in PhpDumper (nicolas-grekas, sroze)
+ * bug #25340 [Serializer] Unset attributes when creating child context (dunglas)
+ * bug #25325 [Yaml] do not evaluate PHP constant names (xabbuh)
+ * bug #25380 [FrameworkBundle][Cache] register system cache clearer only if it's used (xabbuh)
+ * bug #25323 [ExpressionLanguage] throw an SyntaxError instead of an undefined index notice (Simperfit)
+ * bug #25363 [HttpKernel] Disable inlining on PHP 5 (nicolas-grekas)
+ * bug #25364 [DependencyInjection] Prevent a loop in aliases within the `findDefinition` method (sroze)
+ * bug #25337 Remove Exclusive Lock That Breaks NFS Caching (brianfreytag)
+
+* 4.0.1 (2017-12-05)
+
+ * bug #25304 [Bridge/PhpUnit] Prefer $_SERVER['argv'] over $argv (ricknox)
+ * bug #25272 [SecurityBundle] fix setLogoutOnUserChange calls for context listeners (dmaicher)
+ * bug #25282 [DI] Register singly-implemented interfaces when doing PSR-4 discovery (nicolas-grekas)
+ * bug #25274 [Security] Adding a GuardAuthenticatorHandler alias (weaverryan)
+ * bug #25308 [FrameworkBundle] Fix a bug where a color tag will be shown when passing an antislash (Simperfit)
+ * bug #25278 Fix for missing whitespace control modifier in form layout (kubawerlos)
+ * bug #25306 [Form][TwigBridge] Fix collision between view properties and form fields (yceruto)
+ * bug #25305 [Form][TwigBridge] Fix collision between view properties and form fields (yceruto)
+ * bug #25236 [Form][TwigBridge] Fix collision between view properties and form fields (yceruto)
+ * bug #25312 [DI] Fix deep-inlining of non-shared refs (nicolas-grekas)
+ * bug #25309 [Yaml] parse newlines in quoted multiline strings (xabbuh)
+ * bug #25313 [DI] Fix missing unset leading to false-positive circular ref (nicolas-grekas)
+ * bug #25268 [DI] turn $private to protected in dumped container, to make cache:clear BC (nicolas-grekas)
+ * bug #25285 [DI] Throw an exception if Expression Language is not installed (sroze)
+ * bug #25241 [Yaml] do not eagerly filter comment lines (xabbuh)
+ * bug #25284 [DI] Cast ids to string, as done on 3.4 (nicolas-grekas, sroze)
+ * bug #25297 [Validator] Fixed the @Valid(groups={"group"}) against null exception case (vudaltsov)
+ * bug #25255 [Console][DI] Fail gracefully (nicolas-grekas)
+ * bug #25264 [DI] Trigger deprecation when setting a to-be-private synthetic service (nicolas-grekas)
+ * bug #25258 [link] Prevent warnings when running link with 2.7 (dunglas)
+ * bug #25244 [DI] Add missing deprecation when fetching private services from ContainerBuilder (nicolas-grekas)
+ * bug #24750 [Validator] ExpressionValidator should use OBJECT_TO_STRING  (Simperfit)
+ * bug #25247 [DI] Fix false-positive circular exception (nicolas-grekas)
+ * bug #25226 [HttpKernel] Fix issue when resetting DumpDataCollector (Pierstoval)
+ * bug #25230 Use a more specific file for detecting the bridge (greg0ire)
+ * bug #25232 [WebProfilerBundle] [TwigBundle] Fix Profiler breaking XHTML pages (tistre)
+
+* 4.0.0 (2017-11-30)
+
+ * bug #25220 [HttpFoundation] Add Session::isEmpty(), fix MockFileSessionStorage to behave like the native one (nicolas-grekas)
+ * bug #25209 [VarDumper] Dont use empty(), it chokes on eg GMP objects (nicolas-grekas)
+ * bug #25200 [HttpKernel] Arrays with scalar values passed to ESI fragment renderer throw deprecation notice (Simperfit)
+ * bug #25201 [HttpKernel] Add a better error messages when passing a private or non-tagged controller (Simperfit)
+ * bug #25155 [DependencyInjection] Detect case mismatch in autowiring (Simperfit, sroze)
+ * bug #25217 [Dotenv] Changed preg_match flags from null to 0 (deekthesqueak)
+ * bug #25180 [DI] Fix circular reference when using setters (nicolas-grekas)
+ * bug #25204 [DI] Clear service reference graph (nicolas-grekas)
+ * bug #25203 [DI] Fix infinite loop in InlineServiceDefinitionsPass (nicolas-grekas)
+ * bug #25185 [Serializer] Do not cache attributes if `attributes` in context (sroze)
+ * bug #25190 [HttpKernel] Keep legacy container files for concurrent requests (nicolas-grekas)
+ * bug #25182 [HttpFoundation] AutExpireFlashBag should not clear new flashes (Simperfit, sroze)
+ * bug #25174 [Translation] modify definitions only if the do exist (xabbuh)
+ * bug #25179 [FrameworkBundle][Serializer] Remove YamlEncoder definition if Yaml component isn't installed (ogizanagi)
+ * bug #25160 [DI] Prevent a ReflectionException during cache:clear when the parent class doesn't exist (dunglas)
+ * bug #25163 [DI] Fix tracking of env vars in exceptions (nicolas-grekas)
+ * bug #25162 [HttpKernel] Read $_ENV when checking SHELL_VERBOSITY (nicolas-grekas)
+ * bug #25158 [DI] Remove unreachable code (GawainLynch)
+ * bug #25152 [Form] Don't rely on `Symfony\Component\HttpFoundation\File\File` if http-foundation isn't in FileType (issei-m)
+ * bug #24987 [Console] Fix global console flag when used in chain (Simperfit)
+ * bug #25137 Adding checks for the expression language (weaverryan)
+ * bug #25151 [FrameworkBundle] Automatically enable the CSRF protection if CSRF manager exists (sroze)
+ * bug #25043 [Yaml] added ability for substitute aliases when mapping is on single line (Michał Strzelecki, xabbuh)
+
+* 4.0.0-RC2 (2017-11-24)
+
+ * bug #25146 [DI] Dont resolve envs in service ids (nicolas-grekas)
+ * bug #25113 [Routing] Fix "config-file-relative" annotation loader resources (nicolas-grekas, sroze)
+ * bug #25065 [FrameworkBundle] Update translation commands to work with default paths (yceruto)
+ * bug #25109 Make debug:container search command case-insensitive (jzawadzki)
+ * bug #25121 [FrameworkBundle] Fix AssetsInstallCommand (nicolas-grekas)
+ * bug #25102 [Form] Fixed ContextErrorException in FileType (chihiro-adachi)
+ * bug #25130 [DI] Fix handling of inlined definitions by ContainerBuilder (nicolas-grekas)
+ * bug #25119 [DI] Fix infinite loop when analyzing references (nicolas-grekas)
+ * bug #25094 [FrameworkBundle][DX] Display a nice error message if an enabled component is missing (derrabus)
+ * bug #25100 [SecurityBundle] providerIds is undefined error when firewall provider is not specified (karser)
+ * bug #25100 [SecurityBundle] providerIds is undefined error when firewall provider is not specified (karser)
+ * bug #25100 [SecurityBundle] providerIds is undefined error when firewall provider is not specified (karser)
+ * bug #25097 [Bridge\PhpUnit] Turn "preserveGlobalState" to false by default, revert "Blacklist" removal (nicolas-grekas)
+
+* 4.0.0-RC1 (2017-11-21)
+
+ * bug #25077 [Bridge/Twig] Let getFlashes starts the session (MatTheCat)
+ * bug #25082 [HttpKernel] Disable container inlining when legacy inlining has been used (nicolas-grekas)
+ * bug #25022 [Filesystem] Updated Filesystem::makePathRelative (inso)
+ * bug #25072 [Bridge/PhpUnit] Remove trailing "\n" from ClockMock::microtime(false) (joky)
+ * bug #25069 [Debug] Fix undefined variable $lightTrace (nicolas-grekas)
+ * bug #25053 [Serializer] Fixing PropertyNormalizer supports parent properties (Christopher Hertel)
+ * bug #25055 [DI] Analyze setter-circular deps more precisely (nicolas-grekas)
+ * feature #25056 [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone (nicolas-grekas)
+ * bug #25048 Allow EnumNode name to be null (MatTheCat)
+ * bug #25045 [SecurityBundle] Don't trigger auto-picking notice if provider is set per listener (chalasr)
+ * bug #25033 [FrameworkBundle] Dont create empty bundles directory by default (ro0NL)
+ * bug #25037 [DI] Skip hot_path tag for deprecated services as their class might also be (nicolas-grekas)
+ * bug #25038 [Cache] Memcached options should ignore "lazy" (nicolas-grekas)
+ * bug #25014 Move deprecation under use statements (greg0ire)
+ * bug #25030 [Console] Fix ability to disable lazy commands (chalasr)
+ * bug #25032 [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit (nicolas-grekas)
+ * bug #25016 [HttpKernel] add type-hint for the requestType (Simperfit)
+ * bug #25027 [FrameworkBundle] Hide server:log command based on deps (sroze)
+ * bug #24991 [DependencyInjection] Single typed argument can be applied on multiple parameters (nicolas-grekas, sroze)
+ * bug #24983 [Validator] enter the context in which to validate (xabbuh)
+ * bug #24956 Fix ambiguous pattern (weltling)
+ * bug #24732 [DependencyInjection] Prevent service:method factory notation in PHP config (vudaltsov)
+ * bug #24979 [HttpKernel] remove services resetter even when it's an alias (xabbuh)
+ * bug #24972 [HttpKernel] Fix service arg resolver for controllers as array callables (sroze, nicolas-grekas)
+ * bug #24971 [FrameworkBundle] Empty event dispatcher earlier in CacheClearCommand (nicolas-grekas)
+ * security #24995 Validate redirect targets using the session cookie domain (nicolas-grekas)
+ * security #24994 Prevent bundle readers from breaking out of paths (xabbuh)
+ * security #24993 Ensure that submitted data are uploaded files (xabbuh)
+ * security #24992 Namespace generated CSRF tokens depending of the current scheme (dunglas)
+ * bug #24975 [DomCrawler] Type fix Crawler:: discoverNamespace() (VolCh)
+ * bug #24954 [DI] Fix dumping with custom base class (nicolas-grekas)
+ * bug #24952 [HttpFoundation] Fix session-related BC break (nicolas-grekas, sroze)
+ * bug #24943 [FrameworkBundle] Wire the translation.reader service instead of deprecated translation.loader in commands (ogizanagi)
+
 * 4.0.0-BETA4 (2017-11-12)
 
  * bug #24874 [TwigBridge] Fixed the .form-check-input class in the bs4 templates (vudaltsov)