diff options
author | Kévin Gomez <contact@kevingomez.fr> | 2015-11-13 14:37:58 +0100 |
---|---|---|
committer | Kévin Gomez <contact@kevingomez.fr> | 2015-11-13 14:37:58 +0100 |
commit | a6e27f74663637ecc4a4cf84028e6b5a3556a6ff (patch) | |
tree | 98e0ef2d9d2d11283a08ec0dc0af0f7c6c2e4887 /src/Wallabag | |
parent | 5c514b0be320d683c22a3044d875a5e4b5fe6ce0 (diff) | |
download | wallabag-a6e27f74663637ecc4a4cf84028e6b5a3556a6ff.tar.gz wallabag-a6e27f74663637ecc4a4cf84028e6b5a3556a6ff.tar.zst wallabag-a6e27f74663637ecc4a4cf84028e6b5a3556a6ff.zip |
Add matches operator
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/TaggingRule.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php | 15 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Operator/PHP/Matches.php | 11 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 10 |
4 files changed, 37 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/TaggingRule.php b/src/Wallabag/CoreBundle/Entity/TaggingRule.php index 851af932..4eab590f 100644 --- a/src/Wallabag/CoreBundle/Entity/TaggingRule.php +++ b/src/Wallabag/CoreBundle/Entity/TaggingRule.php | |||
@@ -30,7 +30,7 @@ class TaggingRule | |||
30 | * @Assert\NotBlank() | 30 | * @Assert\NotBlank() |
31 | * @RulerZAssert\ValidRule( | 31 | * @RulerZAssert\ValidRule( |
32 | * allowed_variables={"title", "url", "isArchived", "isStared", "content", "language", "mimetype", "readingTime", "domainName"}, | 32 | * allowed_variables={"title", "url", "isArchived", "isStared", "content", "language", "mimetype", "readingTime", "domainName"}, |
33 | * allowed_operators={">", "<", ">=", "<=", "=", "is", "!=", "and", "not", "or"} | 33 | * allowed_operators={">", "<", ">=", "<=", "=", "is", "!=", "and", "not", "or", "matches"} |
34 | * ) | 34 | * ) |
35 | * @ORM\Column(name="rule", type="string", nullable=false) | 35 | * @ORM\Column(name="rule", type="string", nullable=false) |
36 | */ | 36 | */ |
diff --git a/src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php b/src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php new file mode 100644 index 00000000..dc47c982 --- /dev/null +++ b/src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php | |||
@@ -0,0 +1,15 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Operator\Doctrine; | ||
4 | |||
5 | class Matches | ||
6 | { | ||
7 | public function __invoke($subject, $pattern) | ||
8 | { | ||
9 | if ($pattern[0] === "'") { | ||
10 | $pattern = sprintf("'%%%s%%'", substr($pattern, 1, -1)); | ||
11 | } | ||
12 | |||
13 | return sprintf('UPPER(%s) LIKE UPPER(%s)', $subject, $pattern); | ||
14 | } | ||
15 | } | ||
diff --git a/src/Wallabag/CoreBundle/Operator/PHP/Matches.php b/src/Wallabag/CoreBundle/Operator/PHP/Matches.php new file mode 100644 index 00000000..4768900c --- /dev/null +++ b/src/Wallabag/CoreBundle/Operator/PHP/Matches.php | |||
@@ -0,0 +1,11 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Operator\PHP; | ||
4 | |||
5 | class Matches | ||
6 | { | ||
7 | public function __invoke($subject, $pattern) | ||
8 | { | ||
9 | return stripos($subject, $pattern) !== false; | ||
10 | } | ||
11 | } | ||
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 03d33560..c92b4eb3 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -91,3 +91,13 @@ services: | |||
91 | arguments: | 91 | arguments: |
92 | - %wallabag_url% | 92 | - %wallabag_url% |
93 | - src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png | 93 | - src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png |
94 | |||
95 | wallabag.operator.array.matches: | ||
96 | class: Wallabag\CoreBundle\Operator\PHP\Matches | ||
97 | tags: | ||
98 | - { name: rulerz.operator, executor: rulerz.executor.array, operator: matches } | ||
99 | |||
100 | wallabag.operator.doctrine.matches: | ||
101 | class: Wallabag\CoreBundle\Operator\Doctrine\Matches | ||
102 | tags: | ||
103 | - { name: rulerz.operator, executor: rulerz.executor.doctrine, operator: matches, inline: true } | ||