Merge branch '2.5' into 2.6

fabpot · fabpot · commit 921361d3fdd8 · 2015-01-25T05:39:26.000+01:00
* 2.5: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed symfony#10531 Make the container considered non-fresh if the environment parameters are changed Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
diff --git a/Dbal/MutableAclProvider.php b/Dbal/MutableAclProvider.php
@@ -928,7 +928,6 @@ private function updateNewAceProperty($name, array $changes)
 
         $sids = new \SplObjectStorage();
         $classIds = new \SplObjectStorage();
-        $currentIds = array();
         for ($i = 0, $c = count($new); $i<$c; $i++) {
             $ace = $new[$i];
 
@@ -955,8 +954,6 @@ private function updateNewAceProperty($name, array $changes)
                 $aceIdProperty = new \ReflectionProperty($ace, 'id');
                 $aceIdProperty->setAccessible(true);
                 $aceIdProperty->setValue($ace, intval($aceId));
-            } else {
-                $currentIds[$ace->getId()] = true;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,6 @@ private function updateNewAceProperty($name, array $changes)`
`928`	`928`
`929`	`929`	`$sids = new \SplObjectStorage();`
`930`	`930`	`$classIds = new \SplObjectStorage();`
`931`		`- $currentIds = array();`
`932`	`931`	`for ($i = 0, $c = count($new); $i<$c; $i++) {`
`933`	`932`	`$ace = $new[$i];`
`934`	`933`
`@@ -955,8 +954,6 @@ private function updateNewAceProperty($name, array $changes)`
`955`	`954`	`$aceIdProperty = new \ReflectionProperty($ace, 'id');`
`956`	`955`	`$aceIdProperty->setAccessible(true);`
`957`	`956`	`$aceIdProperty->setValue($ace, intval($aceId));`
`958`		`- } else {`
`959`		`- $currentIds[$ace->getId()] = true;`
`960`	`957`	`}`
`961`	`958`	`}`
`962`	`959`	`}`