From 754b297044e17c6355b7173e133db8e72fd95a45 Mon Sep 17 00:00:00 2001 From: Tobias Trozowski Date: Thu, 3 Mar 2022 12:14:38 +0100 Subject: [PATCH 1/3] fixed existing unit-tests --- composer.json | 10 ++++++++-- src/DMS/Filter/Filters/Zend.php | 1 + src/DMS/Filter/Rules/Zend.php | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6c3d0ac..4546489 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,9 @@ ], "require": { - "php": "^7.4 || ^8.0", - "doctrine/annotations": "^1.13" + "php": "^7.4 || ~8.0 || ~8.1", + "doctrine/annotations": "^1.13", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { @@ -33,5 +34,10 @@ "suggest": { "laminas/laminas-filter": "Use Laminas Filters via DMS Filter", "ext-mbstring": "for encoding safety" + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/src/DMS/Filter/Filters/Zend.php b/src/DMS/Filter/Filters/Zend.php index 4d3fb13..f4ed95b 100644 --- a/src/DMS/Filter/Filters/Zend.php +++ b/src/DMS/Filter/Filters/Zend.php @@ -18,6 +18,7 @@ * Zend Filter * * Instantiates and runs Zend Filters (from ZF2) + * @deprecated Replaced with {@link Laminas} */ class Zend extends BaseFilter { diff --git a/src/DMS/Filter/Rules/Zend.php b/src/DMS/Filter/Rules/Zend.php index 9dc582b..92ce024 100644 --- a/src/DMS/Filter/Rules/Zend.php +++ b/src/DMS/Filter/Rules/Zend.php @@ -9,6 +9,7 @@ * Allows the use for Zend Filters * * @Annotation + * @deprecated Replaced with {@link Laminas} */ class Zend extends Rule { From a80c74686a01bf900df3bf2a3e34827b57d6e2c0 Mon Sep 17 00:00:00 2001 From: Tobias Trozowski Date: Thu, 3 Mar 2022 12:15:18 +0100 Subject: [PATCH 2/3] added php 8.1 to test matrix --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index dd348d6..2b59743 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - php: [7.4, 8.0] + php: [7.4, 8.0, 8.1] dependency-version: [prefer-lowest, prefer-stable] name: P${{ matrix.php }} - ${{ matrix.dependency-version }} From be0a9a473a088182c71a8f6b76566c48c173e97c Mon Sep 17 00:00:00 2001 From: Tobias Trozowski Date: Wed, 16 Mar 2022 09:47:21 +0100 Subject: [PATCH 3/3] fixed coding-style --- src/DMS/Filter/Filters/Zend.php | 1 + src/DMS/Filter/Rules/Zend.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DMS/Filter/Filters/Zend.php b/src/DMS/Filter/Filters/Zend.php index f4ed95b..d6e6118 100644 --- a/src/DMS/Filter/Filters/Zend.php +++ b/src/DMS/Filter/Filters/Zend.php @@ -18,6 +18,7 @@ * Zend Filter * * Instantiates and runs Zend Filters (from ZF2) + * * @deprecated Replaced with {@link Laminas} */ class Zend extends BaseFilter diff --git a/src/DMS/Filter/Rules/Zend.php b/src/DMS/Filter/Rules/Zend.php index 92ce024..2c05171 100644 --- a/src/DMS/Filter/Rules/Zend.php +++ b/src/DMS/Filter/Rules/Zend.php @@ -8,8 +8,9 @@ * * Allows the use for Zend Filters * - * @Annotation * @deprecated Replaced with {@link Laminas} + * + * @Annotation */ class Zend extends Rule {