breaking: migrate to php 8.0+ syntax

Author: inhere

.github/workflows/php.yml

@@ -15,12 +15,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0] #
+        php: [8.0, 8.1] # 7.3, 7.4,
         os: [ubuntu-latest, macOS-latest] # windows-latest,
-        include:
-          - os: 'ubuntu-latest'
-            php: '7.2'
-            phpunit: '8.5.13'
+#        include:
+#          - os: 'ubuntu-latest'
+#            php: '7.2'
+#            phpunit: '8.5.13'
 
     steps:
       - name: Checkout

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4]
+        php: [8.0]
 
     steps:
       - name: Checkout
@@ -40,23 +40,23 @@ jobs:
         run: |
           tag1=${GITHUB_REF#refs/*/}
           echo "release tag: ${tag1}"
-          composer install --no-progress --no-suggest
+          composer install --no-progress
 
-      # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-      # Docs: https://getcomposer.org/doc/articles/scripts.md
-
-      #      - name: Build phar and send to github assets
-      #        run: |
-      #          echo $RELEASE_TAG
-      #          echo $RELEASE_NAME
-      #          php -d phar.readonly=0 bin/kite phar:pack -o kite-${RELEASE_TAG}.phar --no-progress
-      #          php kite-${RELEASE_TAG}.phar -V
+      # more see https://github.com/inhere/kite
+      - name: Generate changelog file
+        id: changelog
+        run: |
+          wget -c -q https://github.com/inhere/kite/releases/latest/download/kite.phar
+          php kite.phar git cl prev last --style gh-release --no-merges --fetch-tags --unshallow --file changelog.md
+          cat changelog.md
 
-      # https://github.com/actions/create-release
-      - uses: meeDamian/github-release@2.0
+      # https://github.com/softprops/action-gh-release
+      - name: Create release and upload assets
+        uses: softprops/action-gh-release@v1
         with:
-          gzip: false
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ env.RELEASE_TAG }}
           name: ${{ env.RELEASE_TAG }}
-#          files: kite-${{ env.RELEASE_TAG }}.phar
+          tag_name: ${{ env.RELEASE_TAG }}
+          body_path: changelog.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         GITHUB_REPOSITORY: my_gh_org/my_gh_repo

example/property_exists.php

@@ -25,51 +25,51 @@ abstract class AbstractCmdBuilder
     /**
      * @var string
      */
-    protected $command = '';
+    protected string $command = '';
 
     /**
      * @var string
      */
-    protected $workDir;
+    protected string $workDir;
 
     /**
      * @var int
      */
-    protected $code = 0;
+    protected int $code = 0;
 
     /**
      * @var string
      */
-    protected $error = '';
+    protected string $error = '';
 
     /**
      * @var string
      */
-    protected $output = '';
+    protected string $output = '';
 
     /**
      * Dry run all commands
      *
      * @var bool
      */
-    protected $dryRun = false;
+    protected bool $dryRun = false;
 
     /**
      * @var bool
      */
-    protected $printCmd = true;
+    protected bool $printCmd = true;
 
     /**
      * Ignore check prevision return code
      *
      * @var bool
      */
-    protected $ignoreError = false;
+    protected bool $ignoreError = false;
 
     /**
      * @var bool
      */
-    protected $printOutput = false;
+    protected bool $printOutput = false;
 
     /**
      * Class constructor.

src/Cmd/AbstractCmdBuilder.php

@@ -20,12 +20,12 @@ class CmdBuilder extends AbstractCmdBuilder
     /**
      * @var string
      */
-    protected $bin = '';
+    protected string $bin = '';
 
     /**
      * @var array|string[]
      */
-    protected $args = [];
+    protected array $args = [];
 
     /**
      * @param string $bin
@@ -69,11 +69,11 @@ public function __construct(string $bin = '', string $workDir = '')
     }
 
     /**
-     * @param string|int $arg
+     * @param int|string $arg
      *
      * @return $this
      */
-    public function add($arg): self
+    public function add(int|string $arg): self
     {
         $this->args[] = $arg;
         return $this;
@@ -92,12 +92,12 @@ public function addf(string $format, ...$a): self
     }
 
     /**
-     * @param string|int      $arg
+     * @param int|string $arg
      * @param bool|int|string $ifExpr
      *
      * @return $this
      */
-    public function addIf($arg, $ifExpr): self
+    public function addIf(int|string $arg, bool|int|string $ifExpr): self
     {
         if ($ifExpr) {
             $this->args[] = $arg;
@@ -107,11 +107,11 @@ public function addIf($arg, $ifExpr): self
     }
 
     /**
-     * @param string|int $arg
+     * @param int|string $arg
      *
      * @return $this
      */
-    public function addArg($arg): self
+    public function addArg(int|string $arg): self
     {
         $this->args[] = $arg;
         return $this;

src/Cmd/CmdBuilder.php

@@ -156,7 +156,7 @@ public static function run(string $command, string $cwd = ''): array
      *
      * @return array|string
      */
-    public static function auto(string $command, bool $returnStatus = true, string $cwd = '')
+    public static function auto(string $command, bool $returnStatus = true, string $cwd = ''): array|string
     {
         $status = 1;
         $curDir = '';
@@ -207,7 +207,7 @@ public static function auto(string $command, bool $returnStatus = true, string $
      * @return mixed
      * @throws RuntimeException
      */
-    public static function execWithSudo(string $command, string $logfile = '', string $user = '')
+    public static function execWithSudo(string $command, string $logfile = '', string $user = ''): mixed
     {
         // If should run as another user, we must be on *nix and must have sudo privileges.
         $suDo = '';

src/Exec.php

@@ -60,7 +60,7 @@ public static function open(
      */
     public static function getStatus($process): array
     {
-        return (array)proc_get_status($process);
+        return proc_get_status($process);
     }
 
     /**
@@ -80,12 +80,13 @@ public static function close($process): int
      * Kills a process opened by `proc_open`
      *
      * @param resource $process
+     * @param int $signal
      *
      * @return bool
      * @see https://www.php.net/manual/en/function.proc-terminate.php
      */
-    public static function terminate($process): bool
+    public static function terminate($process, int $signal = 15): bool
     {
-        return proc_terminate($process);
+        return proc_terminate($process, $signal);
     }
 }

src/Proc/ProcFunc.php

@@ -0,0 +1,68 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\Sys\Proc;
+
+use Toolkit\Stdlib\Helper\Assert;
+use Toolkit\Stdlib\Obj\Traits\AutoConfigTrait;
+
+/**
+ * class ProcManager
+ *
+ * @author inhere
+ */
+class ProcManager
+{
+    use AutoConfigTrait;
+
+    /**
+     * @var callable
+     */
+    private $handler;
+
+    private int $procNum = 1;
+
+    /**
+     * @var string custom process name
+     */
+    private string $procName = '';
+
+    public function run(): self
+    {
+        Assert::notNull($this->handler, 'process: logic handler must be set before run');
+        $handler = $this->handler;
+
+
+        return $this;
+    }
+
+    /**
+     * @param callable $handler
+     *
+     * @return $this
+     */
+    public function setHandler(callable $handler): self
+    {
+        $this->handler = $handler;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getProcNum(): int
+    {
+        return $this->procNum;
+    }
+
+    /**
+     * @param int $procNum
+     *
+     * @return ProcManager
+     */
+    public function setProcNum(int $procNum): self
+    {
+        Assert::intShouldGt0($procNum);
+        $this->procNum = $procNum;
+        return $this;
+    }
+}