浏览代码

[Form][Validator] Fixed indentation

Fabien Pennequin 14 年之前
父节点
当前提交
c392f2518d

+ 1 - 1
src/Symfony/Component/Form/CollectionField.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  *
  *     $form->add(new CollectionField(new TextField('emails')));
  *
- * @author     Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
  */
 class CollectionField extends FieldGroup
 {

+ 27 - 27
src/Symfony/Component/Form/FieldFactory/ValidatorFieldFactoryGuesser.php

@@ -110,7 +110,7 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
                     case 'boolean':
                     case 'bool':
                         return new FieldFactoryClassGuess(
-                        	'Symfony\Component\Form\CheckboxField',
+                            'Symfony\Component\Form\CheckboxField',
                             array(),
                             FieldFactoryGuess::MEDIUM_CONFIDENCE
                         );
@@ -119,7 +119,7 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
                     case 'numeric':
                     case 'real':
                         return new FieldFactoryClassGuess(
-                        	'Symfony\Component\Form\NumberField',
+                            'Symfony\Component\Form\NumberField',
                             array(),
                             FieldFactoryGuess::MEDIUM_CONFIDENCE
                         );
@@ -127,13 +127,13 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
                     case 'int':
                     case 'long':
                         return new FieldFactoryClassGuess(
-                        	'Symfony\Component\Form\IntegerField',
+                            'Symfony\Component\Form\IntegerField',
                             array(),
                             FieldFactoryGuess::MEDIUM_CONFIDENCE
                         );
                     case 'string':
                         return new FieldFactoryClassGuess(
-                        	'Symfony\Component\Form\TextField',
+                            'Symfony\Component\Form\TextField',
                             array(),
                             FieldFactoryGuess::LOW_CONFIDENCE
                         );
@@ -141,109 +141,109 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
                 break;
             case 'Symfony\Component\Validator\Constraints\Choice':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\ChoiceField',
+                    'Symfony\Component\Form\ChoiceField',
                     array('choices' => $constraint->choices),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Country':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\CountryField',
+                    'Symfony\Component\Form\CountryField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Date':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\DateField',
+                    'Symfony\Component\Form\DateField',
                     array('type' => 'string'),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\DateTime':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\DateTimeField',
+                    'Symfony\Component\Form\DateTimeField',
                     array('type' => 'string'),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Email':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\File':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\FileField',
+                    'Symfony\Component\Form\FileField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Image':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\FileField',
+                    'Symfony\Component\Form\FileField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Ip':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Language':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\LanguageField',
+                    'Symfony\Component\Form\LanguageField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Locale':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\LocaleField',
+                    'Symfony\Component\Form\LocaleField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Max':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\NumberField',
+                    'Symfony\Component\Form\NumberField',
                     array(),
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\MaxLength':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Min':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\NumberField',
+                    'Symfony\Component\Form\NumberField',
                     array(),
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\MinLength':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Regex':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Time':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TimeField',
+                    'Symfony\Component\Form\TimeField',
                     array('type' => 'string'),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Url':
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\UrlField',
+                    'Symfony\Component\Form\UrlField',
                     array(),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             default:
                 return new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
@@ -261,17 +261,17 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
         switch (get_class($constraint)) {
             case 'Symfony\Component\Validator\Constraints\NotNull':
                 return new FieldFactoryGuess(
-                	true,
+                    true,
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\NotBlank':
                 return new FieldFactoryGuess(
-                	true,
+                    true,
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             default:
                 return new FieldFactoryGuess(
-                	false,
+                    false,
                     FieldFactoryGuess::LOW_CONFIDENCE
                 );
         }
@@ -288,12 +288,12 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
         switch (get_class($constraint)) {
             case 'Symfony\Component\Validator\Constraints\MaxLength':
                 return new FieldFactoryGuess(
-                	$constraint->limit,
+                    $constraint->limit,
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Max':
                 return new FieldFactoryGuess(
-                	strlen((string)$constraint->limit),
+                    strlen((string)$constraint->limit),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 );
         }

+ 1 - 1
src/Symfony/Component/Form/PropertyPath.php

@@ -384,6 +384,6 @@ class PropertyPath implements \IteratorAggregate
 
     protected function camelize($property)
     {
-       return preg_replace(array('/(^|_)+(.)/e', '/\.(.)/e'), array("strtoupper('\\2')", "'_'.strtoupper('\\1')"), $property);
+        return preg_replace(array('/(^|_)+(.)/e', '/\.(.)/e'), array("strtoupper('\\2')", "'_'.strtoupper('\\1')"), $property);
     }
 }

+ 3 - 2
src/Symfony/Component/Validator/Mapping/ClassMetadata.php

@@ -98,8 +98,9 @@ class ClassMetadata extends ElementMetadata
     {
         if (!in_array(Constraint::CLASS_CONSTRAINT, (array)$constraint->targets())) {
             throw new ConstraintDefinitionException(sprintf(
-            		'The constraint %s cannot be put on classes',
-                    get_class($constraint)));
+                'The constraint %s cannot be put on classes',
+                get_class($constraint)
+            ));
         }
 
         $constraint->addImplicitGroupName($this->getDefaultGroup());

+ 3 - 2
src/Symfony/Component/Validator/Mapping/MemberMetadata.php

@@ -45,8 +45,9 @@ abstract class MemberMetadata extends ElementMetadata
     {
         if (!in_array(Constraint::PROPERTY_CONSTRAINT, (array)$constraint->targets())) {
             throw new ConstraintDefinitionException(sprintf(
-            		'The constraint %s cannot be put on properties or getters',
-                    get_class($constraint)));
+                'The constraint %s cannot be put on properties or getters',
+                get_class($constraint)
+            ));
         }
 
         if ($constraint instanceof Valid) {

+ 1 - 1
tests/Symfony/Tests/Component/Form/CsrfProvider/SessionCsrfProviderTest.php

@@ -20,7 +20,7 @@ class SessionCsrfProviderTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->session = $this->getMock(
-        	'Symfony\Component\HttpFoundation\Session',
+            'Symfony\Component\HttpFoundation\Session',
             array(),
             array(),
             '',

+ 11 - 11
tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryTest.php

@@ -35,7 +35,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessClass')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array('max_length' => 10),
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
@@ -45,7 +45,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessClass')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\PasswordField',
+                    'Symfony\Component\Form\PasswordField',
                     array('max_length' => 7),
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 )));
@@ -85,7 +85,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessClass')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array('max_length' => 10),
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
@@ -107,7 +107,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessClass')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array('max_length' => 10),
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
@@ -115,7 +115,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessMaxLength')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryGuess(
-                	15,
+                    15,
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
 
