8000 Merge branch '2.8' · ostrolucky/symfony@0f9a9a6 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0f9a9a6

Browse files
committed
Merge branch '2.8'
* 2.8: (36 commits) Fix test name fixed CS Allow new lines in Messages translated with transchoice() (replacement for symfony#14867) [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one [2.3] Fix tests on Windows [Yaml] remove partial deprecation annotation [HttpFoundation] Postpone setting the date header on a Response [Console] SymfonyStyle : Fix blocks wordwrapping [Console] SymfonyStyle : Fix blocks output is broken on wind 8000 ows cmd [toolbar] Merged colored icons in toolbar [Validator] remove partial deprecation annotation Updated UPGRADE-2.4.md added missing " Silence invasive deprecation warnings, opt-in for warnings [Form] Support DateTimeImmutable in transform() Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions Removed route name from the debugbar. [FrameworkBundle] Document form.csrf_provider service deprecation [Form] add test to avoid regression of symfony#14891 without this change allways the legacy code get called ... Conflicts: UPGRADE-2.4.md UPGRADE-2.7.md src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/Logger.php src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bridge/Twig/AppVariable.php src/Symfony/Bridge/Twig/Extension/AssetExtension.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingAssetHelperPass.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/Debug/TimedTwigEngine.php src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php src/Symfony/Bundle/TwigBundle/TwigEngine.php src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php src/Symfony/Component/ClassLoader/DebugClassLoader.php src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Console/Helper/HelperSet.php src/Symfony/Component/Console/Helper/ProgressBar.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Console/Input/StringInput.php src/Symfony/Component/Debug/DebugClassLoader.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Debug/Exception/DummyException.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php src/Symfony/Component/DependencyInjection/SimpleXMLElement.php src/Symfony/Component/EventDispatcher/Event.php src/Symfony/Component/Filesystem/Filesystem.php src/Symfony/Component/Form/Deprecated/FormEvents.php src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php src/Symfony/Component/Form/ResolvedFormType.php src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php src/Symfony/Component/HttpKernel/EventListener/EsiListener.php src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/EventListener/RouterListener.php src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php src/Symfony/Component/HttpKernel/Exception/FlattenException.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/HttpCache/Esi.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Log/NullLogger.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Locale/Exception/MethodArgumentNotImplementedException.php src/Symfony/Component/Locale/Exception/MethodArgumentValueNotImplementedException.php src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php src/Symfony/Component/Locale/Exception/NotImplementedException.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/Stub/DateFormat/AmPmTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/DayOfWeekTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/DayOfYearTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour2400Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/HourTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/QuarterTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php src/Symfony/Component/Locale/Stub/DateFormat/Transformer.php src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php src/Symfony/Component/Locale/Stub/StubCollator.php src/Symfony/Component/Locale/Stub/StubIntl.php src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php src/Symfony/Component/Locale/Stub/StubLocale.php src/Symfony/Component/Locale/Stub/StubNumberFormatter.php src/Symfony/Component/OptionsResolver/OptionsResolver.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccess.php src/Symfony/Component/Routing/Annotation/Route.php src/Symfony/Component/Routing/Loader/XmlFileLoader.php src/Symfony/Component/Routing/Loader/YamlFileLoader.php src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Serializer/Encoder/JsonDecode.php src/Symfony/Component/Serializer/Encoder/JsonEncode.php src/Symfony/Component/Serializer/Encoder/JsonEncoder.php src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php src/Symfony/Component/Templating/Asset/Package.php src/Symfony/Component/Templating/Asset/PackageInterface.php src/Symfony/Component/Templating/Asset/PathPackage.php src/Symfony/Component/Templating/Asset/UrlPackage.php src/Symfony/Component/Templating/Helper/AssetsHelper.php src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php src/Symfony/Component/Templating/Loader/Loader.php src/Symfony/Component/Translation/Translator.php src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php src/Symfony/Component/VarDumper/Cloner/Data.php src/Symfony/Component/Yaml/Yaml.php
2 parents c143547 + 25c8b38 commit 0f9a9a6

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

Resources/views/Collector/config.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@
6969
{% set debug_status_class %}sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}{% endset %}
7070
{% set icon %}
7171
<svg width="21" height="28" xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 21 28" enable-background="new 0 0 21 28" xml:space="preserve"><g><path fill="#3F3F3F" d="M5 17H1c-0.5 0-1-0.4-1-1V9c0-0.5 0.4-1 1-1h4c0.5 0 1 0.4 1 1v7C6 16.6 5.6 17 5 17z"/><path fill="#3F3F3F" d="M19 17h-4c-0.5 0-1-0.4-1-1V9c0-0.5 0.4-1 1-1h4c0.5 0 1 0.4 1 1v7C20 16.6 19.6 17 19 17z"/><path fill="#3F3F3F" d="M12.1 20h-4c-0.5 0-1-0.4-1-1v-7c0-0.5 0.4-1 1-1h4c0.5 0 1 0.4 1 1v7C13.1 19.5 12.6 20 12.1 20z"/><rect x="9.1" y="5.8" fill="#3F3F3F" width="2" height="4.5"/><rect x="16" y="17.7" fill="#3F3F3F" width="2" height="4.5"/><rect x="2.1" y="17.7" fill="#3F3F3F" width="2" height="4.5"/><rect x="9.1" y="20.7" fill="#3F3F3F" width="2" height="1.5"/><rect x="2.1" y="5.7" fill="#3F3F3F" width="2" height="1.5"/><rect x="16.1" y="5.7" fill="#3F3F3F" width="2" height="1.5"/></g></svg>
72-
<span class="sf-toolbar-info-piece-additional-detail {{ debug_status_class }}"> </span>
73-
<span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ token }}</span>
72+
<span class="sf-toolbar-info-piece-additional {{ debug_status_class }}">{{ token }}</span>
7473
{% if 'n/a' != collector.appname or 'n/a' != collector.env %}
7574
<span class="sf-toolbar-info-piece-additional-detail">
7675
<span class="sf-toolbar-info-with-delimiter">{{ collector.appname }}</span>

