minor symfony#13488 [2.3] Removed dead code and various cleaning (saro0h)

This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Removed dead code and various cleaning

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

50973ba Removed dead code and various cleaning

Author: fabpot

src/Symfony/Bridge/Twig/NodeVisitor/Scope.php

@@ -21,11 +21,6 @@ class Scope
      */
     private $parent;
 
-    /**
-     * @var Scope[]
-     */
-    private $children;
-
     /**
      * @var array
      */
@@ -53,10 +48,7 @@ public function __construct(Scope $parent = null)
      */
     public function enter()
     {
-        $child = new self($this);
-        $this->children[] = $child;
-
-        return $child;
+        return new self($this);
     }
 
     /**

src/Symfony/Component/Console/Application.php

@@ -754,8 +754,8 @@ public function renderException($e, $output)
                 $trace = $e->getTrace();
                 array_unshift($trace, array(
                     'function' => '',
-                    'file' => $e->getFile() != null ? $e->getFile() : 'n/a',
-                    'line' => $e->getLine() != null ? $e->getLine() : 'n/a',
+                    'file' => $e->getFile() !== null ? $e->getFile() : 'n/a',
+                    'line' => $e->getLine() !== null ? $e->getLine() : 'n/a',
                     'args' => array(),
                 ));
 

src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php

@@ -26,7 +26,6 @@
  */
 class CheckCircularReferencesPass implements CompilerPassInterface
 {
-    private $currentId;
     private $currentPath;
     private $checkedNodes;
 
@@ -41,7 +40,6 @@ public function process(ContainerBuilder $container)
 
         $this->checkedNodes = array();
         foreach ($graph->getNodes() as $id => $node) {
-            $this->currentId = $id;
             $this->currentPath = array($id);
 
             $this->checkOutEdges($node->getOutEdges());

src/Symfony/Component/HttpFoundation/Request.php

@@ -446,7 +446,7 @@ public function duplicate(array $query = null, array $request = null, array $att
         }
 
         if (!$dup->getRequestFormat(null)) {
-            $dup->setRequestFormat($format = $this->getRequestFormat(null));
+            $dup->setRequestFormat($this->getRequestFormat(null));
         }
 
         return $dup;

src/Symfony/Component/Intl/Intl.php

@@ -264,20 +264,6 @@ private static function getEntryReader()
         return self::$entryReader;
     }
 
-    /**
-     * Resets the internal state.
-     */
-    private static function reset()
-    {
-        self::$currencyBundle = null;
-        self::$languageBundle = null;
-        self::$localeBundle = null;
-        self::$regionBundle = null;
-        self::$icuVersion = false;
-        self::$icuDataVersion = false;
-        self::$entryReader = null;
-    }
-
     /**
      * This class must not be instantiated.
      */

src/Symfony/Component/Process/Process.php

@@ -1040,8 +1040,7 @@ protected function buildCallback($callback)
     {
         $that = $this;
         $out = self::OUT;
-        $err = self::ERR;
-        $callback = function ($type, $data) use ($that, $callback, $out, $err) {
+        $callback = function ($type, $data) use ($that, $callback, $out) {
             if ($out == $type) {
                 $that->addOutput($data);
             } else {

src/Symfony/Component/PropertyAccess/PropertyPath.php

@@ -109,8 +109,7 @@ public function __construct($propertyPath)
                 $element = $matches[3];
                 $this->isIndex[] = true;
             }
-            // Disabled this behaviour as the syntax is not yet final
-            //$pos = strpos($element, self::SINGULAR_SEPARATOR);
+
             $pos = false;
             $singular = null;
 
@@ -131,7 +130,7 @@ public function __construct($propertyPath)
             throw new InvalidPropertyPathException(sprintf(
                 'Could not parse property path "%s". Unexpected token "%s" at position %d',
                 $propertyPath,
-                $remaining{0},
+                $remaining[0],
                 $position
             ));
         }

src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php

@@ -863,7 +863,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];
 
@@ -890,8 +889,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;
             }
         }
     }

src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php

@@ -59,11 +59,7 @@ public function authenticate(TokenInterface $token)
          if (!$user = $token->getUser()) {
              throw new BadCredentialsException('No pre-authenticated principal found in request.');
          }
-/*
-        if (null === $token->getCredentials()) {
-            throw new BadCredentialsException('No pre-authenticated credentials found in request.');
-        }
-*/
+
         $user = $this->userProvider->loadUserByUsername($user);
 
          $this->userChecker->checkPostAuth($user);

src/Symfony/Component/Security/Http/Firewall/AccessListener.php

@@ -55,7 +55,7 @@ public function handle(GetResponseEvent $event)
 
         $request = $event->getRequest();
 
-        list($attributes, $channel) = $this->map->getPatterns($request);
+        list($attributes) = $this->map->getPatterns($request);
 
         if (null === $attributes) {
             return;