فهرست منبع

[Validator] renamed method to follow CS

Fabien Potencier 14 سال پیش
والد
کامیت
525702b5c6

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

@@ -35,7 +35,7 @@ class ValidatorContext implements ValidatorContextInterface
     /**
      * @inheritDoc
      */
-    public function classMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory)
+    public function setClassMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory)
     {
         $this->classMetadataFactory = $classMetadataFactory;
 
@@ -45,7 +45,7 @@ class ValidatorContext implements ValidatorContextInterface
     /**
      * @inheritDoc
      */
-    public function constraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory)
+    public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory)
     {
         $this->constraintValidatorFactory = $constraintValidatorFactory;
 

+ 3 - 3
src/Symfony/Component/Validator/ValidatorContextInterface.php

@@ -22,7 +22,7 @@ use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;
  *
  * <code>
  * $validator = $context
- *     ->classMetadataFactory($customFactory)
+ *     ->setClassMetadataFactory($customFactory)
  *     ->getValidator();
  * </code>
  *
@@ -35,14 +35,14 @@ interface ValidatorContextInterface
      *
      * @param ClassMetadataFactoryInterface $classMetadataFactory  The factory instance
      */
-    function classMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory);
+    function setClassMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory);
 
     /**
      * Sets the constraint validator factory used in the new validator
      *
      * @param ConstraintValidatorFactoryInterface $constraintValidatorFactory  The factory instance
      */
-    function constraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory);
+    function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory);
 
     /**
      * Creates a new validator with the settings stored in this context

+ 9 - 9
src/Symfony/Component/Validator/ValidatorFactory.php

@@ -51,8 +51,8 @@ use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
  *
  * <code>
  * $defaultContext = new ValidatorContext();
- * $defaultContext->classMetadataFactory($metadataFactory);
- * $defaultContext->constraintValidatorFactory($validatorFactory);
+ * $defaultContext->setClassMetadataFactory($metadataFactory);
+ * $defaultContext->setConstraintValidatorFactory($validatorFactory);
  * $factory = new ValidatorFactory($defaultContext);
  *
  * $form = $factory->getValidator();
@@ -65,7 +65,7 @@ use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
  *
  * <code>
  * $form = $factory
- *     ->classMetadataFactory($customFactory);
+ *     ->setClassMetadataFactory($customFactory);
  *     ->getValidator();
  * </code>
  *
@@ -143,8 +143,8 @@ class ValidatorFactory implements ValidatorContextInterface
             throw new MappingException('No mapping loader was found for the given parameters');
         }
 
-        $context->classMetadataFactory(new ClassMetadataFactory($loader));
-        $context->constraintValidatorFactory(new ConstraintValidatorFactory());
+        $context->setClassMetadataFactory(new ClassMetadataFactory($loader));
+        $context->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         return new static($context);
     }
@@ -166,11 +166,11 @@ class ValidatorFactory implements ValidatorContextInterface
      * @param  ClassMetadataFactoryInterface $metadataFactory  The new factory instance
      * @return ValidatorContextInterface                       The preconfigured form context
      */
-    public function classMetadataFactory(ClassMetadataFactoryInterface $metadataFactory)
+    public function setClassMetadataFactory(ClassMetadataFactoryInterface $metadataFactory)
     {
         $context = clone $this->defaultContext;
 
-        return $context->classMetadataFactory($metadataFactory);
+        return $context->setClassMetadataFactory($metadataFactory);
     }
 
     /**
@@ -180,11 +180,11 @@ class ValidatorFactory implements ValidatorContextInterface
      * @param  ClassMetadataFactoryInterface $validatorFactory  The new factory instance
      * @return ValidatorContextInterface                        The preconfigured form context
      */
