Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit 6d52ff701eea · 2018-02-22T12:40:25.000+01:00
* 4.0: [Translation] Process multiple segments within a single unit. Document the container.autowiring.strict_mode option fix custom radios/inputs for checkbox/radio type Another PR template tweak [FrameworkBundle] Add missing XML config for circular_reference_handler. Add tests. fix CS [PropertyInfo] ReflectionExtractor: give a chance to other extractors if no properties Clean calls to http_build_query() [WebProfilerBundle] limit ajax request to 100 and remove the last one Add support for URL-like DSNs for the PdoSessionHandler removed version in @Final @internal for version < 4.0 [HttpFoundation] Fix missing "throw" in JsonResponse Improve the documentation of Suppress warning from sapi_windows_vt100_support on stream other than STDIO removed extra-verbose comments Fixes #26136: Avoid emitting warning in hasParameterOption() Added a README entry to the PR template [HttpFoundation] Add x-zip-compressed to MimeTypeExtensionGuesser. [DI] Add null check for removeChild
diff --git a/CacheWarmer/RouterCacheWarmer.php b/CacheWarmer/RouterCacheWarmer.php
@@ -22,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
diff --git a/Command/AboutCommand.php b/Command/AboutCommand.php
@@ -25,7 +25,7 @@
  *
  * @author Roland Franssen <franssen.roland@gmail.com>
  *
