-[Symfony][1] is a **PHP framework** for web applications and a set of reusable
+[Symfony][1] is a **PHP framework** for web and console applications and a set of reusable
**PHP components**. Symfony is used by thousands of web applications (including
BlaBlaCar.com and Spotify.com) and most of the [popular PHP projects][2] (including
Drupal and Magento).
@@ -29,7 +29,7 @@ Community
* [Join the Symfony Community][11] and meet other members at the [Symfony events][12].
* [Get Symfony support][13] on Stack Overflow, Slack, IRC, etc.
* Follow us on [GitHub][14], [Twitter][15] and [Facebook][16].
-* Read our [Code of Conduct][24] and meet the [CARE Team][25]
+* Read our [Code of Conduct][24] and meet the [CARE Team][25].
Contributing
------------
@@ -53,7 +53,7 @@ Symfony development is sponsored by [SensioLabs][21], led by the
[2]: https://symfony.com/projects
[3]: https://symfony.com/doc/current/reference/requirements.html
[4]: https://symfony.com/doc/current/setup.html
-[5]: http://semver.org
+[5]: https://semver.org
[6]: https://symfony.com/doc/current/contributing/community/releases.html
[7]: https://symfony.com/doc/current/page_creation.html
[8]: https://symfony.com/doc/current/index.html
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 30a3805bc8a50..a7e49d469c502 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -26,8 +26,8 @@ file and directory structure of your application:
Then, upgrade the contents of your console script and your front controller:
-* `bin/console`: https://github.com/symfony/recipes/blob/master/symfony/console/3.3/bin/console
-* `public/index.php`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/3.3/public/index.php
+* `bin/console`: https://github.com/symfony/recipes/blob/master/symfony/console/4.4/bin/console
+* `public/index.php`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/4.4/public/index.php
Lastly, read the following article to add Symfony Flex to your application and
upgrade the configuration files: https://symfony.com/doc/current/setup/flex.html
@@ -250,9 +250,9 @@ DependencyInjection
DoctrineBridge
--------------
-* The `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler` and
- `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandlerSchema` have been removed. Use
- `Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler` instead.
+ * The `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler` and
+ `Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandlerSchema` have been removed. Use
+ `Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler` instead.
EventDispatcher
---------------
@@ -287,9 +287,9 @@ Finder
Form
----
-* The values of the `FormEvents::*` constants have been updated to match the
- constant names. You should only update your application if you relied on the
- constant values instead of their names.
+ * The values of the `FormEvents::*` constants have been updated to match the
+ constant names. You should only update your application if you relied on the
+ constant values instead of their names.
* The `choices_as_values` option of the `ChoiceType` has been removed.
@@ -817,8 +817,8 @@ Translation
TwigBundle
----------
-* The `ContainerAwareRuntimeLoader` class has been removed. Use the
- Twig `Twig_ContainerRuntimeLoader` class instead.
+ * The `ContainerAwareRuntimeLoader` class has been removed. Use the
+ Twig `Twig_ContainerRuntimeLoader` class instead.
* Removed `DebugCommand` in favor of `Symfony\Bridge\Twig\Command\DebugCommand`.
@@ -870,7 +870,6 @@ TwigBridge
* Removed `LintCommand::set/getTwigEnvironment`. Pass an instance of
`Twig\Environment` as first argument of the constructor instead.
-
Validator
---------
@@ -924,7 +923,7 @@ Validator
VarDumper
---------
- * The `VarDumperTestTrait::assertDumpEquals()` method expects a 3rd `$context = null`
+ * The `VarDumperTestTrait::assertDumpEquals()` method expects a 3rd `$filter = 0`
argument and moves `$message = ''` argument at 4th position.
Before:
@@ -939,7 +938,7 @@ VarDumper
VarDumperTestTrait::assertDumpEquals($dump, $data, $filter = 0, $message = '');
```
- * The `VarDumperTestTrait::assertDumpMatchesFormat()` method expects a 3rd `$context = null`
+ * The `VarDumperTestTrait::assertDumpMatchesFormat()` method expects a 3rd `$filter = 0`
argument and moves `$message = ''` argument at 4th position.
Before:
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
index 3b1f238fa6f84..8f7cc54411aa9 100644
--- a/UPGRADE-4.2.md
+++ b/UPGRADE-4.2.md
@@ -192,15 +192,15 @@ HttpKernel
* The `Kernel::getRootDir()` and the `kernel.root_dir` parameter have been deprecated
* The `KernelInterface::getName()` and the `kernel.name` parameter have been deprecated
- * Deprecated the first and second constructor argument of `ConfigDataCollector`
- * Deprecated `ConfigDataCollector::getApplicationName()`
+ * Deprecated the first and second constructor argument of `ConfigDataCollector`
+ * Deprecated `ConfigDataCollector::getApplicationName()`
* Deprecated `ConfigDataCollector::getApplicationVersion()`
Messenger
---------
* The `MiddlewareInterface::handle()` and `SenderInterface::send()` methods must now return an `Envelope` instance.
- * The return value of handlers isn't forwarded anymore by middleware and buses.
+ * The return value of handlers isn't forwarded anymore by middleware and buses.
If you used to return a value, e.g in query bus handlers, you can either:
- get the result from the `HandledStamp` in the envelope returned by the bus.
- use the `HandleTrait` to leverage a message bus, expecting a single, synchronous message handling and returning its result.
@@ -214,15 +214,15 @@ Messenger
$query->setResult($yourResult);
```
* The `EnvelopeAwareInterface` was removed and the `MiddlewareInterface::handle()` method now requires an `Envelope` object
- as first argument. When using built-in middleware with the provided `MessageBus`, you will not have to do anything.
- If you use your own `MessageBusInterface` implementation, you must wrap the message in an `Envelope` before passing it to middleware.
+ as first argument. When using built-in middleware with the provided `MessageBus`, you will not have to do anything.
+ If you use your own `MessageBusInterface` implementation, you must wrap the message in an `Envelope` before passing it to middleware.
If you created your own middleware, you must change the signature to always expect an `Envelope`.
* The `MiddlewareInterface::handle()` second argument (`callable $next`) has changed in favor of a `StackInterface` instance.
- When using built-in middleware with the provided `MessageBus`, you will not have to do anything.
- If you use your own `MessageBusInterface` implementation, you can use the `StackMiddleware` implementation.
+ When using built-in middleware with the provided `MessageBus`, you will not have to do anything.
+ If you use your own `MessageBusInterface` implementation, you can use the `StackMiddleware` implementation.
If you created your own middleware, you must change the signature to always expect an `StackInterface` instance
and call `$stack->next()->handle($envelope, $stack)` instead of `$next` to call the next middleware:
-
+
Before:
```php
public function handle($message, callable $next): Envelope
@@ -230,7 +230,7 @@ Messenger
// do something before
$message = $next($message);
// do something after
-
+
return $message;
}
```
@@ -242,7 +242,7 @@ Messenger
// do something before
$envelope = $stack->next()->handle($envelope, $stack);
// do something after
-
+
return $envelope;
}
```
@@ -251,7 +251,7 @@ Messenger
respectively `ReceivedStamp`, `ValidationStamp`, `SerializerStamp` and moved to the `Stamp` namespace.
* `AllowNoHandlerMiddleware` has been removed in favor of a new constructor argument on `HandleMessageMiddleware`
* The `ConsumeMessagesCommand` class now takes an instance of `Psr\Container\ContainerInterface`
- as first constructor argument, i.e a message bus locator. The CLI command now expects a mandatory
+ as first constructor argument, i.e a message bus locator. The CLI command now expects a mandatory
`--bus` option value if there is more than one bus in the locator.
* `MessageSubscriberInterface::getHandledMessages()` return value has changed. The value of an array item
needs to be an associative array or the method name.
@@ -343,6 +343,7 @@ Security
* `SimpleAuthenticatorInterface`, `SimpleFormAuthenticatorInterface`, `SimplePreAuthenticatorInterface`,
`SimpleAuthenticationProvider`, `SimpleAuthenticationHandler`, `SimpleFormAuthenticationListener` and
`SimplePreAuthenticationListener` have been deprecated. Use Guard instead.
+ * **BC break note**: Upgrade to this version will log out all logged in users. See bug #33473.
SecurityBundle
--------------
diff --git a/UPGRADE-4.3.md b/UPGRADE-4.3.md
index b85e09dadc320..5093de27cb2dc 100644
--- a/UPGRADE-4.3.md
+++ b/UPGRADE-4.3.md
@@ -54,7 +54,36 @@ Dotenv
EventDispatcher
---------------
- * The signature of the `EventDispatcherInterface::dispatch()` method should be updated to `dispatch($event, string $eventName = null)`, not doing so is deprecated
+ * The signature of the `EventDispatcherInterface::dispatch()` method has been updated, consider using the new signature `dispatch($event, string $eventName = null)` instead of the old signature `dispatch($eventName, $event)` that is deprecated
+
+ You have to swap arguments when calling `dispatch()`:
+
+ Before:
+ ```php
+ $this->eventDispatcher->dispatch(Events::My_EVENT, $event);
+ ```
+
+ After:
+ ```php
+ $this->eventDispatcher->dispatch($event, Events::My_EVENT);
+ ```
+
+ If your bundle or package needs to provide compatibility with the previous way of using the dispatcher, you can use `Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy::decorate()` to ease upgrades:
+
+ Before:
+ ```php
+ public function __construct(EventDispatcherInterface $eventDispatcher) {
+ $this->eventDispatcher = $eventDispatcher;
+ }
+ ```
+
+ After:
+ ```php
+ public function __construct(EventDispatcherInterface $eventDispatcher) {
+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+ }
+ ```
+
* The `Event` class has been deprecated, use `Symfony\Contracts\EventDispatcher\Event` instead
Filesystem
@@ -77,7 +106,7 @@ Form
FrameworkBundle
---------------
- * Deprecated the `framework.templating` option, use Twig instead.
+ * Deprecated the `framework.templating` option, configure the Twig bundle instead.
* Not passing the project directory to the constructor of the `AssetsInstallCommand` is deprecated. This argument will
be mandatory in 5.0.
* Deprecated the "Psr\SimpleCache\CacheInterface" / "cache.app.simple" service, use "Symfony\Contracts\Cach
8000
e\CacheInterface" / "cache.app" instead.
@@ -180,11 +209,6 @@ Security
* Not implementing the methods `__serialize` and `__unserialize` in classes implementing
the `TokenInterface` is deprecated
-SecurityBundle
---------------
-
- * Configuring encoders using `argon2i` or `bcrypt` as algorithm has been deprecated, use `auto` instead.
-
TwigBridge
----------
@@ -213,6 +237,28 @@ Workflow
initial_marking: [draft]
```
+ * `WorkflowInterface::apply()` will have a third argument in Symfony 5.0.
+
+ Before:
+ ```php
+ class MyWorkflow implements WorkflowInterface
+ {
+ public function apply($subject, $transitionName)
+ {
+ }
+ }
+ ```
+
+ After:
+ ```php
+ class MyWorkflow implements WorkflowInterface
+ {
+ public function apply($subject, $transitionName, array $context = [])
+ {
+ }
+ }
+ ```
+
* `MarkingStoreInterface::setMarking()` will have a third argument in Symfony 5.0.
Before:
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
index bb29a880159d9..c0160192746c3 100644
--- a/UPGRADE-4.4.md
+++ b/UPGRADE-4.4.md
@@ -5,51 +5,45 @@ Cache
-----
* Added argument `$prefix` to `AdapterInterface::clear()`
+ * Marked the `CacheDataCollector` class as `@final`.
+
+Console
+-------
+
+ * Deprecated finding hidden commands using an abbreviation, use the full name instead
+ * Deprecated returning `null` from `Command::execute()`, return `0` instead
+ * Deprecated the `Application::renderException()` and `Application::doRenderException()` methods,
+ use `renderThrowable()` and `doRenderThrowable()` instead.
Debug
-----
- * Deprecated `FlattenException`, use the `FlattenException` of the `ErrorRenderer` component
- * Deprecated the whole component in favor of `ErrorHandler` component
+ * Deprecated the component in favor of the `ErrorHandler` component
+ * Replace uses of `Symfony\Component\Debug\Debug` by `Symfony\Component\ErrorHandler\Debug`
+
+Config
+------
+
+ * Deprecated overriding the `FilerLoader::import()` method without declaring the optional `$exclude` argument
DependencyInjection
-------------------
+ * Made singly-implemented interfaces detection be scoped by file
* Deprecated support for short factories and short configurators in Yaml
Before:
```yaml
services:
- my_service:
- factory: factory_service:method
- ```
-
- After:
- ```yaml
- services:
- my_service:
- factory: ['@factory_service', method]
- ```
- * Deprecated `tagged` in favor of `tagged_iterator`
-
- Before:
- ```yaml
- services:
- App\Handler:
- tags: ['app.handler']
-
- App\HandlerCollection:
- arguments: [!tagged app.handler]
+ my_service:
+ factory: factory_service:method
```
After:
```yaml
services:
- App\Handler:
- tags: ['app.handler']
-
- App\HandlerCollection:
- arguments: [!tagged_iterator app.handler]
+ my_service:
+ factory: ['@factory_service', method]
```
* Passing an instance of `Symfony\Component\DependencyInjection\Parameter` as class name to `Symfony\Component\DependencyInjection\Definition` is deprecated.
@@ -64,6 +58,16 @@ DependencyInjection
new Definition('%my_class%');
```
+DoctrineBridge
+--------------
+ * Deprecated injecting `ClassMetadataFactory` in `DoctrineExtractor`, an instance of `EntityManagerInterface` should be
+ injected instead.
+ * Deprecated passing an `IdReader` to the `DoctrineChoiceLoader` when the query cannot be optimized with single id field.
+ * Deprecated not passing an `IdReader` to the `DoctrineChoiceLoader` when the query can be optimized with single id field.
+ * Deprecated `RegistryInterface`, use `Doctrine\Persistence\ManagerRegistry`.
+ * Added a new `getMetadataDriverClass` method to replace class parameters in `AbstractDoctrineExtension`. This method
+ will be abstract in Symfony 5 and must be declared in extending classes.
+
Filesystem
----------
@@ -72,17 +76,24 @@ Filesystem
Form
----
+ * Using different values for the "model_timezone" and "view_timezone" options of the `TimeType` without configuring a
+ reference date is deprecated.
* Using `int` or `float` as data for the `NumberType` when the `input` option is set to `string` is deprecated.
+ * Overriding the methods `FormIntegrationTestCase::setUp()`, `TypeTestCase::setUp()` and `TypeTestCase::tearDown()` without the `void` return-type is deprecated.
FrameworkBundle
---------------
- * Deprecated booting the kernel before running `WebTestCase::createClient()`.
+ * Deprecated calling `WebTestCase::createClient()` while a kernel has been booted, ensure the kernel is shut down before calling the method
* Deprecated support for `templating` engine in `TemplateController`, use Twig instead
* The `$parser` argument of `ControllerResolver::__construct()` and `DelegatingLoader::__construct()`
has been deprecated.
* The `ControllerResolver` and `DelegatingLoader` classes have been marked as `final`.
* The `controller_name_converter` and `resolve_controller_name_subscriber` services have been deprecated.
+ * Deprecated `routing.loader.service`, use `routing.loader.container` instead.
+ * Not tagging service route loaders with `routing.route_loader` has been deprecated.
+ * Overriding the methods `KernelTestCase::tearDown()` and `WebTestCase::tearDown()` without the `void` return-type is deprecated.
+ * Marked the `RouterDataCollector` class as `@final`.
HttpClient
----------
@@ -93,74 +104,293 @@ HttpFoundation
--------------
* `ApacheRequest` is deprecated, use `Request` class instead.
+ * Passing a third argument to `HeaderBag::get()` is deprecated since Symfony 4.4, use method `all()` instead
+ * [BC BREAK] `PdoSessionHandler` with MySQL changed the type of the lifetime column,
+ make sure to run `ALTER TABLE sessions MODIFY sess_lifetime INTEGER UNSIGNED NOT NULL` to
+ update your database.
+ * `PdoSessionHandler` now precalculates the expiry timestamp in the lifetime column,
+ make sure to run `CREATE INDEX EXPIRY ON sessions (sess_lifetime)` to update your database
+ to speed up garbage collection of expired sessions.
HttpKernel
----------
- * Implementing the `BundleInterface` without implementing the `getPublicDir()` method is deprecated.
- This method will be added to the interface in 5.0.
* The `DebugHandlersListener` class has been marked as `final`
+ * Added new Bundle directory convention consistent with standard skeletons:
+
+ ```
+ βββ MyBundle/
+ βββ config/
+ βββ public/
+ βββ src/
+ β βββ MyBundle.php
+ βββ templates/
+ βββ translations/
+ ```
+
+ To make this work properly, it is necessary to change the root path of the bundle:
+
+ ```php
+ class MyBundle extends Bundle
+ {
+ public function getPath(): string
+ {
+ return \dirname(__DIR__);
+ }
+ }
+ ```
+
+ As many bundles must be compatible with a range of Symfony versions, the current
+ directory convention is not deprecated yet, but it will be in the future.
+
+ * Deprecated the second and third argument of `KernelInterface::locateResource`
+ * Deprecated the second and third argument of `FileLocator::__construct`
+ * Deprecated loading resources from `%kernel.root_dir%/Resources` and `%kernel.root_dir%` as
+ fallback directories. Resources like service definitions are usually loaded relative to the
+ current directory or with a glob pattern. The fallback directories have never been advocated
+ so you likely do not use those in any app based on the SF Standard or Flex edition.
+ * Getting the container from a non-booted kernel is deprecated
+ * Marked the `AjaxDataCollector`, `ConfigDataCollector`, `EventDataCollector`,
+ `ExceptionDataCollector`, `LoggerDataCollector`, `MemoryDataCollector`,
+ `RequestDataCollector` and `TimeDataCollector` classes as `@final`.
+ * Marked the `RouterDataCollector::collect()` method as `@final`.
+ * The `DataCollectorInterface::collect()` and `Profiler::collect()` methods third parameter signature
+ will be `\Throwable $exception = null` instead of `\Exception $exception = null` in Symfony 5.0.
+ * Deprecated methods `ExceptionEvent::get/setException()`, use `get/setThrowable()` instead
+ * Deprecated class `ExceptionListener`, use `ErrorListener` instead
Lock
----
* Deprecated `Symfony\Component\Lock\StoreInterface` in favor of `Symfony\Component\Lock\BlockingStoreInterface` and
- `Symfony\Component\Lock\PersistStoreInterface`.
+ `Symfony\Component\Lock\PersistingStoreInterface`.
* `Factory` is deprecated, use `LockFactory` instead
+ * Deprecated services `lock.store.flock`, `lock.store.semaphore`, `lock.store.memcached.abstract` and `lock.store.redis.abstract`,
+ use `StoreFactory::createStore` instead.
+
+Mailer
+------
+
+ * [BC BREAK] Changed the DSN to use for disabling delivery (using the `NullTransport`) from `smtp://null` to `null://null` (host doesn't matter).
+ * [BC BREAK] Renamed class `SmtpEnvelope` to `Envelope` and `DelayedSmtpEnvelope` to `DelayedEnvelope`.
+ * [BC BREAK] Added a required `string $transport` argument to `MessageEvent::__construct`.
Messenger
---------
- * Deprecated passing a `ContainerInterface` instance as first argument of the `ConsumeMessagesCommand` constructor,
- pass a `RoutableMessageBus` instance instead.
+ * [BC BREAK] Removed `SendersLocatorInterface::getSenderByAlias` added in 4.3.
+ * [BC BREAK] Removed `$retryStrategies` argument from `Worker::__construct`.
+ * [BC BREAK] Changed arguments of `ConsumeMessagesCommand::__construct`.
+ * [BC BREAK] Removed `$senderClassOrAlias` argument from `RedeliveryStamp::__construct`.
+ * [BC BREAK] Removed `UnknownSenderException`.
+ * [BC BREAK] Removed `WorkerInterface`.
+ * [BC BREAK] Removed `$onHandledCallback` of `Worker::run(array $options = [], callable $onHandledCallback = null)`.
+ * [BC BREAK] Removed `StopWhenMemoryUsageIsExceededWorker` in favor of `StopWorkerOnMemoryLimitListener`.
+ * [BC BREAK] Removed `StopWhenMessageCountIsExceededWorker` in favor of `StopWorkerOnMessageLimitListener`.
+ * [BC BREAK] Removed `StopWhenTimeLimitIsReachedWorker` in favor of `StopWorkerOnTimeLimitListener`.
+ * [BC BREAK] Removed `StopWhenRestartSignalIsReceived` in favor of `StopWorkerOnRestartSignalListener`.
+ * Marked the `MessengerDataCollector` class as `@final`.
+
+Mime
+----
+
+ * Removed `NamedAddress`, use `Address` instead (which supports a name now)
MonologBridge
--------------
* The `RouteProcessor` has been marked final.
+Process
+-------
+
+ * Deprecated the `Process::inheritEnvironmentVariables()` method: env variables are always inherited.
+
PropertyAccess
--------------
* Deprecated passing `null` as 2nd argument of `PropertyAccessor::createCache()` method (`$defaultLifetime`), pass `0` instead.
+Routing
+-------
+
+ * Deprecated `ServiceRouterLoader` in favor of `ContainerLoader`.
+ * Deprecated `ObjectRouteLoader` in favor of `ObjectLoader`.
+
Security
--------
+ * The `LdapUserProvider` class has been deprecated, use `Symfony\Component\Ldap\Security\LdapUserProvider` instead.
* Implementations of `PasswordEncoderInterface` and `UserPasswordEncoderInterface` should add a new `needsRehash()` method
+ * Deprecated returning a non-boolean value when implementing `Guard\AuthenticatorInterface::checkCredentials()`. Please explicitly return `false` to indicate invalid credentials.
+ * The `ListenerInterface` is deprecated, extend `AbstractListener` instead.
+ * Deprecated passing more than one attribute to `AccessDecisionManager::decide()` and `AuthorizationChecker::isGranted()` (and indirectly the `is_granted()` Twig and ExpressionLanguage function)
+
+ **Before**
+ ```php
+ if ($this->authorizationChecker->isGranted(['ROLE_USER', 'ROLE_ADMIN'])) {
+ // ...
+ }
+ ```
+
+ **After**
+ ```php
+ if ($this->authorizationChecker->isGranted(new Expression("is_granted('ROLE_USER') or is_granted('ROLE_ADMIN')"))) {}
+
+ // or:
+ if ($this->authorizationChecker->isGranted('ROLE_USER')
+ || $this->authorizationChecker->isGranted('ROLE_ADMIN')
+ ) {}
+ ```
+
+SecurityBundle
+--------------
+
+ * Marked the `SecurityDataCollector` class as `@final`.
+
+Serializer
+----------
+
+ * Deprecated the `XmlEncoder::TYPE_CASE_ATTRIBUTES` constant. Use `XmlEncoder::TYPE_CAST_ATTRIBUTES` instead.
Stopwatch
---------
* Deprecated passing `null` as 1st (`$id`) argument of `Section::get()` method, pass a valid child section identifier instead.
+Translation
+-----------
+
+ * Deprecated support for using `null` as the locale in `Translator`.
+ * Deprecated accepting STDIN implicitly when using the `lint:xliff` command, use `lint:xliff -` (append a dash) instead to make it explicit.
+ * Marked the `TranslationDataCollector` class as `@final`.
+
TwigBridge
----------
* Deprecated to pass `$rootDir` and `$fileLinkFormatter` as 5th and 6th argument respectively to the
`DebugCommand::__construct()` method, swap the variables position.
+ * Deprecated accepting STDIN implicitly when using the `lint:twig` command, use `lint:twig -` (append a dash) instead to make it explicit.
+ * Marked the `TwigDataCollector` class as `@final`.
+
+TwigBundle
+----------
+
+ * Deprecated `twig.exception_controller` configuration option.
+
+ If you were not using this option previously, set it to `null`:
+
+ After:
+ ```yaml
+ twig:
+ exception_controller: null
+ ```
+
+ If you were using this option previously, set it to `null` and use `framework.error_controller` instead:
+
+ Before:
+ ```yaml
+ twig:
+ exception_controller: 'App\Controller\MyExceptionController'
+ ```
+
+ After:
+ ```yaml
+ twig:
+ exception_controller: null
+
+ framework:
+ error_controller: 'App\Controller\MyExceptionController'
+ ```
+
+ The new default exception controller will also change the error response content according to
+ https://tools.ietf.org/html/rfc7807 for `json`, `xml`, `atom` and `txt` formats:
+
+ Before (HTTP status code `200`):
+ ```json
+ {
+ "error": {
+ "code": 404,
+ "message": "Sorry, the page you are looking for could not be found"
+ }
+ }
+ ```
+
+ After (HTTP status code `404`):
+ ```json
+ {
+ "title": "Not Found",
+ "status": 404,
+ "detail": "Sorry, the page you are looking for could not be found"
+ }
+ ```
+
+ * Deprecated the `ExceptionController` and `PreviewErrorController` controllers, use `ErrorController` from the HttpKernel component instead
+ * Deprecated all built-in error templates, use the error renderer mechanism of the `ErrorHandler` component
+ * Deprecated loading custom error templates in non-html formats. Custom HTML error pages based on Twig keep working as before:
+
+ Before (`templates/bundles/TwigBundle/Exception/error.json.twig`):
+ ```twig
+ {
+ "type": "https://example.com/error",
+ "title": "{{ status_text }}",
+ "status": {{ status_code }}
+ }
+ ```
+
+ After (`App\Serializer\ProblemJsonNormalizer`):
+ ```php
+ class ProblemJsonNormalizer implements NormalizerInterface
+ {
+ public function normalize($exception, $format = null, array $context = [])
+ {
+ return [
+ 'type' => 'https://example.com/error',
+ 'title' => $exception->getStatusText(),
+ 'status' => $exception->getStatusCode(),
+ ];
+ }
+
+ public function supportsNormalization($data, $format = null)
+ {
+ return 'json' === $format && $data instanceof FlattenException;
+ }
+ }
+ ```
Validator
---------
+ * [BC BREAK] Using null as `$classValidatorRegexp` value in `DoctrineLoader::__construct` or `PropertyInfoLoader::__construct` will not enable auto-mapping for all classes anymore, use `'{.*}'` instead.
* Deprecated passing an `ExpressionLanguage` instance as the second argument of `ExpressionValidator::__construct()`.
* Deprecated using anything else than a `string` as the code of a `ConstraintViolation`, a `string` type-hint will
be added to the constructor of the `ConstraintViolation` class and to the `ConstraintViolationBuilder::setCode()`
method in 5.0.
- * Deprecated passing an `ExpressionLanguage` instance as the second argument of `ExpressionValidator::__construct()`.
+ * Deprecated passing an `ExpressionLanguage` instance as the second argument of `ExpressionValidator::__construct()`.
Pass it as the first argument instead.
* The `Length` constraint expects the `allowEmptyString` option to be defined
when the `min` option is used.
Set it to `true` to keep the current behavior and `false` to reject empty strings.
In 5.0, it'll become optional and will default to `false`.
+ * Overriding the methods `ConstraintValidatorTestCase::setUp()` and `ConstraintValidatorTestCase::tearDown()` without the `void` return-type is deprecated.
+ * deprecated `Symfony\Component\Validator\Mapping\Cache\CacheInterface` and all implementations in favor of PSR-6.
+ * deprecated `ValidatorBuilder::setMetadataCache`, use `ValidatorBuilder::setMappingCache` instead.
+ * The `Range` constraint has a new message option `notInRangeMessage` that is used when both `min` and `max` values are set.
+ In case you are using custom translations make sure to add one for this new message.
+ * Marked the `ValidatorDataCollector` class as `@final`.
WebProfilerBundle
-----------------
- * Deprecated the `ExceptionController::templateExists()` method
+ * Deprecated the `ExceptionController` class in favor of `ExceptionErrorController`
* Deprecated the `TemplateManager::templateExists()` method
WebServerBundle
---------------
* The bundle is deprecated and will be removed in 5.0.
+
+Yaml
+----
+
+ * Deprecated accepting STDIN implicitly when using the `lint:yaml` command, use `lint:yaml -` (append a dash) instead to make it explicit.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
index 4795d2c5de00a..17dbdc4759b88 100644
--- a/UPGRADE-5.0.md
+++ b/UPGRADE-5.0.md
@@ -27,15 +27,20 @@ Config
* Removed `FileLoaderLoadException`, use `LoaderLoadException` instead.
* Using environment variables with `cannotBeEmpty()` if the value is validated with `validate()` will throw an exception.
* Removed the `root()` method in `TreeBuilder`, pass the root node information to the constructor instead
+ * The `FilerLoader::import()` method has a new `$exclude` argument.
Console
-------
+ * Removed support for finding hidden commands using an abbreviation, use the full name instead
* Removed the `setCrossingChar()` method in favor of the `setDefaultCrossingChar()` method in `TableStyle`.
* Removed the `setHorizontalBorderChar()` method in favor of the `setDefaultCrossingChars()` method in `TableStyle`.
* Removed the `getHorizontalBorderChar()` method in favor of the `getBorderChars()` method in `TableStyle`.
* Removed the `setVerticalBorderChar()` method in favor of the `setVerticalBorderChars()` method in `TableStyle`.
* Removed the `getVerticalBorderChar()` method in favor of the `getBorderChars()` method in `TableStyle`.
+ * Removed support for returning `null` from `Command::execute()`, return `0` instead
+ * Renamed `Application::renderException()` and `Application::doRenderException()`
+ to `renderThrowable()` and `doRenderThrowable()` respectively.
* The `ProcessHelper::run()` method takes the command as an array of arguments.
Before:
@@ -54,7 +59,8 @@ Console
Debug
-----
- * Removed the component
+ * Removed the component in favor of the `ErrorHandler` component
+ * Replace uses of `Symfony\Component\Debug\Debug` by `Symfony\Component\ErrorHandler\Debug`
DependencyInjection
-------------------
@@ -90,35 +96,16 @@ DependencyInjection
my_service:
factory: ['@factory_service', method]
```
- * Removed `tagged` in favor of `tagged_iterator`
-
- Before:
- ```yaml
- services:
- App\Handler:
- tags: ['app.handler']
-
- App\HandlerCollection:
- arguments: [!tagged app.handler]
- ```
-
- After:
- ```yaml
- services:
- App\Handler:
- tags: ['app.handler']
-
- App\HandlerCollection:
- arguments: [!tagged_iterator app.handler]
- ```
DoctrineBridge
--------------
- * Deprecated injecting `ClassMetadataFactory` in `DoctrineExtractor`, an instance of `EntityManagerInterface` should be
+ * Removed the possibility to inject `ClassMetadataFactory` in `DoctrineExtractor`, an instance of `EntityManagerInterface` should be
injected instead
* Passing an `IdReader` to the `DoctrineChoiceLoader` when the query cannot be optimized with single id field will throw an exception, pass `null` instead
* Not passing an `IdReader` to the `DoctrineChoiceLoader` when the query can be optimized with single id field will not apply any optimization
+ * The `RegistryInterface` has been removed.
+ * Added a new `getMetadataDriverClass` method in `AbstractDoctrineExtension` to replace class parameters.
DomCrawler
----------
@@ -152,6 +139,8 @@ Finder
Form
----
+ * Removed support for using different values for the "model_timezone" and "view_timezone" options of the `TimeType`
+ without configuring a reference date.
* Removed support for using `int` or `float` as data for the `NumberType` when the `input` option is set to `string`.
* Removed support for using the `format` option of `DateType` and `DateTimeType` when the `html5` option is enabled.
* Using names for buttons that do not start with a letter, a digit, or an underscore leads to an exception.
@@ -209,13 +198,13 @@ Form
```
* The `regions` option was removed from the `TimezoneType`.
+ * Added support for PHPUnit 8. A `void` return-type was added to the `FormIntegrationTestCase::setUp()`, `TypeTestCase::setUp()` and `TypeTestCase::tearDown()` methods.
FrameworkBundle
---------------
- * Dropped support for booting the kernel before running `WebTestCase::createClient()`. `createClient()` will throw an
- exception if the kernel was already booted before.
- * Removed the `framework.templating` option, use Twig instead.
+ * Calling `WebTestCase::createClient()` while a kernel has been booted now throws an exception, ensure the kernel is shut down before calling the method
+ * Removed the `framework.templating` option, configure the Twig bundle instead.
* The project dir argument of the constructor of `AssetsInstallCommand` is required.
* Removed support for `bundle:controller:action` syntax to reference controllers. Use `serviceOrFqcn::method`
instead where `serviceOrFqcn` is either the service ID when using controllers as services or the FQCN of the controller.
@@ -250,6 +239,11 @@ FrameworkBundle
* Support for the legacy directory structure in `translation:update` and `debug:translation` commands has been removed.
* Removed the "Psr\SimpleCache\CacheInterface" / "cache.app.simple" service, use "Symfony\Contracts\Cache\CacheInterface" / "cache.app" instead.
* Removed support for `templating` engine in `TemplateController`, use Twig instead
+ * Removed `ResolveControllerNameSubscriber`.
+ * Removed `routing.loader.service`.
+ * Added support for PHPUnit 8. A `void` return-type was added to the `KernelTestCase::tearDown()` and `WebTestCase::tearDown()` method.
+ * Removed the `lock.store.flock`, `lock.store.semaphore`, `lock.store.memcached.abstract` and `lock.store.redis.abstract` services.
+ * Removed the `router.cache_class_prefix` parameter.
HttpClient
----------
@@ -277,11 +271,15 @@ HttpFoundation
* The `FileinfoMimeTypeGuesser` class has been removed,
use `Symfony\Component\Mime\FileinfoMimeTypeGuesser` instead.
* `ApacheRequest` has been removed, use the `Request` class instead.
+ * The third argument of the `HeaderBag::get()` method has been removed, use method `all()` instead.
+ * Getting the container from a non-booted kernel is not possible anymore.
+ * [BC BREAK] `PdoSessionHandler` with MySQL changed the type of the lifetime column,
+ make sure to run `ALTER TABLE sessions MODIFY sess_lifetime INTEGER UNSIGNED NOT NULL` to
+ update your database.
HttpKernel
----------
- * The `getPublicDir()` method has been added to the `BundleInterface`.
* Removed `Client`, use `HttpKernelBrowser` instead
* The `Kernel::getRootDir()` and the `kernel.root_dir` parameter have been removed
* The `KernelInterface::getName()` and the `kernel.name` parameter have been removed
@@ -297,6 +295,39 @@ HttpKernel
* Removed `PostResponseEvent`, use `TerminateEvent` instead
* Removed `TranslatorListener` in favor of `LocaleAwareListener`
* The `DebugHandlersListener` class has been made `final`
+ * Removed `SaveSessionListener` in favor of `AbstractSessionListener`
+ * Removed methods `ExceptionEvent::get/setException()`, use `get/setThrowable()` instead
+ * Removed class `ExceptionListener`, use `ErrorListener` instead
+ * Added new Bundle directory convention consistent with standard skeletons:
+
+ ```
+ βββ MyBundle/
+ βββ config/
+ βββ public/
+ βββ src/
+ β βββ MyBundle.php
+ βββ templates/
+ βββ translations/
+ ```
+
+ To make this work properly, it is necessary to change the root path of the bundle:
+
+ ```php
+ class MyBundle extends Bundle
+ {
+ public function getPath(): string
+ {
+ return \dirname(__DIR__);
+ }
+ }
+ ```
+
+ As many bundles must be compatible with a range of Symfony versions, the current
+ directory convention is not deprecated yet, but it will be in the future.
+ * Removed the second and third argument of `KernelInterface::locateResource`
+ * Removed the second and third argument of `FileLocator::__construct`
+ * Removed loading resources from `%kernel.root_dir%/Resources` and `%kernel.root_dir%` as
+ fallback directories.
Intl
----
@@ -311,7 +342,7 @@ Lock
----
* Removed `Symfony\Component\Lock\StoreInterface` in favor of `Symfony\Component\Lock\BlockingStoreInterface` and
- `Symfony\Component\Lock\PersistStoreInterface`.
+ `Symfony\Component\Lock\PersistingStoreInterface`.
* Removed `Factory`, use `LockFactory` instead
Messenger
@@ -329,11 +360,12 @@ Monolog
MonologBridge
--------------
-* The `RouteProcessor` class is final.
+ * The `RouteProcessor` class is final.
Process
-------
+ * Removed the `Process::inheritEnvironmentVariables()` method: env variables are always inherited.
* Removed the `Process::setCommandline()` and the `PhpProcess::setPhpBinary()` methods.
* Commands must be defined as arrays when creating a `Process` instance.
@@ -361,14 +393,36 @@ Routing
-------
* The `generator_base_class`, `generator_cache_class`, `matcher_base_class`, and `matcher_cache_class` router
- options have been removed.
+ options have been removed. If you are using multiple Router instances and need separate caches for them, set a unique `cache_dir` per Router instance instead.
* `Serializable` implementing methods for `Route` and `CompiledRoute` are final.
Instead of overwriting them, use `__serialize` and `__unserialize` as extension points which are forward compatible
with the new serialization methods in PHP 7.4.
+ * Removed `ServiceRouterLoader` and `ObjectRouteLoader`.
+ * Service route loaders must be tagged with `routing.route_loader`.
+ * The `RoutingConfigurator::import()` method has a new optional `$exclude` argument.
Security
--------
+ * Dropped support for passing more than one attribute to `AccessDecisionManager::decide()` and `AuthorizationChecker::isGranted()` (and indirectly the `is_granted()` Twig and ExpressionLanguage function):
+
+ **Before**
+ ```php
+ if ($this->authorizationChecker->isGranted(['ROLE_USER', 'ROLE_ADMIN'])) {
+ // ...
+ }
+ ```
+
+ **After**
+ ```php
+ if ($this->authorizationChecker->isGranted(new Expression("is_granted('ROLE_USER') or is_granted('ROLE_ADMIN')"))) {}
+
+ // or:
+ if ($this->authorizationChecker->isGranted('ROLE_USER')
+ || $this->authorizationChecker->isGranted('ROLE_ADMIN')
+ ) {}
+ ```
+ * The `LdapUserProvider` class has been removed, use `Symfony\Component\Ldap\Security\LdapUserProvider` instead.
* Implementations of `PasswordEncoderInterface` and `UserPasswordEncoderInterface` must have a new `needsRehash()` method
* The `Role` and `SwitchUserRole` classes have been removed.
* The `getReachableRoles()` method of the `RoleHierarchy` class has been removed. It has been replaced by the new
@@ -385,7 +439,7 @@ Security
* `SimpleAuthenticatorInterface`, `SimpleFormAuthenticatorInterface`, `SimplePreAuthenticatorInterface`,
`SimpleAuthenticationProvider`, `SimpleAuthenticationHandler`, `SimpleFormAuthenticationListener` and
`SimplePreAuthenticationListener` have been removed. Use Guard instead.
- * The `ListenerInterface` has been removed, turn your listeners into callables instead.
+ * The `ListenerInterface` has been removed, extend `AbstractListener` instead.
* The `Firewall::handleRequest()` method has been removed, use `Firewall::callListeners()` instead.
* `\Serializable` interface has been removed from `AbstractToken` and `AuthenticationException`,
thus `serialize()` and `unserialize()` aren't available.
@@ -423,6 +477,8 @@ Security
* The `BCryptPasswordEncoder` class has been removed, use `NativePasswordEncoder` instead.
* Classes implementing the `TokenInterface` must implement the two new methods
`__serialize` and `__unserialize`
+ * Implementations of `Guard\AuthenticatorInterface::checkCredentials()` must return a boolean value now. Please explicitly return `false` to indicate invalid credentials.
+ * Removed the `has_role()` function from security expressions, use `is_granted()` instead.
SecurityBundle
--------------
@@ -443,22 +499,50 @@ SecurityBundle
changed to underscores.
Before: `my-cookie` deleted the `my_cookie` cookie (with an underscore).
After: `my-cookie` deletes the `my-cookie` cookie (with a dash).
- * Configuring encoders using `argon2i` or `bcrypt` as algorithm is not supported anymore, use `auto` instead.
+ * Removed the `security.user.provider.in_memory.user` service.
Serializer
----------
+ * The default value of the `CsvEncoder` "as_collection" option was changed to `true`.
+ * Individual encoders & normalizers options as constructor arguments were removed.
+ Use the default context instead.
+ * The following method and properties:
+ - `AbstractNormalizer::$circularReferenceLimit`
+ - `AbstractNormalizer::$circularReferenceHandler`
+ - `AbstractNormalizer::$callbacks`
+ - `AbstractNormalizer::$ignoredAttributes`
+ - `AbstractNormalizer::$camelizedAttributes`
+ - `AbstractNormalizer::setCircularReferenceLimit()`
+ - `AbstractNormalizer::setCircularReferenceHandler()`
+ - `AbstractNormalizer::setCallbacks()`
+ - `AbstractNormalizer::setIgnoredAttributes()`
+ - `AbstractObjectNormalizer::$maxDepthHandler`
+ - `AbstractObjectNormalizer::setMaxDepthHandler()`
+ - `XmlEncoder::setRootNodeName()`
+ - `XmlEncoder::getRootNodeName()`
+
+ were removed, use the default context instead.
* The `AbstractNormalizer::handleCircularReference()` method has two new `$format` and `$context` arguments.
+ * Removed support for instantiating a `DataUriNormalizer` with a default MIME type guesser when the `symfony/mime` component isn't installed.
+ * Removed the `XmlEncoder::TYPE_CASE_ATTRIBUTES` constant. Use `XmlEncoder::TYPE_CAST_ATTRIBUTES` instead.
+
+Stopwatch
+---------
+
+ * Removed support for passing `null` as 1st (`$id`) argument of `Section::get()` method, pass a valid child section identifier instead.
Translation
-----------
+ * Support for using `null` as the locale in `Translator` has been removed.
* The `FileDumper::setBackup()` method has been removed.
* The `TranslationWriter::disableBackup()` method has been removed.
* The `TranslatorInterface` has been removed in favor of `Symfony\Contracts\Translation\TranslatorInterface`
* The `MessageSelector`, `Interval` and `PluralizationRules` classes have been removed, use `IdentityTranslator` instead
* The `Translator::getFallbackLocales()` and `TranslationDataCollector::getFallbackLocales()` method are now internal
* The `Translator::transChoice()` method has been removed in favor of using `Translator::tran
8000
s()` with "%count%" as the parameter driving plurals
+ * Removed support for implicit STDIN usage in the `lint:xliff` command, use `lint:xliff -` (append a dash) instead to make it explicit.
TwigBundle
----------
@@ -466,6 +550,8 @@ TwigBundle
* The default value (`false`) of the `twig.strict_variables` configuration option has been changed to `%kernel.debug%`.
* The `transchoice` tag and filter have been removed, use the `trans` ones instead with a `%count%` parameter.
* Removed support for legacy templates directories `src/Resources/views/` and `src/Resources/+ {{ email.subject }} +
+ {% endblock %} + + {% block content %} + {% if markdown %} + {{ include('@email/zurb_2/notification/content_markdown.html.twig') }} + {% else %} + {{ (raw ? content|raw : content)|nl2br }} + {% endif %} + {% endblock %} + + {% block action %} + {% if action_url %} +Exception stack trace attached.
+ {% endif %} + {% endblock %} +Notification e-mail sent by Symfony
+ {% endblock %} +
+
{{- form_label(form) -}}
{{- form_widget(form, widget_attr) -}}
@@ -38,7 +38,7 @@ col-sm-2
{%- endblock form_row %}
{% block submit_row -%}
-
{#--#}
+ {#--#}
{#--#}
{{- form_widget(form) -}}
@@ -47,7 +47,7 @@ col-sm-2
{%- endblock submit_row %}
{% block reset_row -%}
-
{#--#}
+ {#--#}
{#--#}
{{- form_widget(form) -}}
@@ -60,10 +60,11 @@ col-sm-10
{%- endblock form_group_class %}
{% block checkbox_row -%}
-
- {{- widget|raw }} {{ label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}}
+ {{- widget|raw }} {{ label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain)) -}}
{%- endif -%}
{%- endblock checkbox_radio_label %}
@@ -111,7 +108,7 @@
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
-
{#--#}
+ {#--#}
{#--#}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
index a1e2a4f28c7f6..12d9545f3aaff 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -85,9 +85,6 @@
{%- if required -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
{%- endif -%}
- {%- if parent_label_class is defined -%}
- {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|trim}) -%}
- {%- endif -%}
{%- if label is not same as(false) and label is empty -%}
{%- if label_format is not empty -%}
{%- set label = label_format|replace({
@@ -99,7 +96,7 @@
{%- endif -%}
{%- endif -%}
{{- form_widget(form) -}}
+ {{- form_help(form) -}}
{{- form_errors(form) -}}
{#--#}
+
{{- form_label(form) }} {# -#}
{{ form_widget(form, widget_attr) }} {# -#}
{{- form_help(form) -}}
@@ -120,7 +117,7 @@
{%- endblock form_row %}
{% block button_row -%}
-
+
{{- form_widget(form) -}}
{%- endblock button_row %}
@@ -146,15 +143,17 @@
{%- endblock datetime_row %}
{% block checkbox_row -%}
-
+
{{- form_widget(form) -}}
+ {{- form_help(form) -}}
{{- form_errors(form) -}}
{%- endblock checkbox_row %}
{% block radio_row -%}
-
+
{{- form_widget(form) -}}
+ {{- form_help(form) -}}
{{- form_errors(form) -}}
{%- endblock radio_row %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
index 7fcea4b0ecd25..990b324cb0d17 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
@@ -28,7 +28,7 @@ col-sm-2
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
-
+
{{- form_label(form) -}}
{{- form_widget(form, widget_attr) -}}
@@ -43,19 +43,20 @@ col-sm-2
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
-
{%- endblock fieldset_form_row %}
{% block submit_row -%}
-
{#--#}
+ {#--#}
{#--#}
{{- form_widget(form) -}}
@@ -64,7 +65,7 @@ col-sm-2
{%- endblock submit_row %}
{% block reset_row -%}
-
{#--#}
+ {#--#}
{#--#}
{{- form_widget(form) -}}
@@ -77,12 +78,11 @@ col-sm-10
{%- endblock form_group_class %}
{% block checkbox_row -%}
-
{#--#}
+ {#--#}
{#--#}
{%- endblock checkbox_row %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index 1848d0dc9838c..f08fc8d20f9cc 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -122,9 +122,9 @@
<{{ element|default('div') }} class="custom-file">
{%- set type = type|default('file') -%}
{{- block('form_widget_simple') -}}
- {%- set label_attr = label_attr|merge({ class: (label_attr.class|default('') ~ ' custom-file-label')|trim }) -%}
+ {%- set label_attr = label_attr|merge({ class: (label_attr.class|default('') ~ ' custom-file-label')|trim })|filter((value, key) => key != 'id') -%}
@@ -132,9 +132,15 @@
{% endblock %}
{% block form_widget_simple -%}
- {% if type is not defined or type != 'hidden' %}
- {%- set attr = attr|merge({class: (attr.class|default('') ~ (type|default('') == 'file' ? ' custom-file-input' : ' form-control'))|trim}) -%}
- {% endif %}
+ {%- if type is not defined or type != 'hidden' -%}
+ {%- set className = ' form-control' -%}
+ {%- if type|default('') == 'file' -%}
+ {%- set className = ' custom-file-input' -%}
+ {%- elseif type|default('') == 'range' -%}
+ {%- set className = ' form-control-range' -%}
+ {%- endif -%}
+ {%- set attr = attr|merge({class: (attr.class|default('') ~ className)|trim}) -%}
+ {%- endif -%}
{%- if type is defined and (type == 'range' or type == 'color') %}
{# Attribute "required" is not supported #}
{%- set required = false -%}
@@ -142,12 +148,12 @@
{{- parent() -}}
{%- endblock form_widget_simple %}
-{%- block widget_attributes -%}
- {%- if not valid %}
+{% block widget_attributes -%}
+ {%- if not valid -%}
{% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) %}
- {% endif -%}
+ {%- endif -%}
{{ parent() }}
-{%- endblock widget_attributes -%}
+{%- endblock widget_attributes %}
{% block button_widget -%}
{%- set attr = attr|merge({class: (attr.class|default('btn-secondary') ~ ' btn')|trim}) -%}
@@ -166,6 +172,11 @@
{{- form_widget(form) -}}
{{- form_help(form) -}}
- {{- form_errors(form) -}}
{#--#}
{{- form_label(form, null, { widget: parent() }) -}}
+ {%- elseif 'switch-custom' in parent_label_class -%}
+ {%- set attr = attr|merge({class: (attr.class|default('') ~ ' custom-control-input')|trim}) -%}
+
+ {{- form_label(form, null, { widget: parent() }) -}}
+
{%- else -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
@@ -237,8 +248,8 @@
{% block checkbox_radio_label -%}
{#- Do not display the label if widget is not defined in order to prevent double label rendering -#}
{%- if widget is defined -%}
- {% set is_parent_custom = parent_label_class is defined and ('checkbox-custom' in parent_label_class or 'radio-custom' in parent_label_class) %}
- {% set is_custom = label_attr.class is defined and ('checkbox-custom' in label_attr.class or 'radio-custom' in label_attr.class) %}
+ {% set is_parent_custom = parent_label_class is defined and ('checkbox-custom' in parent_label_class or 'radio-custom' in parent_label_class or 'switch-custom' in parent_label_class) %}
+ {% set is_custom = label_attr.class is defined and ('checkbox-custom' in label_attr.class or 'radio-custom' in label_attr.class or 'switch-custom' in label_attr.class) %}
{%- if is_parent_custom or is_custom -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' custom-control-label')|trim}) -%}
{%- else %}
@@ -250,9 +261,6 @@
{%- if required -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
{%- endif -%}
- {%- if parent_label_class is defined -%}
- {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|replace({'checkbox-inline': '', 'radio-inline': '', 'checkbox-custom': '', 'radio-custom': ''})|trim}) -%}
- {%- endif -%}
{%- if label is not same as(false) and label is empty -%}
{%- if label_format is not empty -%}
{%- set label = label_format|replace({
@@ -266,7 +274,7 @@
{{ widget|raw }}
- {{- label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}}
+ {{- label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain)) -}}
{{- form_errors(form) -}}
{%- endif -%}
@@ -282,7 +290,7 @@
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
- <{{ element|default('div') }} class="form-group">
+ <{{ element|default('div') }}{% with {attr: row_attr|merge({class: (row_attr.class|default('') ~ ' form-group')|trim})} %}{{ block('attributes') }}{% endwith %}>
{{- form_label(form) -}}
{{- form_widget(form, widget_attr) -}}
{{- form_help(form) -}}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
index a6ee019a094b6..1b0092859dbd9 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
@@ -172,7 +172,7 @@
{% block choice_label -%}
{# remove the checkbox-inline and radio-inline class, it's only useful for embed labels #}
- {%- set label_attr = label_attr|merge({class: label_attr.class|default('')|replace({'checkbox-inline': '', 'radio-inline': '', 'checkbox-custom': '', 'radio-custom': ''})|trim}) -%}
+ {%- set label_attr = label_attr|merge({class: label_attr.class|default('')|replace({'checkbox-inline': '', 'radio-inline': '', 'checkbox-custom': '', 'radio-custom': '', 'switch-custom': ''})|trim}) -%}
{{- block('form_label') -}}
{% endblock choice_label %}
@@ -187,7 +187,7 @@
{# Rows #}
{% block button_row -%}
-
+
{{- form_widget(form) -}}
{%- endblock button_row %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 0a5cd42cfda41..066ed89c6372b 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -65,12 +65,14 @@
{%- endif -%}
{%- if preferred_choices|length > 0 -%}
{% set options = preferred_choices %}
+ {% set render_preferred_choices = true %}
{{- block('choice_widget_options') -}}
{%- if choices|length > 0 and separator is not none -%}
{%- endif -%}
{%- endif -%}
{%- set options = choices -%}
+ {%- set render_preferred_choices = false -%}
{{- block('choice_widget_options') -}}
{%- endblock choice_widget_collapsed -%}
@@ -83,7 +85,7 @@
{{- block('choice_widget_options') -}}
{%- else -%}
-
+
{%- endif -%}
{% endfor %}
{%- endblock choice_widget_options -%}
@@ -226,13 +228,11 @@
'%name%': name,
'%id%': id,
}) %}
- {%- elseif label is same as(false) -%}
- {% set translation_domain = false %}
- {%- else -%}
+ {%- elseif label is not same as(false) -%}
{% set label = name|humanize %}
{%- endif -%}
{%- endif -%}
-
+
{%- endblock button_widget -%}
{%- block submit_widget -%}
@@ -255,6 +255,17 @@
{{ block('form_widget_simple') }}
{%- endblock color_widget -%}
+{%- block week_widget -%}
+ {%- if widget == 'single_text' -%}
+ {{ block('form_widget_simple') }}
+ {%- else -%}
+ {%- set vars = widget == 'text' ? { 'attr': { 'size': 1 }} : {} -%}
+
+ {{ form_widget(form.year, vars) }}-{{ form_widget(form.week, vars) }}
+
+ {%- endif -%}
+{%- endblock week_widget -%}
+
{# Labels #}
{%- block form_label -%}
@@ -325,7 +336,7 @@
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
-
+
{{- form_label(form) -}}
{{- form_errors(form) -}}
{{- form_widget(form, widget_attr) -}}
@@ -334,7 +345,7 @@
{%- endblock form_row -%}
{%- block button_row -%}
-
+
{{- form_label(form) -}}
@@ -18,7 +18,7 @@
{%- endblock form_row -%}
{%- block button_row -%}
-
+
{{- form_widget(form) -}}
@@ -27,7 +27,8 @@
{%- endblock button_row -%}
{%- block hidden_row -%}
-
+
{{- form_widget(form) -}}
{%- endblock button_row -%}
@@ -433,7 +444,7 @@
{%- for attrname, attrvalue in attr -%}
{{- " " -}}
{%- if attrname in ['placeholder', 'title'] -%}
- {{- attrname }}="{{ translation_domain is same as(false) ? attrvalue : attrvalue|trans(attr_translation_parameters, translation_domain) }}"
+ {{- attrname }}="{{ translation_domain is same as(false) or attrvalue is null ? attrvalue : attrvalue|trans(attr_translation_parameters, translation_domain) }}"
{%- elseif attrvalue is same as(true) -%}
{{- attrname }}="{{ attrname }}"
{%- elseif attrvalue is not same as(false) -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
index 10eaf566d097d..00a51ab04bc28 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
@@ -5,7 +5,7 @@
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
-