Merge pull request weiboad#168 from lcobucci/make-phpcs-more-strict

Make PHPCS more strict
yunnian · Jan 4, 2018 · be0c261 · be0c261
2 parents ce26efe + 337d9b8
commit be0c261
Show file tree

Hide file tree

Showing 100 changed files with 3,315 additions and 1,938 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,7 +51,7 @@ jobs:
       script:
         - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
         - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
-        - ./vendor/bin/infection --min-msi=50 --min-covered-msi=83 --threads=4
+        - ./vendor/bin/infection --min-msi=49 --min-covered-msi=82 --threads=4
 
     - stage: Functional tests
       services:

diff --git a/composer.json b/composer.json
@@ -36,6 +36,7 @@
         "ext-krb5": "To be able to ues the GSSAPI SASL mechanism"
     },
     "require-dev": {
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
         "infection/infection": "^0.7",
         "kmelia/monolog-stdout-handler": "^1.2",
         "mikey179/vfsStream": "^1.6.5",
@@ -46,6 +47,7 @@
         "phpunit/phpcov": "^4.0",
         "phpunit/phpunit": "^6.5",
         "satooshi/php-coveralls": "2.0.0",
+        "slevomat/coding-standard": "^4.1",
         "squizlabs/php_codesniffer": "^3.1"
     }
 }
diff --git a/example/Consumer.php b/example/Consumer.php
@@ -1,15 +1,20 @@
 <?php
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 date_default_timezone_set('PRC');
-use Monolog\Logger;
+
+use Kafka\Consumer;
+use Kafka\ConsumerConfig;
 use Monolog\Handler\StdoutHandler;
+use Monolog\Logger;
 
 // Create the logger
 $logger = new Logger('my_logger');
 // Now add some handlers
 $logger->pushHandler(new StdoutHandler());
 
-$config = \Kafka\ConsumerConfig::getInstance();
+$config = ConsumerConfig::getInstance();
 $config->setMetadataRefreshIntervalMs(10000);
 $config->setMetadataBrokerList('127.0.0.1:9092');
 $config->setGroupId('test');
@@ -22,8 +27,8 @@
 //$config->setSslEnable(true);
 //$config->setSslPassphrase('123456');
 //$config->setSslPeerName('nmred');
-$consumer = new \Kafka\Consumer();
+$consumer = new Consumer();
 $consumer->setLogger($logger);
