Skip to content

Commit 5a781cf

Browse files
Merge branch '2.3' into 2.6
* 2.3: [travis] Do no tar in // [2.3] Static Code Analysis for Components
2 parents 18bb157 + dc6ea1a commit 5a781cf

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.travis.sh

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ if [ -z "$components" ]; then
1010
exit 1
1111
fi
1212
echo '{"packages": {' > packages.json
13-
components=$(
14-
for c in $components; do
15-
sed -i ':a;N;$!ba;s#^{\n\(\s*\)\("name"\)#{\n\1"repositories": \[{ "type": "composer", "url": "file://'$(pwd)'/" }\],\n\1\2#' $c/composer.json
16-
n=$(php -r '$n=json_decode(file_get_contents("'$c'/composer.json"));echo $n->name;')
17-
echo '"'$n'": {"'$branch'.x-dev": ' >> packages.json
18-
cat $c/composer.json >> packages.json
19-
echo '"version": "'$branch.x-dev'",\n "dist": {"type": "tar", "url": "file://'$(pwd)/$c'/package'$branch'.tar"}\n}},' >> packages.json
20-
echo $c
21-
done;
22-
)
13+
for c in $components; do
14+
sed -i ':a;N;$!ba;s#^{\n\(\s*\)\("name"\)#{\n\1"repositories": \[{ "type": "composer", "url": "file://'$(pwd)'/" }\],\n\1\2#' $c/composer.json
15+
n=$(php -r '$n=json_decode(file_get_contents("'$c'/composer.json"));echo $n->name;')
16+
echo '"'$n'": {"'$branch'.x-dev": ' >> packages.json
17+
cat $c/composer.json >> packages.json
18+
echo '"version": "'$branch.x-dev'",\n "dist": {"type": "tar", "url": "file://'$(pwd)/$c'/package'$branch'.tar"}\n}},' >> packages.json
19+
done;
2320
sed -i ':a;N;$!ba;s/\n}\n"/,\n "/g' packages.json
2421
sed -i ':a;N;$!ba;s/}},$/\n}}\n}}/' packages.json
25-
echo "$components" | parallel --gnu "cd {}; tar -cf package$branch.tar --exclude='package*.tar' *"
22+
for c in $components; do
23+
(cd $c && tar -cf package$branch.tar --exclude='package*.tar' *)
24+
done

src/Symfony/Component/BrowserKit/Response.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@ public function getHeaders()
123123
*/
124124
public function getHeader($header, $first = true)
125125
{
126+
$normalizedHeader = str_replace('-', '_', strtolower($header));
126127
foreach ($this->headers as $key => $value) {
127-
if (str_replace('-', '_', strtolower($key)) == str_replace('-', '_', strtolower($header))) {
128+
if (str_replace('-', '_', strtolower($key)) === $normalizedHeader) {
128129
if ($first) {
129130
return is_array($value) ? (count($value) ? $value[0] : '') : $value;
130131
}

0 commit comments

Comments
 (0)