diff --git a/Gii/GiiModel.php b/Gii/GiiModel.php index 2dc20db4..5c269751 100644 --- a/Gii/GiiModel.php +++ b/Gii/GiiModel.php @@ -338,7 +338,7 @@ class ' . $managerName . ' extends ActiveRecord if (empty($data)) return ''; $string = []; foreach ($data as $key => $_val) { - if (strpos($key, ',') !== false) { + if (is_string($key) && strpos($key, ',') !== false) { $key = '[' . $key . ']'; } if (count($_val) == 1) { diff --git a/HttpServer/Controller.php b/HttpServer/Controller.php index 8be68454..6be59a8f 100644 --- a/HttpServer/Controller.php +++ b/HttpServer/Controller.php @@ -4,18 +4,47 @@ declare(strict_types=1); namespace HttpServer; +use Database\DatabasesProviders; +use HttpServer\Client\Client; +use HttpServer\Client\Curl; +use HttpServer\Client\Http2; use HttpServer\Http\HttpHeaders; use HttpServer\Http\HttpParams; use HttpServer\Http\Request; use Exception; +use HttpServer\Route\Router; +use Kafka\Producer; use Snowflake\Abstracts\BaseGoto; +use Snowflake\Annotation\Annotation; +use Snowflake\Cache\Memcached; +use Snowflake\Cache\Redis; +use Snowflake\Error\Logger; +use Snowflake\Event; use Snowflake\Exception\ComponentException; +use Snowflake\Jwt\Jwt; +use Snowflake\Pool\Connection; +use Snowflake\Pool\Pool as SPool; use Snowflake\Snowflake; /** * Class WebController * @package Snowflake\Snowflake\Web * @property BaseGoto $goto + * @property Annotation $annotation + * @property Event $event + * @property Router $router + * @property SPool $pool + * @property \Redis|Redis $redis + * @property Server $server + * @property DatabasesProviders $db + * @property Connection $connections + * @property Memcached $memcached + * @property Logger $logger + * @property Jwt $jwt + * @property Client $client + * @property Producer $kafka + * @property Curl $curl + * @property Http2 $http2 */ class Controller extends Application { diff --git a/System/Abstracts/BaseApplication.php b/System/Abstracts/BaseApplication.php index ce049ec1..8d971c69 100644 --- a/System/Abstracts/BaseApplication.php +++ b/System/Abstracts/BaseApplication.php @@ -38,7 +38,6 @@ use Database\DatabasesProviders; /** * Class BaseApplication * @package Snowflake\Snowflake\Base - * @property $json * @property Annotation $annotation * @property Event $event * @property Router $router