Removed dead code and various cleaning

saro0h · saro0h · commit 982444868846 · 2015-01-21T20:52:32.000+01:00
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
@@ -21,11 +21,6 @@ class Scope
      */
     private $parent;
 
-    /**
-     * @var Scope[]
-     */
-    private $children;
-
     /**
      * @var array
      */
@@ -52,7 +47,6 @@ public function __construct(Scope $parent = null)
     public function enter()
     {
         $child = new self($this);
-        $this->children[] = $child;
 
         return $child;
     }
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -59,7 +59,7 @@ private function writeNode(NodeInterface $node, $depth = 0, $root = false, $name
             });
 
             if (count($remapping)) {
-                list($singular, $plural) = current($remapping);
+                list($singular) = current($remapping);
                 $rootName = $singular;
             }
         }
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\NodeInterface;
 use Symfony\Component\Config\Definition\ArrayNode;
-use Symfony\Component\Config\Definition\ScalarNode;
 use Symfony\Component\Config\Definition\EnumNode;
 use Symfony\Component\Config\Definition\PrototypedArrayNode;
 use Symfony\Component\Yaml\Inline;
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -708,8 +708,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(),
                 ));
 
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -105,7 +105,7 @@ protected function describeCommand(Command $command, array $options = array())
             $this->write($help);
         }
 
-        if ($definition = $command->getNativeDefinition()) {
+        if ($command->getNativeDefinition()) {
             $this->write("\n\n");
             $this->describeInputDefinition($command->getNativeDefinition());
         }
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -50,7 +50,7 @@ public function __construct($debug = true, $fileLinkFormat = null)
      */
     public static function register($debug = true, $fileLinkFormat = null)
     {
-        $handler = new static($debug, $fileLinkFormat = null);
+        $handler = new static($debug, $fileLinkFormat);
 
         $prev = set_exception_handler(array($handler, 'handle'));
         if (is_array($prev) && $prev[0] instanceof ErrorHandler) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/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());
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
@@ -33,7 +33,6 @@ class CheckReferenceValidityPass implements CompilerPassInterface
 {
     private $container;
     private $currentId;
-    private $currentDefinition;
     private $currentScope;
     private $currentScopeAncestors;
     private $currentScopeChildren;
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -480,7 +480,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;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
@@ -24,7 +24,7 @@
  */
 class DumpListener implements EventSubscriberInterface
 {
-    private $container;
+    private $cloner;
     private $dumper;
 
     /**
diff --git a/src/Symfony/Component/Intl/Intl.php b/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.
      */
diff --git a/src/Symfony/Component/Process/Pipes/UnixPipes.php b/src/Symfony/Component/Process/Pipes/UnixPipes.php
@@ -172,7 +172,7 @@ public function readAndWrite($blocking, $close = false)
         }
 
         if (null !== $w && 0 < count($w)) {
-            while ($len = strlen($this->inputBuffer)) {
+            while (strlen($this->inputBuffer)) {
                 $written = fwrite($w[0], $this->inputBuffer, 2 << 18); // write 512k
                 if ($written > 0) {
                     $this->inputBuffer = (string) substr($this->inputBuffer, $written);
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -235,7 +235,7 @@ private function write($blocking, $close)
         }
 
         if (null !== $w && 0 < count($w)) {
-            while ($len = strlen($this->inputBuffer)) {
+            while (strlen($this->inputBuffer)) {
                 $written = fwrite($w[0], $this->inputBuffer, 2 << 18);
                 if ($written > 0) {
                     $this->inputBuffer = (string) substr($this->inputBuffer, $written);
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1290,8 +1290,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 {
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -579,8 +579,6 @@ private function camelize($string)
      */
     private function findAdderAndRemover(\ReflectionClass $reflClass, array $singulars)
     {
-        $exception = null;
-
         foreach ($singulars as $singular) {
             $addMethod = 'add'.$singular;
             $removeMethod = 'remove'.$singular;
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPath.php b/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;
 
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -853,7 +853,6 @@ private function updateNewFieldAceProperty($name, array $changes)
     {
         $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];
@@ -881,8 +880,6 @@ private function updateNewFieldAceProperty($name, array $changes)
                     $aceIdProperty = new \ReflectionProperty('Symfony\Component\Security\Acl\Domain\Entry', 'id');
                     $aceIdProperty->setAccessible(true);
                     $aceIdProperty->setValue($ace, intval($aceId));
-                } else {
-                    $currentIds[$ace->getId()] = true;
                 }
             }
         }
@@ -931,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];
 
@@ -958,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;
             }
         }
     }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/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);
diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/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;
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -94,7 +94,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
             } elseif ($exception instanceof AccessDeniedException) {
                 return $this->handleAccessDeniedException($event, $exception);
             } elseif ($exception instanceof LogoutException) {
-                return $this->handleLogoutException($event, $exception);
+                return $this->handleLogoutException($exception);
             }
         } while (null !== $exception = $exception->getPrevious());
     }
@@ -160,7 +160,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
         }
     }
 