@@ -124,7 +124,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessMaxLength')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryGuess(
-                	20,
+                    20,
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 )));
 
@@ -145,7 +145,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessClass')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\PasswordField',
+                    'Symfony\Component\Form\PasswordField',
                     array('max_length' => 10),
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
@@ -153,7 +153,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessMaxLength')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryGuess(
-                	15,
+                    15,
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
 
@@ -174,7 +174,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessClass')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryClassGuess(
-                	'Symfony\Component\Form\TextField',
+                    'Symfony\Component\Form\TextField',
                     array(),
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
@@ -182,7 +182,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessRequired')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryGuess(
-                	true,
+                    true,
                     FieldFactoryGuess::MEDIUM_CONFIDENCE
                 )));
 
@@ -191,7 +191,7 @@ class FieldFactoryTest extends \PHPUnit_Framework_TestCase
                 ->method('guessRequired')
                 ->with($this->equalTo($object), $this->equalTo('firstName'))
                 ->will($this->returnValue(new FieldFactoryGuess(
-                	false,
+                    false,
                     FieldFactoryGuess::HIGH_CONFIDENCE
                 )));
 

+ 1 - 1
tests/Symfony/Tests/Component/Form/FieldGroupTest.php

@@ -762,7 +762,7 @@ class FieldGroupTest extends \PHPUnit_Framework_TestCase
     protected function createMockForm()
     {
         $form = $this->getMock(
-        	'Symfony\Component\Form\Form',
+            'Symfony\Component\Form\Form',
             array(),
             array(),
             '',