Merge pull request #137 from SimonFrings/cleanup

friends-of-reactphp · Aug 9, 2021 · 648174d · 648174d
2 parents 3fb07dd + baf56b6
commit 648174d
Show file tree

Hide file tree

Showing 17 changed files with 93 additions and 91 deletions.
diff --git a/README.md b/README.md
@@ -74,16 +74,16 @@ proxy servers etc.), you can explicitly pass a custom instance of the
 [`ConnectorInterface`](https://github.com/reactphp/socket#connectorinterface):
 
 ```php
-$connector = new React\Socket\Connector(array(
+$connector = new React\Socket\Connector([
     'dns' => '127.0.0.1',
-    'tcp' => array(
+    'tcp' => [
         'bindto' => '192.168.10.1:0'
-    ),
-    'tls' => array(
+    ],
+    'tls' => [
         'verify_peer' => false,
         'verify_peer_name' => false
     )
-));
+]);
 
 $factory = new React\MySQL\Factory(null, $connector);
 ```
@@ -302,7 +302,7 @@ and sending your database queries.
 
 #### query()
 
-The `query(string $query, array $params = array()): PromiseInterface` method can be used to
+The `query(string $query, array $params = []): PromiseInterface` method can be used to
 perform an async query.
 
 This method returns a promise that will resolve with a `QueryResult` on
@@ -358,7 +358,7 @@ suited for exposing multiple possible results.
 
 #### queryStream()
 
-The `queryStream(string $sql, array $params = array()): ReadableStreamInterface` method can be used to
+The `queryStream(string $sql, array $params = []): ReadableStreamInterface` method can be used to
 perform an async query and stream the rows of the result set.
 
 This method returns a readable stream that will emit each row of the
@@ -513,7 +513,7 @@ See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
 This project aims to run on any platform and thus does not require any PHP
 extensions and supports running on legacy PHP 5.4 through current PHP 7+ and
 HHVM.
-It's *highly recommended to use PHP 7+* for this project.
+It's *highly recommended to use the latest supported PHP version* for this project.
 
 ## Tests
 
@@ -551,7 +551,7 @@ $ docker run -it --rm --net=host \
 To run the test suite, go to the project root and run:
 
 ```bash
-$ php vendor/bin/phpunit
+$ vendor/bin/phpunit
 ```
 
 ## License

diff --git a/examples/12-slow-stream.php b/examples/12-slow-stream.php
@@ -72,4 +72,6 @@
     });
 
     $connection->quit();
-}, 'printf');
+}, function (Exception $e) {
+    echo 'Error: ' . $e->getMessage() . PHP_EOL;
+});
diff --git a/src/Commands/AuthenticateCommand.php b/src/Commands/AuthenticateCommand.php
@@ -33,7 +33,7 @@ class AuthenticateCommand extends AbstractCommand
      * @see self::$charsetNumber
      * @see \React\MySQL\Io\Query::$escapeChars
      */
-    private static $charsetMap = array(
+    private static $charsetMap = [
         'latin1' => 8,
         'latin2' => 9,
         'ascii' => 11,
@@ -42,7 +42,7 @@ class AuthenticateCommand extends AbstractCommand
         'latin7' => 41,
         'utf8mb4' => 45,
         'binary' => 63
-    );
+    ];
 
     /**
      * @param string $user

diff --git a/src/ConnectionInterface.php b/src/ConnectionInterface.php
@@ -100,7 +100,7 @@ interface ConnectionInterface extends EventEmitterInterface
      * @param array  $params Parameters which should be bound to query
      * @return PromiseInterface Returns a Promise<QueryResult,Exception>
      */
-    public function query($sql, array $params = array());
+    public function query($sql, array $params = []);
 
     /**
      * Performs an async query and streams the rows of the result set.
@@ -161,7 +161,7 @@ public function query($sql, array $params = array());
      * @param array  $params Parameters which should be bound to query
      * @return ReadableStreamInterface
      */
