diff --git a/.travis.sh b/.travis.sh index 9eeecbeeb8..55020cb012 100644 --- a/.travis.sh +++ b/.travis.sh @@ -10,16 +10,15 @@ if [ -z "$components" ]; then exit 1 fi echo '{"packages": {' > packages.json -components=$( - for c in $components; do - sed -i ':a;N;$!ba;s#^{\n\(\s*\)\("name"\)#{\n\1"repositories": \[{ "type": "composer", "url": "file://'$(pwd)'/" }\],\n\1\2#' $c/composer.json - n=$(php -r '$n=json_decode(file_get_contents("'$c'/composer.json"));echo $n->name;') - echo '"'$n'": {"'$branch'.x-dev": ' >> packages.json - cat $c/composer.json >> packages.json - echo '"version": "'$branch.x-dev'",\n "dist": {"type": "tar", "url": "file://'$(pwd)/$c'/package'$branch'.tar"}\n}},' >> packages.json - echo $c - done; -) +for c in $components; do + sed -i ':a;N;$!ba;s#^{\n\(\s*\)\("name"\)#{\n\1"repositories": \[{ "type": "composer", "url": "file://'$(pwd)'/" }\],\n\1\2#' $c/composer.json + n=$(php -r '$n=json_decode(file_get_contents("'$c'/composer.json"));echo $n->name;') + echo '"'$n'": {"'$branch'.x-dev": ' >> packages.json + cat $c/composer.json >> packages.json + echo '"version": "'$branch.x-dev'",\n "dist": {"type": "tar", "url": "file://'$(pwd)/$c'/package'$branch'.tar"}\n}},' >> packages.json +done; sed -i ':a;N;$!ba;s/\n}\n"/,\n "/g' packages.json sed -i ':a;N;$!ba;s/}},$/\n}}\n}}/' packages.json -echo "$components" | parallel --gnu "cd {}; tar -cf package$branch.tar --exclude='package*.tar' *" +for c in $components; do + (cd $c && tar -cf package$branch.tar --exclude='package*.tar' *) +done diff --git a/src/Symfony/Component/BrowserKit/Response.php b/src/Symfony/Component/BrowserKit/Response.php index d00836fa83..7a7130b95e 100644 --- a/src/Symfony/Component/BrowserKit/Response.php +++ b/src/Symfony/Component/BrowserKit/Response.php @@ -123,8 +123,9 @@ class Response */ public function getHeader($header, $first = true) { + $normalizedHeader = str_replace('-', '_', strtolower($header)); foreach ($this->headers as $key => $value) { - if (str_replace('-', '_', strtolower($key)) == str_replace('-', '_', strtolower($header))) { + if (str_replace('-', '_', strtolower($key)) === $normalizedHeader) { if ($first) { return is_array($value) ? (count($value) ? $value[0] : '') : $value; }