Update PHP language syntax, and tests

reactphp · Feb 21, 2024 · a6bc754 · a6bc754
1 parent cbaa402
commit a6bc754
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 84 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
  "php": ">=7.1.0"
  },
  "require-dev": {
- "phpunit/phpunit": "^9.6 || ^5.7"
+ "phpunit/phpunit": "^9.6 || ^7.5"
  },
  "suggest": {
  "ext-pcntl": "For signal handling support when using the StreamSelectLoop"

diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
@@ -2,7 +2,7 @@
 
 <!-- PHPUnit configuration file with old format for legacy PHPUnit -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
+ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
  bootstrap="vendor/autoload.php"
  colors="true">
  <testsuites>

diff --git a/src/ExtEvLoop.php b/src/ExtEvLoop.php
@@ -41,12 +41,12 @@ class ExtEvLoop implements LoopInterface
  /**
  * @var EvIo[]
  */
- private $readStreams = array();
+ private $readStreams = [];
 
  /**
  * @var EvIo[]
  */
- private $writeStreams = array();
+ private $writeStreams = [];
 
  /**
  * @var bool
@@ -61,7 +61,7 @@ class ExtEvLoop implements LoopInterface
  /**
  * @var \EvSignal[]
  */
- private $signalEvents = array();
+ private $signalEvents = [];
 
  public function __construct()
  {

diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -27,15 +27,15 @@ final class ExtEventLoop implements LoopInterface
  private $timerCallback;
  private $timerEvents;
  private $streamCallback;
- private $readEvents = array();
- private $writeEvents = array();
- private $readListeners = array();
- private $writeListeners = array();
- private $readRefs = array();
- private $writeRefs = array();
+ private $readEvents = [];
+ private $writeEvents = [];
+ private $readListeners = [];
+ private $writeListeners = [];
+ private $readRefs = [];
+ private $writeRefs = [];
  private $running;
  private $signals;
- private $signalEvents = array();
+ private $signalEvents = [];
 
  public function __construct()
  {
@@ -67,8 +67,8 @@ public function __destruct()
  $this->timerEvents->detach($timer);
  }
 
- $this->readEvents = array();
- $this->writeEvents = array();
+ $this->readEvents = [];
+ $this->writeEvents = [];
  }
 
  public function addReadStream($stream, $listener)
@@ -173,7 +173,7 @@ public function addSignal($signal, $listener)
  $this->signals->add($signal, $listener);
 
  if (!isset($this->signalEvents[$signal])) {
- $this->signalEvents[$signal] = Event::signal($this->eventBase, $signal, array($this->signals, 'call'));
+ $this->signalEvents[$signal] = Event::signal($this->eventBase, $signal, [$this->signals, 'call']);
  $this->signalEvents[$signal]->add();
  }
  }

diff --git a/src/ExtUvLoop.php b/src/ExtUvLoop.php
@@ -22,12 +22,12 @@ final class ExtUvLoop implements LoopInterface
  private $uv;
  private $futureTickQueue;
  private $timers;
- private $streamEvents = array();
- private $readStreams = array();
- private $writeStreams = array();
+ private $streamEvents = [];
+ private $readStreams = [];
+ private $writeStreams = [];
  private $running;
  private $signals;
- private $signalEvents = array();
+ private $signalEvents = [];
  private $streamListener;
 
  public function __construct()