-    public function queryStream($sql, $params = array());
+    public function queryStream($sql, $params = []);
 
     /**
      * Checks that the connection is alive.

diff --git a/src/Factory.php b/src/Factory.php
@@ -42,16 +42,16 @@ class Factory
      * [`ConnectorInterface`](https://github.com/reactphp/socket#connectorinterface):
      *
      * ```php
-     * $connector = new React\Socket\Connector(array(
+     * $connector = new React\Socket\Connector([
      *     'dns' => '127.0.0.1',
-     *     'tcp' => array(
+     *     'tcp' => [
      *         'bindto' => '192.168.10.1:0'
-     *     ),
-     *     'tls' => array(
+     *     ],
+     *     'tls' => [
      *         'verify_peer' => false,
      *         'verify_peer_name' => false
-     *     )
-     * ));
+     *     ]
+     * ]);
      *
      * $factory = new React\MySQL\Factory(null, $connector);
      * ```
@@ -62,7 +62,7 @@ class Factory
     public function __construct(LoopInterface $loop = null, ConnectorInterface $connector = null)
     {
         $this->loop = $loop ?: Loop::get();
-        $this->connector = $connector ?: new Connector(array(), $this->loop);
+        $this->connector = $connector ?: new Connector([], $this->loop);
     }
 
     /**

diff --git a/src/Io/Connection.php b/src/Io/Connection.php
@@ -57,7 +57,7 @@ public function __construct(SocketConnectionInterface $stream, Executor $executo
     /**
      * {@inheritdoc}
      */
-    public function query($sql, array $params = array())
+    public function query($sql, array $params = [])
     {
         $query = new Query($sql);
         if ($params) {
@@ -75,7 +75,7 @@ public function query($sql, array $params = array())
         $deferred = new Deferred();
 
         // store all result set rows until result set end
-        $rows = array();
+        $rows = [];
         $command->on('result', function ($row) use (&$rows) {
             $rows[] = $row;
         });
@@ -85,7 +85,7 @@ public function query($sql, array $params = array())
             $result->resultRows = $rows;
             $result->warningCount = $command->warningCount;
 
-            $rows = array();
+            $rows = [];
 
             $deferred->resolve($result);
         });
@@ -106,7 +106,7 @@ public function query($sql, array $params = array())
         return $deferred->promise();
     }
 
-    public function queryStream($sql, $params = array())
+    public function queryStream($sql, $params = [])
     {
         $query = new Query($sql);
         if ($params) {
@@ -162,9 +162,9 @@ public function close()
         // reject all pending commands if connection is closed
         while (!$this->executor->isIdle()) {
             $command = $this->executor->dequeue();
-            $command->emit('error', array(
+            $command->emit('error', [
                 new \RuntimeException('Connection lost')
-            ));
+            ]);
         }
 
         $this->emit('close');

diff --git a/src/Io/LazyConnection.php b/src/Io/LazyConnection.php
@@ -33,7 +33,7 @@ class LazyConnection extends EventEmitter implements ConnectionInterface
 
     public function __construct(Factory $factory, $uri, LoopInterface $loop)
     {
-        $args = array();
+        $args = [];
         \parse_str(\parse_url($uri, \PHP_URL_QUERY), $args);
         if (isset($args['idle'])) {
             $this->idlePeriod = (float)$args['idle'];

diff --git a/src/Io/Parser.php b/src/Io/Parser.php
@@ -97,8 +97,8 @@ public function __construct(DuplexStreamInterface $stream, Executor $executor)
 
     public function start()
     {
-        $this->stream->on('data', array($this, 'parse'));
-        $this->stream->on('close', array($this, 'onClose'));
+        $this->stream->on('data', [$this, 'parse']);
+        $this->stream->on('close', [$this, 'onClose']);
     }
 
     public function debug($message)
@@ -221,7 +221,7 @@ public function parse($data)
                 // Empty data packet during result set => row with only empty strings
                 $this->debug('Result set empty row data');
 
-                $row = array();
+                $row = [];
                 foreach ($this->resultFields as $field) {
                     $row[$field['name']] = '';
                 }
@@ -272,7 +272,7 @@ private function onResultRow($row)
     {
         // $this->debug('row data: ' . json_encode($row));
         $command = $this->currCommand;
-        $command->emit('result', array($row));
+        $command->emit('result', [$row]);
     }
 
     private function onError(Exception $error)
@@ -283,7 +283,7 @@ private function onError(Exception $error)
             $command = $this->currCommand;
             $this->currCommand = null;
 
-            $command->emit('error', array($error));
+            $command->emit('error', [$error]);
         }
     }
 
@@ -322,9 +322,9 @@ public function onClose()
             if ($command instanceof QuitCommand) {
                 $command->emit('success');
             } else {
-                $command->emit('error', array(
+                $command->emit('error', [
                     new \RuntimeException('Connection lost')
-                ));
+                ]);
             }
         }
     }

