From 1fa2059d9c96bf9ae319f206d760e634c0f8694f Mon Sep 17 00:00:00 2001 From: Jeroeny Date: Tue, 22 Aug 2023 16:01:06 +0200 Subject: [PATCH 1/2] update dependencies --- .github/workflows/ci.yml | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5482c9..9a69b1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - php-version: [ '7.3', '7.4', '8.0', '8.1' ] + php-version: [ '7.3', '7.4', '8.0', '8.1', '8.2' ] steps: - name: Checkout code diff --git a/composer.json b/composer.json index cfb3adc..e5078a4 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ }, "require": { "php": "^7.1 || ^8.0", - "squizlabs/php_codesniffer": "^3.0.0", - "slevomat/coding-standard": "^6.0 || ^7.0 || ^8.0 <= 8.8.0" + "squizlabs/php_codesniffer": "^3.0", + "slevomat/coding-standard": "^6.0 || ^7.0 || ^8.0 <= 8.13" }, "require-dev": { - "phpunit/phpunit": "^8.5.12" + "phpunit/phpunit": "^8.5" }, "config": { "allow-plugins": { From 45b311037b248e690ef9d48eec6c06313c1d3e53 Mon Sep 17 00:00:00 2001 From: Jeroeny Date: Tue, 22 Aug 2023 16:07:30 +0200 Subject: [PATCH 2/2] update phpunit --- ...bstractSniffTest.php => AbstractSniff.php} | 3 +- ...ArrayCombinersWithSingleArraySniffTest.php | 4 +-- .../DisallowBareContinueInSwitchSniffTest.php | 4 +-- ...tWithUnspecifiedTimeComponentSniffTest.php | 4 +-- .../Tests/PHP/DisallowDateTimeSniffTest.php | 4 +-- ...citIteratorToArrayWithUseKeysSniffTest.php | 4 +-- ...llowImplicitLooseBase64DecodeSniffTest.php | 4 +-- ...sallowImplicitLooseComparisonSniffTest.php | 4 +-- ...llowImplicitMicrotimeAsStringSniffTest.php | 4 +-- .../PHP/DisallowMbDetectEncodingSniffTest.php | 4 +-- ...allowUniqidWithoutMoreEntropySniffTest.php | 4 +-- .../PHP/DisallowUtf8EncodeDecodeSniffTest.php | 4 +-- composer.json | 4 +-- phpunit.xml.dist | 31 +++++++++---------- 14 files changed, 41 insertions(+), 41 deletions(-) rename MoxioSniffs/Sniffs/Tests/{AbstractSniffTest.php => AbstractSniff.php} (91%) diff --git a/MoxioSniffs/Sniffs/Tests/AbstractSniffTest.php b/MoxioSniffs/Sniffs/Tests/AbstractSniff.php similarity index 91% rename from MoxioSniffs/Sniffs/Tests/AbstractSniffTest.php rename to MoxioSniffs/Sniffs/Tests/AbstractSniff.php index cc440be..f1a8f9e 100644 --- a/MoxioSniffs/Sniffs/Tests/AbstractSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/AbstractSniff.php @@ -4,10 +4,11 @@ use PHP_CodeSniffer\Config; use PHP_CodeSniffer\Files\LocalFile; use PHP_CodeSniffer\Runner; +use PHPUnit\Framework\TestCase; require_once __DIR__ . '/../../../vendor/squizlabs/php_codesniffer/autoload.php'; -abstract class AbstractSniffTest extends \PHPUnit\Framework\TestCase +abstract class AbstractSniff extends TestCase { abstract protected function getSniffClass(); diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowArrayCombinersWithSingleArraySniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowArrayCombinersWithSingleArraySniffTest.php index 037d95b..8b4ff94 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowArrayCombinersWithSingleArraySniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowArrayCombinersWithSingleArraySniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowArrayCombinersWithSingleArraySniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowArrayCombinersWithSingleArraySniffTest extends AbstractSniffTest +class DisallowArrayCombinersWithSingleArraySniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowBareContinueInSwitchSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowBareContinueInSwitchSniffTest.php index db65260..c1b3f0d 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowBareContinueInSwitchSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowBareContinueInSwitchSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowBareContinueInSwitchSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowBareContinueInSwitchSniffTest extends AbstractSniffTest +class DisallowBareContinueInSwitchSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniffTest.php index 20fa1a1..4653341 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniffTest extends AbstractSniffTest { +class DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniffTest extends AbstractSniff { protected function getSniffClass() { return DisallowDateCreateFromFormatWithUnspecifiedTimeComponentSniff::class; diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateTimeSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateTimeSniffTest.php index 1e40a30..a8eec1c 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateTimeSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowDateTimeSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowDateTimeSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowDateTimeSniffTest extends AbstractSniffTest +class DisallowDateTimeSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitIteratorToArrayWithUseKeysSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitIteratorToArrayWithUseKeysSniffTest.php index 08743a5..da48cc2 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitIteratorToArrayWithUseKeysSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitIteratorToArrayWithUseKeysSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowImplicitIteratorToArrayWithUseKeysSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowImplicitIteratorToArrayWithUseKeysSniffTest extends AbstractSniffTest +class DisallowImplicitIteratorToArrayWithUseKeysSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseBase64DecodeSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseBase64DecodeSniffTest.php index 8161a77..486471b 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseBase64DecodeSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseBase64DecodeSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowImplicitLooseBase64DecodeSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowImplicitLooseBase64DecodeSniffTest extends AbstractSniffTest +class DisallowImplicitLooseBase64DecodeSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseComparisonSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseComparisonSniffTest.php index eae3b42..e95275c 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseComparisonSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitLooseComparisonSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowImplicitLooseComparisonSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowImplicitLooseComparisonSniffTest extends AbstractSniffTest +class DisallowImplicitLooseComparisonSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitMicrotimeAsStringSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitMicrotimeAsStringSniffTest.php index 77ff306..a767175 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitMicrotimeAsStringSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowImplicitMicrotimeAsStringSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowImplicitMicrotimeAsStringSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowImplicitMicrotimeAsStringSniffTest extends AbstractSniffTest +class DisallowImplicitMicrotimeAsStringSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowMbDetectEncodingSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowMbDetectEncodingSniffTest.php index 318fc60..e5861d1 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowMbDetectEncodingSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowMbDetectEncodingSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowMbDetectEncodingSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowMbDetectEncodingSniffTest extends AbstractSniffTest +class DisallowMbDetectEncodingSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowUniqidWithoutMoreEntropySniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowUniqidWithoutMoreEntropySniffTest.php index 7cebecd..d3fed0b 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowUniqidWithoutMoreEntropySniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowUniqidWithoutMoreEntropySniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowUniqidWithoutMoreEntropySniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowUniqidWithoutMoreEntropySniffTest extends AbstractSniffTest +class DisallowUniqidWithoutMoreEntropySniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/MoxioSniffs/Sniffs/Tests/PHP/DisallowUtf8EncodeDecodeSniffTest.php b/MoxioSniffs/Sniffs/Tests/PHP/DisallowUtf8EncodeDecodeSniffTest.php index ec6fafc..c73a31a 100644 --- a/MoxioSniffs/Sniffs/Tests/PHP/DisallowUtf8EncodeDecodeSniffTest.php +++ b/MoxioSniffs/Sniffs/Tests/PHP/DisallowUtf8EncodeDecodeSniffTest.php @@ -2,9 +2,9 @@ namespace Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\PHP; use Moxio\CodeSniffer\MoxioSniffs\Sniffs\PHP\DisallowUtf8EncodeDecodeSniff; -use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniffTest; +use Moxio\CodeSniffer\MoxioSniffs\Sniffs\Tests\AbstractSniff; -class DisallowUtf8EncodeDecodeSniffTest extends AbstractSniffTest +class DisallowUtf8EncodeDecodeSniffTest extends AbstractSniff { protected function getSniffClass() { diff --git a/composer.json b/composer.json index e5078a4..4c7e359 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ "require": { "php": "^7.1 || ^8.0", "squizlabs/php_codesniffer": "^3.0", - "slevomat/coding-standard": "^6.0 || ^7.0 || ^8.0 <= 8.13" + "slevomat/coding-standard": "^6.0 || ^7.0 || ^8.0 < 8.14" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^10.0" }, "config": { "allow-plugins": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e28a71d..65c34e3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,26 +1,25 @@ - + + + + ./MoxioSniffs/Sniffs/Tests + + - - - ./MoxioSniffs/Sniffs/Tests - - - - - - ./MoxioSniffs - - ./MoxioSniffs/Sniffs/Tests - - - + + + ./MoxioSniffs + + + ./MoxioSniffs/Sniffs/Tests + +