icy2003 / php

src/iapis/Meteorology.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
     public function fetchProvinces()
     {
         $this->fetchCitys();
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, ['code', 'name']);
         };
 
@@ -38,7 +38,7 @@ 
     {
         $res = Http::get('http://www.nmc.cn/f/rest/province/' . $provinceCode);
         $this->_result = Json::decode($res);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, ['code', 'city', 'province']);
         };
 
@@ -72,7 +72,7 @@ 
     {
         $res = Http::get('http://www.nmc.cn/f/rest/real/' . $cityId);
         $this->_result = Json::decode($res);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, [
                 'publish_time',
                 'airpressure' => 'weather.airpressure',
@@ -107,7 +107,7 @@ 
     {
         $res = Http::get('http://www.nmc.cn/f/rest/aqi/' . $cityId);
         $this->_result = Json::decode($res);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, [
                 'forecasttime',
                 'aq',
@@ -132,10 +132,10 @@ 
      *
      * @return static
      */
-    public function fetchToday($cityId){
+    public function fetchToday($cityId) {
         $res = Http::get('http://www.nmc.cn/f/rest/passed/' . $cityId);
         $this->_result = Json::decode($res);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, [
                 'time',
                 'humidity',

src/iapis/VideoResource.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
             'pageSize' => $pageSize,
         ]);
         $this->_result = Json::get($res, 'data', []);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, [
                 'id' => 'd_id',
                 'name' => 'd_name',
@@ -60,7 +60,7 @@ 
             'pageSize' => $pageSize,
         ]);
         $this->_result = Json::get($res, 'data', []);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, [
                 'id' => 'd_id',
                 'name' => 'd_name',
@@ -85,7 +85,7 @@ 
             'd_id' => $id,
         ]);
         $this->_result = Json::get($res, 'data', []);
-        $this->_toArrayCall = function ($array) {
+        $this->_toArrayCall = function($array) {
             return Arrays::columns($array, [
                 'id' => 'd_id',
                 'name' => 'd_name',
@@ -96,7 +96,7 @@ 
                 'lang' => 'd_lang',
                 'year' => 'd_year',
                 'description' => 'd_content',
-                'episodes' => function ($array) {
+                'episodes' => function($array) {
                     $episodes = explode('#', I::get($array, 'd_playurl'));
                     return Arrays::explode('$', $episodes);
                 },

src/I.php

Spacing +5 added lines, -5 removed lines

@@ -60,15 +60,15 @@ 
             }
             return $result;
         } elseif (is_array($mixed) || is_object($mixed)) { // 数组和对象
-            if(false === is_string($keyString) && is_callable($keyString)){
+            if (false === is_string($keyString) && is_callable($keyString)) {
                 $mixed = self::call($keyString, [$mixed]);
-            }else{
+            } else {
                 $keyArray = explode('.', $keyString);
                 foreach ($keyArray as $key) {
                     if (is_array($mixed)) {
                         if (array_key_exists($key, $mixed) && null !== $mixed[$key]) {
                             $mixed = $mixed[$key];
-                        }else {
+                        } else {
                             return $defaultValue;
                         }
                     } elseif (is_object($mixed)) {
@@ -92,8 +92,8 @@ 
             }
             return $mixed;
         } elseif (is_string($mixed) || is_numeric($mixed)) { // 字符串或数字
-            $pos = (int) $keyString;
-            $length = null === $defaultValue ? 1 : (int) $defaultValue;
+            $pos = (int)$keyString;
+            $length = null === $defaultValue ? 1 : (int)$defaultValue;
             return Strings::sub($mixed, $pos, $length);
         } elseif (null === $mixed) { // null
             return $defaultValue;

Braces +2 added lines, -2 removed lines

@@ -62,13 +62,13 @@
         } elseif (is_array($mixed) || is_object($mixed)) { // 数组和对象
             if(false === is_string($keyString) && is_callable($keyString)){
                 $mixed = self::call($keyString, [$mixed]);
-            }else{
+            } else{
                 $keyArray = explode('.', $keyString);
                 foreach ($keyArray as $key) {
                     if (is_array($mixed)) {
                         if (array_key_exists($key, $mixed) && null !== $mixed[$key]) {
                             $mixed = $mixed[$key];
-                        }else {
+                        } else {
                             return $defaultValue;
                         }
                     } elseif (is_object($mixed)) {