-    private function handleLogoutException(GetResponseForExceptionEvent $event, LogoutException $exception)
+    private function handleLogoutException(LogoutException $exception)
     {
         if (null !== $this->logger) {
             $this->logger->info(sprintf('Logout exception occurred; wrapping with AccessDeniedHttpException (%s)', $exception->getMessage()));
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -73,7 +73,7 @@ protected function cancelCookie(Request $request)
         if (null !== ($cookie = $request->cookies->get($this->options['name']))
             && count($parts = $this->decodeCookie($cookie)) === 2
         ) {
-            list($series, $tokenValue) = $parts;
+            list($series) = $parts;
             $this->tokenProvider->deleteTokenBySeries($series);
         }
     }
diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
@@ -46,7 +46,7 @@ public function validate($value, Constraint $constraint)
         $value = (string) $value;
         $canonical = str_replace('-', '', $value);
 
-        if (null == $constraint->type) {
+        if (null === $constraint->type) {
             if ($constraint->isbn10 && !$constraint->isbn13) {
                 $constraint->type = 'isbn10';
             } elseif ($constraint->isbn13 && !$constraint->isbn10) {
diff --git a/src/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php
@@ -40,11 +40,6 @@ class LegacyConstraintViolationBuilder implements ConstraintViolationBuilderInte
      */
     private $parameters;
 
-    /**
-     * @var mixed
-     */
-    private $root;
-
     /**
      * @var mixed
      */
@@ -70,7 +65,6 @@ public function __construct(ExecutionContextInterface $context, $message, array
         $this->context = $context;
         $this->message = $message;
         $this->parameters = $parameters;
-        $this->root = $context->getRoot();
         $this->invalidValue = $context->getValue();
     }
 
diff --git a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
@@ -115,8 +115,6 @@ public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
 
     public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, $isNested)
     {
-        // Commented lines denote properties that exist but are better not dumped for clarity.
-
         $a += array(
             'nodeName' => $dom->nodeName,
             'nodeValue' => new CutStub($dom->nodeValue),

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private function writeNode(NodeInterface $node, $depth = 0, $root = false, $name`
`59`	`59`	`});`
`60`	`60`
`61`	`61`	`if (count($remapping)) {`
`62`		`- list($singular, $plural) = current($remapping);`
	`62`	`+ list($singular) = current($remapping);`
`63`	`63`	`$rootName = $singular;`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected function describeCommand(Command $command, array $options = array())`
`105`	`105`	`$this->write($help);`
`106`	`106`	`}`
`107`	`107`
`108`		`- if ($definition = $command->getNativeDefinition()) {`
	`108`	`+ if ($command->getNativeDefinition()) {`
`109`	`109`	`$this->write("\n\n");`
`110`	`110`	`$this->describeInputDefinition($command->getNativeDefinition());`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct($debug = true, $fileLinkFormat = null)`
`50`	`50`	`*/`
`51`	`51`	`public static function register($debug = true, $fileLinkFormat = null)`
`52`	`52`	`{`
`53`		`- $handler = new static($debug, $fileLinkFormat = null);`
	`53`	`+ $handler = new static($debug, $fileLinkFormat);`
`54`	`54`
`55`	`55`	`$prev = set_exception_handler(array($handler, 'handle'));`
`56`	`56`	`if (is_array($prev) && $prev[0] instanceof ErrorHandler) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ class CheckReferenceValidityPass implements CompilerPassInterface`
`33`	`33`	`{`
`34`	`34`	`private $container;`
`35`	`35`	`private $currentId;`
`36`		`- private $currentDefinition;`
`37`	`36`	`private $currentScope;`
`38`	`37`	`private $currentScopeAncestors;`
`39`	`38`	`private $currentScopeChildren;`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ public function duplicate(array $query = null, array $request = null, array $att`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`if (!$dup->getRequestFormat(null)) {`
`483`		`- $dup->setRequestFormat($format = $this->getRequestFormat(null));`
	`483`	`+ $dup->setRequestFormat($this->getRequestFormat(null));`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`return $dup;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`class DumpListener implements EventSubscriberInterface`
`26`	`26`	`{`
`27`		`- private $container;`
	`27`	`+ private $cloner;`
`28`	`28`	`private $dumper;`
`29`	`29`
`30`	`30`	`/**`