Skip to content

Update PHPUnit version #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions MoxioSniffs/Sniffs/Tests/PHP/DisallowDateTimeSniffTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.14"
},
"require-dev": {
"phpunit/phpunit": "^8.5.12"
"phpunit/phpunit": "^10.0"
},
"config": {
"allow-plugins": {
Expand Down
31 changes: 15 additions & 16 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="vendor/autoload.php"
failOnRisky="true"
failOnWarning="true"
>
<coverage/>
<testsuites>
<testsuite name="Moxio PHP_CodeSniffer Sniffs Test Suite">
<directory>./MoxioSniffs/Sniffs/Tests</directory>
</testsuite>
</testsuites>

<testsuites>
<testsuite name="Moxio PHP_CodeSniffer Sniffs Test Suite">
<directory>./MoxioSniffs/Sniffs/Tests</directory>
</testsuite>
</testsuites>

<filter>
<whitelist>
<directory>./MoxioSniffs</directory>
<exclude>
<directory>./MoxioSniffs/Sniffs/Tests</directory>
</exclude>
</whitelist>
</filter>
<source>
<include>
<directory>./MoxioSniffs</directory>
</include>
<exclude>
<directory>./MoxioSniffs/Sniffs/Tests</directory>
</exclude>
</source>
</phpunit>