update

extend/catcher/CatchAdmin.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use think\helper\Arr;

extend/catcher/CatchAdminService.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use catcher\event\LoadModuleRoutes;

extend/catcher/CatchAuth.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use catchAdmin\permissions\model\Users;

extend/catcher/CatchCacheKeys.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename  CacheKeys.php
  * @createdAt 2020/1/17

extend/catcher/CatchConsole.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------
@@ -12,6 +14,7 @@ namespace catcher;
 
 use catcher\library\Composer;
 use catcher\facade\FileSystem;
+use Symfony\Component\Finder\SplFileInfo;
 use think\App;
 use think\console\Command;
 
@@ -40,12 +43,12 @@ class CatchConsole
 
         $commands = [];
 
-        /*  \Symfony\Component\Finder\SplFileInfo $command */
+        /* \Symfony\Component\Finder\SplFileInfo $command */
         foreach ($commandFiles as $command) {
             if ($command->getExtension() === 'php') {
-                $lastPath = str_replace($this->parseNamespace(), '',pathinfo($command, PATHINFO_DIRNAME));
+                $lastPath = str_replace($this->parseNamespace(), '', pathinfo($command->getPathname(), PATHINFO_DIRNAME));
                 $namespace = $this->namespace . str_replace(DIRECTORY_SEPARATOR, '\\', $lastPath) . '\\';
-                $commandClass = $namespace . pathinfo($command, PATHINFO_FILENAME);
+                $commandClass = $namespace . pathinfo($command->getPathname(), PATHINFO_FILENAME);
                 $commands[] = $commandClass;
             }
         }

extend/catcher/CatchExceptionHandle.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use app\ExceptionHandle;

extend/catcher/CatchModelCollection.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use catcher\library\excel\Excel;

extend/catcher/CatchQuery.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use catcher\base\CatchModel;

extend/catcher/CatchResponse.php

@@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace catcher;
 
 use think\Paginator;
-use think\Response;
 use think\response\Json;
 
 class CatchResponse
@@ -19,11 +19,11 @@ class CatchResponse
    */
   public static function success($data = [], $msg = 'success', $code = Code::SUCCESS): Json
   {
-    return json([
-      'code'    => $code,
-      'message' => $msg,
-      'data'    => $data,
-    ]);
+        return json([
+          'code'    => $code,
+          'message' => $msg,
+          'data'    => $data,
+        ]);
   }
 
   /**
@@ -35,14 +35,14 @@ class CatchResponse
    */
   public static function paginate(Paginator $list)
   {
-    return json([
-      'code'    => Code::SUCCESS,
-      'message' => 'success',
-      'count'   => $list->total(),
-      'current' => $list->currentPage(),
-      'limit'   => $list->listRows(),
-      'data'    => $list->getCollection(),
-    ]);
+        return json([
+          'code'    => Code::SUCCESS,
+          'message' => 'success',
+          'count'   => $list->total(),
+          'current' => $list->currentPage(),
+          'limit'   => $list->listRows(),
+          'data'    => $list->getCollection(),
+        ]);
   }
 
   /**
@@ -55,9 +55,9 @@ class CatchResponse
    */
   public static function fail($msg = '', $code = Code::FAILED): Json
   {
-    return json([
-        'code' => $code,
-        'message'  => $msg,
-    ]);
+        return json([
+            'code' => $code,
+            'message'  => $msg,
+        ]);
   }
 }

extend/catcher/CatchUpload.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use catchAdmin\system\model\Attachments;

extend/catcher/Code.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 class Code

extend/catcher/ModuleService.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/Tree.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 class Tree

extend/catcher/Utils.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher;
 
 use catchAdmin\system\model\Config;

extend/catcher/base/CatchController.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\base;
 
 abstract class CatchController

extend/catcher/base/CatchCronTask.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/base/CatchModel.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\base;
 
 use catcher\CatchQuery;

extend/catcher/base/CatchRepository.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename  CatchRepository.php
  * @createdAt 2020/6/21

extend/catcher/base/CatchRequest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\base;
 
 use app\Request;

extend/catcher/base/CatchValidate.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\base;
 
 use think\Validate;

extend/catcher/exceptions/CatchException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\exceptions;
 
 use Exception;

extend/catcher/exceptions/FailedException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\exceptions;
 
 use catcher\Code;

extend/catcher/exceptions/FiledNotFoundException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\exceptions;
 
 

extend/catcher/exceptions/LoginFailedException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\exceptions;
 
 use catcher\Code;

extend/catcher/exceptions/PermissionForbiddenException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\exceptions;
 
 use catcher\Code;

extend/catcher/exceptions/ValidateFailedException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\exceptions;
 
 use catcher\Code;

extend/catcher/exceptions/WechatResponseException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename  WechatResponseException.php
  * @createdAt 2020/6/21

extend/catcher/facade/FileSystem.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/facade/Http.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\facade;
 
 use think\Facade;

extend/catcher/facade/Trie.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\facade;
 
 use think\Facade;

extend/catcher/library/BackUpDatabase.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/Composer.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/Compress.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library;
 
 use catcher\CatchAdmin;

extend/catcher/library/Errors.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename  Errors.php
  * @createdAt 2020/6/21

extend/catcher/library/FileSystem.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/InstallCatchModule.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/InstallLocalModule.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/ParseClass.php

@@ -1,6 +1,8 @@
 <?php
-namespace catcher\library;
 
+declare(strict_types=1);
+
+namespace catcher\library;
 
 use think\exception\ClassNotFoundException;
 

extend/catcher/library/ProgressBar.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename  ProgressBar.php
  * @createdAt 2020/6/20

extend/catcher/library/Trie.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library;
 
 use catcher\CatchCacheKeys;

extend/catcher/library/WeChat.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename WeChat.php
  * @date     2020/6/7

extend/catcher/library/Zip.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/client/Http.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\client;
 
 use catcher\exceptions\FailedException;

extend/catcher/library/client/Response.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\client;
 
 

extend/catcher/library/excel/Excel.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\excel;
 
 use catcher\CatchUpload;

extend/catcher/library/excel/ExcelContract.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\excel;
 
 interface ExcelContract

extend/catcher/library/excel/Factory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\excel;
 
 

extend/catcher/library/excel/MacroExcel.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\excel;
 
 trait MacroExcel

extend/catcher/library/excel/ShouldTaskContract.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\library\excel;
 
 interface ShouldTaskContract

extend/catcher/library/rate/GrantLimit.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/rate/RateLimiter.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/rate/Redis.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/library/rate/SlidingWindowLimit.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/middlewares/JsonResponseMiddleware.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------

extend/catcher/traits/db/BaseOptionsTrait.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace catcher\traits\db;
 

extend/catcher/traits/db/ScopeTrait.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * @filename  ScopeTrait.php
  * @createdAt 2020/6/21

extend/catcher/traits/db/TransTrait.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\traits\db;
 
 use think\facade\Db;

extend/catcher/validates/SensitiveWord.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\validates;
 
 use catcher\library\Trie;

extend/catcher/validates/Sometimes.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\validates;
 
 class Sometimes implements ValidateInterface

extend/catcher/validates/ValidateInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace catcher\validates;
 
 interface  ValidateInterface