Upgrade framework

vendor/phpunit/php-timer/src/Duration.php

@@ -0,0 +1,109 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-timer.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\Timer;
+
+use function floor;
+use function sprintf;
+
+/**
+ * @psalm-immutable
+ */
+final class Duration
+{
+    /**
+     * @var float
+     */
+    private $nanoseconds;
+
+    /**
+     * @var int
+     */
+    private $hours;
+
+    /**
+     * @var int
+     */
+    private $minutes;
+
+    /**
+     * @var int
+     */
+    private $seconds;
+
+    /**
+     * @var int
+     */
+    private $milliseconds;
+
+    public static function fromMicroseconds(float $microseconds): self
+    {
+        return new self($microseconds * 1000);
+    }
+
+    public static function fromNanoseconds(float $nanoseconds): self
+    {
+        return new self($nanoseconds);
+    }
+
+    private function __construct(float $nanoseconds)
+    {
+        $this->nanoseconds     = $nanoseconds;
+        $timeInMilliseconds    = $nanoseconds / 1000000;
+        $hours                 = floor($timeInMilliseconds / 60 / 60 / 1000);
+        $hoursInMilliseconds   = $hours * 60 * 60 * 1000;
+        $minutes               = floor($timeInMilliseconds / 60 / 1000) % 60;
+        $minutesInMilliseconds = $minutes * 60 * 1000;
+        $seconds               = floor(($timeInMilliseconds - $hoursInMilliseconds - $minutesInMilliseconds) / 1000);
+        $secondsInMilliseconds = $seconds * 1000;
+        $milliseconds          = $timeInMilliseconds - $hoursInMilliseconds - $minutesInMilliseconds - $secondsInMilliseconds;
+        $this->hours           = (int) $hours;
+        $this->minutes         = $minutes;
+        $this->seconds         = (int) $seconds;
+        $this->milliseconds    = (int) $milliseconds;
+    }
+
+    public function asNanoseconds(): float
+    {
+        return $this->nanoseconds;
+    }
+
+    public function asMicroseconds(): float
+    {
+        return $this->nanoseconds / 1000;
+    }
+
+    public function asMilliseconds(): float
+    {
+        return $this->nanoseconds / 1000000;
+    }
+
+    public function asSeconds(): float
+    {
+        return $this->nanoseconds / 1000000000;
+    }
+
+    public function asString(): string
+    {
+        $result = '';
+
+        if ($this->hours > 0) {
+            $result = sprintf('%02d', $this->hours) . ':';
+        }
+
+        $result .= sprintf('%02d', $this->minutes) . ':';
+        $result .= sprintf('%02d', $this->seconds);
+
+        if ($this->milliseconds > 0) {
+            $result .= '.' . sprintf('%03d', $this->milliseconds);
+        }
+
+        return $result;
+    }
+}

vendor/phpunit/php-timer/src/ResourceUsageFormatter.php

