From 62adf931091a8ab8c75462a09457a8c4162b1a41 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 26 May 2018 17:55:46 +0200 Subject: [PATCH 1/6] bumped Symfony version to 4.1.0 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 4fbabf8d9bfcc..051ad7b5a0cb0 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -63,12 +63,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '4.1.0-BETA3'; + const VERSION = '4.1.0-DEV'; const VERSION_ID = 40100; const MAJOR_VERSION = 4; const MINOR_VERSION = 1; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'BETA3'; + const EXTRA_VERSION = 'DEV'; const END_OF_MAINTENANCE = '01/2019'; const END_OF_LIFE = '07/2019'; From 744362ad024e5eb45094bc600f500dcc830efb05 Mon Sep 17 00:00:00 2001 From: Martin Hujer Date: Sun, 27 May 2018 18:59:28 +0200 Subject: [PATCH 2/6] update UPGRADE-4.1 for feature #26332 Form field help option --- UPGRADE-4.1.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UPGRADE-4.1.md b/UPGRADE-4.1.md index 64921efd287c5..d6202c682fbae 100644 --- a/UPGRADE-4.1.md +++ b/UPGRADE-4.1.md @@ -64,6 +64,9 @@ Form } ``` + * Added `help` option to the form field. If you have custom Form extension for it, you should remove it. + Also remove it from the custom form theme. + FrameworkBundle --------------- From 2ddb89b7a3ba0dd0c5b067d6dcfa80bfd1287c86 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 30 May 2018 09:24:25 +0200 Subject: [PATCH 3/6] Revert "feature #26702 Mark ExceptionInterfaces throwable (ostrolucky)" This reverts commit 9fda6d3ee3ea7f32a00a13508f9748df01c2ecc7, reversing changes made to ca53d3e0fdfce16b0bd9e8412ef220daf77cf58d. --- src/Symfony/Component/Asset/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Console/Exception/ExceptionInterface.php | 2 +- .../Component/CssSelector/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Dotenv/Exception/ExceptionInterface.php | 2 +- .../Component/Filesystem/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Form/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Intl/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Ldap/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Lock/Exception/ExceptionInterface.php | 2 +- .../Component/Messenger/Exception/ExceptionInterface.php | 2 +- .../Component/OptionsResolver/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Process/Exception/ExceptionInterface.php | 2 +- .../Component/PropertyAccess/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Routing/Exception/ExceptionInterface.php | 2 +- .../Component/Security/Core/Exception/ExceptionInterface.php | 2 +- .../Component/Serializer/Exception/ExceptionInterface.php | 2 +- .../Component/Translation/Exception/ExceptionInterface.php | 2 +- .../Component/Validator/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Workflow/Exception/ExceptionInterface.php | 2 +- src/Symfony/Component/Yaml/Exception/ExceptionInterface.php | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Asset/Exception/ExceptionInterface.php b/src/Symfony/Component/Asset/Exception/ExceptionInterface.php index 777f64b321e44..cce1b5ccede8e 100644 --- a/src/Symfony/Component/Asset/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Asset/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Fabien Potencier */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Console/Exception/ExceptionInterface.php b/src/Symfony/Component/Console/Exception/ExceptionInterface.php index 1624e13d0b0ca..491cc4c645616 100644 --- a/src/Symfony/Component/Console/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Console/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Jérôme Tamarelle */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/CssSelector/Exception/ExceptionInterface.php b/src/Symfony/Component/CssSelector/Exception/ExceptionInterface.php index 9e259006b0df6..e4c5ae1b6b3ef 100644 --- a/src/Symfony/Component/CssSelector/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/CssSelector/Exception/ExceptionInterface.php @@ -19,6 +19,6 @@ * * @author Jean-François Simon */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Dotenv/Exception/ExceptionInterface.php b/src/Symfony/Component/Dotenv/Exception/ExceptionInterface.php index 140a93f9669cd..90509f7db5b17 100644 --- a/src/Symfony/Component/Dotenv/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Dotenv/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Fabien Potencier */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Filesystem/Exception/ExceptionInterface.php b/src/Symfony/Component/Filesystem/Exception/ExceptionInterface.php index fc438d9f31385..8f4f10aac7092 100644 --- a/src/Symfony/Component/Filesystem/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Filesystem/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Romain Neutron */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Form/Exception/ExceptionInterface.php b/src/Symfony/Component/Form/Exception/ExceptionInterface.php index 69145f0bcd613..d455932edfafd 100644 --- a/src/Symfony/Component/Form/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Form/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Bernhard Schussek */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Intl/Exception/ExceptionInterface.php b/src/Symfony/Component/Intl/Exception/ExceptionInterface.php index 0a7368237956a..4fc076cafbaa9 100644 --- a/src/Symfony/Component/Intl/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Intl/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Bernhard Schussek */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Ldap/Exception/ExceptionInterface.php b/src/Symfony/Component/Ldap/Exception/ExceptionInterface.php index dbc4819e92c4a..b861a3fe8d3ca 100644 --- a/src/Symfony/Component/Ldap/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Ldap/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Charles Sarrazin */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Lock/Exception/ExceptionInterface.php b/src/Symfony/Component/Lock/Exception/ExceptionInterface.php index 30343f939e8db..0d41958474061 100644 --- a/src/Symfony/Component/Lock/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Lock/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Jérémy Derussé */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Messenger/Exception/ExceptionInterface.php b/src/Symfony/Component/Messenger/Exception/ExceptionInterface.php index 3a208deacc3e7..56f665b9ee804 100644 --- a/src/Symfony/Component/Messenger/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Messenger/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Samuel Roze */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php b/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php index ea99d050e4ab0..b62bb51d465ba 100644 --- a/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Bernhard Schussek */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Process/Exception/ExceptionInterface.php b/src/Symfony/Component/Process/Exception/ExceptionInterface.php index bd4a60403ba7b..75c1c9e5d8005 100644 --- a/src/Symfony/Component/Process/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Process/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Johannes M. Schmitt */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/PropertyAccess/Exception/ExceptionInterface.php b/src/Symfony/Component/PropertyAccess/Exception/ExceptionInterface.php index fabf9a0802bf8..d1fcdac94253c 100644 --- a/src/Symfony/Component/PropertyAccess/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/PropertyAccess/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Bernhard Schussek */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Routing/Exception/ExceptionInterface.php b/src/Symfony/Component/Routing/Exception/ExceptionInterface.php index 22e72b16bdbd4..db7636211fe42 100644 --- a/src/Symfony/Component/Routing/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Routing/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Alexandre Salomé */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Security/Core/Exception/ExceptionInterface.php b/src/Symfony/Component/Security/Core/Exception/ExceptionInterface.php index 7bc2b9132c74e..5000d0278083b 100644 --- a/src/Symfony/Component/Security/Core/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Security/Core/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Bernhard Schussek */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Serializer/Exception/ExceptionInterface.php b/src/Symfony/Component/Serializer/Exception/ExceptionInterface.php index 859dcb4618e72..99ed63246c5d3 100644 --- a/src/Symfony/Component/Serializer/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Serializer/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Johannes M. Schmitt */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Translation/Exception/ExceptionInterface.php b/src/Symfony/Component/Translation/Exception/ExceptionInterface.php index 8f9c54ef7a21a..c85fb93ca82d7 100644 --- a/src/Symfony/Component/Translation/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Translation/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Fabien Potencier */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Validator/Exception/ExceptionInterface.php b/src/Symfony/Component/Validator/Exception/ExceptionInterface.php index 390e8c053fe92..77d09b9029c26 100644 --- a/src/Symfony/Component/Validator/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Validator/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Bernhard Schussek */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Workflow/Exception/ExceptionInterface.php b/src/Symfony/Component/Workflow/Exception/ExceptionInterface.php index 5298262674f23..b0dfa9b79bbc1 100644 --- a/src/Symfony/Component/Workflow/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Workflow/Exception/ExceptionInterface.php @@ -15,6 +15,6 @@ * @author Fabien Potencier * @author Grégoire Pineau */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } diff --git a/src/Symfony/Component/Yaml/Exception/ExceptionInterface.php b/src/Symfony/Component/Yaml/Exception/ExceptionInterface.php index 909131684c5fd..ad850eea1d70f 100644 --- a/src/Symfony/Component/Yaml/Exception/ExceptionInterface.php +++ b/src/Symfony/Component/Yaml/Exception/ExceptionInterface.php @@ -16,6 +16,6 @@ * * @author Fabien Potencier */ -interface ExceptionInterface extends \Throwable +interface ExceptionInterface { } From 37270d79a2a72cfe9b1bfa5187cba72ba12402be Mon Sep 17 00:00:00 2001 From: Niels Keurentjes Date: Wed, 30 May 2018 01:32:15 +0200 Subject: [PATCH 4/6] Insert correct parameter_bag service in AbstractController --- .../Controller/AbstractController.php | 3 ++- .../Controller/AbstractControllerTest.php | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php index 954961119eb66..b317786c68583 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php @@ -13,6 +13,7 @@ use Psr\Container\ContainerInterface; use Doctrine\Common\Persistence\ManagerRegistry; +use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface; use Symfony\Component\DependencyInjection\ServiceSubscriberInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\RequestStack; @@ -84,7 +85,7 @@ public static function getSubscribedServices() 'form.factory' => '?'.FormFactoryInterface::class, 'security.token_storage' => '?'.TokenStorageInterface::class, 'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class, - 'parameter_bag' => '?'.ContainerInterface::class, + 'parameter_bag' => '?'.ContainerBagInterface::class, 'message_bus' => '?'.MessageBusInterface::class, ); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php index 77e92a09c0798..0ae42c14ce317 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php @@ -24,6 +24,32 @@ protected function createController() return new TestAbstractController(); } + /** + * This test protects the default subscribed core services against accidental modification. + */ + public function testSubscribedServices() + { + $subscribed = AbstractController::getSubscribedServices(); + $expectedServices = array( + 'router' => '?Symfony\\Component\\Routing\\RouterInterface', + 'request_stack' => '?Symfony\\Component\\HttpFoundation\\RequestStack', + 'http_kernel' => '?Symfony\\Component\\HttpKernel\\HttpKernelInterface', + 'serializer' => '?Symfony\\Component\\Serializer\\SerializerInterface', + 'session' => '?Symfony\\Component\\HttpFoundation\\Session\\SessionInterface', + 'security.authorization_checker' => '?Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationCheckerInterface', + 'templating' => '?Symfony\\Component\\Templating\\EngineInterface', + 'twig' => '?Twig\\Environment', + 'doctrine' => '?Doctrine\\Common\\Persistence\\ManagerRegistry', + 'form.factory' => '?Symfony\\Component\\Form\\FormFactoryInterface', + 'parameter_bag' => '?Symfony\\Component\\DependencyInjection\\ParameterBag\\ContainerBagInterface', + 'message_bus' => '?Symfony\\Component\\Messenger\\MessageBusInterface', + 'security.token_storage' => '?Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface', + 'security.csrf.token_manager' => '?Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface', + ); + + $this->assertEquals($expectedServices, $subscribed, 'Subscribed core services in AbstractController have changed'); + } + public function testGetParameter() { $container = new Container(new FrozenParameterBag(array('foo' => 'bar'))); From 1442c429f052c290d192250c2a411d94e9bb5f5f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 30 May 2018 14:52:06 +0200 Subject: [PATCH 5/6] updated CHANGELOG for 4.1.0 --- CHANGELOG-4.1.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG-4.1.md b/CHANGELOG-4.1.md index a042563276456..3f712a6dfd14d 100644 --- a/CHANGELOG-4.1.md +++ b/CHANGELOG-4.1.md @@ -7,6 +7,11 @@ in 4.1 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.1.0...v4.1.1 +* 4.1.0 (2018-05-30) + + * bug #27420 Revert "feature #26702 Mark ExceptionInterfaces throwable (ostrolucky)" (nicolas-grekas) + * bug #27415 Insert correct parameter_bag service in AbstractController (curry684) + * 4.1.0-BETA3 (2018-05-26) * bug #27388 [Routing] Account for greediness when merging route patterns (nicolas-grekas) From 1d9e42269339b3a33ef12f0ead196a165bd3449c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 30 May 2018 14:52:34 +0200 Subject: [PATCH 6/6] updated VERSION for 4.1.0 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 051ad7b5a0cb0..3894f0a7c9c87 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -63,12 +63,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '4.1.0-DEV'; + const VERSION = '4.1.0'; const VERSION_ID = 40100; const MAJOR_VERSION = 4; const MINOR_VERSION = 1; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '01/2019'; const END_OF_LIFE = '07/2019';