Yeelight / miot-api

src/Exception/SpecificationErrorException.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 {
     public function __toString()
     {
-        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+        return __CLASS__.": [{$this->code}]: {$this->message}\n";
     }
 }

src/Exception/InstanceErrorException.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 {
     public function __toString()
     {
-        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+        return __CLASS__.": [{$this->code}]: {$this->message}\n";
     }
 }

src/Exception/ApiErrorException.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 {
     public function __toString()
     {
-        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+        return __CLASS__.": [{$this->code}]: {$this->message}\n";
     }
 }

src/Contract/Urn.php

Spacing +16 added lines, -16 removed lines

@@ -97,9 +97,9 @@ 
      * @var array
      */
     private $validNamespaces = [
-        'miot-spec',        // 小米定义的规范
-        'miot-spec-v2',     // 小米定义的规范版本2
-        'bluetooth-spec',   // 蓝牙联盟定义的规范
+        'miot-spec', // 小米定义的规范
+        'miot-spec-v2', // 小米定义的规范版本2
+        'bluetooth-spec', // 蓝牙联盟定义的规范
     ];
 
     /**
@@ -122,11 +122,11 @@ 
      * @var array
      */
     private $validTypes = [
-        'property',     // 属性
-        'action',       // 方法
-        'event',        // 事件
-        'service',      // 服务
-        'device',       // 设备
+        'property', // 属性
+        'action', // 方法
+        'event', // 事件
+        'service', // 服务
+        'device', // 设备
     ];
 
     /**
@@ -410,14 +410,14 @@ 
         $baseUrn = '';
 
         foreach ($this->baseColumns as $column) {
-            $fncName = 'get' . ucfirst(
-                    preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $fncName = 'get'.ucfirst(
+                    preg_replace_callback('/_([a-zA-Z])/', function($match) {
                         return strtoupper($match[1]);
                     }, $column)
                 );
 
             if (method_exists($this, $fncName) && $this->{$fncName}()) {
-                $baseUrn .= $this->delimiter . $this->{$fncName}();
+                $baseUrn .= $this->delimiter.$this->{$fncName}();
             }
         }
 
@@ -444,14 +444,14 @@ 
         $expression = '';
 
         foreach ($this->columns as $column) {
-            $fncName = 'get' . ucfirst(
-                    preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $fncName = 'get'.ucfirst(
+                    preg_replace_callback('/_([a-zA-Z])/', function($match) {
                         return strtoupper($match[1]);
                     }, $column)
                 );
 
             if (method_exists($this, $fncName) && $this->{$fncName}()) {
-                $expression .= $this->delimiter . $this->{$fncName}();
+                $expression .= $this->delimiter.$this->{$fncName}();
             }
         }
 
@@ -470,8 +470,8 @@ 
         $parses = explode($this->delimiter, $this->original);
 
         foreach ($this->columns as $index => $column) {
-            $fncName = 'set' . ucfirst(
-                    preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $fncName = 'set'.ucfirst(
+                    preg_replace_callback('/_([a-zA-Z])/', function($match) {
                         return strtoupper($match[1]);
                     }, $column)
                 );

src/Contract/RemoteSpec.php

Spacing +17 added lines, -17 removed lines

@@ -66,7 +66,7 @@ 
      */
     public static function properties()
     {
-        $file = self::SPEC . DIRECTORY_SEPARATOR . self::PROPERTIES;
+        $file = self::SPEC.DIRECTORY_SEPARATOR.self::PROPERTIES;
 
         return self::__instances($file);
     }
@@ -78,7 +78,7 @@ 
      */
     public static function actions()
     {
-        $file = self::SPEC . DIRECTORY_SEPARATOR . self::ACTIONS;
+        $file = self::SPEC.DIRECTORY_SEPARATOR.self::ACTIONS;
 
         return self::__instances($file);
     }
@@ -90,7 +90,7 @@ 
      */
     public static function events()
     {
-        $file = self::SPEC . DIRECTORY_SEPARATOR . self::EVENTS;
+        $file = self::SPEC.DIRECTORY_SEPARATOR.self::EVENTS;
 
         return self::__instances($file);
     }
@@ -102,7 +102,7 @@ 
      */
     public static function services()
     {
-        $file = self::SPEC . DIRECTORY_SEPARATOR . self::SERVICES;
+        $file = self::SPEC.DIRECTORY_SEPARATOR.self::SERVICES;
 
         return self::__instances($file);
     }
@@ -114,7 +114,7 @@ 
      */
     public static function devices()
     {
-        $file = self::SPEC . DIRECTORY_SEPARATOR . self::DEVICES;
+        $file = self::SPEC.DIRECTORY_SEPARATOR.self::DEVICES;
 
         return self::__instances($file);
     }