@@ -0,0 +1,73 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-timer.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\Timer;
+
+use function is_float;
+use function memory_get_peak_usage;
+use function microtime;
+use function sprintf;
+
+final class ResourceUsageFormatter
+{
+    /**
+     * @psalm-var array<string,int>
+     */
+    private const SIZES = [
+        'GB' => 1073741824,
+        'MB' => 1048576,
+        'KB' => 1024,
+    ];
+
+    public function resourceUsage(Duration $duration): string
+    {
+        return sprintf(
+            'Time: %s, Memory: %s',
+            $duration->asString(),
+            $this->bytesToString(memory_get_peak_usage(true))
+        );
+    }
+
+    /**
+     * @throws TimeSinceStartOfRequestNotAvailableException
+     */
+    public function resourceUsageSinceStartOfRequest(): string
+    {
+        if (!isset($_SERVER['REQUEST_TIME_FLOAT'])) {
+            throw new TimeSinceStartOfRequestNotAvailableException(
+                'Cannot determine time at which the request started because $_SERVER[\'REQUEST_TIME_FLOAT\'] is not available'
+            );
+        }
+
+        if (!is_float($_SERVER['REQUEST_TIME_FLOAT'])) {
+            throw new TimeSinceStartOfRequestNotAvailableException(
+                'Cannot determine time at which the request started because $_SERVER[\'REQUEST_TIME_FLOAT\'] is not of type float'
+            );
+        }
+
+        return $this->resourceUsage(
+            Duration::fromMicroseconds(
+                (1000000 * (microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']))
+            )
+        );
+    }
+
+    private function bytesToString(int $bytes): string
+    {
+        foreach (self::SIZES as $unit => $value) {
+            if ($bytes >= $value) {
+                return sprintf('%.2f %s', $bytes >= 1024 ? $bytes / $value : $bytes, $unit);
+            }
+        }
+
+        // @codeCoverageIgnoreStart
+        return $bytes . ' byte' . ($bytes !== 1 ? 's' : '');
+        // @codeCoverageIgnoreEnd
+    }
+}

vendor/phpunit/php-timer/src/Timer.php

@@ -1,105 +1,40 @@
-<?php
+<?php declare(strict_types=1);
 /*
- * This file is part of the PHP_Timer package.
+ * This file is part of phpunit/php-timer.
  *
  * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+namespace SebastianBergmann\Timer;
 
-/**
- * Utility class for timing.
- */
-class PHP_Timer
+use function array_pop;
+use function hrtime;
+
+final class Timer
 {
     /**
-     * @var array
+     * @psalm-var list<float>
      */
-    private static $times = array(
-      'hour'   => 3600000,
-      'minute' => 60000,
-      'second' => 1000
-    );
+    private $startTimes = [];
 
-    /**
-     * @var array
-     */
-    private static $startTimes = array();
-
-    /**
-     * @var float
-     */
-    public static $requestTime;
-
-    /**
-     * Starts the timer.
-     */
-    public static function start()
+    public function start(): void
     {
-        array_push(self::$startTimes, microtime(true));
+        $this->startTimes[] = (float) hrtime(true);
     }
 
     /**
-     * Stops the timer and returns the elapsed time.
-     *
-     * @return float
+     * @throws NoActiveTimerException
      */
-    public static function stop()
+    public function stop(): Duration
     {
-        return microtime(true) - array_pop(self::$startTimes);
-    }
-
-    /**
-     * Formats the elapsed time as a string.
-     *
-     * @param  float  $time
-     * @return string
-     */
-    public static function secondsToTimeString($time)
-    {
-        $ms = round($time * 1000);
-
-        foreach (self::$times as $unit => $value) {
-            if ($ms >= $value) {
-                $time = floor($ms / $value * 100.0) / 100.0;
-
-                return $time . ' ' . ($time == 1 ? $unit : $unit . 's');
-            }
+        if (empty($this->startTimes)) {
+            throw new NoActiveTimerException(
+                'Timer::start() has to be called before Timer::stop()'
+            );
         }
 
-        return $ms . ' ms';
-    }
-
-    /**
-     * Formats the elapsed time since the start of the request as a string.
-     *
-     * @return string
-     */
-    public static function timeSinceStartOfRequest()
-    {
-        return self::secondsToTimeString(microtime(true) - self::$requestTime);
-    }
-
-    /**
-     * Returns the resources (time, memory) of the request as a string.
-     *
-     * @return string
-     */
-    public static function resourceUsage()
-    {
-        return sprintf(
-            'Time: %s, Memory: %4.2fMB',
-            self::timeSinceStartOfRequest(),
-            memory_get_peak_usage(true) / 1048576
-        );
+        return Duration::fromNanoseconds((float) hrtime(true) - array_pop($this->startTimes));
     }
 }
-
-if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
-    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME_FLOAT'];
-} elseif (isset($_SERVER['REQUEST_TIME'])) {
-    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME'];
-} else {
-    PHP_Timer::$requestTime = microtime(true);
-}

vendor/phpunit/php-timer/src/exceptions/Exception.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-timer.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\Timer;
+
+use Throwable;
+
+interface Exception extends Throwable
+{
+}

vendor/phpunit/php-timer/src/exceptions/NoActiveTimerException.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-timer.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\Timer;
+
+use LogicException;
+
+final class NoActiveTimerException extends LogicException implements Exception
+{
+}

vendor/phpunit/php-timer/src/exceptions/TimeSinceStartOfRequestNotAvailableException.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-timer.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\Timer;
+
+use RuntimeException;
+
+final class TimeSinceStartOfRequestNotAvailableException extends RuntimeException implements Exception
+{
+}