Added PHP 8.1 support.

Migrated from Travis CI to GHA.

Author: Bilge

.github/workflows/CI.yml

@@ -0,0 +1,55 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: 0 6 * * *
+
+jobs:
+  Test:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - 8.1
+          - 8.0
+        dependencies:
+          - hi
+          - lo
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+
+      - name: Validate composer.json
+        run: composer validate
+
+      - name: Cache dependencies
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: php-${{ matrix.php }}-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}
+          restore-keys: php-${{ matrix.php }}-${{ matrix.dependencies }}-
+
+      - name: Install dependencies ${{ matrix.dependencies == 'lo' && '(lowest)' || '' }}
+        run: composer update --no-interaction --no-progress
+          ${{ matrix.dependencies == 'lo' && '--prefer-lowest' || '' }}
+
+      - name: Run test suite
+        run: composer test -- --coverage-clover=build/logs/clover.xml
+
+      - name: Upload test coverage
+        run: |
+          composer global require php-coveralls/php-coveralls:^2
+          php-coveralls -v
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -14,7 +14,7 @@
         }
     },
     "require": {
-        "php": "^7.3|^8",
+        "php": "^8",
         "scriptfusion/static-class": "^1"
     },
     "require-dev": {

composer.json

@@ -9,28 +9,19 @@
  */
 class ByteFormatter
 {
-    private const DEFAULT_BASE = Base::BINARY;
+    private int $base = Base::BINARY;
 
-    /** @var int */
-    private $base = self::DEFAULT_BASE;
+    private string $format;
 
-    /** @var string */
-    private $format;
+    private string $sprintfFormat;
 
-    /** @var string */
-    private $sprintfFormat;
+    private int $precision = 0;
 
-    /** @var int */
-    private $precision = 0;
+    private bool $automaticPrecision = true;
 
-    /** @var bool */
-    private $automaticPrecision = true;
+    private ?int $exponent = null;
 
-    /** @var int */
-    private $exponent;
-
-    /** @var UnitDecorator */
-    private $unitDecorator;
+    private UnitDecorator $unitDecorator;
 
     /**
      * Initializes this instance, optionally with a specific unit decorator.
@@ -54,13 +45,13 @@ public function __construct(UnitDecorator $unitDecorator = null)
      *
      * @return string Formatted bytes.
      */
-    public function format($bytes, int $precision = null): string
+    public function format(int|float $bytes, int $precision = null): string
     {
         // Use default precision when not specified.
         $precision === null && $precision = $this->getPrecision();
 
         $log = log($bytes, $this->getBase());
-        $exponent = $this->hasFixedExponent() ? $this->getFixedExponent() : max(0, $log|0);
+        $exponent = $this->hasFixedExponent() ? $this->getFixedExponent() : max(0, (int)$log);
         $value = round($this->getBase() ** ($log - $exponent), $precision);
         $units = $this->getUnitDecorator()->decorate($exponent, $this->getBase(), $value);
 
@@ -89,12 +80,12 @@ private function formatValue(float $value, int $precision): string
 
             if (isset($formattedParts[1])) {
                 // Strip trailing 0s in fractional part.
-                if (!$formattedParts[1] = chop($formattedParts[1], '0')) {
+                if (!$formattedParts[1] = rtrim($formattedParts[1], '0')) {
                     // Remove fractional part.
                     unset($formattedParts[1]);
                 }
 
-                $formatted = join('.', $formattedParts);
+                $formatted = implode('.', $formattedParts);
             }
         }
 

src/Byte/ByteFormatter.php

@@ -8,7 +8,7 @@
  */
 class NameDecorator implements UnitDecorator
 {
-    protected static $sequences = [
+    protected static array $sequences = [
         Base::BINARY => ['kibi', 'mebi', 'gibi', 'tebi', 'pebi', 'exbi', 'zebi', 'yobi'],
         Base::DECIMAL => ['kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zetta', 'yotta'],
     ];

src/Byte/Unit/NameDecorator.php

@@ -13,9 +13,9 @@ class SymbolDecorator implements UnitDecorator
     const SUFFIX_METRIC = 'B';
     const SUFFIX_IEC = 'iB';
 
-    private $prefixes = self::PREFIXES;
-    private $suffix;
-    private $alwaysShowUnit;
+    private string $prefixes = self::PREFIXES;
+    private ?string $suffix;
+    private bool $alwaysShowUnit = false;
 
     public function __construct($suffix = null)
     {
@@ -72,9 +72,9 @@ public function setSuffix(?string $suffix): self
         return $this;
     }
 
-    public function alwaysShowUnit($show = true): SymbolDecorator
+    public function alwaysShowUnit(bool $show = true): SymbolDecorator
     {
-        $this->alwaysShowUnit = (bool)$show;
+        $this->alwaysShowUnit = $show;
 
         return $this;
     }

src/Byte/Unit/SymbolDecorator.php

@@ -9,8 +9,7 @@
 
 final class ByteFormatterTest extends TestCase
 {
-    /** @var ByteFormatter */
-    private $formatter;
+    private ByteFormatter $formatter;
 
     protected function setUp(): void
     {

test/Integration/Byte/ByteFormatterTest.php

@@ -9,7 +9,7 @@ final class ByteFormatterTest extends TestCase
     /**
      * @var ByteFormatter
      */
-    private $formatter;
+    private ByteFormatter $formatter;
 
     protected function setUp(): void
     {