@@ -126,7 +126,7 @@ 
      */
     public static function instance($type)
     {
-        $file = self::INSTANCE . DIRECTORY_SEPARATOR . $type;
+        $file = self::INSTANCE.DIRECTORY_SEPARATOR.$type;
         $uri = self::INSTANCE;
         $params = [
             'type' => $type,
@@ -145,8 +145,8 @@ 
     public static function property($type)
     {
         $type = self::getBaseType($type);
-        $file = self::PROPERTY . DIRECTORY_SEPARATOR . $type;
-        $uri = self::SPEC . DIRECTORY_SEPARATOR . self::PROPERTY;
+        $file = self::PROPERTY.DIRECTORY_SEPARATOR.$type;
+        $uri = self::SPEC.DIRECTORY_SEPARATOR.self::PROPERTY;
         $params = [
             'type' => $type,
         ];
@@ -164,8 +164,8 @@ 
     public static function action($type)
     {
         $type = self::getBaseType($type);
-        $file = self::ACTION . DIRECTORY_SEPARATOR . $type;
-        $uri = self::SPEC . DIRECTORY_SEPARATOR . self::ACTION;
+        $file = self::ACTION.DIRECTORY_SEPARATOR.$type;
+        $uri = self::SPEC.DIRECTORY_SEPARATOR.self::ACTION;
         $params = [
             'type' => $type,
         ];
@@ -183,8 +183,8 @@ 
     public static function event($type)
     {
         $type = self::getBaseType($type);
-        $file = self::EVENT . DIRECTORY_SEPARATOR . $type;
-        $uri = self::SPEC . DIRECTORY_SEPARATOR . self::EVENT;
+        $file = self::EVENT.DIRECTORY_SEPARATOR.$type;
+        $uri = self::SPEC.DIRECTORY_SEPARATOR.self::EVENT;
         $params = [
             'type' => $type,
         ];
@@ -202,8 +202,8 @@ 
     public static function service($type)
     {
         $type = self::getBaseType($type);
-        $file = self::SERVICE . DIRECTORY_SEPARATOR . $type;
-        $uri = self::SPEC . DIRECTORY_SEPARATOR . self::SERVICE;
+        $file = self::SERVICE.DIRECTORY_SEPARATOR.$type;
+        $uri = self::SPEC.DIRECTORY_SEPARATOR.self::SERVICE;
         $params = [
             'type' => $type,
         ];
@@ -221,8 +221,8 @@ 
     public static function device($type)
     {
         $type = self::getBaseType($type);
-        $file = self::DEVICE . DIRECTORY_SEPARATOR . $type;
-        $uri = self::SPEC . DIRECTORY_SEPARATOR . self::DEVICE;
+        $file = self::DEVICE.DIRECTORY_SEPARATOR.$type;
+        $uri = self::SPEC.DIRECTORY_SEPARATOR.self::DEVICE;
         $params = [
             'type' => $type,
         ];
@@ -300,7 +300,7 @@ 
     {
         $http = new Request(
             self::$host,
-            '/' . self::$namespaces . '/' . $uri,
+            '/'.self::$namespaces.'/'.$uri,
             self::$prot,
             true,
             self::$timeout

src/Contract/Instance/Instance.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
             foreach ($services as $index => $service) {
                 if (!empty($this->getPropertiesNode($index))) {
                     foreach ($this->getPropertiesNode($index) as $i => $item) {
-                        $propertiesNodes[($index . '.' . $i)] = $item;
+                        $propertiesNodes[($index.'.'.$i)] = $item;
                     }
                 }
             }

src/Util/Request.php

Spacing +11 added lines, -11 removed lines

@@ -309,7 +309,7 @@ 
         // Set additional headers.
         $headers = [];
         foreach ($this->headers as $name => $val) {
-            $headers[] = $name . ': ' . $val;
+            $headers[] = $name.': '.$val;
         }
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
         // Do stuff it it's HTTPS/SSL.
@@ -326,13 +326,13 @@ 
             }
         }
         // Build and set URL.
-        $url = $protocol . '://' . $host . $uri . $query;
+        $url = $protocol.'://'.$host.$uri.$query;
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_PORT, $port);
         // Add any authentication to the request.
         // Currently supports only HTTP Basic Auth.
         if ($this->useBasicAuth === true) {
-            curl_setopt($ch, CURLOPT_USERPWD, $this->authUsername . ':' . $this->authPassword);
+            curl_setopt($ch, CURLOPT_USERPWD, $this->authUsername.':'.$this->authPassword);
             curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
         }
         // Execute!
@@ -365,7 +365,7 @@ 
                 if (!is_string($val)) {
                     $val = json_encode($val);
                 }
-                $dataArray[] = urlencode($key) . '=' . urlencode($val);
+                $dataArray[] = urlencode($key).'='.urlencode($val);
             }
         }
 
@@ -415,15 +415,15 @@ 
         if ($this->useBasicAuth === true) {
             $this->setHeader(
                 'Authorization',
-                'Basic ' . base64_encode($this->authUsername . ':' . $this->authPassword)
+                'Basic '.base64_encode($this->authUsername.':'.$this->authPassword)
             );
         }
         $headers = $this->headers;
         $req = '';
-        $req .= $type . ' ' . $uri . (isset($get_data) ? '?' . $get_data : '') . ' HTTP/' . $HTTPVersion . $crlf;
-        $req .= 'Host: ' . $host . $crlf;
+        $req .= $type.' '.$uri.(isset($get_data) ? '?'.$get_data : '').' HTTP/'.$HTTPVersion.$crlf;
+        $req .= 'Host: '.$host.$crlf;
         foreach ($headers as $header => $content) {
-            $req .= $header . ': ' . $content . $crlf;
+            $req .= $header.': '.$content.$crlf;
         }
         $req .= $crlf;
         if ($type === 'POST') {
@@ -433,14 +433,14 @@ 
         }
 
         // Construct hostname.
-        $fsock_host = ($port == 443 ? 'ssl://' : '') . $host;
+        $fsock_host = ($port == 443 ? 'ssl://' : '').$host;
 
         // Open socket.
         $httpreq = @fsockopen($fsock_host, $port, $errno, $errstr, 30);
 
         // Handle an error.
         if (!$httpreq) {
-            $this->error = $errno . ': ' . $errstr;
+            $this->error = $errno.': '.$errstr;
 
             return false;
         }
@@ -454,7 +454,7 @@ 
         }
 
         // Extract the headers and the responseText.
-        list($headers, $responseText) = explode($crlf . $crlf, $rsp);
+        list($headers, $responseText) = explode($crlf.$crlf, $rsp);
 
         // Store the finalized response.
         $this->response = $rsp;

src/Util/Jsoner/JsonLoader.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         if (is_null($lastError)) {
             return $array;
         } else {
-            throw new JsonException($lastError['message'] . ' ' . $file);
+            throw new JsonException($lastError['message'].' '.$file);
         }
     }
 
@@ -68,7 +68,7 @@ 
             if (!mkdir($path, 0755, true)) {
                 $message = 'Could not create directory in';
 
-                throw new JsonException($message . ' ' . $path);
+                throw new JsonException($message.' '.$path);
             }
         }
     }