- * @final since version 3.4
+ * @final
  */
 class AboutCommand extends Command
 {
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -28,7 +28,7 @@
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Gábor Egyed <gabor.egyed@gmail.com>
  *
- * @final since version 3.4
+ * @final
  */
 class AssetsInstallCommand extends Command
 {
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -29,7 +29,7 @@
  * @author Francis Besset <francis.besset@gmail.com>
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class CacheClearCommand extends Command
 {
diff --git a/Command/CacheWarmupCommand.php b/Command/CacheWarmupCommand.php
@@ -23,7 +23,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class CacheWarmupCommand extends Command
 {
diff --git a/Command/ConfigDebugCommand.php b/Command/ConfigDebugCommand.php
@@ -25,7 +25,7 @@
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *
- * @final since version 3.4
+ * @final
  */
 class ConfigDebugCommand extends AbstractConfigCommand
 {
diff --git a/Command/ConfigDumpReferenceCommand.php b/Command/ConfigDumpReferenceCommand.php
@@ -26,7 +26,7 @@
  * @author Wouter J <waldio.webdesign@gmail.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *
- * @final since version 3.4
+ * @final
  */
 class ConfigDumpReferenceCommand extends AbstractConfigCommand
 {
diff --git a/Command/ContainerDebugCommand.php b/Command/ContainerDebugCommand.php
@@ -29,7 +29,7 @@
  *
  * @author Ryan Weaver <ryan@thatsquality.com>
  *
- * @internal since version 3.4
+ * @internal
  */
 class ContainerDebugCommand extends Command
 {
diff --git a/Command/EventDispatcherDebugCommand.php b/Command/EventDispatcherDebugCommand.php
@@ -25,7 +25,7 @@
  *
  * @author Matthieu Auger <mail@matthieuauger.com>
  *
- * @final since version 3.4
+ * @final
  */
 class EventDispatcherDebugCommand extends Command
 {
diff --git a/Command/RouterDebugCommand.php b/Command/RouterDebugCommand.php
@@ -26,7 +26,7 @@
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
  *
- * @final since version 3.4
+ * @final
  */
 class RouterDebugCommand extends Command
 {
diff --git a/Command/RouterMatchCommand.php b/Command/RouterMatchCommand.php
@@ -26,7 +26,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class RouterMatchCommand extends Command
 {
diff --git a/Command/TranslationDebugCommand.php b/Command/TranslationDebugCommand.php
@@ -33,7 +33,7 @@
  *
  * @author Florian Voutzinos <florian@voutzinos.com>
  *
- * @final since version 3.4
+ * @final
  */
 class TranslationDebugCommand extends Command
 {
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -31,7 +31,7 @@
  *
  * @author Michel Salib <michelsalib@hotmail.com>
  *
- * @final since version 3.4
+ * @final
  */
 class TranslationUpdateCommand extends Command
 {
diff --git a/Command/WorkflowDumpCommand.php b/Command/WorkflowDumpCommand.php
@@ -24,7 +24,7 @@
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *
- * @final since version 3.4
+ * @final
  */
 class WorkflowDumpCommand extends Command
 {
diff --git a/Command/XliffLintCommand.php b/Command/XliffLintCommand.php
@@ -20,7 +20,7 @@
  * @author Robin Chalas <robin.chalas@gmail.com>
  * @author Javier Eguiluz <javier.eguiluz@gmail.com>
  *
- * @final since version 3.4
+ * @final
  */
 class XliffLintCommand extends BaseLintCommand
 {
diff --git a/Command/YamlLintCommand.php b/Command/YamlLintCommand.php
@@ -19,7 +19,7 @@
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  * @author Robin Chalas <robin.chalas@gmail.com>
  *
- * @final since version 3.4
+ * @final
  */
 class YamlLintCommand extends BaseLintCommand
 {
diff --git a/Controller/Controller.php b/Controller/Controller.php
@@ -31,7 +31,7 @@ abstract class Controller implements ContainerAwareInterface
      *
      * @return mixed
      *
-     * @final since version 3.4
+     * @final
      */
     protected function getParameter(string $name)
     {
diff --git a/Controller/ControllerTrait.php b/Controller/ControllerTrait.php
@@ -42,7 +42,7 @@ trait ControllerTrait
     /**
      * Returns true if the service id is defined.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function has(string $id): bool
     {
@@ -54,7 +54,7 @@ protected function has(string $id): bool
      *
      * @return object The service
      *
-     * @final since version 3.4
+     * @final
      */
     protected function get(string $id)
     {
@@ -66,7 +66,7 @@ protected function get(string $id)
      *
      * @see UrlGeneratorInterface
      *
-     * @final since version 3.4
+     * @final
      */
     protected function generateUrl(string $route, array $parameters = array(), int $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH): string
     {
@@ -78,7 +78,7 @@ protected function generateUrl(string $route, array $parameters = array(), int $
      *
      * @param string $controller The controller name (a string like BlogBundle:Post:index)
      *
-     * @final since version 3.4
+     * @final
      */
     protected function forward(string $controller, array $path = array(), array $query = array()): Response
     {
@@ -92,7 +92,7 @@ protected function forward(string $controller, array $path = array(), array $que
     /**
      * Returns a RedirectResponse to the given URL.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function redirect(string $url, int $status = 302): RedirectResponse
     {
@@ -102,7 +102,7 @@ protected function redirect(string $url, int $status = 302): RedirectResponse
     /**
      * Returns a RedirectResponse to the given route with the given parameters.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function redirectToRoute(string $route, array $parameters = array(), int $status = 302): RedirectResponse
     {
@@ -112,7 +112,7 @@ protected function redirectToRoute(string $route, array $parameters = array(), i
     /**
      * Returns a JsonResponse that uses the serializer component if enabled, or json_encode.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function json($data, int $status = 200, array $headers = array(), array $context = array()): JsonResponse
     {
@@ -132,7 +132,7 @@ protected function json($data, int $status = 200, array $headers = array(), arra
      *
      * @param \SplFileInfo|string $file File object or path to file to be sent as response
      *
-     * @final since version 3.4
+     * @final
      */
     protected function file($file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse
     {
@@ -147,7 +147,7 @@ protected function file($file, string $fileName = null, string $disposition = Re
      *
      * @throws \LogicException
      *
-     * @final since version 3.4
+     * @final
      */
     protected function addFlash(string $type, string $message)
     {
@@ -163,7 +163,7 @@ protected function addFlash(string $type, string $message)
      *
      * @throws \LogicException
      *
-     * @final since version 3.4
+     * @final
      */
     protected function isGranted($attributes, $subject = null): bool
     {
@@ -180,7 +180,7 @@ protected function isGranted($attributes, $subject = null): bool
      *
      * @throws AccessDeniedException
      *
-     * @final since version 3.4
+     * @final
      */
     protected function denyAccessUnlessGranted($attributes, $subject = null, string $message = 'Access Denied.')
     {
@@ -196,7 +196,7 @@ protected function denyAccessUnlessGranted($attributes, $subject = null, string
     /**
      * Returns a rendered view.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function renderView(string $view, array $parameters = array()): string
     {
@@ -214,7 +214,7 @@ protected function renderView(string $view, array $parameters = array()): string
     /**
      * Renders a view.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function render(string $view, array $parameters = array(), Response $response = null): Response
     {
@@ -238,7 +238,7 @@ protected function render(string $view, array $parameters = array(), Response $r
     /**
      * Streams a view.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function stream(string $view, array $parameters = array(), StreamedResponse $response = null): StreamedResponse
     {
@@ -274,7 +274,7 @@ protected function stream(string $view, array $parameters = array(), StreamedRes
      *
      *     throw $this->createNotFoundException('Page not found!');
      *
-     * @final since version 3.4
+     * @final
      */
     protected function createNotFoundException(string $message = 'Not Found', \Exception $previous = null): NotFoundHttpException
     {
@@ -290,7 +290,7 @@ protected function createNotFoundException(string $message = 'Not Found', \Excep
      *
      * @throws \LogicException If the Security component is not available
      *
-     * @final since version 3.4
+     * @final
      */
     protected function createAccessDeniedException(string $message = 'Access Denied.', \Exception $previous = null): AccessDeniedException
     {
@@ -304,7 +304,7 @@ protected function createAccessDeniedException(string $message = 'Access Denied.
     /**
      * Creates and returns a Form instance from the type of the form.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function createForm(string $type, $data = null, array $options = array()): FormInterface
     {
@@ -314,7 +314,7 @@ protected function createForm(string $type, $data = null, array $options = array
     /**
      * Creates and returns a form builder instance.
      *
-     * @final since version 3.4
+     * @final
      */
     protected function createFormBuilder($data = null, array $options = array()): FormBuilderInterface
     {
@@ -326,7 +326,7 @@ protected function createFormBuilder($data = null, array $options = array()): Fo
      *
      * @throws \LogicException If DoctrineBundle is not available
      *
-     * @final since version 3.4
+     * @final
      */
     protected function getDoctrine(): ManagerRegistry
     {
@@ -346,7 +346,7 @@ protected function getDoctrine(): ManagerRegistry
      *
      * @see TokenInterface::getUser()
      *
-     * @final since version 3.4
+     * @final
      */
     protected function getUser()
     {
@@ -372,7 +372,7 @@ protected function getUser()
      * @param string      $id    The id used when generating the token
      * @param string|null $token The actual token sent with the request that should be validated
      *
-     * @final since version 3.4
+     * @final
      */
     protected function isCsrfTokenValid(string $id, ?string $token): bool
     {
diff --git a/Controller/RedirectController.php b/Controller/RedirectController.php
@@ -22,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class RedirectController
 {
diff --git a/Controller/TemplateController.php b/Controller/TemplateController.php
@@ -20,7 +20,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class TemplateController
 {
diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
@@ -239,6 +239,7 @@
         <xsd:attribute name="cache" type="xsd:string" />
         <xsd:attribute name="enable-annotations" type="xsd:boolean" />
         <xsd:attribute name="name-converter" type="xsd:string" />
+        <xsd:attribute name="circular-reference-handler" type="xsd:string" />
         <xsd:attribute name="max-depth-handler" type="xsd:string" />
     </xsd:complexType>
 
diff --git a/Tests/DependencyInjection/Fixtures/php/full.php b/Tests/DependencyInjection/Fixtures/php/full.php
@@ -68,6 +68,7 @@
         'enabled' => true,
         'enable_annotations' => true,
         'name_converter' => 'serializer.name_converter.camel_case_to_snake_case',
+        'circular_reference_handler' => 'my.circular.reference.handler',
         'max_depth_handler' => 'my.max.depth.handler',
     ),
     'property_info' => true,
diff --git a/Tests/DependencyInjection/Fixtures/xml/full.xml b/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -41,7 +41,7 @@
         </framework:translator>
         <framework:validation enabled="true" />
         <framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
-        <framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" max-depth-handler="my.max.depth.handler" />
+        <framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" circular-reference-handler="my.circular.reference.handler" max-depth-handler="my.max.depth.handler" />
         <framework:property-info />
     </framework:config>
 </container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/full.yml b/Tests/DependencyInjection/Fixtures/yml/full.yml
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @author Fabien Potencier <fabien@symfony.com>`
`24`	`24`	`*`
`25`		`- * @final since version 3.4`
	`25`	`+ * @final`
`26`	`26`	`*/`
`27`	`27`	`class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Roland Franssen <franssen.roland@gmail.com>`
`27`	`27`	`*`
`28`		`- * @final since version 3.4`
	`28`	`+ * @final`
`29`	`29`	`*/`
`30`	`30`	`class AboutCommand extends Command`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* @author Fabien Potencier <fabien@symfony.com>`
`29`	`29`	`* @author Gábor Egyed <gabor.egyed@gmail.com>`
`30`	`30`	`*`
`31`		`- * @final since version 3.4`
	`31`	`+ * @final`
`32`	`32`	`*/`
`33`	`33`	`class AssetsInstallCommand extends Command`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* @author Francis Besset <francis.besset@gmail.com>`
`30`	`30`	`* @author Fabien Potencier <fabien@symfony.com>`
`31`	`31`	`*`
`32`		`- * @final since version 3.4`
	`32`	`+ * @final`
`33`	`33`	`*/`
`34`	`34`	`class CacheClearCommand extends Command`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @author Fabien Potencier <fabien@symfony.com>`
`25`	`25`	`*`
`26`		`- * @final since version 3.4`
	`26`	`+ * @final`
`27`	`27`	`*/`
`28`	`28`	`class CacheWarmupCommand extends Command`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* @author Wouter J <waldio.webdesign@gmail.com>`
`27`	`27`	`* @author Grégoire Pineau <lyrixx@lyrixx.info>`
`28`	`28`	`*`
`29`		`- * @final since version 3.4`
	`29`	`+ * @final`
`30`	`30`	`*/`
`31`	`31`	`class ConfigDumpReferenceCommand extends AbstractConfigCommand`
`32`	`32`	`{`