Merge branch 'release/0.6.1'

README.md

@@ -171,7 +171,7 @@ There may be occassions where you want the bridge between Symfony and Parsley en
   );
 ```
 
-There is also the ``RemoveParsleyConstraint()`` class that can be used to remove specific Parsley constrains. This is handy if you want to remove something that was auto-generated from a Symfony Constraint.
+There is also the ``RemoveParsleyDirective()`` class that can be used to remove specific Parsley constrains. This is handy if you want to remove something that was auto-generated from a Symfony Constraint.
 
 ## Rolling your own
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "c0ntax/parsley-bundle",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "type": "symfony-bundle",
     "description": "A bridge between Symfony and Parsley.js",
     "license": "Apache-2.0",

src/Form/Extension/ParsleyTypeExtension.php

@@ -8,8 +8,10 @@
 use C0ntax\ParsleyBundle\Contracts\ParsleyInterface;
 use C0ntax\ParsleyBundle\Contracts\RemoveInterface;
 use C0ntax\ParsleyBundle\Factory\ConstraintFactory;
+use C0ntax\ParsleyBundle\Parsleys\AbstractRemove;
 use C0ntax\ParsleyBundle\Parsleys\Directive\Field\Trigger;
 use C0ntax\ParsleyBundle\Parsleys\RemoveParsleyConstraint;
+use C0ntax\ParsleyBundle\Parsleys\RemoveParsleyDirective;
 use C0ntax\ParsleyBundle\Parsleys\RemoveSymfonyConstraint;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -71,7 +73,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
                 $this->createParsleyConstraintsFromValidationConstraints($symfonyConstraints, $form),
                 $this->getDirectivesFromParsleys($parsleys)
             ),
-            $this->getRemoveParsleyConstraintsFromParsleys($parsleys)
+            $this->getRemoveParsleyDirectivesFromParsleys($parsleys)
         );
 
         $this->addParsleyToView($view, $parsleyConstraints);
@@ -121,15 +123,15 @@ function (ParsleyInterface $parsley) {
 
     /**
      * @param ParsleyInterface[] $parsleys
-     * @return RemoveParsleyConstraint[]
+     * @return AbstractRemove[]
      */
-    private function getRemoveParsleyConstraintsFromParsleys(array $parsleys): array
+    private function getRemoveParsleyDirectivesFromParsleys(array $parsleys): array
     {
         return array_values(
             array_filter(
                 $parsleys,
                 function (ParsleyInterface $parsley) {
-                    return $parsley instanceof RemoveParsleyConstraint;
+                    return $parsley instanceof RemoveParsleyDirective || $parsley instanceof RemoveParsleyConstraint;
                 }
             )
         );

src/Parsleys/RemoveParsleyConstraint.php

@@ -11,6 +11,7 @@
  * Used to remove Parsley Directives after they've been put in
  *
  * @package C0ntax\ParsleyBundle\Parsleys
+ * @deprecated Use RemoveParsleyDirective instead
  */
 class RemoveParsleyConstraint extends AbstractRemove
 {

src/Parsleys/RemoveParsleyDirective.php

@@ -0,0 +1,27 @@
+<?php
+declare(strict_types = 1);
+
+namespace C0ntax\ParsleyBundle\Parsleys;
+
+use C0ntax\ParsleyBundle\Contracts\DirectiveInterface;
+
+/**
+ * Class RemoveParsleyConstraint
+ *
+ * Used to remove Parsley Directives after they've been put in
+ *
+ * @package C0ntax\ParsleyBundle\Parsleys
+ */
+class RemoveParsleyDirective extends AbstractRemove
+{
+    /**
+     * RemoveParsley constructor.
+     *
+     * @param string $className
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(string $className)
+    {
+        parent::__construct($className, DirectiveInterface::class);
+    }
+}

tests/Form/Extension/ParsleyTypeExtensionTest.php

@@ -82,7 +82,6 @@ public function testTriggerOverride()
             ],
             $view->children['check']->vars['attr']
         );
-
     }
 
     protected function getParsleyTypeConfig()

tests/Parsleys/RemoveParsleyDirectiveTest.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace C0ntax\ParsleyBundle\Tests\Parsleys;
+
+use C0ntax\ParsleyBundle\Parsleys\Directive\Field\Constraint as ParsleyConstraint;
+use C0ntax\ParsleyBundle\Parsleys\Directive\Field\ConstraintErrorMessage;
+use C0ntax\ParsleyBundle\Parsleys\Directive\Field\Generic;
+use C0ntax\ParsleyBundle\Parsleys\Directive\Field\Trigger;
+use C0ntax\ParsleyBundle\Parsleys\RemoveParsleyDirective;
+use Symfony\Component\Validator\Constraints as SymfonyConstraint;
+
+class RemoveParsleyDirectiveTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getValidClassNames
+     * @param string $className
+     */
+    public function testValid(string $className)
+    {
+        self::assertInstanceOf(RemoveParsleyDirective::class, new RemoveParsleyDirective($className));
+    }
+
+    /**
+     * @dataProvider getInvalidClassNames
+     * @param string $className
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessageRegExp /^Class [\S]+ does not implement C0ntax\\ParsleyBundle\\Contracts\\DirectiveInterface$/
+     */
+    public function testInvalid(string $className)
+    {
+        new RemoveParsleyDirective($className);
+    }
+
+    public function getValidClassNames()
+    {
+        return [
+            [
+                'className' => ConstraintErrorMessage::class,
+            ],
+            [
+                'className' => Generic::class,
+            ],
+            [
+                'className' => Trigger::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Email::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Length::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Max::class,
+            ],
+            [
+                'className' => ParsleyConstraint\MaxLength::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Min::class,
+            ],
+            [
+                'className' => ParsleyConstraint\MinLength::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Pattern::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Range::class,
+            ],
+            [
+                'className' => ParsleyConstraint\Required::class,
+            ],
+        ];
+    }
+
+    public function getInvalidClassNames()
+    {
+        return [
+            [
+                'className' => SymfonyConstraint\Email::class,
+            ],
+            [
+                'className' => SymfonyConstraint\Length::class,
+            ],
+            [
+                'className' => SymfonyConstraint\Regex::class,
+            ],
+        ];
+    }
+}