From f83e92bf44d83f9fe3163434549cffdc6f53edbe Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Tue, 26 Apr 2011 11:39:34 +0200 Subject: [PATCH] Make casting scalar to array consistent --- .../DependencyInjection/AbstractDoctrineExtensionTest.php | 4 +--- src/Symfony/Component/Config/FileLocator.php | 5 +---- src/Symfony/Component/Console/Helper/FormatterHelper.php | 4 +--- src/Symfony/Component/Console/Input/ArgvInput.php | 8 ++------ src/Symfony/Component/Console/Input/ArrayInput.php | 8 ++------ src/Symfony/Component/Console/Output/Output.php | 4 +--- src/Symfony/Component/DomCrawler/Crawler.php | 4 +--- .../Component/DomCrawler/Field/ChoiceFormField.php | 4 ++-- src/Symfony/Component/Finder/Finder.php | 4 +--- .../Extension/Validator/Validator/DelegatingValidator.php | 6 +----- src/Symfony/Component/HttpFoundation/HeaderBag.php | 4 +--- src/Symfony/Component/Templating/Asset/AssetPackage.php | 6 +----- .../Component/Templating/Loader/FilesystemLoader.php | 6 +----- 13 files changed, 16 insertions(+), 51 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php index 5ded6f3423..ddf5e5f1a9 100755 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -686,9 +686,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase protected function getContainer($bundles = 'YamlBundle', $vendor = null) { - if (!is_array($bundles)) { - $bundles = array($bundles); - } + $bundles = (array) $bundles; $map = array(); foreach ($bundles as $bundle) { diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php index 9f5178d752..8d8372e264 100644 --- a/src/Symfony/Component/Config/FileLocator.php +++ b/src/Symfony/Component/Config/FileLocator.php @@ -27,10 +27,7 @@ class FileLocator implements FileLocatorInterface */ public function __construct($paths = array()) { - if (!is_array($paths)) { - $paths = array($paths); - } - $this->paths = $paths; + $this->paths = (array) $paths; } /** diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php index 1e68b2a82c..b15b0be376 100644 --- a/src/Symfony/Component/Console/Helper/FormatterHelper.php +++ b/src/Symfony/Component/Console/Helper/FormatterHelper.php @@ -41,9 +41,7 @@ class FormatterHelper extends Helper */ public function formatBlock($messages, $style, $large = false) { - if (!is_array($messages)) { - $messages = array($messages); - } + $messages = (array) $messages; $len = 0; $lines = array(); diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 0bc0dfd307..abec444091 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -260,9 +260,7 @@ class ArgvInput extends Input */ public function hasParameterOption($values) { - if (!is_array($values)) { - $values = array($values); - } + $values = (array) $values; foreach ($this->tokens as $v) { if (in_array($v, $values)) { @@ -285,9 +283,7 @@ class ArgvInput extends Input */ public function getParameterOption($values, $default = false) { - if (!is_array($values)) { - $values = array($values); - } + $values = (array) $values; $tokens = $this->tokens; while ($token = array_shift($tokens)) { diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php index 639f995a61..e0f5478cc9 100644 --- a/src/Symfony/Component/Console/Input/ArrayInput.php +++ b/src/Symfony/Component/Console/Input/ArrayInput.php @@ -69,9 +69,7 @@ class ArrayInput extends Input */ public function hasParameterOption($values) { - if (!is_array($values)) { - $values = array($values); - } + $values = (array) $values; foreach ($this->parameters as $k => $v) { if (!is_int($k)) { @@ -99,9 +97,7 @@ class ArrayInput extends Input */ public function getParameterOption($values, $default = false) { - if (!is_array($values)) { - $values = array($values); - } + $values = (array) $values; foreach ($this->parameters as $k => $v) { if (is_int($k) && in_array($v, $values)) { diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php index 5f333d4894..f35850399a 100644 --- a/src/Symfony/Component/Console/Output/Output.php +++ b/src/Symfony/Component/Console/Output/Output.php @@ -154,9 +154,7 @@ abstract class Output implements OutputInterface return; } - if (!is_array($messages)) { - $messages = array($messages); - } + $messages = (array) $messages; foreach ($messages as $message) { switch ($type) { diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index 173dc45d28..c220705103 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -447,9 +447,7 @@ class Crawler extends \SplObjectStorage */ public function extract($attributes) { - if (!is_array($attributes)) { - $attributes = array($attributes); - } + $attributes = (array) $attributes; $data = array(); foreach ($this as $node) { diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php index f77389b5d5..c017158953 100644 --- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php +++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php @@ -115,8 +115,8 @@ class ChoiceFormField extends FormField throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: %s).', $this->name, $value, implode(', ', $this->options))); } - if ($this->multiple && !is_array($value)) { - $value = array($value); + if ($this->multiple) { + $value = (array) $value; } if (is_array($value)) { diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index 4b5a9137e9..13193fb380 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -327,9 +327,7 @@ class Finder implements \IteratorAggregate */ public function in($dirs) { - if (!is_array($dirs)) { - $dirs = array($dirs); - } + $dirs = (array) $dirs; foreach ($dirs as $dir) { if (!is_dir($dir)) { diff --git a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php index f4a4414526..5abcdcbe4e 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php @@ -231,10 +231,6 @@ class DelegatingValidator implements FormValidatorInterface $groups = array('Default'); } - if (!is_array($groups)) { - $groups = array($groups); - } - - return $groups; + return (array) $groups; } } diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php index 5564c3b3f5..d66a3f7111 100644 --- a/src/Symfony/Component/HttpFoundation/HeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php @@ -119,9 +119,7 @@ class HeaderBag { $key = strtr(strtolower($key), '_', '-'); - if (!is_array($values)) { - $values = array($values); - } + $values = (array) $values; if (true === $replace || !isset($this->headers[$key])) { $this->headers[$key] = $values; diff --git a/src/Symfony/Component/Templating/Asset/AssetPackage.php b/src/Symfony/Component/Templating/Asset/AssetPackage.php index ae6f4c834b..19ace2af3a 100644 --- a/src/Symfony/Component/Templating/Asset/AssetPackage.php +++ b/src/Symfony/Component/Templating/Asset/AssetPackage.php @@ -32,11 +32,7 @@ class AssetPackage implements AssetPackageInterface $this->baseUrls = array(); $this->version = $version; - if (!is_array($baseUrls)) { - $baseUrls = (array) $baseUrls; - } - - foreach ($baseUrls as $baseUrl) { + foreach ((array) $baseUrls as $baseUrl) { $this->baseUrls[] = rtrim($baseUrl, '/'); } } diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php index 4e0b47b65b..bff96bac21 100644 --- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php +++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php @@ -31,11 +31,7 @@ class FilesystemLoader extends Loader */ public function __construct($templatePathPatterns) { - if (!is_array($templatePathPatterns)) { - $templatePathPatterns = array($templatePathPatterns); - } - - $this->templatePathPatterns = $templatePathPatterns; + $this->templatePathPatterns = (array) $templatePathPatterns; } /**