From afc49309009d8723ae0cc8012c8b480600955294 Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Mon, 7 Jul 2014 12:13:42 +0200 Subject: [PATCH 1/5] removed defaults from PHPUnit configuration --- phpunit.xml.dist | 6 ------ src/Symfony/Bridge/Doctrine/phpunit.xml.dist | 6 ------ src/Symfony/Bridge/Monolog/phpunit.xml.dist | 6 ------ src/Symfony/Bridge/Propel1/phpunit.xml.dist | 6 ------ src/Symfony/Bridge/ProxyManager/phpunit.xml.dist | 6 ------ src/Symfony/Bridge/Twig/phpunit.xml.dist | 6 ------ src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist | 6 ------ src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist | 6 ------ src/Symfony/Bundle/TwigBundle/phpunit.xml.dist | 6 ------ src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist | 6 ------ src/Symfony/Component/BrowserKit/phpunit.xml.dist | 6 ------ src/Symfony/Component/ClassLoader/phpunit.xml.dist | 6 ------ src/Symfony/Component/Config/phpunit.xml.dist | 6 ------ src/Symfony/Component/Console/phpunit.xml.dist | 6 ------ src/Symfony/Component/CssSelector/phpunit.xml.dist | 6 ------ src/Symfony/Component/Debug/phpunit.xml.dist | 6 ------ src/Symfony/Component/DependencyInjection/phpunit.xml.dist | 6 ------ src/Symfony/Component/DomCrawler/phpunit.xml.dist | 6 ------ src/Symfony/Component/EventDispatcher/phpunit.xml.dist | 6 ------ src/Symfony/Component/Filesystem/phpunit.xml.dist | 6 ------ src/Symfony/Component/Finder/phpunit.xml.dist | 6 ------ src/Symfony/Component/Form/phpunit.xml.dist | 6 ------ src/Symfony/Component/HttpFoundation/phpunit.xml.dist | 6 ------ src/Symfony/Component/HttpKernel/phpunit.xml.dist | 6 ------ src/Symfony/Component/Intl/phpunit.xml.dist | 6 ------ src/Symfony/Component/Locale/phpunit.xml.dist | 6 ------ src/Symfony/Component/OptionsResolver/phpunit.xml.dist | 6 ------ src/Symfony/Component/Process/phpunit.xml.dist | 6 ------ src/Symfony/Component/PropertyAccess/phpunit.xml.dist | 6 ------ src/Symfony/Component/Routing/phpunit.xml.dist | 6 ------ src/Symfony/Component/Security/phpunit.xml.dist | 6 ------ src/Symfony/Component/Serializer/phpunit.xml.dist | 6 ------ src/Symfony/Component/Stopwatch/phpunit.xml.dist | 6 ------ src/Symfony/Component/Templating/phpunit.xml.dist | 6 ------ src/Symfony/Component/Translation/phpunit.xml.dist | 6 ------ src/Symfony/Component/Validator/phpunit.xml.dist | 6 ------ src/Symfony/Component/Yaml/phpunit.xml.dist | 6 ------ 37 files changed, 222 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 74dd3bdda2..0a5ed5cfaa 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist index 9958a1e696..f7f3d49ac0 100644 --- a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist +++ b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bridge/Monolog/phpunit.xml.dist b/src/Symfony/Bridge/Monolog/phpunit.xml.dist index d7efb8e2c9..1afee95c4e 100644 --- a/src/Symfony/Bridge/Monolog/phpunit.xml.dist +++ b/src/Symfony/Bridge/Monolog/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bridge/Propel1/phpunit.xml.dist b/src/Symfony/Bridge/Propel1/phpunit.xml.dist index 2d2791f5db..a2e9ba2b93 100644 --- a/src/Symfony/Bridge/Propel1/phpunit.xml.dist +++ b/src/Symfony/Bridge/Propel1/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist index 0df7655a0c..0314075d3c 100644 --- a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist +++ b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bridge/Twig/phpunit.xml.dist b/src/Symfony/Bridge/Twig/phpunit.xml.dist index 94215c4408..645101a5b8 100644 --- a/src/Symfony/Bridge/Twig/phpunit.xml.dist +++ b/src/Symfony/Bridge/Twig/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist index 58e2a75999..e01faa1316 100644 --- a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist index 40d28e3360..ffad320be5 100644 --- a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist index c175c0cf39..67921d2bea 100644 --- a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist index f193c99acf..712fa0b308 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/BrowserKit/phpunit.xml.dist b/src/Symfony/Component/BrowserKit/phpunit.xml.dist index ae508db748..51a0f31d18 100644 --- a/src/Symfony/Component/BrowserKit/phpunit.xml.dist +++ b/src/Symfony/Component/BrowserKit/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/ClassLoader/phpunit.xml.dist b/src/Symfony/Component/ClassLoader/phpunit.xml.dist index 182c597c89..3602188f09 100644 --- a/src/Symfony/Component/ClassLoader/phpunit.xml.dist +++ b/src/Symfony/Component/ClassLoader/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Config/phpunit.xml.dist b/src/Symfony/Component/Config/phpunit.xml.dist index d6cdbe7365..9b13467ddb 100644 --- a/src/Symfony/Component/Config/phpunit.xml.dist +++ b/src/Symfony/Component/Config/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Console/phpunit.xml.dist b/src/Symfony/Component/Console/phpunit.xml.dist index e90c5ce5dd..13e0f33748 100644 --- a/src/Symfony/Component/Console/phpunit.xml.dist +++ b/src/Symfony/Component/Console/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/CssSelector/phpunit.xml.dist b/src/Symfony/Component/CssSelector/phpunit.xml.dist index c015e7ef6d..3eb0a1ece0 100644 --- a/src/Symfony/Component/CssSelector/phpunit.xml.dist +++ b/src/Symfony/Component/CssSelector/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Debug/phpunit.xml.dist b/src/Symfony/Component/Debug/phpunit.xml.dist index 31324f26e7..2a8cb8143e 100644 --- a/src/Symfony/Component/Debug/phpunit.xml.dist +++ b/src/Symfony/Component/Debug/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist index 36f4d0b4b5..d636cde6dc 100644 --- a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist +++ b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/DomCrawler/phpunit.xml.dist b/src/Symfony/Component/DomCrawler/phpunit.xml.dist index 7c8f58bab2..9be3b45ab1 100644 --- a/src/Symfony/Component/DomCrawler/phpunit.xml.dist +++ b/src/Symfony/Component/DomCrawler/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist index a3e430dde8..cca1259b37 100644 --- a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist +++ b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Filesystem/phpunit.xml.dist b/src/Symfony/Component/Filesystem/phpunit.xml.dist index 9612e394f3..790283551c 100644 --- a/src/Symfony/Component/Filesystem/phpunit.xml.dist +++ b/src/Symfony/Component/Filesystem/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Finder/phpunit.xml.dist b/src/Symfony/Component/Finder/phpunit.xml.dist index 54bde1eef8..ccef55ac46 100644 --- a/src/Symfony/Component/Finder/phpunit.xml.dist +++ b/src/Symfony/Component/Finder/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Form/phpunit.xml.dist b/src/Symfony/Component/Form/phpunit.xml.dist index 83736cbe5f..bd91d7b831 100644 --- a/src/Symfony/Component/Form/phpunit.xml.dist +++ b/src/Symfony/Component/Form/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist index 6fdeb6abbb..bbc5dc6dc8 100644 --- a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist +++ b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist index a6d1f071fd..f572ab27d3 100644 --- a/src/Symfony/Component/HttpKernel/phpunit.xml.dist +++ b/src/Symfony/Component/HttpKernel/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Intl/phpunit.xml.dist b/src/Symfony/Component/Intl/phpunit.xml.dist index 0e6e13fd4e..4d4f32b0ab 100644 --- a/src/Symfony/Component/Intl/phpunit.xml.dist +++ b/src/Symfony/Component/Intl/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Locale/phpunit.xml.dist b/src/Symfony/Component/Locale/phpunit.xml.dist index 0180f7bb3f..c72b2438a8 100644 --- a/src/Symfony/Component/Locale/phpunit.xml.dist +++ b/src/Symfony/Component/Locale/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist index d855fc9ba4..42fa6df152 100644 --- a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist +++ b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Process/phpunit.xml.dist b/src/Symfony/Component/Process/phpunit.xml.dist index f77a3f8bc0..fcb230a062 100644 --- a/src/Symfony/Component/Process/phpunit.xml.dist +++ b/src/Symfony/Component/Process/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist index 760b76a5bb..cd114f81e8 100644 --- a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist +++ b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Routing/phpunit.xml.dist b/src/Symfony/Component/Routing/phpunit.xml.dist index 5f91149105..8cf6352f3a 100644 --- a/src/Symfony/Component/Routing/phpunit.xml.dist +++ b/src/Symfony/Component/Routing/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Security/phpunit.xml.dist b/src/Symfony/Component/Security/phpunit.xml.dist index 875857fea5..9c53c60896 100644 --- a/src/Symfony/Component/Security/phpunit.xml.dist +++ b/src/Symfony/Component/Security/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Serializer/phpunit.xml.dist b/src/Symfony/Component/Serializer/phpunit.xml.dist index 83cb47d12c..aa28252cab 100644 --- a/src/Symfony/Component/Serializer/phpunit.xml.dist +++ b/src/Symfony/Component/Serializer/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Stopwatch/phpunit.xml.dist b/src/Symfony/Component/Stopwatch/phpunit.xml.dist index f7805624c0..1795afc19a 100644 --- a/src/Symfony/Component/Stopwatch/phpunit.xml.dist +++ b/src/Symfony/Component/Stopwatch/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Templating/phpunit.xml.dist b/src/Symfony/Component/Templating/phpunit.xml.dist index e71dc18e8c..fcb78e17e4 100644 --- a/src/Symfony/Component/Templating/phpunit.xml.dist +++ b/src/Symfony/Component/Templating/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Translation/phpunit.xml.dist b/src/Symfony/Component/Translation/phpunit.xml.dist index cba02055e7..6392d3d557 100644 --- a/src/Symfony/Component/Translation/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Validator/phpunit.xml.dist b/src/Symfony/Component/Validator/phpunit.xml.dist index d2a0ec7e18..3713ca85ad 100644 --- a/src/Symfony/Component/Validator/phpunit.xml.dist +++ b/src/Symfony/Component/Validator/phpunit.xml.dist @@ -3,13 +3,7 @@ diff --git a/src/Symfony/Component/Yaml/phpunit.xml.dist b/src/Symfony/Component/Yaml/phpunit.xml.dist index 9894db629b..90e0bcc27e 100644 --- a/src/Symfony/Component/Yaml/phpunit.xml.dist +++ b/src/Symfony/Component/Yaml/phpunit.xml.dist @@ -3,13 +3,7 @@ From 1fb3ccb3be42cc50cade55c9a68fafcbeced743b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 8 Jul 2014 16:47:36 +0200 Subject: [PATCH 2/5] bumped Symfony version to 2.4.8 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 3a86e6c482..0e9977de68 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $startTime; protected $loadClassCache; - const VERSION = '2.4.7'; - const VERSION_ID = '20407'; + const VERSION = '2.4.8-DEV'; + const VERSION_ID = '20408'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '4'; - const RELEASE_VERSION = '7'; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = '8'; + const EXTRA_VERSION = 'DEV'; /** * Constructor. From 9dbe89dba63212fd6fe5a573f2a5ae27ca635e3e Mon Sep 17 00:00:00 2001 From: Simon Schick Date: Fri, 27 Jun 2014 09:57:31 +0200 Subject: [PATCH 3/5] [HttpFoundation] Remove content-related headers if content is empty --- .../Component/HttpFoundation/Response.php | 62 ++++++++++--------- .../HttpFoundation/Tests/ResponseTest.php | 2 + 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 00502dd8ab..d6fd08750d 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -209,36 +209,42 @@ class Response if ($this->isInformational() || in_array($this->statusCode, array(204, 304))) { $this->setContent(null); - } - - // Content-type based on the Request - if (!$headers->has('Content-Type')) { - $format = $request->getRequestFormat(); - if (null !== $format && $mimeType = $request->getMimeType($format)) { - $headers->set('Content-Type', $mimeType); - } - } - - // Fix Content-Type - $charset = $this->charset ?: 'UTF-8'; - if (!$headers->has('Content-Type')) { - $headers->set('Content-Type', 'text/html; charset='.$charset); - } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) { - // add the charset - $headers->set('Content-Type', $headers->get('Content-Type').'; charset='.$charset); - } - - // Fix Content-Length - if ($headers->has('Transfer-Encoding')) { + $headers->remove('Content-Type'); $headers->remove('Content-Length'); - } + } else { + // Content-type based on the Request + if (!$headers->has('Content-Type')) { + $format = $request->getRequestFormat(); + if (null !== $format && $mimeType = $request->getMimeType($format)) { + $headers->set('Content-Type', $mimeType); + } + } - if ($request->isMethod('HEAD')) { - // cf. RFC2616 14.13 - $length = $headers->get('Content-Length'); - $this->setContent(null); - if ($length) { - $headers->set('Content-Length', $length); + // Fix Content-Type + $charset = $this->charset ?: 'UTF-8'; + if (!$headers->has('Content-Type')) { + $headers->set('Content-Type', 'text/html; charset=' . $charset); + } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos( + $headers->get('Content-Type'), + 'charset' + ) + ) { + // add the charset + $headers->set('Content-Type', $headers->get('Content-Type') . '; charset=' . $charset); + } + + // Fix Content-Length + if ($headers->has('Transfer-Encoding')) { + $headers->remove('Content-Length'); + } + + if ($request->isMethod('HEAD')) { + // cf. RFC2616 14.13 + $length = $headers->get('Content-Length'); + $this->setContent(null); + if ($length) { + $headers->set('Content-Length', $length); + } } } diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php index 8143c56a07..7b3402ce6d 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php @@ -374,6 +374,8 @@ class ResponseTest extends ResponseTestCase $response->prepare($request); $this->assertEquals('', $response->getContent()); + $this->assertFalse($response->headers->has('Content-Type')); + $this->assertFalse($response->headers->has('Content-Length')); } public function testPrepareSetsPragmaOnHttp10Only() From 5955f8edfe62cc8c2eb49381e5025728ad5890f5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 9 Jul 2014 11:04:31 +0200 Subject: [PATCH 4/5] fixed CS --- src/Symfony/Component/HttpFoundation/Response.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index d6fd08750d..cfff05ff97 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -224,11 +224,7 @@ class Response $charset = $this->charset ?: 'UTF-8'; if (!$headers->has('Content-Type')) { $headers->set('Content-Type', 'text/html; charset=' . $charset); - } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos( - $headers->get('Content-Type'), - 'charset' - ) - ) { + } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) { // add the charset $headers->set('Content-Type', $headers->get('Content-Type') . '; charset=' . $charset); } From 1edd1c7147754b1c0202340bea383f9e5a6bb0dd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 9 Jul 2014 11:05:16 +0200 Subject: [PATCH 5/5] added missing test --- src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php index 3f4178f307..77b4ee3363 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php @@ -445,6 +445,8 @@ class ResponseTest extends ResponseTestCase $response->setStatusCode(101); $response->prepare($request); $this->assertEquals('', $response->getContent()); + $this->assertFalse($response->headers->has('Content-Type')); + $this->assertFalse($response->headers->has('Content-Length')); $response->setContent('content'); $response->setStatusCode(304);