From 3b7ee9a4bc2c80cf37c40cef69384f54fba25674 Mon Sep 17 00:00:00 2001 From: Ziumin Date: Mon, 23 Apr 2012 10:54:46 +0300 Subject: [PATCH 1/3] http_build_query fix --- src/Symfony/Component/DomCrawler/Form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 8bdaa33ebf..c0d322fef2 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -141,7 +141,7 @@ class Form extends Link implements \ArrayAccess */ public function getPhpValues() { - $qs = http_build_query($this->getValues()); + $qs = http_build_query($this->getValues(), '', '&'); parse_str($qs, $values); return $values; @@ -159,7 +159,7 @@ class Form extends Link implements \ArrayAccess */ public function getPhpFiles() { - $qs = http_build_query($this->getFiles()); + $qs = http_build_query($this->getFiles(), '', '&'); parse_str($qs, $values); return $values; From de73de02596e7f29a4a291c4b20b3fa4567ce54a Mon Sep 17 00:00:00 2001 From: Ziumin Date: Mon, 23 Apr 2012 10:55:54 +0300 Subject: [PATCH 2/3] http_build_query fix --- src/Symfony/Component/Routing/Generator/UrlGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php index f0e2a48518..b1be194ba8 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -146,7 +146,7 @@ class UrlGenerator implements UrlGeneratorInterface // add a query string if needed $extra = array_diff_key($originParameters, $variables, $defaults); - if ($extra && $query = http_build_query($extra)) { + if ($extra && $query = http_build_query($extra, '', '&')) { $url .= '?'.$query; } From 2e7d3b19c15ea4bfdfafa4e14919a168bc6fb965 Mon Sep 17 00:00:00 2001 From: Ziumin Date: Mon, 23 Apr 2012 10:56:52 +0300 Subject: [PATCH 3/3] http_build_query fix --- src/Symfony/Bundle/FrameworkBundle/HttpKernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php index e103162844..5e839d44b6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php +++ b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php @@ -190,14 +190,14 @@ class HttpKernel extends BaseHttpKernel return $controller; } - $path = http_build_query($attributes); + $path = http_build_query($attributes, '', '&'); $uri = $this->container->get('router')->generate('_internal', array( 'controller' => $controller, 'path' => $path ?: 'none', '_format' => $this->container->get('request')->getRequestFormat(), )); - if ($queryString = http_build_query($query)) { + if ($queryString = http_build_query($query, '', '&')) { $uri .= '?'.$queryString; }