Merge branch '2.8' into 3.3

* 2.8:
  [SecurityBundle] Fix syntax error in test
  [Console] Remove remaining dead code
  bumped Symfony version to 2.8.32
  bumped Symfony version to 2.7.39
  updated VERSION for 2.8.31
  updated CHANGELOG for 2.8.31
  updated VERSION for 2.7.38
  updated CHANGELOG for 2.7.38
  Replace array|\Traversable by iterable
  Fix ambiguous pattern

Author: nicolas-grekas

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php

@@ -126,7 +126,8 @@ private function createContainer($sessionStorageOptions)
         $ext = new SecurityExtension();
         $ext->load($config, $container);
 
-        (new AddSessionDomainConstraintPass())->process($container);
+        $pass = new AddSessionDomainConstraintPass();
+        $pass->process($container);
 
         return $container;
     }

src/Symfony/Component/Console/Application.php

@@ -121,11 +121,10 @@ public function run(InputInterface $input = null, OutputInterface $output = null
             $e = null;
             $exitCode = $this->doRun($input, $output);
         } catch (\Exception $e) {
-        } catch (\Throwable $e) {
         }
 
         if (null !== $e) {
-            if (!$this->catchExceptions || !$e instanceof \Exception) {
+            if (!$this->catchExceptions) {
                 throw $e;
             }
 
@@ -998,8 +997,8 @@ public function extractNamespace($name, $limit = null)
      * Finds alternative of $name among $collection,
      * if nothing is found in $collection, try in $abbrevs.
      *
-     * @param string             $name       The string
-     * @param array|\Traversable $collection The collection
+     * @param string   $name       The string
+     * @param iterable $collection The collection
      *
      * @return string[] A sorted array of similar string
      */

src/Symfony/Component/Console/Question/Question.php

@@ -117,7 +117,7 @@ public function setHiddenFallback($fallback)
     /**
      * Gets values for the autocompleter.
      *
-     * @return null|array|\Traversable
+     * @return null|iterable
      */
     public function getAutocompleterValues()
     {
@@ -127,7 +127,7 @@ public function getAutocompleterValues()
     /**
      * Sets values for the autocompleter.
      *
-     * @param null|array|\Traversable $values
+     * @param null|iterable $values
      *
      * @return $this
      *

src/Symfony/Component/Filesystem/Filesystem.php

@@ -83,8 +83,8 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
     /**
      * Creates a directory recursively.
      *
-     * @param string|array|\Traversable $dirs The directory path
-     * @param int                       $mode The directory mode
+     * @param string|iterable $dirs The directory path
+     * @param int             $mode The directory mode
      *
      * @throws IOException On any directory creation failure
      */
@@ -111,7 +111,7 @@ public function mkdir($dirs, $mode = 0777)
     /**
      * Checks the existence of files or directories.
      *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
+     * @param string|iterable $files A filename, an array of files, or a \Traversable instance to check
      *
      * @return bool true if the file exists, false otherwise
      */
@@ -135,9 +135,9 @@ public function exists($files)
     /**
      * Sets access and modification time of file.
      *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
-     * @param int                       $time  The touch time as a Unix timestamp
-     * @param int                       $atime The access time as a Unix timestamp
+     * @param string|iterable $files A filename, an array of files, or a \Traversable instance to create
+     * @param int             $time  The touch time as a Unix timestamp
+     * @param int             $atime The access time as a Unix timestamp
      *
      * @throws IOException When touch fails
      */
@@ -154,7 +154,7 @@ public function touch($files, $time = null, $atime = null)
     /**
      * Removes files or directories.
      *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
+     * @param string|iterable $files A filename, an array of files, or a \Traversable instance to remove
      *
      * @throws IOException When removal fails
      */
@@ -190,10 +190,10 @@ public function remove($files)
     /**
      * Change mode for an array of files or directories.
      *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change mode
-     * @param int                       $mode      The new mode (octal)
-     * @param int                       $umask     The mode mask (octal)
-     * @param bool                      $recursive Whether change the mod recursively or not
+     * @param string|iterable $files     A filename, an array of files, or a \Traversable instance to change mode
+     * @param int             $mode      The new mode (octal)
+     * @param int             $umask     The mode mask (octal)
+     * @param bool            $recursive Whether change the mod recursively or not
      *
      * @throws IOException When the change fail
      */
@@ -212,9 +212,9 @@ public function chmod($files, $mode, $umask = 0000, $recursive = false)
     /**
      * Change the owner of an array of files or directories.
      *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change owner
-     * @param string                    $user      The new owner user name
-     * @param bool                      $recursive Whether change the owner recursively or not
+     * @param string|iterable $files     A filename, an array of files, or a \Traversable instance to change owner
+     * @param string          $user      The new owner user name
+     * @param bool            $recursive Whether change the owner recursively or not
      *
      * @throws IOException When the change fail
      */
@@ -239,9 +239,9 @@ public function chown($files, $user, $recursive = false)
     /**
      * Change the group of an array of files or directories.
      *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change group
-     * @param string                    $group     The group name
-     * @param bool                      $recursive Whether change the group recursively or not
+     * @param string|iterable $files     A filename, an array of files, or a \Traversable instance to change group
+     * @param string          $group     The group name
+     * @param bool            $recursive Whether change the group recursively or not
      *
      * @throws IOException When the change fail
      */

src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php

@@ -56,11 +56,11 @@ class ArrayChoiceList implements ChoiceListInterface
      *
      * The given choice array must have the same array keys as the value array.
      *
-     * @param array|\Traversable $choices The selectable choices
-     * @param callable|null      $value   The callable for creating the value
-     *                                    for a choice. If `null` is passed,
-     *                                    incrementing integers are used as
-     *                                    values
+     * @param iterable      $choices The selectable choices
+     * @param callable|null $value   The callable for creating the value
+     *                               for a choice. If `null` is passed,
+     *                               incrementing integers are used as
+     *                               values
      */
     public function __construct($choices, callable $value = null)
     {

src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php

@@ -31,9 +31,9 @@ interface ChoiceListFactoryInterface
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param array|\Traversable $choices The choices
-     * @param null|callable      $value   The callable generating the choice
-     *                                    values
+     * @param iterable      $choices The choices
+     * @param null|callable $value   The callable generating the choice
+     *                               values
      *
      * @return ChoiceListInterface The choice list
      */

src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php

@@ -63,7 +63,7 @@ public function getDecoratedFactory()
     /**
      * {@inheritdoc}
      *
-     * @param array|\Traversable                $choices The choices
+     * @param iterable                          $choices The choices
      * @param null|callable|string|PropertyPath $value   The callable or path for
      *                                                   generating the choice values
      *

src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php

@@ -195,11 +195,11 @@ private function writeArray($file, array $value, $indentation)
     /**
      * Writes a "table" node.
      *
-     * @param resource           $file        The file handle to write to
-     * @param array|\Traversable $value       The value of the node
-     * @param int                $indentation The number of levels to indent
-     * @param bool               $fallback    Whether the table should be merged
-     *                                        with the fallback locale
+     * @param resource $file        The file handle to write to
+     * @param iterable $value       The value of the node
+     * @param int      $indentation The number of levels to indent
+     * @param bool     $fallback    Whether the table should be merged
+     *                              with the fallback locale
      *
      * @throws UnexpectedTypeException when $value is not an array and not a
      *                                 \Traversable instance

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

@@ -645,11 +645,11 @@ private function writeProperty($zval, $property, $value)
     /**
      * Adjusts a collection-valued property by calling add*() and remove*() methods.
      *
-     * @param array              $zval         The array containing the object to write to
-     * @param string             $property     The property to write
-     * @param array|\Traversable $collection   The collection to write
-     * @param string             $addMethod    The add*() method
-     * @param string             $removeMethod The remove*() method
+     * @param array    $zval         The array containing the object to write to
+     * @param string   $property     The property to write
+     * @param iterable $collection   The collection to write
+     * @param string   $addMethod    The add*() method
+     * @param string   $removeMethod The remove*() method
      */
     private function writeCollection($zval, $property, $collection, $addMethod, $removeMethod)
     {

src/Symfony/Component/Validator/Constraints/UrlValidator.php

@@ -24,7 +24,7 @@ class UrlValidator extends ConstraintValidator
             (%s)://                                 # protocol
             (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)?      # basic auth
             (
-                ([\pL\pN\pS-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                ([\pL\pN\pS\-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                                 # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                    # an IP address
                     |                                                 # or

src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php

@@ -374,7 +374,7 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
      * objects are iterated as well. Nested arrays are always iterated,
      * regardless of the value of $recursive.
      *
-     * @param array|\Traversable        $collection   The collection
+     * @param iterable                  $collection   The collection
      * @param string                    $propertyPath The current property path
      * @param string[]                  $groups       The validated groups
      * @param ExecutionContextInterface $context      The current execution context