Commit Graph

3935 Commits

Author SHA1 Message Date
Nicolas Grekas
eb7330f7af Merge branch '3.0'
* 3.0:
  Fix merge
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
  Removed an object as route generator argument
2015-12-30 19:48:02 +01:00
Nicolas Grekas
78a08f3a68 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
  Removed an object as route generator argument

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
2015-12-30 19:45:14 +01:00
Nicolas Grekas
d38278fd12 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 19:23:12 +01:00
Tobias Schultze
140ed985be feature #16747 [Form] Improved performance of ChoiceType and its subtypes (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Improved performance of ChoiceType and its subtypes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

I found out today that, although CachingFactoryDecorator is part of Symfony 2.7, it is not configured to be used in the DI configuration. This simple in-memory cache improved the page load by 50% for one considerably large form with many (~600) choice/entity fields that I was working on today.

Also, caching of query builders with parameters was broken, since the parameters are represented by objects. PHP's object hashes were used to calculate the cache keys, hence the cache always missed. I converted parameters to arrays for calculating the cache keys to fix this problem.

Commits
-------

a0ef101 [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 16:04:43 +01:00
Bernhard Schussek
a0ef1018d6 [Form] Improved performance of ChoiceType and its subtypes 2015-12-30 11:11:52 +01:00
Diego Saint Esteben
98cb838aa1 Added the assets helper again 2015-12-28 12:42:02 -03:00
Nicolas Grekas
586c58a354 Merge branch '3.0'
* 3.0:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  bumped Symfony version to 3.0.2
  Do not use HttpKernel Extension when not needed
  updated VERSION for 3.0.1
  updated CHANGELOG for 3.0.1
  bumped Symfony version to 2.8.2
  updated VERSION for 2.8.1
  updated CHANGELOG for 2.8.1
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-12-28 14:15:29 +01:00
Nicolas Grekas
304097705c Merge branch '2.8' into 3.0
* 2.8:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.8.2
  updated VERSION for 2.8.1
  updated CHANGELOG for 2.8.1
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.7.md
	CHANGELOG-2.8.md
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Command/ExportCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Command/ImportCommand.php
	src/Symfony/Component/Console/Shell.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-12-28 14:14:56 +01:00
Nicolas Grekas
a7e5b4932e Merge branch '2.7' into 2.8
* 2.7:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
2015-12-28 14:12:56 +01:00
Nicolas Grekas
a63dd194ed Merge branch '2.3' into 2.7
* 2.3:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
2015-12-28 14:11:03 +01:00
Tobias Schultze
cc64c54cfa Do not use HttpKernel Extension when not needed for 2.7 2015-12-26 18:53:53 +01:00
Gregor Harlan
3dca549b95 use nowdoc instead of heredoc 2015-12-21 17:05:00 +01:00
Nicolas Grekas
28e0f7bafb Merge branch '3.0'
* 3.0:
  prefer phpunit 5.x on hhvm
  Reflected the change of the choice_value option in the Upgrade information
  [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
  [travis] Auto-conf deps=high matrix line
  [FrameworkBundle] fixes outdated phpdoc on Controller::createForm() method.
  fix error level for deprecation
  Fix the logout path when not using the router
  Fix the logout path when not using the router
  [Form] cast IDs to match deprecated behaviour of EntityChoiceList
  [FrameworkBundle] minor: fix property_info service name in composer.json
  [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
  [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers
  CSS min-height and min-width should not be "auto"
2015-12-18 16:44:05 +01:00
Nicolas Grekas
f6f8819733 Merge branch '2.8' into 3.0
* 2.8:
  prefer phpunit 5.x on hhvm
  Reflected the change of the choice_value option in the Upgrade information
  [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
  [travis] Auto-conf deps=high matrix line
  fix error level for deprecation
  Fix the logout path when not using the router
  Fix the logout path when not using the router
  [Form] cast IDs to match deprecated behaviour of EntityChoiceList
  [FrameworkBundle] minor: fix property_info service name in composer.json
  [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
  [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers
  CSS min-height and min-width should not be "auto"

Conflicts:
	.travis.yml
	UPGRADE-2.8.md
	appveyor.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/HttpFoundation/ParameterBag.php
2015-12-18 16:43:53 +01:00
Nicolas Grekas
6cc5756d8b Merge branch '2.7' into 2.8
* 2.7:
  prefer phpunit 5.x on hhvm
  [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
  [travis] Auto-conf deps=high matrix line
  Fix the logout path when not using the router
  Fix the logout path when not using the router
  [Form] cast IDs to match deprecated behaviour of EntityChoiceList
  [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
  [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-12-18 16:38:35 +01:00
Nicolas Grekas
85814de44c Merge branch '2.3' into 2.7
* 2.3:
  prefer phpunit 5.x on hhvm
  [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
  [travis] Auto-conf deps=high matrix line
  Fix the logout path when not using the router
  [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
  [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
2015-12-18 16:35:58 +01:00
Christian Flothmann
17fcef5aff [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands 2015-12-18 10:21:31 +01:00
Hugo Hamon
3d0c4dd303 [FrameworkBundle] fixes outdated phpdoc on Controller::createForm() method. 2015-12-18 08:55:12 +01:00
Kévin Dunglas
2680b5cd0c [FrameworkBundle] minor: fix property_info service name in composer.json 2015-12-15 08:31:34 +01:00
Tobias Schultze
e612b92ed0 Merge branch '3.0' 2015-12-15 03:03:25 +01:00
Tobias Schultze
06dd574627 Merge branch '2.8' into 3.0 2015-12-15 03:03:07 +01:00
Tobias Schultze
3a57b77bc7 Merge branch '2.7' into 2.8 2015-12-15 02:39:37 +01:00
Tobias Schultze
88d586b447 Merge branch '2.3' into 2.7 2015-12-15 02:31:17 +01:00
Christophe Coevoet
25b89d4af4 bug #16955 [FrameworkBundle] ContainerDebugCommand: pass the right object to the descriptors (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] ContainerDebugCommand: pass the right object to the descriptors

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | c5067dacb3 (commitcomment-14884960)
| License       | MIT
| Doc PR        |

Commits
-------

8cf0022 pass the right object to the descriptors
2015-12-14 17:14:40 +01:00
Maxime Steinhausser
ac15454912 [FrameworkBundle][HttpKernel] Remove remaining $triggerDeprecation flag 2015-12-13 17:11:34 +01:00
Tobias Schultze
47258df50c minor #16818 [Form] Improve deprecation notice to mention the affected service id (apfelbox)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Improve deprecation notice to mention the affected service id

| Q             | A
| ------------- | ---
| Bug fix?      |no
| New feature?  |no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This fix changes the deprecation notice to mention the affected service id. Without this update it is quite annoying to find the service with the deprecated definition.

Commits
-------

0b9ea95 Improve form deprecation notices to mention the affected service ids
2015-12-12 05:10:34 +01:00
Jannik Zschiesche
0b9ea95fd4 Improve form deprecation notices to mention the affected service ids 2015-12-12 02:23:05 +01:00
Christian Flothmann
8cf00225f9 pass the right object to the descriptors 2015-12-10 20:25:40 +01:00
NothingWeAre
8a2c75791c return ajax collector to collectors.php
in symfony 3.0 there is no ajax collector declared. Because of that debug toolbar do not display ajac calls
2015-12-10 20:31:29 +02:00
Nicolas Grekas
45e26ca067 Merge branch '3.0'
* 3.0:
  [Process] Enhance compatiblity with --enable-sigchild
  [Validator] removes unused variable in LengthValidator class.
  [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920
  fix short array syntax for php 5.3
  [Serializer] Fixed  on array of objects in .
  [Process] Always call proc_close
  [Form] Add missing tests for StringUtil::fqcnToBlockPrefix()
  [Security] Fix a Polyfill import statement in StringUtils
  [Validator] Updated Luxembourgish translations for 2.8
  Improved the code of the commands that use the new SymfonyStyle class
  disable server commands without Process component
  list all server command names in suggestion
  Suggested Process dependency
  disable server:run cmd without Process component
  Suggested Process dependency
  Fix DeprecationErrorHandler on PHP 5.3
  [FrameworkBundle] prevent cache:clear creating too long paths
  [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command
2015-12-10 18:31:22 +01:00
Nicolas Grekas
c1bfa46feb Merge branch '2.8' into 3.0
* 2.8:
  [Process] Enhance compatiblity with --enable-sigchild
  [Validator] removes unused variable in LengthValidator class.
  [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920
  fix short array syntax for php 5.3
  [Serializer] Fixed  on array of objects in .
  [Process] Always call proc_close
  [Form] Add missing tests for StringUtil::fqcnToBlockPrefix()
  [Security] Fix a Polyfill import statement in StringUtils
  [Validator] Updated Luxembourgish translations for 2.8
  Improved the code of the commands that use the new SymfonyStyle class
  disable server commands without Process component
  list all server command names in suggestion
  Suggested Process dependency
  disable server:run cmd without Process component
  Suggested Process dependency
  [FrameworkBundle] prevent cache:clear creating too long paths
  [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command

Conflicts:
	.travis.yml
	src/Symfony/Bridge/Twig/Command/LintCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
	src/Symfony/Bundle/TwigBundle/Command/DebugCommand.php
	src/Symfony/Component/Security/Core/Util/StringUtils.php
2015-12-10 18:31:09 +01:00
Nicolas Grekas
829c011b49 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Enhance compatiblity with --enable-sigchild
  fix short array syntax for php 5.3
  [Serializer] Fixed  on array of objects in .
  [Process] Always call proc_close
  [Validator] Updated Luxembourgish translations for 2.8
  disable server commands without Process component
  list all server command names in suggestion
  Suggested Process dependency
  disable server:run cmd without Process component
  Suggested Process dependency
  [FrameworkBundle] prevent cache:clear creating too long paths
  [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-12-10 18:11:25 +01:00
Nicolas Grekas
f253d624a0 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Enhance compatiblity with --enable-sigchild
  [Process] Always call proc_close
  [Validator] Updated Luxembourgish translations for 2.8
  [FrameworkBundle] prevent cache:clear creating too long paths

Conflicts:
	src/Symfony/Component/Process/Tests/ProcessTest.php
	src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
	src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
	src/Symfony/Component/Process/Tests/SimpleProcessTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf
2015-12-10 17:58:22 +01:00
Nicolas Grekas
99535506e8 Clean useless deprecation silencing 2015-12-10 15:12:08 +01:00
Tobias Schultze
4cde2d1e33 bug #16829 [FrameworkBundle] prevent cache:clear creating too long paths (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] prevent cache:clear creating too long paths

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15547 #16783
| License       | MIT
| Doc PR        | -

Commits
-------

6e279c5 [FrameworkBundle] prevent cache:clear creating too long paths
2015-12-10 01:42:36 +01:00
Almog Baku
d2b9a1db88 [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 2015-12-09 14:54:22 +01:00
Fabien Potencier
420da14156 bug #16757 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command (jeremyFreeAgent)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Currently when you run the TranslationUpdateCommand and want to write the translation in the domain file without a `translations` directory the output is `[OK] Success` but the file is not created.

This PR fix the creation of the directory.

Commits
-------

8c45107 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command
2015-12-08 19:14:24 +01:00
Javier Eguiluz
c5067dacb3 Improved the code of the commands that use the new SymfonyStyle class 2015-12-07 22:56:39 +01:00
Fabien Potencier
b8fbe69bb8 bug #16871 [FrameworkBundle] Disable built-in server commands when Process component is missing (gnugat, xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Disable built-in server commands when Process component is missing

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This also backports the improvement for the `suggest` section from #16650 to the `2.7` branch and improves it by also mentioning the other built-in server commands.

Commits
-------

972c4ca disable server commands without Process component
dd82b64 list all server command names in suggestion
d18fb9b Suggested Process dependency
2015-12-07 22:55:06 +01:00
Fabien Potencier
52915ede0f Merge branch '2.3' into 2.7
* 2.3:
  disable server:run cmd without Process component
  Suggested Process dependency
2015-12-07 22:53:02 +01:00
Christian Flothmann
972c4caae8 disable server commands without Process component 2015-12-06 23:34:46 +01:00
Christian Flothmann
dd82b6459d list all server command names in suggestion 2015-12-06 23:34:45 +01:00
Loïc Faugeron
d18fb9bbbe Suggested Process dependency
The `server:run` command requires the Process component.
2015-12-06 23:33:58 +01:00
Christian Flothmann
99d174176a disable server:run cmd without Process component 2015-12-06 23:31:12 +01:00
Loïc Faugeron
604174c963 Suggested Process dependency
The `server:run` command requires the Process component.
2015-12-06 23:31:09 +01:00
ogizanagi
907bbece01 [FrameworkBundle][Validator] Fix apc cache service deprecation 2015-12-06 22:50:37 +01:00
Christophe Coevoet
d859e0ea0a Merge branch '3.0'
* 3.0:
  [Process] Fix stopping a process on Windows
  [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name
  Added a note about the new requirement iconv.
  Improved error messages for Yaml Deprecations
  Added a test case for the Logger class.
  [Form] Fix choices defined as Traversable
  CS: general fixes
  Suggested Process dependency
2015-12-05 18:45:25 +01:00
Christophe Coevoet
d553264958 Merge branch '2.8' into 3.0
* 2.8:
  [Process] Fix stopping a process on Windows
  [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name
  Added a note about the new requirement iconv.
  Improved error messages for Yaml Deprecations
  Added a test case for the Logger class.
  [Form] Fix choices defined as Traversable
  CS: general fixes
  Suggested Process dependency
2015-12-05 18:45:07 +01:00
Christophe Coevoet
b6e13f8861 minor #16650 Suggested Process dependency (gnugat)
This PR was merged into the 2.8 branch.

Discussion
----------

Suggested Process dependency

The `server:run` command requires the Process component.

Commits
-------

7c1231a Suggested Process dependency
2015-12-05 16:18:14 +01:00
Tobias Schultze
6e279c5f8a [FrameworkBundle] prevent cache:clear creating too long paths 2015-12-05 03:07:20 +01:00
Fabien Potencier
582f4753a3 updated version to 3.1 2015-11-30 22:39:17 +01:00
Jérémy Romey
8c45107856 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command 2015-11-30 14:03:45 +01:00
Nicolas Grekas
ef61e5481f Forward compatibility with AbstractLayout* 2.8 tests 2015-11-29 18:06:34 +01:00
Nicolas Grekas
5bc34d2d51 [Form] Drop remaing CsrfProviderAdapter/Interface mentions 2015-11-28 10:23:07 +01:00
Fabien Potencier
0468f745d8 Merge branch '2.8'
* 2.8:
  Fixed the wrong source name and the ja translation
  [Debug] fix readme: DebugClassLoader moved to debug itself
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset
  [Console] Fix bug with  overloading
  [Form] Fixed wrong usages of the "text" type
  [Form] Disabled view data validation if "data_class" is set to null
  [HttpFoundation] Workaround HHVM rewriting HTTP response line
2015-11-27 06:46:53 +01:00
Fabien Potencier
14f70aeafd bug #16621 [Console] Fix bug with $output overloading (WouterJ)
This PR was squashed before being merged into the 2.8 branch (closes #16621).

Discussion
----------

[Console] Fix bug with $output overloading

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony-standard/issues/887, #16622
| License       | MIT
| Doc PR        | -

This is exactly why variable overloading isn't a great idea :)

Commits
-------

5764a00 [Console] Fix bug with  overloading
2015-11-26 17:44:52 +01:00
Wouter J
5764a00a76 [Console] Fix bug with overloading 2015-11-26 17:44:51 +01:00
Nicolas Grekas
5183c881d0 Merge branch '2.8'
* 2.8:
  Always enable clock-mock for HttpFoundation
  [ClassLoader] Fix parsing namespace when token_get_all() is missing
  Bug #16343 [Router] Too many Routes ?
  Fixes the stack traces of the deprecation logs
  fix unused variable warning
  [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false
  add composer exclude-from-classmap for new 2.8 components
  [Yaml] sync changelog and upgrade files
  [Debug] Ensure class declarations are loaded only once
  Minor design tweaks for the Logs and Doctrine profiler panels

Conflicts:
	UPGRADE-2.8.md
2015-11-26 08:02:09 +01:00
Fabien Potencier
09e896c306 feature #16031 [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false (Restless-ET)
This PR was squashed before being merged into the 2.8 branch (closes #16031).

Discussion
----------

[Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Seems like this behaviour was already partially added (as stated [here](https://github.com/symfony/symfony/pull/16016#issuecomment-144464875)) to solve the problem of expanded choice widgets.

Commits
-------

0e0b904 [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false
2015-11-25 05:07:02 +01:00
Restless-ET
0e0b904ff2 [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false 2015-11-25 05:06:57 +01:00
Loïc Faugeron
7c1231a2e0 Suggested Process dependency
The `server:run` command requires the Process component.
2015-11-24 11:52:35 +00:00
Fabien Potencier
45fe468074 Merge branch '2.8'
* 2.8:
  removed usage of the deprecated StringUtils::equals() method
  Fix: Resolve tempdir symlink, not working on OSX
  fixed tests
  migrate session after remember me authentication
  prevent timing attacks in digest auth listener
  mitigate CSRF timing attack vulnerability
  fix potential timing attack issue
  [WebProfilerBundle] Added a top left border radius to the minified to…
  [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder
  [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase
  [Process] PhpExecutableFinder: add regression test
2015-11-23 11:41:47 +01:00
Nicolas Grekas
baad4da9b7 [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase 2015-11-20 13:20:48 +01:00
Nicolas Grekas
2abbb8a451 Merge branch '2.8'
* 2.8:
  Fix undefined array $server
  Fix call to undefined function json_last_error_message
  Fix bug in windows detection
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Fix PropertyInfo extractor namespace in framework bundle
  Add missing exclusions from phpunit.xml.dist
  [Serializer] ObjectNormalizer: don't serialize static methods and props
  [Form] Enhance some FormRegistry deprecation messages
  [Validator] [sl] BIC (SWIFT-BIC) validation constraint
  [WebProfilerBundle] correct typo in show stack trace link
  bumped Symfony version to 2.8.0
  updated VERSION for 2.8.0-BETA1
  updated CHANGELOG for 2.8.0-BETA1
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
	src/Symfony/Component/Form/FormRegistry.php
2015-11-18 14:48:51 +01:00
Nicolas Grekas
ecdd681898 Merge branch '2.7' into 2.8
* 2.7:
  Fix undefined array $server
  Fix bug in windows detection
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  [Serializer] ObjectNormalizer: don't serialize static methods and props
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Component/Security/phpunit.xml.dist
2015-11-18 14:45:00 +01:00
Nicolas Grekas
a8d21b5ca9 Merge branch '2.3' into 2.7
* 2.3:
  Fix undefined array $server
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
	src/Symfony/Component/Security/phpunit.xml.dist
2015-11-18 14:41:01 +01:00
Jérôme Vasseur
d04984ad05 Fix PropertyInfo extractor namespace in framework bundle 2015-11-18 09:40:44 +01:00
Nicolas Grekas
d4880c4785 Add missing exclusions from phpunit.xml.dist 2015-11-18 09:19:46 +01:00
Nicolas Grekas
02d2148f37 [Form] Enhance some FormRegistry deprecation messages 2015-11-17 11:33:11 +01:00
Fabien Potencier
c0f7463c3e bug #16352 Fix the server variables in the router_*.php files (leofeyer)
This PR was squashed before being merged into the 2.3 branch (closes #16352).

Discussion
----------

Fix the server variables in the router_*.php files

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT

The built-in web server automatically rewrites everything to the `app_dev.php` script, but it does not adjust the server variables accordingly.

Here is the output of `print_r($_SERVER)` on Apache with mod_rewrite enabled (relevant lines only):

```
Array
(
    [REQUEST_URI] => /text-elements.html
    [SCRIPT_NAME] => /app_dev.php
    [PHP_SELF] => /app_dev.php
)
```

And here is the output of the exact same script on the built-in server:

```
Array
(
    [REQUEST_URI] => /text-elements.html
    [SCRIPT_NAME] => /text-elements.html
    [PHP_SELF] => /text-elements.html
)
```

And here is the return value of Symfony's `Request::getScriptName()` method:

```php
// Apache: http://localhost/text-elements.html
echo $this->container->get('request_stack')->getCurrentRequest()->getScriptName(); // /app_dev.php

// Built-in web server: http://127.0.0.1:8000/text-elements.html
echo $this->container->get('request_stack')->getCurrentRequest()->getScriptName(); // /text-elements.html
```

This PR fixes the two server variables in the `router_dev.php` script.

Commits
-------

4923411 Fix the server variables in the router_*.php files
2015-11-13 09:09:50 +01:00
Leo Feyer
4923411062 Fix the server variables in the router_*.php files 2015-11-13 09:09:48 +01:00
WouterJ
6f2782b188 Revert removal of framework.csrf_protection section 2015-11-11 11:02:58 +01:00
Nicolas Grekas
5aa4a3b64c Remove some more legacy code 2015-11-10 11:42:06 +01:00
Nicolas Grekas
1c1c4e7005 Merge branch '2.8'
* 2.8:
  Fix merge
2015-11-09 14:21:10 +01:00
Nicolas Grekas
0bb46c1ae2 Fix merge 2015-11-09 14:20:59 +01:00
Nicolas Grekas
d33879a9db Merge branch '2.8'
* 2.8:
  [ci] Phpunit tests wont run if composer is installed in a wrapper
  [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
  fix race condition at mkdir (#16258)
  [VarDumper] Fix PHP7 type-hints compat
  [Bridge] [PhpUnit] fixes documentation markup.
  [PropertyAccess] Port of the performance optimization from 2.3
  trigger deprecation warning when using empty_value
  [PropertyAccess] Test access to dynamic properties
  [PropertyAccess] Fix dynamic property accessing.
  [Serializer] GetSetNormalizer shouldn't set/get static methods
  [Serializer] PropertyNormalizer shouldn't set static properties
  JsonDescriptor - encode container params only once

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Extension/Core/Type/DateType.php
	src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
	src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
2015-11-09 13:52:14 +01:00
Nicolas Grekas
d86a3f3172 Merge branch '2.7' into 2.8
* 2.7:
  [ci] Phpunit tests wont run if composer is installed in a wrapper
  [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
  fix race condition at mkdir (#16258)
  [VarDumper] Fix PHP7 type-hints compat
  [Bridge] [PhpUnit] fixes documentation markup.
  [PropertyAccess] Port of the performance optimization from 2.3
  trigger deprecation warning when using empty_value
  [PropertyAccess] Test access to dynamic properties
  [PropertyAccess] Fix dynamic property accessing.
  [Serializer] GetSetNormalizer shouldn't set/get static methods
  [Serializer] PropertyNormalizer shouldn't set static properties
  JsonDescriptor - encode container params only once

Conflicts:
	src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
2015-11-09 13:46:59 +01:00
Nicolas Grekas
b1ad6232b7 Merge branch '2.8'
* 2.8:
  [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist
  [DependencyInjection] Autowing: exclude abstract definitons
  [DependencyInjection] Autowiring: support parent/decorators
  [FrameworkBundle] Autowiring support for debug:container
  Fixing bad type-hint auto-wiring bug
  [Yaml] deprecate unquoted indicator characters
  added a micro kernel
  Re-adding the ability to add a resource to the RouteCollectionBuilder
  [DependencyInjection] Add autowiring support to dumpers
  ldap_set_option should be called with a valid link identifier
  [FrameworkBundle][Form] Better exception message for private form tagged services

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml
	src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
2015-11-09 11:46:27 +01:00
Fabien Potencier
515007e941 bug #16469 [DependencyInjection] [FrameworkBundle] Enhance autowiring DX (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] [FrameworkBundle] Enhance autowiring DX

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

* Dump autowiring data when using the container
* Add autowiring data to the `debug:container` command

Commits
-------

9c3b910 [FrameworkBundle] Autowiring support for debug:container
18913e1 [DependencyInjection] Add autowiring support to dumpers
2015-11-07 09:30:54 +01:00
Fabien Potencier
aacbcef537 bug #16384 [FrameworkBundle] JsonDescriptor - encode container params only once (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] JsonDescriptor - encode container params only once

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16379
| License       | MIT
| Doc PR        |

Commits
-------

dd9d076 JsonDescriptor - encode container params only once
2015-11-07 09:20:26 +01:00
Kévin Dunglas
9c3b910849 [FrameworkBundle] Autowiring support for debug:container 2015-11-06 14:08:21 +01:00
Nicolas Grekas
53f4fd50ed [FwB] Fix tests on Windows 2015-11-05 16:42:47 +01:00
Fabien Potencier
1f57d5e33a feature #16419 [FrameworkBundle][Form] Better exception message for private form tagged services (ogizanagi)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle][Form] Better exception message for private form tagged services

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Similar to what is done in [RegisterListenerPass](https://github.com/symfony/symfony/blob/2.8/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php#L61-L63), those changes allow to have a better exception message when defining a private `form.type`, `form.type_extension` or `form.form_guesser` tagged service, and at container compilation instead of runtime:

> The service "my.form.type" must be public as form types are lazy-loaded.

instead of:
> You have requested a non-existent service "my.form.type"

If I'm right, similar cases were considered as new features in the past, so this targets 2.8.

Commits
-------

11d675f [FrameworkBundle][Form] Better exception message for private form tagged services
2015-11-05 14:20:52 +01:00
Fabien Potencier
eab0f0a4f4 added a micro kernel 2015-11-04 18:19:57 +01:00
blanchonvincent
52c50e3b1e Remove abstract class and use Interface+Trait
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
	src/Symfony/Component/DependencyInjection/ContainerAware.php
2015-11-04 18:03:42 +01:00
ogizanagi
11d675fdcf [FrameworkBundle][Form] Better exception message for private form tagged services 2015-11-02 11:45:59 +01:00
Fabien Potencier
bc0c8c1b5b Merge branch '2.8'
* 2.8:
  added the new Composer exclude-from-classmap option
  added the new Composer exclude-from-classmap option
  fix docblock description for the build() method
  fix expected argument type docblock
  Set back libxml settings after testings.
  fixed Twig deprecation notices
2015-10-30 16:35:59 -07:00
Fabien Potencier
a15c9eb82d Merge branch '2.7' into 2.8
* 2.7:
  added the new Composer exclude-from-classmap option
  added the new Composer exclude-from-classmap option
  fix expected argument type docblock
  Set back libxml settings after testings.
  fixed Twig deprecation notices
2015-10-30 13:15:42 -07:00
Fabien Potencier
05c2ecc124 Merge branch '2.3' into 2.7
* 2.3:
  added the new Composer exclude-from-classmap option
  fix expected argument type docblock
  Set back libxml settings after testings.
  fixed Twig deprecation notices
2015-10-30 13:10:21 -07:00
Anne-Sophie Bachelard
65bef75bef added the new Composer exclude-from-classmap option 2015-10-30 12:48:51 -07:00
Christian Flothmann
dd9d076a0b JsonDescriptor - encode container params only once 2015-10-29 22:04:12 +01:00
Tobias Schultze
d0acda84f2 Merge branch '2.8'
Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.7.md
	composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/Form/Tests/FormRegistryTest.php
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Ldap/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
	src/Symfony/Component/VarDumper/composer.json
2015-10-29 13:12:54 +01:00
Nicolas Grekas
303f05baaf Rely on iconv and symfony/polyfill-* 2015-10-28 03:15:07 +01:00
Fabien Potencier
7f48360eda Merge branch '2.7' into 2.8
* 2.7:
  fixed YAML files missing quotes when a string starts with @
  [VarDumper] Fix anonymous class dumping
  [Routing] mark internal classes
  [Translation][Csv file] remove unnecessary statements, for better readability.
  [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-27 08:40:42 -07:00
Fabien Potencier
ced865deb1 Merge branch '2.3' into 2.7
* 2.3:
  fixed YAML files missing quotes when a string starts with @
  [Routing] mark internal classes
  [Translation][Csv file] remove unnecessary statements, for better readability.
  [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-27 08:38:06 -07:00
Fabien Potencier
e36fea8a63 fixed YAML files missing quotes when a string starts with @ 2015-10-26 13:58:42 +01:00
Fabien Potencier
1054dd7f28 bug #16316 [FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed (tucksaun)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Autoreloading was previously set to `false`, but actually we want to force it.
This could even lead to a fatal error when warming where it was already warmed as the previous `classes.php` is directly required.

Commits
-------

d31350f [FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed
2015-10-25 17:32:30 +01:00
Nicolas Grekas
f863e6af9a Fix merge 2015-10-24 17:25:13 +02:00
Nicolas Grekas
48b25f5251 Merge branch '2.8'
* 2.8:
  Fix the FrameworkBundle dependencies
  [DoctrineBridge] Fix required guess of boolean fields
  [DI] don't use array_map to resolve services
  Remove dead code in the PropertyPath constructor
  [EventDispatcher] fix docblock
  [Process] Inherit env vars by default in PhpProcess
  Changed one console output style to avoid visual issues
  [VarDumper] Fix return type and anonymous classes dumping
  [FrameworkBundle] PropertyInfo support
  [HttpFoundation] Fixes /0 subnet handling in IpUtils
  [Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception.
  [Minor] [Serializer] Removed second license header
  [TwigBundle] added a Twig templates warmer when templating is disabled
  [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer
  [Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates
  [Templating] introduce path and url methods in php templates to be in line with twig templates
  [Routing] deprecate the old url generator reference type values
  [Routing] use constant in a test that is new in 2.7
  [FrameworkBundle] Add a new ClassCache cache warmer
  [Validator] Add expressionLanguage to ExpressionValidator constructor

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
	src/Symfony/Component/EventDispatcher/EventDispatcher.php
2015-10-23 17:08:51 +02:00
Christophe Coevoet
02584c26bf Fix the FrameworkBundle dependencies
Due to the new ClassCacheCacheWarmer, the ClassLoader component is now a
required dependency of the bundle.
2015-10-23 12:11:50 +02:00