Merge pull request #2842 from K-Phoen/update-rulerz

Update RulerZ

3 files changed, 4 insertions, 5 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index a69a979d..4e802c98 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -238,7 +238,7 @@ scheb_two_factor:
         mailer: wallabag_user.auth_code_mailer
 
 kphoen_rulerz:
-    executors:
+    targets:
         doctrine: true
 
 old_sound_rabbit_mq:
diff --git a/composer.json b/composer.json
index 767d9c82..b919f446 100644
--- a/composer.json
+++ b/composer.json
@@ -71,8 +71,7 @@
         "scheb/two-factor-bundle": "~2.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
-        "kphoen/rulerz-bundle": "~0.10",
-        "kphoen/rulerz": "0.19.1",
+        "kphoen/rulerz-bundle": "~0.13",
         "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.0",
         "paragonie/random_compat": "~1.0",
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index fadd5e49..036735ec 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -117,12 +117,12 @@ services:
     wallabag.operator.array.matches:
         class: Wallabag\CoreBundle\Operator\PHP\Matches
         tags:
-            - { name: rulerz.operator, executor: rulerz.executor.array, operator: matches }
+            - { name: rulerz.operator, target: native, operator: matches }
 
     wallabag.operator.doctrine.matches:
         class: Wallabag\CoreBundle\Operator\Doctrine\Matches
         tags:
-            - { name: rulerz.operator, executor: rulerz.executor.doctrine, operator: matches, inline: true }
+            - { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
 
     wallabag_core.helper.redirect:
         class: Wallabag\CoreBundle\Helper\Redirect