Merge branch 'hotfix/h-1.1.6-CompatiblePHP'

Author: qinxuanwu

src/Bootstrap.php

@@ -7,6 +7,8 @@
 /**
  * Rbacp module bootstrap class.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class Bootstrap implements BootstrapInterface
 {
     /**
@@ -24,6 +26,8 @@ class Bootstrap implements BootstrapInterface
      */
     public function bootstrap($app)
     {
+        require __DIR__ . '/components/CompatiblePHP/PHP8/functions.php';
+        
         $this->addConfig($app);
         $this->addTranslations($app);
         $this->addBehaviors($app);

src/Module.php

@@ -9,6 +9,8 @@
 /**
  * captcha module definition class
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class Module extends \yii\base\Module
 {
     public $theme = 'adminlteiframe'; // adminlteiframe,adminlte

src/assets/RbacpAsset.php

@@ -8,6 +8,8 @@
  * Main asset for the `adminlte` theming
  */
 
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpAsset extends AssetBundle
 {
     public $sourcePath = '@vendor/myzero1/yii2-rbacp/src/assets';

src/behaviors/GlobalAccessBehavior.php

@@ -8,6 +8,8 @@
  * Class GlobalAccessBehavior
  * @package common\behaviors
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class GlobalAccessBehavior extends Behavior
 {
     /**

src/components/CompatiblePHP/PHP8/functions.php

@@ -0,0 +1,53 @@
+<?php
+namespace myzero1\rbacp\components\CompatiblePHP\PHP8;
+
+// use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
+function strlen($string) {
+    $string=(string)$string;
+    return \strlen($string);
+}
+function trim($string, string $characters = " \n\r\t\v\0") {
+    $string=(string)$string;
+    return \trim($string,$characters);
+}
+function ltrim($string, string $characters = " \n\r\t\v\0") {
+    $string=(string)$string;
+    return \ltrim($string,$characters);
+}
+function rtrim($string, string $characters = " \n\r\t\v\0") {
+    $string=(string)$string;
+    return \rtrim($string,$characters);
+}
+function strpos( $haystack,  $needle, int $offset = 0) {
+    $haystack=(string)$haystack;
+    $needle=(string)$needle;
+    return \strpos($haystack,$needle,$offset);
+}
+function str_replace( $search,$replace,$subject) {
+    if (!in_array(gettype($search),['array','string '])) {
+        $search=(string)$search;
+    }
+    if (!in_array(gettype($replace),['array','string '])) {
+        $replace=(string)$replace;
+    }
+    if (!in_array(gettype($subject),['array','string '])) {
+        $subject=(string)$subject;
+    }
+
+    return \str_replace($search,$replace,$subject);
+}
+
+function implode($separator, $array) {
+    if(is_array($separator)){
+        return \implode($array,$separator);
+    } else {
+        return \implode($separator,$array);
+    }
+
+}
+
+function htmlspecialchars($separator, $array) {
+    $separator=(string)$separator;
+    return \htmlspecialchars($separator, $array);
+}

src/components/Rbac.php

@@ -9,6 +9,8 @@
  * 
  * @package myzero1\rbacp\components
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class Rbac extends \yii\base\Component
 {
     /**

src/components/Rbacp.php

@@ -8,6 +8,8 @@
  * 
  * @package myzero1\rbacp\components
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class Rbacp extends \yii\base\Component
 {
     /**

src/components/libs/BaseHtml.php

@@ -22,6 +22,8 @@
  * @author Qiang Xue <[email protected]>
  * @since 2.0
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class BaseHtml
 {
     /**

src/components/libs/GridView.php

@@ -46,6 +46,8 @@
  * @author Qiang Xue <[email protected]>
  * @since 2.0
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class GridView extends BaseListView
 {
     const FILTER_POS_HEADER = 'header';

src/components/validators/NoSpecialStrValidator.php

@@ -14,6 +14,8 @@
  *
  *
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class NoSpecialStrValidator extends Validator
 {
     /**

src/controllers/DefaultController.php

@@ -7,6 +7,8 @@
 /**
  * Default controller for the `captcha` module
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class DefaultController extends Controller
 {
     /**

src/controllers/RbacpPolicyController.php

@@ -12,6 +12,8 @@
 /**
  * RbacpPolicyController implements the CRUD actions for RbacpPolicy model.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpPolicyController extends Controller
 {
     /**

src/controllers/RbacpPrivilegeController.php

@@ -12,6 +12,8 @@
 /**
  * RbacpPrivilegeController implements the CRUD actions for RbacpPrivilege model.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpPrivilegeController extends Controller
 {
     /**

src/controllers/RbacpRoleController.php

@@ -13,6 +13,8 @@
 /**
  * RbacpRoleController implements the CRUD actions for RbacpRole model.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpRoleController extends Controller
 {
     /**

src/controllers/RbacpRolePrivilegeController.php

@@ -12,6 +12,8 @@
 /**
  * RbacpRolePrivilegeController implements the CRUD actions for RbacpRolePrivilege model.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpRolePrivilegeController extends Controller
 {
     /**

src/controllers/RbacpUserViewController.php

@@ -15,6 +15,8 @@
 /**
  * RbacpUserViewController implements the CRUD actions for RbacpUserView model.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpUserViewController extends Controller
 {
     /**

src/helper/Helper.php

@@ -7,6 +7,8 @@
  * @author qinxuanwu
  *
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class Helper {
     /**
      * Get the module's name of rbacp.

src/migrations/m171129_120101_rbacp_policy.php

@@ -2,6 +2,8 @@
 
 use yii\db\Schema;
 
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class m171129_120101_rbacp_policy extends \yii\db\Migration
 {
     public function up()

src/migrations/m171129_120101_rbacp_privilege.php

@@ -2,6 +2,8 @@
 
 use yii\db\Schema;
 
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class m171129_120101_rbacp_privilege extends \yii\db\Migration
 {
     public function up()

src/migrations/m171129_120101_rbacp_role.php

@@ -2,6 +2,8 @@
 
 use yii\db\Schema;
 
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class m171129_120101_rbacp_role extends \yii\db\Migration
 {
     public function up()

src/migrations/m171129_120101_rbacp_userv_role.php

@@ -2,6 +2,8 @@
 
 use yii\db\Schema;
 
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class m171129_120101_rbacp_userv_role extends \yii\db\Migration
 {
     public function up()

src/migrations/m171129_120101_user.php

@@ -2,6 +2,8 @@
 
 use yii\db\Schema;
 
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class m171129_120101_user extends \yii\db\Migration
 {
     public function up()

src/models/RbacpActiveRecord.php

@@ -13,6 +13,8 @@
  * Setting the default vaules
  *
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpActiveRecord extends \yii\db\ActiveRecord
 {
     /**

src/models/RbacpPolicy.php

@@ -18,6 +18,8 @@
  * @property integer $scope
  * @property integer $type
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpPolicy extends RbacpActiveRecord
 {
     /**

src/models/RbacpPolicySearch.php

@@ -10,6 +10,8 @@
 /**
  * RbacpPolicySearch represents the model behind the search form about `custom_components\modules\myzero1\rbacp\models\RbacpPolicy`.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpPolicySearch extends RbacpPolicy
 {
     /**

src/models/RbacpPrivilege.php

@@ -15,6 +15,8 @@
  * @property integer $created
  * @property integer $updated
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpPrivilege extends RbacpActiveRecord
 {
     /**

src/models/RbacpPrivilegeSearch.php

@@ -10,6 +10,8 @@
 /**
  * RbacpPrivilegeSearch represents the model behind the search form about `custom_components\modules\myzero1\rbacp\models\RbacpPrivilege`.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpPrivilegeSearch extends RbacpPrivilege
 {
     /**

src/models/RbacpRole.php

@@ -21,6 +21,8 @@
  * @property integer $updated
  * @property integer $author
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpRole extends RbacpActiveRecord
 {
     public $rbacp_privilege_ids;

src/models/RbacpRolePrivilege.php

@@ -16,6 +16,8 @@
  * @property integer $created
  * @property integer $updated
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpRolePrivilege extends RbacpActiveRecord
 {
     // public $rbacp_user_view;

src/models/RbacpUserView.php

@@ -25,6 +25,8 @@
  * @property string $last_ip
  * @property integer $last_time
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpUserView extends RbacpActiveRecord
 {
     const STATUS_ACTIVE = 10;

src/models/RbacpUserViewSearch.php

@@ -10,6 +10,8 @@
 /**
  * RbacpUserViewSearch represents the model behind the search form about `custom_components\modules\myzero1\rbacp\models\RbacpUserView`.
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpUserViewSearch extends RbacpUserView
 {
     public $role_name;

src/models/RbacpUservRole.php

@@ -10,6 +10,8 @@
  * @property integer $role_id
  * @property integer $userv_id
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class RbacpUservRole extends \yii\db\ActiveRecord
 {
     /**

src/models/UserView.php

@@ -8,6 +8,8 @@
 /**
  * Login form
  */
+use function \myzero1\rbacp\components\CompatiblePHP\PHP8\{strlen,trim,ltrim,rtrim,strpos,str_replace,implode,htmlspecialchars};
+
 class UserView extends Model
 {
     public $createDefaultTable;