From d3f2e065d3af5ac324fde16d3d5ae003835f0baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Vil=C3=A0?= Date: Wed, 19 Apr 2023 11:38:53 +0200 Subject: [PATCH 1/2] PHPUnit 10 Support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Vilà --- .styleci.yml | 6 +----- composer.json | 13 ++++--------- tests/ArrayCompareTest.php | 2 -- tests/HelperFunctionTest.php | 2 -- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index 0f9c088..7f00acc 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -1,8 +1,4 @@ -preset: psr2 - -finder: - exclude: - - "tests" +preset: psr12 enabled: - no_unneeded_control_parentheses diff --git a/composer.json b/composer.json index 5dd8a1e..fd0ca50 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,17 @@ { "name": "rogervila/array-diff-multidimensional", "description": "Compare the difference between two multidimensional arrays", - "type": "library", "license": "MIT", + "type": "library", "authors": [ { "name": "Roger Vilà", "email": "rogervila@me.com" } ], + "require-dev": { + "phpunit/phpunit": "^4.8 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" + }, "autoload": { "psr-4": { "Rogervila\\": "src/" @@ -16,13 +19,5 @@ "files": [ "src/helpers.php" ] - }, - "autoload-dev": { - "psr-4": { - "Rogervila\\Tests\\": "tests/" - } - }, - "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" } } diff --git a/tests/ArrayCompareTest.php b/tests/ArrayCompareTest.php index 1bd474e..b09c5c9 100644 --- a/tests/ArrayCompareTest.php +++ b/tests/ArrayCompareTest.php @@ -1,7 +1,5 @@ Date: Wed, 19 Apr 2023 11:39:42 +0200 Subject: [PATCH 2/2] apply styleci fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Vilà --- src/helpers.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/helpers.php b/src/helpers.php index 14a69ce..e9a2ec9 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -3,7 +3,6 @@ use Rogervila\ArrayDiffMultidimensional; if (!function_exists('array_diff_multidimensional')) { - /** * Returns an array with the differences between $array1 and $array2 * $strict variable defines if comparison must be strict or not