mirror of
https://github.com/wallabag/wallabag.git
synced 2025-03-13 22:52:39 +00:00
Merge 71402fee93 into a4a6eb580b
This commit is contained in:
Yassine Guedidi
GitHub
commit
9de6a54487
7 changed files with 3 additions and 126 deletions
|
|
@ -232,10 +232,6 @@ scheb_two_factor:
|
|||
template: "Authentication/form.html.twig"
|
||||
mailer: Wallabag\Mailer\AuthCodeMailer
|
||||
|
||||
rulerz:
|
||||
targets:
|
||||
doctrine: true
|
||||
|
||||
old_sound_rabbit_mq:
|
||||
connections:
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -230,18 +230,10 @@ services:
|
|||
tags:
|
||||
- { name: rulerz.operator, target: native, operator: matches }
|
||||
|
||||
Wallabag\Operator\Doctrine\Matches:
|
||||
tags:
|
||||
- { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
|
||||
|
||||
Wallabag\Operator\PHP\NotMatches:
|
||||
tags:
|
||||
- { name: rulerz.operator, target: native, operator: notmatches }
|
||||
|
||||
Wallabag\Operator\Doctrine\NotMatches:
|
||||
tags:
|
||||
- { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
|
||||
|
||||
Wallabag\Operator\PHP\PatternMatches:
|
||||
tags:
|
||||
- { name: rulerz.operator, target: native, operator: "~" }
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ $config
|
|||
'phpstan/phpstan-symfony',
|
||||
'psr/http-client',
|
||||
'psr/http-factory',
|
||||
'rulerz-php/doctrine-orm',
|
||||
'scheb/2fa-qr-code',
|
||||
'scheb/2fa-trusted-device',
|
||||
'shipmonk/composer-dependency-analyser',
|
||||
|
|
|
|||
|
|
@ -103,7 +103,6 @@
|
|||
"psr/http-factory": "^1.0.2",
|
||||
"psr/http-message": "^2.0",
|
||||
"psr/log": "^1.1.4",
|
||||
"rulerz-php/doctrine-orm": "dev-master",
|
||||
"scheb/2fa-backup-code": "^5.13.2",
|
||||
"scheb/2fa-bundle": "^5.13.2",
|
||||
"scheb/2fa-email": "^5.13.2",
|
||||
|
|
|
|||
65
composer.lock
generated
65
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "a85056bec7fa90b9be4aa16c34464c0e",
|
||||
"content-hash": "0561b5035bbe92efdbf8eceb6835d15d",
|
||||
"packages": [
|
||||
{
|
||||
"name": "babdev/pagerfanta-bundle",
|
||||
|
|
@ -7669,64 +7669,6 @@
|
|||
},
|
||||
"time": "2019-03-08T08:55:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "rulerz-php/doctrine-orm",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/rulerz-php/doctrine-orm.git",
|
||||
"reference": "3ff5c8507e23942fa4af14818ab92f0e91bfaebe"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/rulerz-php/doctrine-orm/zipball/3ff5c8507e23942fa4af14818ab92f0e91bfaebe",
|
||||
"reference": "3ff5c8507e23942fa4af14818ab92f0e91bfaebe",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/orm": "^2.4",
|
||||
"kphoen/rulerz": "dev-master as 1.0.0",
|
||||
"php": ">=7.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"behat/behat": "~3.0",
|
||||
"kphoen/rusty": "dev-master",
|
||||
"liip/rmt": "^1.2",
|
||||
"phpunit/phpunit": "^7.1"
|
||||
},
|
||||
"default-branch": true,
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"RulerZ\\DoctrineORM\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Kévin Gomez",
|
||||
"email": "contact@kevingomez.fr",
|
||||
"homepage": "http://www.kevingomez.fr/"
|
||||
}
|
||||
],
|
||||
"description": "Doctrine ORM compilation target for RulerZ",
|
||||
"keywords": [
|
||||
"doctrine",
|
||||
"engine",
|
||||
"orm",
|
||||
"rule",
|
||||
"rulerz",
|
||||
"specification"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/rulerz-php/doctrine-orm/issues",
|
||||
"source": "https://github.com/rulerz-php/doctrine-orm/tree/master"
|
||||
},
|
||||
"time": "2020-01-03T14:08:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "scheb/2fa-backup-code",
|
||||
"version": "v5.13.2",
|
||||
|
|
@ -19873,7 +19815,6 @@
|
|||
"minimum-stability": "dev",
|
||||
"stability-flags": {
|
||||
"friendsofsymfony/oauth-server-bundle": 20,
|
||||
"rulerz-php/doctrine-orm": 20,
|
||||
"wallabag/rulerz": 20,
|
||||
"wallabag/rulerz-bundle": 20
|
||||
},
|
||||
|
|
@ -19900,9 +19841,9 @@
|
|||
"ext-tokenizer": "*",
|
||||
"ext-xml": "*"
|
||||
},
|
||||
"platform-dev": [],
|
||||
"platform-dev": {},
|
||||
"platform-overrides": {
|
||||
"php": "7.4.29"
|
||||
},
|
||||
"plugin-api-version": "2.3.0"
|
||||
"plugin-api-version": "2.6.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Wallabag\Operator\Doctrine;
|
||||
|
||||
/**
|
||||
* Provides a "matches" operator used for tagging rules.
|
||||
*
|
||||
* It asserts that a given pattern is contained in a subject, in a
|
||||
* case-insensitive way.
|
||||
*
|
||||
* This operator will be used to compile tagging rules in DQL, usable
|
||||
* by Doctrine ORM.
|
||||
* It's registered in RulerZ using a service;
|
||||
*/
|
||||
class Matches
|
||||
{
|
||||
public function __invoke($subject, $pattern)
|
||||
{
|
||||
if ("'" === $pattern[0]) {
|
||||
$pattern = \sprintf("'%%%s%%'", substr($pattern, 1, -1));
|
||||
}
|
||||
|
||||
return \sprintf('UPPER(%s) LIKE UPPER(%s)', $subject, $pattern);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Wallabag\Operator\Doctrine;
|
||||
|
||||
/**
|
||||
* Provides a "notmatches" operator used for tagging rules.
|
||||
*
|
||||
* It asserts that a given pattern is not contained in a subject, in a
|
||||
* case-insensitive way.
|
||||
*
|
||||
* This operator will be used to compile tagging rules in DQL, usable
|
||||
* by Doctrine ORM.
|
||||
* It's registered in RulerZ using a service;
|
||||
*/
|
||||
class NotMatches
|
||||
{
|
||||
public function __invoke($subject, $pattern)
|
||||
{
|
||||
if ("'" === $pattern[0]) {
|
||||
$pattern = \sprintf("'%%%s%%'", substr($pattern, 1, -1));
|
||||
}
|
||||
|
||||
return \sprintf('UPPER(%s) NOT LIKE UPPER(%s)', $subject, $pattern);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue