Merge pull request #17 from adhocore/16-modernize-plus-github-action

Author: adhocore

.github/workflows/build.yml

@@ -0,0 +1,62 @@
+name: Build
+
+on:
+  push:
+  pull_request:
+
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+
+  tests:
+    name: Tests
+    env:
+      extensions: pcov
+
+    strategy:
+      matrix:
+        include:
+          - php: '8.0'
+          - php: '8.1'
+          - php: '8.2'
+      fail-fast: true
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          ini-values: date.timezone=Asia/Bangkok,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,zend.assertions=1
+          php-version: "${{ matrix.php }}"
+          extensions: "${{ env.extensions }}"
+          tools: flex
+
+      - name: Before run
+        run: |
+          echo COLUMNS=120 >> $GITHUB_ENV
+          for P in src tests; do find $P -type f -name '*.php' -exec php -l {} \;; done
+
+      - name: Install dependencies
+        run: composer install --no-progress --ansi -o
+
+      - name: Run tests
+        run: composer test:cov
+
+      - name: Codecov
+        run: bash <(curl -s https://codecov.io/bash)

.travis.yml

@@ -22,10 +22,10 @@
         }
     },
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.0|^5.7.0|^6.5"
+        "phpunit/phpunit": "^9.5"
     },
     "config": {
         "optimize-autoloader": true,
@@ -34,8 +34,7 @@
         }
     },
     "scripts": {
-        "post-root-package-install": [
-        ],
-        "test": "vendor/bin/phpunit"
+        "test": "vendor/bin/phpunit",
+        "test:cov": "phpunit --coverage-text --coverage-clover coverage.xml"
     }
 }

composer.json

@@ -8,7 +8,6 @@
   convertWarningsToExceptions="true"
   processIsolation="false"
   stopOnFailure="false"
-  syntaxCheck="false"
   bootstrap="tests/bootstrap.php"
 >
   <testsuites>

phpunit.xml.dist

@@ -21,7 +21,7 @@ trait Arrayizes
      *
      * @return array
      */
-    public function asArray($data, $cast = true)
+    public function asArray(mixed $data, bool $cast = true): array
     {
         if (\is_array($data)) {
             return $data;
@@ -41,7 +41,7 @@ public function asArray($data, $cast = true)
             return $data->jsonSerialize();
         }
 
-        if (\method_exists($data, 'toArray')) {
+        if (\is_object($data) && \method_exists($data, 'toArray')) {
             return $data->toArray();
         }
 
@@ -50,17 +50,12 @@ public function asArray($data, $cast = true)
 
     /**
      * Convert the data items to array.
-     *
-     * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
-        return \array_map(function ($value) {
-            if (\is_scalar($value)) {
-                return $value;
-            }
-
-            return $this->asArray($value, false);
-        }, $this->getData());
+        return \array_map(
+            fn ($value) => \is_scalar($value) ? $value : $this->asArray($value, false),
+            $this->getData()
+        );
     }
 }

src/Arrayizes.php

@@ -18,28 +18,17 @@
  */
 class HigherOrderMessage
 {
-    protected $underscore;
-    protected $method;
-
-    public function __construct(UnderscoreBase $underscore, $method)
+    public function __construct(protected UnderscoreBase $underscore, protected string $method)
     {
-        $this->underscore = $underscore;
-        $this->method     = $method;
     }
 
-    public function __call($method, $args)
+    public function __call(string $method, array $args): mixed
     {
-        return $this->underscore->{$this->method}(function ($item) use ($method, $args) {
-            return \call_user_func_array([$item, $method], $args);
-        });
+        return $this->underscore->{$this->method}(static fn ($item) => \call_user_func_array([$item, $method], $args));
     }
 
-    public function __get($prop)
+    public function __get($prop): mixed
     {
-        return $this->underscore->{$this->method}(function ($item) use ($prop) {
-            $props = \array_column([$item], $prop);
-
-            return empty($props) ? null : $props[0];
-        });
+        return $this->underscore->{$this->method}(static fn ($item) => \array_column([$item], $prop)[0] ?? null);
     }
 }

src/HigherOrderMessage.php

@@ -18,7 +18,7 @@ final class Underscore extends UnderscoreFunction
      *
      * @param array|mixed $data
      */
-    public function __construct($data = [])
+    public function __construct(mixed $data = [])
     {
         parent::__construct($data);
     }
@@ -30,44 +30,31 @@ public function __construct($data = [])
      *
      * @return self
      */
-    public static function _($data = null)
+    public static function _($data = null): self
     {
         return new static($data);
     }
 
     /**
      * Generates a function that always returns a constant value.
-     *
-     * @param mixed $value
-     *
-     * @return callable
      */
-    public function constant($value)
+    public function constant(mixed $value): callable
     {
-        return function () use ($value) {
-            return $value;
-        };
+        return fn () => $value;
     }
 
     /**
      * No operation!
-     *
-     * @return void
      */
-    public function noop()
+    public function noop(): void
     {
         // ;)
     }
 
     /**
      * Run callable n times and create new collection.
-     *
-     * @param int      $n
-     * @param callable $fn
-     *
-     * @return self
      */
-    public function times($n, callable $fn)
+    public function times(int $n, callable $fn): self
     {
         $data = [];
 
@@ -80,25 +67,16 @@ public function times($n, callable $fn)
 
     /**
      * Return a random integer between min and max (inclusive).
-     *
-     * @param int $min
-     * @param int $max
-     *
-     * @return int
      */
-    public function random($min, $max)
+    public function random(int $min, int $max): int
     {
         return \mt_rand($min, $max);
     }
 
     /**
      * Generate unique ID (unique for current go/session).
-     *
-     * @param string $prefix
-     *
-     * @return string
      */
-    public function uniqueId($prefix = '')
+    public function uniqueId(string $prefix = ''): string
     {
         static $id = 0;