From d05cffb40916426f0252f5a635ea3c8fa1ed1819 Mon Sep 17 00:00:00 2001
From: Vladimir Reznichenko <kalessil@gmail.com>
Date: Wed, 11 Mar 2015 21:36:41 +0100
Subject: [PATCH 1/2] [2.3] Static Code Analysis for Components

---
 src/Symfony/Component/BrowserKit/Response.php                  | 3 ++-
 src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

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;
                 }
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
index a710bf75e7..c34d752942 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -785,7 +785,6 @@ QUERY;
     {
         $sids = new \SplObjectStorage();
         $classIds = new \SplObjectStorage();
-        $currentIds = array();
         foreach ($changes[1] as $field => $new) {
             for ($i = 0, $c = count($new); $i<$c; $i++) {
                 $ace = $new[$i];
@@ -813,8 +812,6 @@ QUERY;
                     $aceIdProperty = new \ReflectionProperty('Symfony\Component\Security\Acl\Domain\Entry', 'id');
                     $aceIdProperty->setAccessible(true);
                     $aceIdProperty->setValue($ace, (int) $aceId);
-                } else {
-                    $currentIds[$ace->getId()] = true;
                 }
             }
         }

From 4f93aa3318661f423947f45be8fdbe213a0f2590 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 13 Mar 2015 13:47:20 +0100
Subject: [PATCH 2/2] [travis] Do no tar in //

---
 .travis.sh | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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