symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Cache/Simple/PhpArrayCache.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Cache/Simple/PhpArrayCache.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Application.php
Lines changed: 6 additions & 16 deletions b/‎src/Symfony/Component/Console/Application.php
Lines changed: 6 additions & 16 deletions
diff --git a/‎src/Symfony/Component/Debug/ErrorHandler.php
Lines changed: 0 additions & 4 deletions b/‎src/Symfony/Component/Debug/ErrorHandler.php
Lines changed: 0 additions & 4 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
Lines changed: 2 additions & 38 deletions b/‎src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
Lines changed: 2 additions & 38 deletions
diff --git a/‎src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 9 additions & 17 deletions b/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 9 additions & 17 deletions
@@ -53,7 +53,7 @@ function ($key, $value, $isHit) {
     }
 
     /**
-     * This adapter to take advantage of how PHP stores arrays in its latest versions.
+     * This adapter takes advantage of how PHP stores arrays in its latest versions.
      *
      * @param string                 $file         The PHP file were values are cached
      * @param CacheItemPoolInterface $fallbackPool Fallback when opcache is disabled
 
@@ -37,7 +37,7 @@ public function __construct($file, CacheInterface $fallbackPool)
     }
 
     /**
-     * This adapter to take advantage of how PHP stores arrays in its latest versions.
+     * This adapter takes advantage of how PHP stores arrays in its latest versions.
      *
      * @param string $file The PHP file were values are cached
      *
 
@@ -194,13 +194,10 @@ public function doRun(InputInterface $input, OutputInterface $output)
         }
 
         try {
-            $e = $this->runningCommand = null;
+            $this->runningCommand = null;
             // the command name MUST be the first element of the input
             $command = $this->find($name);
-        } catch (\Exception $e) {
         } catch (\Throwable $e) {
-        }
-        if (null !== $e) {
             if (null !== $this->dispatcher) {
                 $event = new ConsoleErrorEvent($input, $output, $e);
                 $this->dispatcher->dispatch(ConsoleEvents::ERROR, $event);
@@ -813,24 +810,17 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
             } else {
                 $exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
             }
-        } catch (\Exception $e) {
         } catch (\Throwable $e) {
-        }
-        if (null !== $e) {
             $event = new ConsoleErrorEvent($input, $output, $e, $command);
             $this->dispatcher->dispatch(ConsoleEvents::ERROR, $event);
             $e = $event->getError();
 
-            if (0 === $exitCode = $event->getExitCode()) {
-                $e = null;
+            if (0 !== $exitCode = $event->getExitCode()) {
+                throw $e;
             }
-        }
-
-        $event = new ConsoleTerminateEvent($command, $input, $output, $exitCode);
-        $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
-
-        if (null !== $e) {
-            throw $e;
+        } finally {
+            $event = new ConsoleTerminateEvent($command, $input, $output, $exitCode);
+            $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
         }
 
         return $event->getExitCode();
 
@@ -541,7 +541,6 @@ public function handleException($exception, array $error = null)
         if ($this->loggedErrors & $type) {
             try {
                
F438
 $this->loggers[$type][0]->log($this->loggers[$type][1], $message, array('exception' => $exception));
-            } catch (\Exception $handlerException) {
             } catch (\Throwable $handlerException) {
             }
         }
@@ -558,7 +557,6 @@ public function handleException($exception, array $error = null)
         }
         try {
             call_user_func($this->exceptionHandler, $exception);
-        } catch (\Exception $handlerException) {
         } catch (\Throwable $handlerException) {
         }
         if (isset($handlerException)) {
@@ -598,8 +596,6 @@ public static function handleFatalError(array $error = null)
             while (self::$stackedErrorLevels) {
                 static::unstackErrors();
             }
-        } catch (\Exception $exception) {
-            // Handled below
         } catch (\Throwable $exception) {
             // Handled below
         }
 
@@ -89,7 +89,7 @@ private function updateDefinition(ContainerBuilder $container, $id, Definition $
 
         $returnType = $m->getReturnType();
         if (null !== $returnType && !$returnType->isBuiltin()) {
-            $returnType = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType->__toString();
+            $returnType = $returnType->getName();
             if (null !== $class) {
                 $declaringClass = $m->getDeclaringClass()->getName();
                 if ('self' === strtolower($returnType)) {
 
@@ -76,7 +76,7 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
             return;
         }
         if (!is_string($type)) {
-            $name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
+            $name = $type->getName();
 
             if ($type->isBuiltin()) {
                 return $noBuiltin ? null : $name;
 
@@ -34,48 +34,12 @@ public function createArgumentMetadata($controller)
         }
 
         foreach ($reflection->getParameters() as $param) {
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param), $this->isVariadic($param), $this->hasDefaultValue($param), $this->getDefaultValue($param), $param->allowsNull());
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
         }
 
         return $arguments;
     }
 
-    /**
-     * Returns whether an argument is variadic.
-     *
-     * @param \ReflectionParameter $parameter
-     *
-     * @return bool
-     */
-    private function isVariadic(\ReflectionParameter $parameter)
-    {
-        return $parameter->isVariadic();
-    }
-
-    /**
-     * Determines whether an argument has a default value.
-     *
-     * @param \ReflectionParameter $parameter
-     *
-     * @return bool
-     */
-    private function hasDefaultValue(\ReflectionParameter $parameter)
-    {
-        return $parameter->isDefaultValueAvailable();
-    }
-
-    /**
-     * Returns a default value if available.
-     *
-     * @param \ReflectionParameter $parameter
-     *
-     * @return mixed|null
-     */
-    private function getDefaultValue(\ReflectionParameter $parameter)
-    {
-        return $this->hasDefaultValue($parameter) ? $parameter->getDefaultValue() : null;
-    }
-
     /**
      * Returns an associated type to the given parameter if available.
      *
@@ -88,7 +52,7 @@ private function getType(\ReflectionParameter $parameter)
         if (!$type = $parameter->getType()) {
             return;
         }
-        $typeName = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
+        $typeName = $type->getName();
         if ('array' === $typeName && !$type->isBuiltin()) {
             // Special case for HHVM with variadics
             return;
 
@@ -195,7 +195,7 @@ private function extractFromAccessor($class, $property)
      */
     private function extractFromReflectionType(\ReflectionType $reflectionType)
     {
-        $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : $reflectionType->__toString();
+        $phpTypeOrClass = $reflectionType->getName();
         $nullable = $reflectionType->allowsNull();
 
         if (Type::BUILTIN_TYPE_ARRAY === $phpTypeOrClass) {
 
@@ -87,7 +87,7 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, $isNes
         $prefix = Caster::PREFIX_VIRTUAL;
 
         $a += array(
-            $prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : $c->__toString(),
+            $prefix.'name' => $c->getName(),
             $prefix.'allowsNull' => $c->allowsNull(),
             $prefix.'isBuiltin' => $c->isBuiltin(),
         );
@@ -174,7 +174,7 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
 
         if (isset($a[$prefix.'returnType'])) {
             $v = $a[$prefix.'returnType'];
-            $v = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+            $v = $v->getName();
             $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType']->allowsNull() ? '?'.$v : $v, array(class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', ''));
         }
         if (isset($a[$prefix.'class'])) {
@@ -242,7 +242,7 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
         ));
 
         if ($v = $c->getType()) {
-            $a[$prefix.'typeHint'] = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+            $a[$prefix.'typeHint'] = $v->getName();
         }
 
         if (isset($a[$prefix.'typeHint'])) {
 
@@ -93,7 +93,6 @@ public function parse($value, $flags = 0)
         $this->refs = array();
 
         $mbEncoding = null;
-        $e = null;
         $data = null;
 
         if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) {
@@ -103,22 +102,15 @@ public function parse($value, $flags = 0)
 
         try {
             $data = $this->doParse($value, $flags);
-        } catch (\Exception $e) {
-        } catch (\Throwable $e) {
-        }
-
-        if (null !== $mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        $this->lines = array();
-        $this->currentLine = '';
-        $this->refs = array();
-        $this->skippedLineNumbers = array();
-        $this->locallySkippedLineNumbers = array();
-
-        if (null !== $e) {
-            throw $e;
+        } finally {
+            if (null !== $mbEncoding) {
+                mb_internal_encoding($mbEncoding);
+            }
+            $this->lines = array();
+            $this->currentLine = '';
+            $this->refs = array();
+            $this->skippedLineNumbers = array();
+            $this->locallySkippedLineNumbers = array();
         }
 
         return $data;