diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 722cf2b..1a89547 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -96,7 +96,9 @@ 'phpdoc_separation' => false, 'phpdoc_summary' => false, 'single_quote' => true, - 'increment_style' => [], + 'increment_style' => [ + 'style' => 'post', + ], 'standardize_increment' => false, 'standardize_not_equals' => true, 'multiline_comment_opening_closing' => true, diff --git a/composer.json b/composer.json index 6ae2bff..ef62f94 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,8 @@ "ext-mbstring": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.0", - "phpunit/phpunit": "^8.5", + "deminy/counit": "^0.3", + "friendsofphp/php-cs-fixer": "3.7.0", "swoole/ide-helper": ">=4.4.20", "simps/mqtt-cli": "*", "phpstan/phpstan": "^2.0" @@ -50,7 +50,7 @@ "scripts": { "cs-check": "/usr/bin/env php ./vendor/bin/php-cs-fixer fix --dry-run", "cs-fix": "/usr/bin/env php ./vendor/bin/php-cs-fixer fix", - "test": "./tests/co-phpunit --colors=always", + "test": "./vendor/bin/counit --colors=always", "analyse": "phpstan analyse --memory-limit 4096M -c phpstan.neon" }, "extra": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index adba018..d2b0fca 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -8,4 +8,7 @@ + + + diff --git a/src/Tools/UnPackTool.php b/src/Tools/UnPackTool.php index 3896dab..45f2bd7 100644 --- a/src/Tools/UnPackTool.php +++ b/src/Tools/UnPackTool.php @@ -86,7 +86,7 @@ protected static function getRemainingLength(string $data, ?int &$headBytes): in $digit = ord($data[$headBytes]); $value += ($digit & 127) * $multiplier; $multiplier *= 128; - ++$headBytes; + $headBytes++; } while (($digit & 128) != 0); return $value; diff --git a/tests/Unit/ClientConfigTest.php b/tests/Unit/ClientConfigTest.php index 58602d1..6723371 100644 --- a/tests/Unit/ClientConfigTest.php +++ b/tests/Unit/ClientConfigTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\Unit; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Client; use Simps\MQTT\Config\ClientConfig; use Simps\MQTT\Protocol\ProtocolInterface; diff --git a/tests/Unit/ClientTest.php b/tests/Unit/ClientTest.php index b413d33..8283036 100644 --- a/tests/Unit/ClientTest.php +++ b/tests/Unit/ClientTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\Unit; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Client as MQTTClient; use Simps\MQTT\Exception\ConnectException; use Simps\MQTT\Exception\ProtocolException; diff --git a/tests/Unit/MessageTest.php b/tests/Unit/MessageTest.php index f1178b5..95b7041 100644 --- a/tests/Unit/MessageTest.php +++ b/tests/Unit/MessageTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\Unit; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Message; use Simps\MQTT\Protocol\ProtocolInterface; use Simps\MQTT\Protocol\Types; diff --git a/tests/Unit/ToolsTest.php b/tests/Unit/ToolsTest.php index 9747761..1692eec 100644 --- a/tests/Unit/ToolsTest.php +++ b/tests/Unit/ToolsTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\Unit; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Exception\InvalidArgumentException; use Simps\MQTT\Protocol\ProtocolInterface; use Simps\MQTT\Tools\Debug; diff --git a/tests/V3/PacketTest.php b/tests/V3/PacketTest.php index c6123af..a07e186 100644 --- a/tests/V3/PacketTest.php +++ b/tests/V3/PacketTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\V3; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Client; use Simps\MQTT\Exception\ProtocolException; use Simps\MQTT\Hex\ReasonCode; @@ -30,6 +30,7 @@ class PacketTest extends TestCase public static function setUpBeforeClass(): void { + parent::setUpBeforeClass(); self::$topic = 'testtopic/simps-' . rand(100, 999); self::$client = new Client(SIMPS_MQTT_REMOTE_HOST, SIMPS_MQTT_PORT, getTestConnectConfig()); } @@ -38,6 +39,7 @@ public static function tearDownAfterClass(): void { self::$topic = ''; self::$client = null; + parent::tearDownAfterClass(); } public function testConnect() diff --git a/tests/V3/WebSocketTest.php b/tests/V3/WebSocketTest.php index a707b2f..4b14ae9 100644 --- a/tests/V3/WebSocketTest.php +++ b/tests/V3/WebSocketTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\V3; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Exception\ProtocolException; use Simps\MQTT\Hex\ReasonCode; use Simps\MQTT\Protocol\Types; @@ -30,6 +30,7 @@ class WebSocketTest extends TestCase public static function setUpBeforeClass(): void { + parent::setUpBeforeClass(); self::$topic = 'testtopic/simps-' . rand(100, 999); self::$client = new WebSocketClient(SIMPS_MQTT_REMOTE_HOST, SIMPS_MQTT_OVER_WEBSOCKET_PORT, getTestConnectConfig()); } @@ -38,6 +39,7 @@ public static function tearDownAfterClass(): void { self::$topic = ''; self::$client = null; + parent::tearDownAfterClass(); } public function testConnect() diff --git a/tests/V5/PacketTest.php b/tests/V5/PacketTest.php index 89a45e6..028e024 100644 --- a/tests/V5/PacketTest.php +++ b/tests/V5/PacketTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\V5; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Client; use Simps\MQTT\Exception\ProtocolException; use Simps\MQTT\Hex\ReasonCode; @@ -31,6 +31,7 @@ class PacketTest extends TestCase public static function setUpBeforeClass(): void { + parent::setUpBeforeClass(); self::$topic = 'testtopic/simps-' . rand(100, 999); self::$client = new Client(SIMPS_MQTT_REMOTE_HOST, SIMPS_MQTT_PORT, getTestMQTT5ConnectConfig()); } @@ -39,6 +40,7 @@ public static function tearDownAfterClass(): void { self::$topic = ''; self::$client = null; + parent::tearDownAfterClass(); } public function testConnect() diff --git a/tests/V5/WebSocketTest.php b/tests/V5/WebSocketTest.php index 4c48575..3ef93c5 100644 --- a/tests/V5/WebSocketTest.php +++ b/tests/V5/WebSocketTest.php @@ -12,7 +12,7 @@ */ namespace SimpsTest\MQTT\V5; -use PHPUnit\Framework\TestCase; +use Deminy\Counit\TestCase; use Simps\MQTT\Exception\ProtocolException; use Simps\MQTT\Hex\ReasonCode; use Simps\MQTT\Protocol\Types; @@ -31,6 +31,7 @@ class WebSocketTest extends TestCase public static function setUpBeforeClass(): void { + parent::setUpBeforeClass(); self::$topic = 'testtopic/simps-' . rand(100, 999); self::$client = new WebSocketClient(SIMPS_MQTT_REMOTE_HOST, SIMPS_MQTT_OVER_WEBSOCKET_PORT, getTestMQTT5ConnectConfig()); } @@ -39,6 +40,7 @@ public static function tearDownAfterClass(): void { self::$topic = ''; self::$client = null; + parent::tearDownAfterClass(); } public function testConnect() diff --git a/tests/co-phpunit b/tests/co-phpunit deleted file mode 100755 index b22aa57..0000000 --- a/tests/co-phpunit +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env php - SWOOLE_HOOK_ALL, - 'exit_condition' => function(){ - return Swoole\Coroutine::stats()['coroutine_num'] === 0; - } -]); -Swoole\Coroutine\Run(function () use (&$code) { - if (version_compare('7.1.0', PHP_VERSION, '>')) { - fwrite( - STDERR, - sprintf( - 'This version of PHPUnit is supported on PHP 7.1 and PHP 7.2.' . PHP_EOL . - 'You are using PHP %s (%s).' . PHP_EOL, - PHP_VERSION, - PHP_BINARY - ) - ); - - die(1); - } - - if (! ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); - } - - foreach ([__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php'] as $file) { - if (file_exists($file)) { - define('PHPUNIT_COMPOSER_INSTALL', $file); - - break; - } - } - - unset($file); - - if (! defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( - STDERR, - 'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL . - ' composer install' . PHP_EOL . PHP_EOL . - 'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL - ); - - die(1); - } - - $options = getopt('', ['prepend:']); - - if (isset($options['prepend'])) { - require $options['prepend']; - } - - unset($options); - - require PHPUNIT_COMPOSER_INSTALL; - - $code = PHPUnit\TextUI\Command::main(false); -}); - -exit($code);