@@ -87,7 +87,7 @@ 
         if (file_put_contents($file, $json) === false) {
             $message = 'Could not create file in';
 
-            throw new JsonException($message . ' ' . $file);
+            throw new JsonException($message.' '.$file);
         }
     }
 

src/Util/Jsoner/Jsoner.php

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
     {
         try {
             $file = str_replace(':', '_', $file);
-            $items = JsonLoader::fileToArray(self::getCacheDir() . $file . self::SUFFIX);
+            $items = JsonLoader::fileToArray(self::getCacheDir().$file.self::SUFFIX);
 
             if (!empty($items) && !isset($items['error-code'])) {
                 return self::make($items);
@@ -52,7 +52,7 @@ 
     {
         try {
             $file = str_replace(':', '_', $file);
-            $items = JsonLoader::dataToFile($data, self::getCacheDir() . $file . self::SUFFIX);
+            $items = JsonLoader::dataToFile($data, self::getCacheDir().$file.self::SUFFIX);
             if (!empty($items) && !isset($items['error-code'])) {
                 return self::make($items);
             }
@@ -75,7 +75,7 @@ 
     {
         try {
             $file = str_replace(':', '_', $file);
-            $items = JsonLoader::arrayToFile($array, self::getCacheDir() . $file . self::SUFFIX);
+            $items = JsonLoader::arrayToFile($array, self::getCacheDir().$file.self::SUFFIX);
             if (!empty($items) && !isset($items['error-code'])) {
                 return self::make($items);
             }
@@ -93,9 +93,9 @@ 
      */
     public static function getCacheDir()
     {
-        return dirname(dirname(dirname(__DIR__))) .
-            DIRECTORY_SEPARATOR .
-            self::CACHE_DIR .
+        return dirname(dirname(dirname(__DIR__))).
+            DIRECTORY_SEPARATOR.
+            self::CACHE_DIR.
             DIRECTORY_SEPARATOR;
     }
 }