diff --git a/src/SignalsHandler.php b/src/SignalsHandler.php
@@ -7,12 +7,12 @@
  */
 final class SignalsHandler
 {
- private $signals = array();
+ private $signals = [];
 
  public function add($signal, $listener)
  {
  if (!isset($this->signals[$signal])) {
- $this->signals[$signal] = array();
+ $this->signals[$signal] = [];
  }
 
  if (\in_array($listener, $this->signals[$signal])) {

diff --git a/src/StreamSelectLoop.php b/src/StreamSelectLoop.php
@@ -56,10 +56,10 @@ final class StreamSelectLoop implements LoopInterface
 
  private $futureTickQueue;
  private $timers;
- private $readStreams = array();
- private $readListeners = array();
- private $writeStreams = array();
- private $writeListeners = array();
+ private $readStreams = [];
+ private $readListeners = [];
+ private $writeStreams = [];
+ private $writeListeners = [];
  private $running;
  private $pcntl = false;
  private $pcntlPoll = false;
@@ -157,7 +157,7 @@ public function addSignal($signal, $listener)
  $this->signals->add($signal, $listener);
 
  if ($first) {
- \pcntl_signal($signal, array($this->signals, 'call'));
+ \pcntl_signal($signal, [$this->signals, 'call']);
  }
  }
 
@@ -278,7 +278,7 @@ private function streamSelect(array &$read, array &$write, $timeout)
  // @link https://docs.microsoft.com/de-de/windows/win32/api/winsock2/nf-winsock2-select
  $except = null;
  if (\DIRECTORY_SEPARATOR === '\\') {
- $except = array();
+ $except = [];
  foreach ($write as $key => $socket) {
  if (!isset($read[$key]) && @\ftell($socket) === 0) {
  $except[$key] = $socket;

diff --git a/src/Timer/Timers.php b/src/Timer/Timers.php
@@ -15,8 +15,8 @@
 final class Timers
 {
  private $time;
- private $timers = array();
- private $schedule = array();
+ private $timers = [];
+ private $schedule = [];
  private $sorted = true;
  private $useHighResolution;
 

diff --git a/tests/ExtUvLoopTest.php b/tests/ExtUvLoopTest.php
@@ -45,51 +45,49 @@ public function intervalProvider()
  $tenMillionsIntMax = PHP_INT_MAX + 10000000;
  $tenThousandsTimesIntMax = PHP_INT_MAX * 1000;
 
- return array(
- array(
- $oversizeInterval,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$oversizeInterval}' passed."
- ),
- array(
- $oneMaxValue,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$oneMaxValue}' passed.",
- ),
- array(
- $tenMaxValue,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMaxValue}' passed.",
- ),
- array(
- $tenMillionsMaxValue,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsMaxValue}' passed.",
- ),
- array(
- $intMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$intMax}' passed.",
- ),
- array(
- $oneIntMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$oneIntMax}' passed.",
- ),
- array(
- $tenIntMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$tenIntMax}' passed.",
- ),
- array(
- $oneHundredIntMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$oneHundredIntMax}' passed.",
- ),
- array(
- $oneThousandIntMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$oneThousandIntMax}' passed.",
- ),
- array(
- $tenMillionsIntMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsIntMax}' passed.",
- ),
- array(
- $tenThousandsTimesIntMax,
- "Interval overflow, value must be lower than '{$maxValue}', but '{$tenThousandsTimesIntMax}' passed.",
- ),
- );
+ yield [
+ $oversizeInterval,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$oversizeInterval}' passed."
+ ];
+ yield [
+ $oneMaxValue,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$oneMaxValue}' passed.",
+ ];
+ yield [
+ $tenMaxValue,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMaxValue}' passed.",
+ ];
+ yield [
+ $tenMillionsMaxValue,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsMaxValue}' passed.",
+ ];
+ yield [
+ $intMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$intMax}' passed.",
+ ];
+ yield [
+ $oneIntMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$oneIntMax}' passed.",
+ ];
+ yield [
+ $tenIntMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$tenIntMax}' passed.",
+ ];
+ yield [
+ $oneHundredIntMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$oneHundredIntMax}' passed.",
+ ];
+ yield [
+ $oneThousandIntMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$oneThousandIntMax}' passed.",
+ ];
+ yield [
+ $tenMillionsIntMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsIntMax}' passed.",
+ ];
+ yield [
+ $tenThousandsTimesIntMax,
+ "Interval overflow, value must be lower than '{$maxValue}', but '{$tenThousandsTimesIntMax}' passed.",
+ ];
  }
 }
diff --git a/tests/LoopTest.php b/tests/LoopTest.php
@@ -21,7 +21,7 @@ public function testCallingLoopGetShouldAlwaysReturnTheSameEventLoop()
  */
  public function numberOfTests()
  {
- return array(array(), array(), array());
+ return [[], [], []];
  }
 
  public function testStaticAddReadStreamCallsAddReadStreamOnLoopInstance()

diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
@@ -121,11 +121,9 @@ public function testStreamSelectThrowsWhenCustomErrorHandlerThrowsForStreamWithF
 
  public function signalProvider()
  {
- return array(
- array('SIGUSR1'),
- array('SIGHUP'),
- array('SIGTERM'),
- );
+ yield ['SIGUSR1'];
+ yield ['SIGHUP'];
+ yield ['SIGTERM'];
  }
 
  /**

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -41,10 +41,10 @@ protected function createCallableMock()
  {
  if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
  // PHPUnit 9+
- return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+ return $this->getMockBuilder('stdClass')->addMethods(['__invoke'])->getMock();
  } else {
- // legacy PHPUnit 4 - PHPUnit 9
- return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+ // legacy PHPUnit
+ return $this->getMockBuilder('stdClass')->setMethods(['__invoke'])->getMock();
  }
  }