-    public function constraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory)
+    public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory)
     {
         $context = clone $this->defaultContext;
 
-        return $context->constraintValidatorFactory($validatorFactory);
+        return $context->setConstraintValidatorFactory($validatorFactory);
     }
 
     /**

+ 4 - 4
tests/Symfony/Tests/Component/Validator/ValidatorContextTest.php

@@ -26,7 +26,7 @@ class ValidatorContextTest extends \PHPUnit_Framework_TestCase
     public function testSetClassMetadataFactory()
     {
         $factory = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
-        $result = $this->context->classMetadataFactory($factory);
+        $result = $this->context->setClassMetadataFactory($factory);
 
         $this->assertSame($this->context, $result);
         $this->assertSame($factory, $this->context->getClassMetadataFactory());
@@ -35,7 +35,7 @@ class ValidatorContextTest extends \PHPUnit_Framework_TestCase
     public function testSetConstraintValidatorFactory()
     {
         $factory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
-        $result = $this->context->constraintValidatorFactory($factory);
+        $result = $this->context->setConstraintValidatorFactory($factory);
 
         $this->assertSame($this->context, $result);
         $this->assertSame($factory, $this->context->getConstraintValidatorFactory());
@@ -47,8 +47,8 @@ class ValidatorContextTest extends \PHPUnit_Framework_TestCase
         $validatorFactory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
 
         $validator = $this->context
-            ->classMetadataFactory($metadataFactory)
-            ->constraintValidatorFactory($validatorFactory)
+            ->setClassMetadataFactory($metadataFactory)
+            ->setConstraintValidatorFactory($validatorFactory)
             ->getValidator();
 
         $this->assertEquals(new Validator($metadataFactory, $validatorFactory), $validator);

+ 18 - 18
tests/Symfony/Tests/Component/Validator/ValidatorFactoryTest.php

@@ -38,9 +38,9 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
         $factory1 = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
         $factory2 = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
 
-        $this->defaultContext->classMetadataFactory($factory1);
+        $this->defaultContext->setClassMetadataFactory($factory1);
 
-        $result = $this->factory->classMetadataFactory($factory2);
+        $result = $this->factory->setClassMetadataFactory($factory2);
 
         $this->assertSame($factory1, $this->defaultContext->getClassMetadataFactory());
         $this->assertSame($factory2, $result->getClassMetadataFactory());
@@ -51,9 +51,9 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
         $factory1 = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
         $factory2 = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
 
-        $this->defaultContext->constraintValidatorFactory($factory1);
+        $this->defaultContext->setConstraintValidatorFactory($factory1);
 
-        $result = $this->factory->constraintValidatorFactory($factory2);
+        $result = $this->factory->setConstraintValidatorFactory($factory2);
 
         $this->assertSame($factory1, $this->defaultContext->getConstraintValidatorFactory());
         $this->assertSame($factory2, $result->getConstraintValidatorFactory());
@@ -65,8 +65,8 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
         $validatorFactory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
 
         $this->defaultContext
-            ->classMetadataFactory($metadataFactory)
-            ->constraintValidatorFactory($validatorFactory);
+            ->setClassMetadataFactory($metadataFactory)
+            ->setConstraintValidatorFactory($validatorFactory);
 
         $validator = $this->factory->getValidator();
 
@@ -82,8 +82,8 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
 
         $context = new ValidatorContext();
         $context
-            ->classMetadataFactory(new ClassMetadataFactory(new AnnotationLoader()))
-            ->constraintValidatorFactory(new ConstraintValidatorFactory());
+            ->setClassMetadataFactory(new ClassMetadataFactory(new AnnotationLoader()))
+            ->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         $this->assertEquals(new ValidatorFactory($context), $factory);
     }
@@ -99,10 +99,10 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
 
         $context = new ValidatorContext();
         $context
-            ->classMetadataFactory(new ClassMetadataFactory(new AnnotationLoader(array(
+            ->setClassMetadataFactory(new ClassMetadataFactory(new AnnotationLoader(array(
                 'myns' => 'My\\Namespace\\',
             ))))
-            ->constraintValidatorFactory(new ConstraintValidatorFactory());
+            ->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         $this->assertEquals(new ValidatorFactory($context), $factory);
     }
@@ -114,8 +114,8 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
 
         $context = new ValidatorContext();
         $context
-            ->classMetadataFactory(new ClassMetadataFactory(new XmlFilesLoader(array($path))))
-            ->constraintValidatorFactory(new ConstraintValidatorFactory());
+            ->setClassMetadataFactory(new ClassMetadataFactory(new XmlFilesLoader(array($path))))
+            ->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         $this->assertEquals(new ValidatorFactory($context), $factory);
     }
@@ -127,8 +127,8 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
 
         $context = new ValidatorContext();
         $context
-            ->classMetadataFactory(new ClassMetadataFactory(new YamlFilesLoader(array($path))))
-            ->constraintValidatorFactory(new ConstraintValidatorFactory());
+            ->setClassMetadataFactory(new ClassMetadataFactory(new YamlFilesLoader(array($path))))
+            ->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         $this->assertEquals(new ValidatorFactory($context), $factory);
     }
@@ -140,8 +140,8 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
 
         $context = new ValidatorContext();
         $context
-            ->classMetadataFactory(new ClassMetadataFactory(new StaticMethodLoader('loadMetadata')))
-            ->constraintValidatorFactory(new ConstraintValidatorFactory());
+            ->setClassMetadataFactory(new ClassMetadataFactory(new StaticMethodLoader('loadMetadata')))
+            ->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         $this->assertEquals(new ValidatorFactory($context), $factory);
     }
@@ -164,8 +164,8 @@ class ValidatorFactoryTest extends \PHPUnit_Framework_TestCase
 
         $context = new ValidatorContext();
         $context
-            ->classMetadataFactory(new ClassMetadataFactory($chain))
-            ->constraintValidatorFactory(new ConstraintValidatorFactory());
+            ->setClassMetadataFactory(new ClassMetadataFactory($chain))
+            ->setConstraintValidatorFactory(new ConstraintValidatorFactory());
 
         $this->assertEquals(new ValidatorFactory($context), $factory);
     }