diff --git a/src/Io/Query.php b/src/Io/Query.php
@@ -22,7 +22,7 @@ class Query
      * @var array<string,string>
      * @see \React\MySQL\Commands\AuthenticateCommand::$charsetMap
      */
-    private $escapeChars = array(
+    private $escapeChars = [
             "\x00"   => "\\0",
             "\r"   => "\\r",
             "\n"   => "\\n",
@@ -34,7 +34,7 @@ class Query
             "\\"   => "\\\\",
             //"%"    => "\\%",
             //"_"    => "\\_",
-        );
+        ];
 
     public function __construct($sql)
     {
@@ -134,7 +134,7 @@ protected function buildSql()
 
         return $sql;
         /*
-        $names    = array();
+        $names    = [];
         $inName   = false;
         $currName = '';
         $currIdx  = 0;
@@ -166,7 +166,7 @@ protected function buildSql()
             $names[$currIdx] = $currName;
         }
 
-        $namedMarks = $unnamedMarks = array();
+        $namedMarks = $unnamedMarks = [];
         foreach ($this->params as $arg) {
             if (is_array($arg)) {
                 $namedMarks += $arg;

diff --git a/src/Io/QueryStream.php b/src/Io/QueryStream.php
@@ -33,7 +33,7 @@ public function __construct(QueryCommand $command, ConnectionInterface $connecti
             }
             $this->started = true;
 
-            $this->emit('data', array($row));
+            $this->emit('data', [$row]);
         });
         $command->on('end', function () {
             $this->emit('end');
@@ -46,7 +46,7 @@ public function __construct(QueryCommand $command, ConnectionInterface $connecti
             $this->close();
         });
         $command->on('error', function ($err) {
-            $this->emit('error', array($err));
+            $this->emit('error', [$err]);
             $this->close();
         });
     }

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -21,7 +21,7 @@ protected function getConnectionOptions($debug = false)
         ] + ($debug ? ['debug' => true] : []);
     }
 
-    protected function getConnectionString($params = array())
+    protected function getConnectionString($params = [])
     {
         $parts = $params + $this->getConnectionOptions();
 
@@ -56,23 +56,23 @@ protected function getDataTable()
 
     protected function expectCallableOnce()
     {
-        $mock = $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        $mock = $this->getMockBuilder('stdClass')->setMethods(['__invoke'])->getMock();
         $mock->expects($this->once())->method('__invoke');
 
         return $mock;
     }
 
     protected function expectCallableOnceWith($value)
     {
-        $mock = $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        $mock = $this->getMockBuilder('stdClass')->setMethods(['__invoke'])->getMock();
         $mock->expects($this->once())->method('__invoke')->with($value);
 
         return $mock;
     }
 
     protected function expectCallableNever()
     {
-        $mock = $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        $mock = $this->getMockBuilder('stdClass')->setMethods(['__invoke'])->getMock();
         $mock->expects($this->never())->method('__invoke');
 
         return $mock;