breaking: migrate to php 8.0+ for all codes

Author: inhere

.github/workflows/php.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0, 8.1] #
+        php: [8.0, 8.1] #
         os: [ubuntu-latest, macOS-latest] # windows-latest,
 #        include:
 #          - os: 'ubuntu-latest'

README.md

@@ -1,7 +1,7 @@
 # FileSystem Util
 
 [![License](https://img.shields.io/packagist/l/toolkit/fsutil.svg?style=flat-square)](LICENSE)
-[![Php Version](https://img.shields.io/badge/php-%3E=7.3.0-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/toolkit/fsutil)
+[![Php Version](https://img.shields.io/badge/php-%3E=8.0-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/toolkit/fsutil)
 [![Latest Stable Version](http://img.shields.io/packagist/v/toolkit/fsutil.svg)](https://packagist.org/packages/toolkit/fsutil)
 [![Actions Status](https://github.com/php-toolkit/fsutil/workflows/Unit-tests/badge.svg)](https://github.com/php-toolkit/fsutil/actions)
 
@@ -15,6 +15,8 @@ Some useful file system util for php
 
 ## Install
 
+- Required PHP 8.0+
+
 ```bash
 composer require toolkit/fsutil
 ```

composer.json

@@ -1,10 +1,11 @@
 {
   "name": "toolkit/fsutil",
   "type": "library",
-  "description": "some file tool library of the php",
+  "description": "some file system tool library of the php",
   "keywords": [
     "library",
     "tool",
+    "filesystem",
     "php"
   ],
   "homepage": "https://github.com/php-toolkit/fsutil",
@@ -13,12 +14,12 @@
     {
       "name": "inhere",
       "email": "[email protected]",
-      "homepage": "http://www.yzone.net/"
+      "homepage": "https://github.com/inhere"
     }
   ],
   "require": {
-    "php": ">7.3.0",
-    "toolkit/stdlib": "^1.0"
+    "php": ">=8.0.1",
+    "toolkit/stdlib": "^2.0"
   },
   "autoload": {
     "psr-4": {

src/Directory.php

@@ -106,13 +106,13 @@ public static function getDirs(string $path, bool $loop = false, $parent = null,
      * 获得目录下的文件，可选择类型、是否遍历子文件夹
      *
      * @param string       $dir       string 目标目录
-     * @param string|array $ext       array('css','html','php') css|html|php
+     * @param array|string $ext       array('css','html','php') css|html|php
      * @param bool         $recursive int|bool 是否包含子目录
      *
      * @return array
      * @throws FileNotFoundException
      */
-    public static function simpleInfo(string $dir, $ext = null, bool $recursive = false): array
+    public static function simpleInfo(string $dir, array|string $ext = '', bool $recursive = false): array
     {
         $list = [];
         $dir  = self::pathFormat($dir);
@@ -157,7 +157,7 @@ public static function simpleInfo(string $dir, $ext = null, bool $recursive = fa
      */
     public static function getFiles(
         string $path,
-        $ext = null,
+        array|string $ext = '',
         bool $recursive = false,
         string $parent = '',
         array $list = []
@@ -197,7 +197,7 @@ public static function getFiles(
      * @throws InvalidArgumentException
      * @throws FileNotFoundException
      */
-    public static function getFilesInfo(string $path, $ext = null, bool $recursive = false, array &$list = []): array
+    public static function getFilesInfo(string $path, array|string $ext = '', bool $recursive = false, array &$list = []): array
     {
         $path = self::pathFormat($path);
         if (!is_dir($path)) {

src/File.php

@@ -209,14 +209,14 @@ public static function getContents(
      * save contents to file use file_put_contents()
      *
      * @param string $filename
-     * @param string|array|resource  $data string, array(仅一维数组) 或者是 stream  资源
+     * @param string|array|resource|mixed  $data string, array(仅一维数组) 或者是 stream  资源
      * @param int    $flags
-     * @param null   $context
+     * @param resource|null   $context
      *
      * @return int
      * @see file_put_contents()
      */
-    public static function putContents(string $filename, $data, int $flags = 0, $context = null): int
+    public static function putContents(string $filename, mixed $data, int $flags = 0, $context = null): int
     {
         $number = file_put_contents($filename, $data, $flags, $context);
         if ($number === false) {
@@ -236,7 +236,7 @@ public static function putContents(string $filename, $data, int $flags = 0, $con
      *
      * @return int
      */
-    public static function save(string $filename, $data, int $flags = 0, $context = null): int
+    public static function save(string $filename, mixed $data, int $flags = 0, $context = null): int
     {
         return self::putContents($filename, $data, $flags, $context);
     }
@@ -247,11 +247,11 @@ public static function save(string $filename, $data, int $flags = 0, $context =
      * @param string $filename
      * @param string|array|resource  $data
      * @param int $flags
-     * @param null|mixed $context
+     * @param null|resource $context
      *
      * @return int
      */
-    public static function mkdirSave(string $filename, $data, int $flags = 0, $context = null): int
+    public static function mkdirSave(string $filename, mixed $data, int $flags = 0, $context = null): int
     {
         if (!is_dir($dir = dirname($filename))) {
             self::mkdir($dir);
@@ -474,7 +474,7 @@ public static function getContentsV2(
         bool $useIncludePath = false,
         $streamContext = null,
         int $curlTimeout = 5
-    ) {
+    ): bool|string {
         $isUrl = preg_match('/^https?:\/\//', $file);
         if (null === $streamContext && $isUrl) {
             $streamContext = @stream_context_create(['http' => ['timeout' => $curlTimeout]]);
@@ -524,16 +524,14 @@ public static function getContentsV2(
     }
 
     /**
-     * @param $inFile
-     * @param $outFile
+     * @param array|string $inFile
+     * @param string $outFile
      *
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws FileNotFoundException
+     * @return string
      */
-    public static function combine($inFile, $outFile)
+    public static function combine(array|string $inFile, string $outFile): string
     {
-        self::check($inFile);
+        // self::check($inFile);
 
         $data = '';
         if (is_array($inFile)) {
@@ -544,13 +542,10 @@ public static function combine($inFile, $outFile)
                     throw new FileNotFoundException('File: ' . $value . ' not exists!');
                 }
             }
-        }
-
-        /*if (is_string($inFile) && is_file($value)) {
-            $data .= trim( file_get_contents($inFile) );
         } else {
-            Trigger::error('文件'.$value.'不存在！！');
-        }*/
+            self::check($inFile);
+            $data = trim(file_get_contents($inFile));
+        }
 
         $preg_arr = [
             '/\/\*.*?\*\/\s*/is',        // 去掉所有多行注释/* .... */