Quellcode durchsuchen

[Validator] fixed CS

Martin Hason vor 14 Jahren
Ursprung
Commit
e21591e16e

+ 2 - 2
src/Symfony/Component/Validator/Constraint.php

@@ -81,7 +81,7 @@ abstract class Constraint
     public function __construct($options = null)
     {
         $invalidOptions = array();
-        $missingOptions = array_flip((array)$this->getRequiredOptions());
+        $missingOptions = array_flip((array) $this->getRequiredOptions());
 
         if (is_array($options) && count($options) == 1 && isset($options['value'])) {
             $options = $options['value'];
@@ -127,7 +127,7 @@ abstract class Constraint
             );
         }
 
-        $this->groups = (array)$this->groups;
+        $this->groups = (array) $this->groups;
     }
 
     /**

+ 1 - 1
src/Symfony/Component/Validator/Constraints/CountryValidator.php

@@ -32,7 +32,7 @@ class CountryValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!in_array($value, \Symfony\Component\Locale\Locale::getCountries())) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 1 - 1
src/Symfony/Component/Validator/Constraints/DateTimeValidator.php

@@ -33,7 +33,7 @@ class DateTimeValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!preg_match(self::PATTERN, $value, $matches)) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 1 - 1
src/Symfony/Component/Validator/Constraints/DateValidator.php

@@ -29,7 +29,7 @@ class DateValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!preg_match(self::PATTERN, $value, $matches)) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 1 - 1
src/Symfony/Component/Validator/Constraints/EmailValidator.php

@@ -28,7 +28,7 @@ class EmailValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 4 - 4
src/Symfony/Component/Validator/Constraints/FileValidator.php

@@ -33,7 +33,7 @@ class FileValidator extends ConstraintValidator
             return true;
         }
 
-        $path = $value instanceof FileObject ? $value->getPath() : (string)$value;
+        $path = $value instanceof FileObject ? $value->getPath() : (string) $value;
 
         if (!file_exists($path)) {
             $this->setMessage($constraint->notFoundMessage, array('{{ file }}' => $path));
@@ -48,7 +48,7 @@ class FileValidator extends ConstraintValidator
         }
 
         if ($constraint->maxSize) {
-            if (ctype_digit((string)$constraint->maxSize)) {
+            if (ctype_digit((string) $constraint->maxSize)) {
                 $size = filesize($path);
                 $limit = $constraint->maxSize;
                 $suffix = ' bytes';
@@ -80,10 +80,10 @@ class FileValidator extends ConstraintValidator
                 $value = new FileObject($value);
             }
 
-            if (!in_array($value->getMimeType(), (array)$constraint->mimeTypes)) {
+            if (!in_array($value->getMimeType(), (array) $constraint->mimeTypes)) {
                 $this->setMessage($constraint->mimeTypesMessage, array(
                     '{{ type }}' => '"'.$value->getMimeType().'"',
-                    '{{ types }}' => '"'.implode('", "', (array)$constraint->mimeTypes).'"',
+                    '{{ types }}' => '"'.implode('", "', (array) $constraint->mimeTypes).'"',
                     '{{ file }}' => $path,
                 ));
 

+ 1 - 1
src/Symfony/Component/Validator/Constraints/IpValidator.php

@@ -35,7 +35,7 @@ class IpValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
         $valid = false;
 
         if ($constraint->version == Ip::V4 || $constraint->version == Ip::ALL) {

+ 1 - 1
src/Symfony/Component/Validator/Constraints/LanguageValidator.php

@@ -32,7 +32,7 @@ class LanguageValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!in_array($value, \Symfony\Component\Locale\Locale::getLanguages())) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 1 - 1
src/Symfony/Component/Validator/Constraints/LocaleValidator.php

@@ -32,7 +32,7 @@ class LocaleValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!in_array($value, \Symfony\Component\Locale\Locale::getLocales())) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 1 - 1
src/Symfony/Component/Validator/Constraints/MaxLengthValidator.php

@@ -27,7 +27,7 @@ class MaxLengthValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         $length = function_exists('mb_strlen') ? mb_strlen($value, $constraint->charset) : strlen($value);
 

+ 1 - 1
src/Symfony/Component/Validator/Constraints/MinLengthValidator.php

@@ -27,7 +27,7 @@ class MinLengthValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         $length = function_exists('mb_strlen') ? mb_strlen($value, $constraint->charset) : strlen($value);
 

+ 1 - 1
src/Symfony/Component/Validator/Constraints/RegexValidator.php

@@ -27,7 +27,7 @@ class RegexValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (
             ($constraint->match && !preg_match($constraint->pattern, $value))

+ 1 - 1
src/Symfony/Component/Validator/Constraints/TimeValidator.php

@@ -29,7 +29,7 @@ class TimeValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (!preg_match(self::PATTERN, $value)) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));

+ 1 - 1
src/Symfony/Component/Validator/Constraints/UrlValidator.php

@@ -38,7 +38,7 @@ class UrlValidator extends ConstraintValidator
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         $pattern = sprintf(self::PATTERN, implode('|', $constraint->protocols));
 

+ 1 - 1
src/Symfony/Component/Validator/Mapping/ClassMetadata.php

@@ -96,7 +96,7 @@ class ClassMetadata extends ElementMetadata
      */
     public function addConstraint(Constraint $constraint)
     {
-        if (!in_array(Constraint::CLASS_CONSTRAINT, (array)$constraint->getTargets())) {
+        if (!in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets())) {
             throw new ConstraintDefinitionException(sprintf(
                 'The constraint %s cannot be put on classes',
                 get_class($constraint)

+ 1 - 1
src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php

@@ -50,7 +50,7 @@ abstract class FileLoader implements LoaderInterface
     protected function newConstraint($name, $options)
     {
         if (strpos($name, '\\') !== false && class_exists($name)) {
-            $className = (string)$name;
+            $className = (string) $name;
         } else if (strpos($name, ':') !== false) {
             list($prefix, $className) = explode(':', $name);
 

+ 7 - 7
src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php

@@ -32,11 +32,11 @@ class XmlFileLoader extends FileLoader
             $xml = $this->parseFile($this->file);
 
             foreach ($xml->namespace as $namespace) {
-                $this->namespaces[(string)$namespace['prefix']] = trim((string)$namespace);
+                $this->namespaces[(string) $namespace['prefix']] = trim((string) $namespace);
             }
 
             foreach ($xml->class as $class) {
-                $this->classes[(string)$class['name']] = $class;
+                $this->classes[(string) $class['name']] = $class;
             }
         }
 
@@ -49,13 +49,13 @@ class XmlFileLoader extends FileLoader
 
             foreach ($xml->property as $property) {
                 foreach ($this->parseConstraints($property->constraint) as $constraint) {
-                    $metadata->addPropertyConstraint((string)$property['name'], $constraint);
+                    $metadata->addPropertyConstraint((string) $property['name'], $constraint);
                 }
             }
 
             foreach ($xml->getter as $getter) {
                 foreach ($this->parseConstraints($getter->constraint) as $constraint) {
-                    $metadata->addGetterConstraint((string)$getter['property'], $constraint);
+                    $metadata->addGetterConstraint((string) $getter['property'], $constraint);
                 }
             }
 
@@ -87,7 +87,7 @@ class XmlFileLoader extends FileLoader
                 } else {
                     $options = array();
                 }
-            } else if (strlen((string)$node) > 0) {
+            } else if (strlen((string) $node) > 0) {
                 $options = trim($node);
             } else {
                 $options = null;
@@ -124,7 +124,7 @@ class XmlFileLoader extends FileLoader
             }
 
             if (isset($node['key'])) {
-                $values[(string)$node['key']] = $value;
+                $values[(string) $node['key']] = $value;
             } else {
                 $values[] = $value;
             }
@@ -157,7 +157,7 @@ class XmlFileLoader extends FileLoader
                 $value = trim($node);
             }
 
-            $options[(string)$node['name']] = $value;
+            $options[(string) $node['name']] = $value;
         }
 
         return $options;

+ 1 - 1
src/Symfony/Component/Validator/Mapping/MemberMetadata.php

@@ -44,7 +44,7 @@ abstract class MemberMetadata extends ElementMetadata
      */
     public function addConstraint(Constraint $constraint)
     {
-        if (!in_array(Constraint::PROPERTY_CONSTRAINT, (array)$constraint->getTargets())) {
+        if (!in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) {
             throw new ConstraintDefinitionException(sprintf(
                 'The constraint %s cannot be put on properties or getters',
                 get_class($constraint)

+ 1 - 1
src/Symfony/Component/Validator/Validator.php

@@ -95,7 +95,7 @@ class Validator implements ValidatorInterface
     protected function validateGraph($root, \Closure $walk, $groups = null)
     {
         $walker = new GraphWalker($root, $this->metadataFactory, $this->validatorFactory);
-        $groups = $groups ? (array)$groups : array(Constraint::DEFAULT_GROUP);
+        $groups = $groups ? (array) $groups : array(Constraint::DEFAULT_GROUP);
 
         foreach ($groups as $group) {
             $walk($walker, $group);