-$consumer->start(function ($topic, $part, $message) {
+$consumer->start(function ($topic, $part, $message): void {
     var_dump($message);
 });
diff --git a/example/ControlProducer.php b/example/ControlProducer.php
@@ -1,15 +1,21 @@
 <?php
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 date_default_timezone_set('PRC');
-use Monolog\Logger;
+
+use Amp\Loop;
+use Kafka\Producer;
+use Kafka\ProducerConfig;
 use Monolog\Handler\StdoutHandler;
+use Monolog\Logger;
 
 // Create the logger
 $logger = new Logger('my_logger');
 // Now add some handlers
 $logger->pushHandler(new StdoutHandler());
 
-$config = \Kafka\ProducerConfig::getInstance();
+$config = ProducerConfig::getInstance();
 $config->setMetadataRefreshIntervalMs(1000);
 $config->setMetadataBrokerList('127.0.0.1:9092');
 $config->setBrokerVersion('1.0.0');
@@ -19,21 +25,31 @@
 
 class Message
 {
+    /**
+     * @var string[]
+     */
     private $message;
 
-    public function getMessage()
+    /**
+     * @return string[]
+     */
+    public function getMessage(): array
     {
         return $this->message;
     }
-    public function setMessage($message)
+
+    /**
+     * @param string[] $message
+     */
+    public function setMessage(array $message): void
     {
         $this->message = $message;
     }
 }
 
 // control message send interval time
 $message = new Message;
-\Amp\Loop::repeat(3000, function () use ($message) {
+Loop::repeat(3000, function () use ($message): void {
     $message->setMessage([
         [
             'topic' => 'test',
@@ -43,16 +59,16 @@ public function setMessage($message)
     ]);
 });
 
-$producer = new \Kafka\Producer(function () use ($message) {
+$producer = new Producer(function () use ($message) {
     $tmp = $message->getMessage();
     $message->setMessage([]);
     return $tmp;
 });
 $producer->setLogger($logger);
-$producer->success(function ($result) {
+$producer->success(function ($result): void {
     var_dump($result);
 });
-$producer->error(function ($errorCode, $context) {
+$producer->error(function ($errorCode, $context): void {
     var_dump($errorCode);
 });
 $producer->send();
diff --git a/example/Producer.php b/example/Producer.php
@@ -1,22 +1,28 @@
 <?php
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 date_default_timezone_set('PRC');
-use Monolog\Logger;
+
+use Kafka\Config;
+use Kafka\Producer;
+use Kafka\ProducerConfig;
 use Monolog\Handler\StdoutHandler;
+use Monolog\Logger;
 
 // Create the logger
 $logger = new Logger('my_logger');
 // Now add some handlers
 $logger->pushHandler(new StdoutHandler());
 
-$config = \Kafka\ProducerConfig::getInstance();
+$config = ProducerConfig::getInstance();
 $config->setMetadataRefreshIntervalMs(10000);
 $config->setMetadataBrokerList('127.0.0.1:9093');
 $config->setBrokerVersion('1.0.0');
 $config->setRequiredAck(1);
 $config->setIsAsyn(false);
 $config->setProduceInterval(500);
-$config->setSecurityProtocol(\Kafka\Config::SECURITY_PROTOCOL_SASL_SSL);
+$config->setSecurityProtocol(Config::SECURITY_PROTOCOL_SASL_SSL);
 $config->setSaslMechanism(\Kafka\Config::SASL_MECHANISMS_SCRAM_SHA_256);
 $config->setSaslUsername('nmred');
 $config->setSaslPassword('123456');
@@ -31,7 +37,7 @@
 $config->setSslPassphrase('123456');
 $config->setSslPeerName('nmred');
 
-$producer = new \Kafka\Producer(function () {
+$producer = new Producer(function () {
     return [
         [
             'topic' => 'test',
@@ -41,10 +47,10 @@
     ];
 });
 $producer->setLogger($logger);
-$producer->success(function ($result) {
+$producer->success(function ($result): void {
     var_dump($result);
 });
-$producer->error(function ($errorCode) {
+$producer->error(function ($errorCode): void {
     var_dump($errorCode);
 });
 $producer->send(true);
diff --git a/example/ProducerSync.php b/example/ProducerSync.php
@@ -1,15 +1,20 @@
 <?php
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 date_default_timezone_set('PRC');
-use Monolog\Logger;
+
+use Kafka\Producer;
+use Kafka\ProducerConfig;
 use Monolog\Handler\StdoutHandler;
+use Monolog\Logger;
 
 // Create the logger
 $logger = new Logger('my_logger');
 // Now add some handlers
 $logger->pushHandler(new StdoutHandler());
 
-$config = \Kafka\ProducerConfig::getInstance();
+$config = ProducerConfig::getInstance();
 $config->setMetadataRefreshIntervalMs(10000);
 $config->setMetadataBrokerList('127.0.0.1:9093');
 $config->setBrokerVersion('0.10.2.1');
@@ -24,7 +29,7 @@
 //$config->setSslPassphrase('123456');
 //$config->setSslPeerName('nmred');
 
-$producer = new \Kafka\Producer();
+$producer = new Producer();
 $producer->setLogger($logger);
 
 for ($i = 0; $i < 100; $i++) {

diff --git a/example/SaslSocket.php b/example/SaslSocket.php
@@ -1,14 +1,18 @@
 <?php
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 
-use \Kafka\Sasl\Scram;
+use Kafka\Protocol;
+use Kafka\Sasl\Scram;
+use Kafka\SocketSync;
 
-\Kafka\Protocol::init('1.0.0');
+Protocol::init('1.0.0');
 //$provider = new \Kafka\Sasl\Plain('nmred', '123456');
 //$provider = new \Kafka\Sasl\Gssapi('/etc/security/keytabs/kafkaclient.keytab', 'kafka/[email protected]');
 $provider = new Scram('alice', 'alice-secret', Scram::SCRAM_SHA_256);
 
-$socket = new \Kafka\SocketSync('127.0.0.1', '9092', null, $provider);
+$socket = new SocketSync('127.0.0.1', '9092', null, $provider);
 $socket->connect();
 
 $data = [

diff --git a/example/protocol/ApiVerions.php b/example/protocol/ApiVerions.php
@@ -1,11 +1,16 @@
 <?php
+declare(strict_types=1);
+
 require '../../vendor/autoload.php';
 
-\Kafka\Protocol::init('1.0.0');
+use Kafka\Protocol;
+use Kafka\Socket;
+
+Protocol::init('1.0.0');
 $requestData = \Kafka\Protocol::encode(\Kafka\Protocol::API_VERSIONS_REQUEST, []);
 
-$socket = new \Kafka\Socket('127.0.0.1', '9092');
-$socket->setOnReadable(function ($data) {
+$socket = new Socket('127.0.0.1', '9092');
+$socket->setOnReadable(function ($data): void {
     $coodid = \Kafka\Protocol\Protocol::unpack(\Kafka\Protocol\Protocol::BIT_B32, substr($data, 0, 4));
     $result = \Kafka\Protocol::decode(\Kafka\Protocol::API_VERSIONS_REQUEST, substr($data, 4));
     echo json_encode($result);
@@ -14,5 +19,5 @@
 
 $socket->connect();
 $socket->write($requestData);
-Amp\Loop::run(function () use ($socket, $requestData) {
+Amp\Loop::run(function () use ($socket, $requestData): void {
 });
diff --git a/example/protocol/CommitOffset.php b/example/protocol/CommitOffset.php
@@ -1,13 +1,21 @@
 <?php
+declare(strict_types=1);
+
 require '../../vendor/autoload.php';
 
+use Kafka\Protocol;
+use Kafka\Socket;
+
 class CommitOffset
 {
+    /**
+     * @var string[]
+     */
     protected $group = [];
     // {{{ functions
     // {{{ protected function joinGroup()
 
-    protected function joinGroup()
+    protected function joinGroup(): void
     {
         $data = [
             'group_id' => 'test',
@@ -24,11 +32,11 @@ protected function joinGroup()
             ],
         ];
 
-        \Kafka\Protocol::init('0.9.1.0');
+        Protocol::init('0.9.1.0');
         $requestData = \Kafka\Protocol::encode(\Kafka\Protocol::JOIN_GROUP_REQUEST, $data);
 
-        $socket = new \Kafka\Socket('127.0.0.1', '9192');
-        $socket->setOnReadable(function ($data) {
+        $socket = new Socket('127.0.0.1', '9192');
+        $socket->setOnReadable(function ($data): void {
             $coodid      = \Kafka\Protocol\Protocol::unpack(\Kafka\Protocol\Protocol::BIT_B32, substr($data, 0, 4));
             $result      = \Kafka\Protocol::decode(\Kafka\Protocol::JOIN_GROUP_REQUEST, substr($data, 4));
             $this->group = $result;
@@ -37,14 +45,14 @@ protected function joinGroup()
 
         $socket->connect();
         $socket->write($requestData);
-        Amp\run(function () use ($socket, $requestData) {
+        Amp\run(function () use ($socket, $requestData): void {
         });
     }
 
     // }}}
     // {{{ protected function syncGroup()
 
-    protected function syncGroup()
+    protected function syncGroup(): void
     {
         $this->joinGroup();
         $data = [
@@ -58,9 +66,7 @@ protected function syncGroup()
                     'assignments' => [
                         [
                             'topic_name' => 'test',
-                            'partitions' => [
-                                0
-                            ],
+                            'partitions' => [0],
                         ],
                     ],
                 ],
@@ -71,7 +77,7 @@ protected function syncGroup()
         $requestData = \Kafka\Protocol::encode(\Kafka\Protocol::SYNC_GROUP_REQUEST, $data);
 
         $socket = new \Kafka\Socket('127.0.0.1', '9192');
-        $socket->setOnReadable(function ($data) {
+        $socket->setOnReadable(function ($data): void {
             $coodid = \Kafka\Protocol\Protocol::unpack(\Kafka\Protocol\Protocol::BIT_B32, substr($data, 0, 4));
             $result = \Kafka\Protocol::decode(\Kafka\Protocol::SYNC_GROUP_REQUEST, substr($data, 4));
             //echo json_encode($result);
@@ -80,14 +86,14 @@ protected function syncGroup()
 
         $socket->connect();
         $socket->write($requestData);
-        Amp\run(function () use ($socket, $requestData) {
+        Amp\run(function () use ($socket, $requestData): void {
         });
     }
 
     // }}}
     // {{{ public function run()
 
-    public function run()
+    public function run(): void
     {
         $this->joinGroup();
         $this->syncGroup();
@@ -104,17 +110,17 @@ public function run()
                             'partition' => 0,
                             'offset' => 45,
                             'metadata' => '',
-                        ]
-                    ]
-                ]
+                        ],
+                    ],
+                ],
             ],
         ];
 
         \Kafka\Protocol::init('0.9.1.0');
         $requestData = \Kafka\Protocol::encode(\Kafka\Protocol::OFFSET_COMMIT_REQUEST, $data);
 
         $socket = new \Kafka\Socket('127.0.0.1', '9192');
-        $socket->setOnReadable(function ($data) {
+        $socket->setOnReadable(function ($data): void {
             $coodid = \Kafka\Protocol\Protocol::unpack(\Kafka\Protocol\Protocol::BIT_B32, substr($data, 0, 4));
             $result = \Kafka\Protocol::decode(\Kafka\Protocol::OFFSET_COMMIT_REQUEST, substr($data, 4));
             echo json_encode($result);
@@ -123,7 +129,7 @@ public function run()
 
         $socket->connect();
         $socket->write($requestData);
-        Amp\run(function () use ($socket, $requestData) {
+        Amp\run(function () use ($socket, $requestData): void {
         });
     }