Resources/views/Collector/request.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<svg width="28" height="28" xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve"><path fill="#3F3F3F" d="M19.5 18c0 0.2 0 0.5 0.1 0.8c-0.8 0.7-1.2 1.2-1.3 1.3c0 0 0 0.1 0 0.1c0.7 1 1.1 1.4 1.1 1.4 c0.1 0 0.3-0.1 0.8-0.3c0.4-0.2 0.8-0.4 0.9-0.5c0.1 0.1 0.3 0.1 0.3 0.2c0.1 0 0.2 0.1 0.4 0.1c0 0.2 0.1 0.6 0.3 1 c0.1 0.5 0.2 0.7 0.3 0.8c0 0 0.6-0.1 1.8-0.2c0 0 0.1 0 0.1-0.1c0.1-0.2 0.1-0.8 0.1-1.9c0.2-0.1 0.4-0.3 0.6-0.5 c1.2 0.4 1.8 0.5 1.9 0.4l0.7-1.6l0 0c0.1-0.1-0.5-0.5-1.6-1.1c0-0.3 0-0.5-0.1-0.8c0.8-0.7 1.2-1.2 1.3-1.3c0 0 0-0.1 0-0.1 c-0.7-0.9-1.1-1.4-1.1-1.4l-0.1 0c-0.5 0.2-1 0.5-1.6 0.8c-0.1-0.1-0.3-0.1-0.3-0.2c-0.1 0-0.2-0.1-0.4-0.1c0-0.2-0.1-0.6-0.3-1 c-0.1-0.5-0.2-0.7-0.3-0.8c0 0-0.2 0-0.4 0c-0.3 0-0.6 0.1-0.9 0.1c-0.3 0-0.5 0.1-0.5 0.1c0 0-0.1 0-0.1 0.1 c-0.1 0.2-0.1 0.8-0.1 1.9c-0.2 0.1-0.4 0.3-0.6 0.5c-1.2-0.4-1.8-0.5-1.9-0.4l-0.7 1.6C17.9 17 18.4 17.4 19.5 18z M22.2 16.5 c0.4-0.2 0.8-0.2 1.2 0c0.4 0.2 0.7 0.5 0.9 0.9c0.2 0.4 0.2 0.8 0 1.2c-0.2 0.4-0.5 0.7-0.9 0.9c-0.4 0.2-0.8 0.2-1.2 0 c-0.4-0.2-0.7-0.5-0.9-0.9c-0.2-0.4-0.2-0.8 0-1.2C21.4 17 21.7 16.7 22.2 16.5z"/><path fill="#3F3F3F" d="M18.9 11.2c0-0.1 0-0.2-0.1-0.3c-0.1-0.1-0.2-0.1-0.3-0.2l-2.2-0.3c-0.1-0.3-0.3-0.7-0.5-1.2 C16 9 16.2 8.7 16.5 8.3s0.5-0.6 0.6-0.8c0.1-0.1 0.1-0.2 0.1-0.3c0-0.3-0.7-1.1-2.1-2.4c-0.1-0.1-0.2-0.1-0.3-0.1 c-0.1 0-0.2 0-0.3 0.1l-1.7 1.3c-0.4-0.2-0.8-0.4-1.1-0.5l-0.3-2.3c0-0.1-0.1-0.2-0.1-0.3C11 3.1 10.9 3 10.8 3H8.1 C7.9 3 7.7 3.2 7.6 3.4C7.5 3.9 7.4 4.6 7.3 5.7C6.9 5.8 6.5 6 6.2 6.2L4.5 4.8C4.4 4.8 4.3 4.7 4.2 4.7C4 4.7 3.6 5 3 5.6 c-0.6 0.6-1 1-1.2 1.3C1.7 7 1.7 7.1 1.7 7.2c0 0.1 0 0.2 0.1 0.3c0.6 0.7 1 1.2 1.3 1.7C2.9 9.6 2.7 10 2.6 10.3l-2.3 0.4 c-0.1 0-0.2 0.1-0.2 0.2C0 10.9 0 11 0 11.1v2.7c0 0.1 0 0.2 0.1 0.3c0.1 0.1 0.2 0.1 0.3 0.1l2.2 0.4c0.1 0.4 0.3 0.8 0.5 1.2 c-0.2 0.2-0.4 0.5-0.7 0.9c-0.3 0.4-0.5 0.6-0.6 0.8c-0.1 0.1-0.1 0.2-0.1 0.3c0 0.3 0.7 1.1 2.1 2.4c0.1 0.1 0.2 0.1 0.3 0.1 c0.1 0 0.2 0 0.3-0.1l1.7-1.3c0.4 0.2 0.8 0.4 1.1 0.5l0.3 2.3c0 0.1 0.1 0.2 0.1 0.3C7.9 21.9 8 22 8.1 22h2.8 c0.2 0 0.4-0.1 0.4-0.4c0.1-0.5 0.2-1.2 0.3-2.3c0.4-0.1 0.8-0.3 1.1-0.5l1.7 1.3c0.1 0.1 0.2 0.1 0.3 0.1c0.2 0 0.6-0.3 1.2-0.9 c0.6-0.6 1-1 1.2-1.3c0.1-0.1 0.1-0.2 0.1-0.3c0-0.1 0-0.2-0.1-0.3c-0.6-0.7-1-1.2-1.3-1.7c0.2-0.4 0.4-0.8 0.5-1.1l2.3-0.4 c0.1 0 0.2-0.1 0.2-0.2c0.1-0.1 0.1-0.2 0.1-0.3L18.9 11.2L18.9 11.2z M12.1 15.2c-0.7 0.7-1.6 1.1-2.7 1.1s-1.9-0.4-2.7-1.1 c-0.7-0.7-1.1-1.6-1.1-2.7S6 10.6 6.8 9.8c0.7-0.7 1.6-1.1 2.7-1.1s1.9 0.4 2.7 1.1c0.7 0.7 1.1 1.6 1.1 2.7S12.9 14.4 12.1 15.2z"/><circle fill="#3F3F3F" cx="9.5" cy="12.5" r="2"/></svg>
2323
<span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}" title="{{ collector.statustext }}">{{ collector.statuscode }}</span>
2424
<span class="sf-toolbar-status sf-toolbar-info-piece-additional">{{ request_handler }}</span>
25-
<span class="sf-toolbar-info-piece-additional-detail">on <i>{{ request_route }}</i></span>
2625
{% endset %}
2726
{% set text %}
2827
{% spaceless %}

Resources/views/Profiler/toolbar.css.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
.sf-toolbar-block .sf-toolbar-info-with-delimiter {
134134
border-right: 1px solid #999;
135135
padding-right: 5px;
136-
margin-right: 5px;
137136
}
138137

139138
.sf-toolbar-block .sf-toolbar-info {

0 commit comments

Comments
 (0)
0