From 89133e6a71f3978328ca78603d727df863007803 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Wed, 10 Feb 2016 10:18:08 +0000 Subject: [PATCH 1/4] [FrameworkBundle] Fix a typo --- .../Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 54f65588d2..03f058dddc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -44,7 +44,7 @@ class TranslationUpdateCommand extends ContainerAwareCommand )) ->setDescription('Updates the translation file') ->setHelp(<<<'EOF' -The %command.name% command extract translation strings from templates +The %command.name% command extracts translation strings from templates of a given bundle. It can display them or merge the new ones into the translation files. When new translation strings are found it can automatically add a prefix to the translation message. From 120dfe48a612a64832acb5137af69efa9209917f Mon Sep 17 00:00:00 2001 From: possum Date: Wed, 10 Feb 2016 20:09:02 +0100 Subject: [PATCH 2/4] sendContent return as parent. --- .../HttpFoundation/BinaryFileResponse.php | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index d20880fceb..d5b1c34bf4 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -27,6 +27,9 @@ class BinaryFileResponse extends Response { protected static $trustXSendfileTypeHeader = false; + /** + * @var File + */ protected $file; protected $offset; protected $maxlen; @@ -179,7 +182,7 @@ class BinaryFileResponse extends Response $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream'); } - if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) { + if ('HTTP/1.0' !== $request->server->get('SERVER_PROTOCOL')) { $this->setProtocolVersion('1.1'); } @@ -196,17 +199,17 @@ class BinaryFileResponse extends Response if (false === $path) { $path = $this->file->getPathname(); } - if (strtolower($type) == 'x-accel-redirect') { + if (strtolower($type) === 'x-accel-redirect') { // Do X-Accel-Mapping substitutions. // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) { $mapping = explode('=', $mapping, 2); - if (2 == count($mapping)) { + if (2 === count($mapping)) { $pathPrefix = trim($mapping[0]); $location = trim($mapping[1]); - if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) { + if (substr($path, 0, strlen($pathPrefix)) === $pathPrefix) { $path = $location.substr($path, strlen($pathPrefix)); break; } @@ -217,7 +220,7 @@ class BinaryFileResponse extends Response $this->maxlen = 0; } elseif ($request->headers->has('Range')) { // Process the range headers. - if (!$request->headers->has('If-Range') || $this->getEtag() == $request->headers->get('If-Range')) { + if (!$request->headers->has('If-Range') || $this->getEtag() === $request->headers->get('If-Range')) { $range = $request->headers->get('Range'); $fileSize = $this->file->getSize(); @@ -252,17 +255,17 @@ class BinaryFileResponse extends Response /** * Sends the file. + * + * {@inheritdoc} */ public function sendContent() { if (!$this->isSuccessful()) { - parent::sendContent(); - - return; + return parent::sendContent(); } if (0 === $this->maxlen) { - return; + return $this; } $out = fopen('php://output', 'wb'); @@ -272,6 +275,8 @@ class BinaryFileResponse extends Response fclose($out); fclose($file); + + return $this; } /** From bb29979218df0a10c778b5e342b342edd1677f2c Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Thu, 11 Feb 2016 09:15:16 -0500 Subject: [PATCH 3/4] avoid (string) catchable fatal error for __PHP_Incomplete_Class instances --- .../HttpKernel/DataCollector/DataCollector.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php index 94e6541c91..e3a2d9fe11 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php @@ -45,6 +45,10 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable return sprintf('Object(%s)', get_class($var)); } + if ($var instanceof \__PHP_Incomplete_Class) { + return sprintf('__PHP_Incomplete_Class(%s)', $this->getClassNameFromIncomplete($var)); + } + if (is_array($var)) { $a = array(); foreach ($var as $k => $v) { @@ -72,4 +76,11 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable return (string) $var; } + + private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $var) + { + $array = new \ArrayObject($var); + + return $array['__PHP_Incomplete_Class_Name']; + } } From ea52400097caf540745eb293c9ad78722e8a5add Mon Sep 17 00:00:00 2001 From: Trent Steel Date: Thu, 11 Feb 2016 21:12:43 +1000 Subject: [PATCH 4/4] remove unnecessary retrieval and setting of data --- .../Extension/Csrf/EventListener/CsrfValidationListener.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php index a800fc48d9..91871a8286 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php @@ -84,9 +84,10 @@ class CsrfValidationListener implements EventSubscriberInterface public function preSubmit(FormEvent $event) { $form = $event->getForm(); - $data = $event->getData(); if ($form->isRoot() && $form->getConfig()->getOption('compound')) { + $data = $event->getData(); + if (!isset($data[$this->fieldName]) || !$this->csrfProvider->isCsrfTokenValid($this->intention, $data[$this->fieldName])) { $errorMessage = $this->errorMessage; @@ -99,10 +100,9 @@ class CsrfValidationListener implements EventSubscriberInterface if (is_array($data)) { unset($data[$this->fieldName]); + $event->setData($data); } } - - $event->setData($data); } /**