Merge pull request #1524 from wallabag/sf2.8

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Entity / TaggingRule.php

diff --git a/src/Wallabag/CoreBundle/Entity/TaggingRule.php b/src/Wallabag/CoreBundle/Entity/TaggingRule.php
index 851af932937f7419510866c8bb6a46baecdfc296..28914cc1949efb94ec3cb59fe688f6e1cd4a5da8 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/TaggingRule.php
+++ b/src/Wallabag/CoreBundle/Entity/TaggingRule.php
@@ -3,14 +3,14 @@
 namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
 use KPhoen\RulerZBundle\Validator\Constraints as RulerZAssert;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Tagging rule.
  *
  * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TaggingRuleRepository")
- * @ORM\Table
+ * @ORM\Table(name="`tagging_rule`")
  * @ORM\Entity
  */
 class TaggingRule
@@ -30,7 +30,7 @@ class TaggingRule
      * @Assert\NotBlank()
      * @RulerZAssert\ValidRule(
      *  allowed_variables={"title", "url", "isArchived", "isStared", "content", "language", "mimetype", "readingTime", "domainName"},
-     *  allowed_operators={">", "<", ">=", "<=", "=", "is", "!=", "and", "not", "or"}
+     *  allowed_operators={">", "<", ">=", "<=", "=", "is", "!=", "and", "not", "or", "matches"}
      * )
      * @ORM\Column(name="rule", type="string", nullable=false)
      */