Skip to content

Commit c17f240

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: [FrameworkBundle] Fix title and placeholder rendering in php form templates. RequestDataCollector - small fix renamed composer.phar to composer to be consistent with the Symfony docs [FrameworkBundle] bumped min version of Routing to 2.3 removed composer --dev option everywhere fixed a test [Console] Fixed output bug, if escaped string in a formatted string. [Security] Remove ContextListener's onKernelResponse listener as it is used Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)" Revert "fixed assertion" fixed assertion [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value fixed URL Add reference to documentation in FormEvents phpdocs [YAML] Fix one-liners to work with multiple new lines Keep "pre" meaning for var_dump quick-and-dirty debug [Console][Table] Fix cell padding with multi-byte Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Console/Helper/TableHelper.php
2 parents 0bd05cc + 57ff2e2 commit c17f240

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DataCollector/RequestDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function collect(Request $request, Response $response, \Exception $except
9191
$this->data = array(
9292
'format' => $request->getRequestFormat(),
9393
'content' => $content,
94-
'content_type' => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
94+
'content_type' => $response->headers->get('Content-Type', 'text/html'),
9595
'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
9696
'status_code' => $statusCode,
9797
'request_query' => $request->query->all(),

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,5 @@ Resources
9595
You can run the unit tests with the following command:
9696

9797
$ cd path/to/Symfony/Component/HttpKernel/
98-
$ composer.phar install
98+
$ composer install
9999
$ phpunit

0 commit comments

Comments
 (0)