diff options
author | Kévin Gomez <kgomez@tea-ebook.com> | 2017-02-05 18:02:09 +0100 |
---|---|---|
committer | Kévin Gomez <kgomez@tea-ebook.com> | 2017-02-05 18:02:09 +0100 |
commit | 177c5510ff7d544a011cb73f419e371c9e054f86 (patch) | |
tree | 8802b6197683e50829ff50cf2e9b1572d59d9d82 | |
parent | 20da238413d1c6cc360d58a13df33eb199fa5f05 (diff) | |
download | wallabag-177c5510ff7d544a011cb73f419e371c9e054f86.tar.gz wallabag-177c5510ff7d544a011cb73f419e371c9e054f86.tar.zst wallabag-177c5510ff7d544a011cb73f419e371c9e054f86.zip |
Update RulerZ
-rw-r--r-- | app/config/config.yml | 2 | ||||
-rw-r--r-- | composer.json | 3 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 4 |
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: | |||
238 | mailer: wallabag_user.auth_code_mailer | 238 | mailer: wallabag_user.auth_code_mailer |
239 | 239 | ||
240 | kphoen_rulerz: | 240 | kphoen_rulerz: |
241 | executors: | 241 | targets: |
242 | doctrine: true | 242 | doctrine: true |
243 | 243 | ||
244 | old_sound_rabbit_mq: | 244 | 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 @@ | |||
71 | "scheb/two-factor-bundle": "~2.0", | 71 | "scheb/two-factor-bundle": "~2.0", |
72 | "grandt/phpepub": "~4.0", | 72 | "grandt/phpepub": "~4.0", |
73 | "wallabag/php-mobi": "~1.0.0", | 73 | "wallabag/php-mobi": "~1.0.0", |
74 | "kphoen/rulerz-bundle": "~0.10", | 74 | "kphoen/rulerz-bundle": "~0.13", |
75 | "kphoen/rulerz": "0.19.1", | ||
76 | "guzzlehttp/guzzle": "^5.3.1", | 75 | "guzzlehttp/guzzle": "^5.3.1", |
77 | "doctrine/doctrine-migrations-bundle": "^1.0", | 76 | "doctrine/doctrine-migrations-bundle": "^1.0", |
78 | "paragonie/random_compat": "~1.0", | 77 | "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: | |||
117 | wallabag.operator.array.matches: | 117 | wallabag.operator.array.matches: |
118 | class: Wallabag\CoreBundle\Operator\PHP\Matches | 118 | class: Wallabag\CoreBundle\Operator\PHP\Matches |
119 | tags: | 119 | tags: |
120 | - { name: rulerz.operator, executor: rulerz.executor.array, operator: matches } | 120 | - { name: rulerz.operator, target: native, operator: matches } |
121 | 121 | ||
122 | wallabag.operator.doctrine.matches: | 122 | wallabag.operator.doctrine.matches: |
123 | class: Wallabag\CoreBundle\Operator\Doctrine\Matches | 123 | class: Wallabag\CoreBundle\Operator\Doctrine\Matches |
124 | tags: | 124 | tags: |
125 | - { name: rulerz.operator, executor: rulerz.executor.doctrine, operator: matches, inline: true } | 125 | - { name: rulerz.operator, target: doctrine, operator: matches, inline: true } |
126 | 126 | ||
127 | wallabag_core.helper.redirect: | 127 | wallabag_core.helper.redirect: |
128 | class: Wallabag\CoreBundle\Helper\Redirect | 128 | class: Wallabag\CoreBundle\Helper\Redirect |