mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 19:41:02 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Update RulerZ
This commit is contained in:
Jeremy Benoist 2017-02-06 09:20:28 +01:00 committed by GitHub
commit 99cc170b0e
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config/config.yml
View file

@ -238,7 +238,7 @@ scheb_two_factor:
mailer: wallabag_user.auth_code_mailer mailer: wallabag_user.auth_code_mailer
kphoen_rulerz: kphoen_rulerz:
executors: targets:
doctrine: true doctrine: true
old_sound_rabbit_mq: old_sound_rabbit_mq:

3
composer.json
View file

@ -71,8 +71,7 @@
"scheb/two-factor-bundle": "~2.0", "scheb/two-factor-bundle": "~2.0",
"grandt/phpepub": "~4.0", "grandt/phpepub": "~4.0",
"wallabag/php-mobi": "~1.0.0", "wallabag/php-mobi": "~1.0.0",
"kphoen/rulerz-bundle": "~0.10", "kphoen/rulerz-bundle": "~0.13",
"kphoen/rulerz": "0.19.1",
"guzzlehttp/guzzle": "^5.3.1", "guzzlehttp/guzzle": "^5.3.1",
"doctrine/doctrine-migrations-bundle": "^1.0", "doctrine/doctrine-migrations-bundle": "^1.0",
"paragonie/random_compat": "~1.0", "paragonie/random_compat": "~1.0",

4
src/Wallabag/CoreBundle/Resources/config/services.yml
View file

@ -117,12 +117,12 @@ services:
wallabag.operator.array.matches: wallabag.operator.array.matches:
class: Wallabag\CoreBundle\Operator\PHP\Matches class: Wallabag\CoreBundle\Operator\PHP\Matches
tags: tags:
- { name: rulerz.operator, executor: rulerz.executor.array, operator: matches } - { name: rulerz.operator, target: native, operator: matches }
wallabag.operator.doctrine.matches: wallabag.operator.doctrine.matches:
class: Wallabag\CoreBundle\Operator\Doctrine\Matches class: Wallabag\CoreBundle\Operator\Doctrine\Matches
tags: 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: wallabag_core.helper.redirect:
class: Wallabag\CoreBundle\Helper\Redirect class: Wallabag\CoreBundle\Helper\Redirect