diff --git a/app/config/config.yml b/app/config/config.yml index 4a4113036..5e53f992f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -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: diff --git a/app/config/services.yml b/app/config/services.yml index ea80f98e0..704c24295 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -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: "~" } diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php index 83fc207ef..a6eec3857 100644 --- a/composer-dependency-analyser.php +++ b/composer-dependency-analyser.php @@ -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', diff --git a/composer.json b/composer.json index ffa423d0d..c513a3659 100644 --- a/composer.json +++ b/composer.json @@ -103,7 +103,6 @@ "psr/http-factory": "^1.1.0", "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", diff --git a/composer.lock b/composer.lock index 0d3dc49b0..505946611 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "0082094723babdca23d61c87b0d5dca3", + "content-hash": "1ac72835fc69aa3c7d966064535196d4", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -7670,64 +7670,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", @@ -19559,7 +19501,6 @@ "minimum-stability": "dev", "stability-flags": { "friendsofsymfony/oauth-server-bundle": 20, - "rulerz-php/doctrine-orm": 20, "wallabag/rulerz": 20, "wallabag/rulerz-bundle": 20 }, @@ -19586,6 +19527,6 @@ "ext-tokenizer": "*", "ext-xml": "*" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } diff --git a/src/Operator/Doctrine/Matches.php b/src/Operator/Doctrine/Matches.php deleted file mode 100644 index 00e4d0b96..000000000 --- a/src/Operator/Doctrine/Matches.php +++ /dev/null @@ -1,25 +0,0 @@ -