Skip to content

Commit b144404

Browse files
committed
BaseObject替换Object
1 parent 28fd936 commit b144404

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

components/Configs.php

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace wind\rest\components;
44

55
use Yii;
6+
use yii\base\BaseObject;
67
use yii\db\Connection;
78
use yii\caching\Cache;
89
use yii\helpers\ArrayHelper;
@@ -11,10 +12,10 @@
1112
/**
1213
* Configs
1314
* Used for configure some value. To set config you can use [[\yii\base\Application::$params]]
14-
*
15+
*
1516
* ```
1617
* return [
17-
*
18+
*
1819
* 'mdm.admin.configs' => [
1920
* 'db' => 'customDb',
2021
* 'menuTable' => '{{%admin_menu}}',
@@ -25,9 +26,9 @@
2526
* ]
2627
* ];
2728
* ```
28-
*
29+
*
2930
* or use [[\Yii::$container]]
30-
*
31+
*
3132
* ```
3233
* Yii::$container->set('wind\rest\components\Configs',[
3334
* 'db' => 'customDb',
@@ -36,12 +37,13 @@
3637
* ```
3738
*
3839
* @author Misbahul D Munir <[email protected]>
39-
* @since 1.0
40+
* @since 1.0
4041
*/
41-
class Configs extends \yii\base\Object
42+
class Configs extends BaseObject
4243
{
44+
4345
const CACHE_TAG = 'wind.rest';
44-
46+
4547
/**
4648
* @var Connection Database connection.
4749
*/
@@ -75,7 +77,7 @@ class Configs extends \yii\base\Object
7577
*/
7678
public $strict = true;
7779
/**
78-
* @var array
80+
* @var array
7981
*/
8082
public $options;
8183
/**
@@ -86,7 +88,7 @@ class Configs extends \yii\base\Object
8688
'db' => 'yii\db\Connection',
8789
'cache' => 'yii\caching\Cache',
8890
];
89-
91+
9092
/**
9193
* @inheritdoc
9294
*/
@@ -101,9 +103,10 @@ public function init()
101103
}
102104
}
103105
}
104-
106+
105107
/**
106108
* Create instance of self
109+
*
107110
* @return static
108111
*/
109112
public static function instance()
@@ -113,13 +116,13 @@ public static function instance()
113116
if (is_array($type) && !isset($type['class'])) {
114117
$type['class'] = static::className();
115118
}
116-
119+
117120
return self::$_instance = Yii::createObject($type);
118121
}
119-
122+
120123
return self::$_instance;
121124
}
122-
125+
123126
public static function __callStatic($name, $arguments)
124127
{
125128
$instance = static::instance();
@@ -133,63 +136,63 @@ public static function __callStatic($name, $arguments)
133136
}
134137
}
135138
}
136-
139+
137140
/**
138141
* @return Connection
139142
*/
140143
public static function db()
141144
{
142145
return static::instance()->db;
143146
}
144-
147+
145148
/**
146149
* @return Cache
147150
*/
148151
public static function cache()
149152
{
150153
return static::instance()->cache;
151154
}
152-
155+
153156
/**
154157
* @return integer
155158
*/
156159
public static function cacheDuration()
157160
{
158161
return static::instance()->cacheDuration;
159162
}
160-
163+
161164
/**
162165
* @return string
163166
*/
164167
public static function menuTable()
165168
{
166169
return static::instance()->menuTable;
167170
}
168-
171+
169172
/**
170173
* @return string
171174
*/
172175
public static function userTable()
173176
{
174177
return static::instance()->userTable;
175178
}
176-
179+
177180
/**
178181
* @return string
179182
*/
180183
public static function defaultUserStatus()
181184
{
182185
return static::instance()->defaultUserStatus;
183186
}
184-
187+
185188
/**
186189
* @return boolean
187190
*/
188191
public static function onlyRegisteredRoute()
189192
{
190193
return static::instance()->onlyRegisteredRoute;
191194
}
192-
195+
193196
/**
194197
* @return boolean
195198
*/

models/Route.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace wind\rest\models;
44

5+
use yii\base\BaseObject;
56
use yii\helpers\ArrayHelper;
67
use Yii;
78
use wind\rest\components\Helper;
@@ -17,7 +18,7 @@
1718
* @author Misbahul D Munir <[email protected]>
1819
* @since 1.0
1920
*/
20-
class Route extends \yii\base\Object
21+
class Route extends BaseObject
2122
{
2223

2324
const CACHE_TAG = 'mdm.admin.route';

0 commit comments

Comments
 (0)