minor #24969 Replace array|\Traversable by iterable (ro0NL)
This PR was merged into the 2.7 branch.
Discussion
----------
Replace array|\Traversable by iterable
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License | MIT
| Doc PR | symfony/symfony-docs#... <!--highly recommended for new features-->
Replace `array|\Traversable` by `iterable`, favoring pure API (or less mixed at least :)) and be clear whenever phpdoc is replaced.
https://secure.php.net/manual/en/language.types.iterable.php
Commits
-------
278088931b
Replace array|\Traversable by iterable
This commit is contained in:
commit
86986b41b0
@ -1014,8 +1014,8 @@ class Application
|
|||||||
* Finds alternative of $name among $collection,
|
* Finds alternative of $name among $collection,
|
||||||
* if nothing is found in $collection, try in $abbrevs.
|
* if nothing is found in $collection, try in $abbrevs.
|
||||||
*
|
*
|
||||||
* @param string $name The string
|
* @param string $name The string
|
||||||
* @param array|\Traversable $collection The collection
|
* @param iterable $collection The collection
|
||||||
*
|
*
|
||||||
* @return string[] A sorted array of similar string
|
* @return string[] A sorted array of similar string
|
||||||
*/
|
*/
|
||||||
|
@ -114,7 +114,7 @@ class Question
|
|||||||
/**
|
/**
|
||||||
* Gets values for the autocompleter.
|
* Gets values for the autocompleter.
|
||||||
*
|
*
|
||||||
* @return null|array|\Traversable
|
* @return null|iterable
|
||||||
*/
|
*/
|
||||||
public function getAutocompleterValues()
|
public function getAutocompleterValues()
|
||||||
{
|
{
|
||||||
@ -124,7 +124,7 @@ class Question
|
|||||||
/**
|
/**
|
||||||
* Sets values for the autocompleter.
|
* Sets values for the autocompleter.
|
||||||
*
|
*
|
||||||
* @param null|array|\Traversable $values
|
* @param null|iterable $values
|
||||||
*
|
*
|
||||||
* @return $this
|
* @return $this
|
||||||
*
|
*
|
||||||
|
@ -83,8 +83,8 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Creates a directory recursively.
|
* Creates a directory recursively.
|
||||||
*
|
*
|
||||||
* @param string|array|\Traversable $dirs The directory path
|
* @param string|iterable $dirs The directory path
|
||||||
* @param int $mode The directory mode
|
* @param int $mode The directory mode
|
||||||
*
|
*
|
||||||
* @throws IOException On any directory creation failure
|
* @throws IOException On any directory creation failure
|
||||||
*/
|
*/
|
||||||
@ -111,7 +111,7 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Checks the existence of files or directories.
|
* 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
|
* @return bool true if the file exists, false otherwise
|
||||||
*/
|
*/
|
||||||
@ -135,9 +135,9 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Sets access and modification time of file.
|
* 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 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 $time The touch time as a Unix timestamp
|
||||||
* @param int $atime The access time as a Unix timestamp
|
* @param int $atime The access time as a Unix timestamp
|
||||||
*
|
*
|
||||||
* @throws IOException When touch fails
|
* @throws IOException When touch fails
|
||||||
*/
|
*/
|
||||||
@ -154,7 +154,7 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Removes files or directories.
|
* 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
|
* @throws IOException When removal fails
|
||||||
*/
|
*/
|
||||||
@ -190,10 +190,10 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Change mode for an array of files or directories.
|
* 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 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 $mode The new mode (octal)
|
||||||
* @param int $umask The mode mask (octal)
|
* @param int $umask The mode mask (octal)
|
||||||
* @param bool $recursive Whether change the mod recursively or not
|
* @param bool $recursive Whether change the mod recursively or not
|
||||||
*
|
*
|
||||||
* @throws IOException When the change fail
|
* @throws IOException When the change fail
|
||||||
*/
|
*/
|
||||||
@ -212,9 +212,9 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Change the owner of an array of files or directories.
|
* 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|iterable $files A filename, an array of files, or a \Traversable instance to change owner
|
||||||
* @param string $user The new owner user name
|
* @param string $user The new owner user name
|
||||||
* @param bool $recursive Whether change the owner recursively or not
|
* @param bool $recursive Whether change the owner recursively or not
|
||||||
*
|
*
|
||||||
* @throws IOException When the change fail
|
* @throws IOException When the change fail
|
||||||
*/
|
*/
|
||||||
@ -239,9 +239,9 @@ class Filesystem
|
|||||||
/**
|
/**
|
||||||
* Change the group of an array of files or directories.
|
* 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|iterable $files A filename, an array of files, or a \Traversable instance to change group
|
||||||
* @param string $group The group name
|
* @param string $group The group name
|
||||||
* @param bool $recursive Whether change the group recursively or not
|
* @param bool $recursive Whether change the group recursively or not
|
||||||
*
|
*
|
||||||
* @throws IOException When the change fail
|
* @throws IOException When the change fail
|
||||||
*/
|
*/
|
||||||
|
@ -58,11 +58,11 @@ class ArrayChoiceList implements ChoiceListInterface
|
|||||||
*
|
*
|
||||||
* The given choice array must have the same array keys as the value array.
|
* The given choice array must have the same array keys as the value array.
|
||||||
*
|
*
|
||||||
* @param array|\Traversable $choices The selectable choices
|
* @param iterable $choices The selectable choices
|
||||||
* @param callable|null $value The callable for creating the value
|
* @param callable|null $value The callable for creating the value
|
||||||
* for a choice. If `null` is passed,
|
* for a choice. If `null` is passed,
|
||||||
* incrementing integers are used as
|
* incrementing integers are used as
|
||||||
* values
|
* values
|
||||||
*/
|
*/
|
||||||
public function __construct($choices, $value = null)
|
public function __construct($choices, $value = null)
|
||||||
{
|
{
|
||||||
|
@ -31,9 +31,9 @@ interface ChoiceListFactoryInterface
|
|||||||
* The callable receives the choice as first and the array key as the second
|
* The callable receives the choice as first and the array key as the second
|
||||||
* argument.
|
* argument.
|
||||||
*
|
*
|
||||||
* @param array|\Traversable $choices The choices
|
* @param iterable $choices The choices
|
||||||
* @param null|callable $value The callable generating the choice
|
* @param null|callable $value The callable generating the choice
|
||||||
* values
|
* values
|
||||||
*
|
*
|
||||||
* @return ChoiceListInterface The choice list
|
* @return ChoiceListInterface The choice list
|
||||||
*/
|
*/
|
||||||
|
@ -63,7 +63,7 @@ class PropertyAccessDecorator implements ChoiceListFactoryInterface
|
|||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*
|
*
|
||||||
* @param array|\Traversable $choices The choices
|
* @param iterable $choices The choices
|
||||||
* @param null|callable|string|PropertyPath $value The callable or path for
|
* @param null|callable|string|PropertyPath $value The callable or path for
|
||||||
* generating the choice values
|
* generating the choice values
|
||||||
*
|
*
|
||||||
|
@ -195,11 +195,11 @@ class TextBundleWriter implements BundleWriterInterface
|
|||||||
/**
|
/**
|
||||||
* Writes a "table" node.
|
* Writes a "table" node.
|
||||||
*
|
*
|
||||||
* @param resource $file The file handle to write to
|
* @param resource $file The file handle to write to
|
||||||
* @param array|\Traversable $value The value of the node
|
* @param iterable $value The value of the node
|
||||||
* @param int $indentation The number of levels to indent
|
* @param int $indentation The number of levels to indent
|
||||||
* @param bool $fallback Whether the table should be merged
|
* @param bool $fallback Whether the table should be merged
|
||||||
* with the fallback locale
|
* with the fallback locale
|
||||||
*
|
*
|
||||||
* @throws UnexpectedTypeException when $value is not an array and not a
|
* @throws UnexpectedTypeException when $value is not an array and not a
|
||||||
* \Traversable instance
|
* \Traversable instance
|
||||||
|
@ -611,11 +611,11 @@ class PropertyAccessor implements PropertyAccessorInterface
|
|||||||
/**
|
/**
|
||||||
* Adjusts a collection-valued property by calling add*() and remove*() methods.
|
* Adjusts a collection-valued property by calling add*() and remove*() methods.
|
||||||
*
|
*
|
||||||
* @param array $zval The array containing the object to write to
|
* @param array $zval The array containing the object to write to
|
||||||
* @param string $property The property to write
|
* @param string $property The property to write
|
||||||
* @param array|\Traversable $collection The collection to write
|
* @param iterable $collection The collection to write
|
||||||
* @param string $addMethod The add*() method
|
* @param string $addMethod The add*() method
|
||||||
* @param string $removeMethod The remove*() method
|
* @param string $removeMethod The remove*() method
|
||||||
*/
|
*/
|
||||||
private function writeCollection($zval, $property, $collection, $addMethod, $removeMethod)
|
private function writeCollection($zval, $property, $collection, $addMethod, $removeMethod)
|
||||||
{
|
{
|
||||||
|
@ -378,7 +378,7 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
|
|||||||
* objects are iterated as well. Nested arrays are always iterated,
|
* objects are iterated as well. Nested arrays are always iterated,
|
||||||
* regardless of the value of $recursive.
|
* 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 $propertyPath The current property path
|
||||||
* @param string[] $groups The validated groups
|
* @param string[] $groups The validated groups
|
||||||
* @param bool $stopRecursion Whether to disable
|
* @param bool $stopRecursion Whether to disable
|
||||||
|
Reference in New Issue
Block a user