ThaDafinser / UserAgentParser

src/Provider/AbstractProvider.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      */
     private function getComposerPackages()
     {
-        if (! file_exists('composer.lock')) {
+        if (!file_exists('composer.lock')) {
             return;
         }
 

Doc Comments +4 added lines

@@ -254,6 +254,10 @@
         return true;
     }
 
+    /**
+     * @param string $group
+     * @param string $part
+     */
     protected function getRealResult($value, $group = null, $part = null)
     {
         if ($this->isRealResult($value, $group, $part) === true) {

src/Provider/Wurfl.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 
     public function getVersion()
     {
-        $version      = $this->getParser()->getWurflInfo()->version;
+        $version = $this->getParser()->getWurflInfo()->version;
 
         preg_match("/\d+(?:\.\d+)+/", $version, $result);
 
@@ -235,7 +235,7 @@ 
          * No result found?
          */
         if ($this->hasResult($deviceRaw) !== true) {
-            throw new NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*

src/Provider/Http/AbstractHttpProvider.php

Spacing +2 added lines, -2 removed lines

@@ -52,11 +52,11 @@
             /* @var $response \GuzzleHttp\Psr7\Response */
             $response = $this->getClient()->send($request);
         } catch (GuzzleHttpException $ex) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '"', null, $ex);
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'"', null, $ex);
         }
 
         if ($response->getStatusCode() !== 200) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Status code is: "' . $response->getStatusCode() . '"');
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Status code is: "'.$response->getStatusCode().'"');
         }
 
         return $response;

src/Provider/Http/UserAgentApiCom.php

Spacing +11 added lines, -11 removed lines

@@ -91,13 +91,13 @@ 
          * an empty UserAgent makes no sense
          */
         if ($userAgent == '') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
-        $parameters = '/' . $this->apiKey;
-        $parameters .= '/' . rawurlencode($userAgent);
+        $parameters = '/'.$this->apiKey;
+        $parameters .= '/'.rawurlencode($userAgent);
 
-        $uri = self::$uri . $parameters;
+        $uri = self::$uri.$parameters;
 
         $request = new Request('GET', $uri);
 
@@ -117,11 +117,11 @@ 
                  * Error
                  */
                 if (isset($content->error->code) && $content->error->code == 'key_invalid') {
-                    throw new Exception\InvalidCredentialsException('Your API key "' . $this->apiKey . '" is not valid for ' . $this->getName(), null, $ex);
+                    throw new Exception\InvalidCredentialsException('Your API key "'.$this->apiKey.'" is not valid for '.$this->getName(), null, $ex);
                 }
 
                 if (isset($content->error->code) && $content->error->code == 'useragent_invalid') {
-                    throw new Exception\RequestException('User agent is invalid "' . $userAgent . '"');
+                    throw new Exception\RequestException('User agent is invalid "'.$userAgent.'"');
                 }
             }
 
@@ -132,8 +132,8 @@ 
          * no json returned?
          */
         $contentType = $response->getHeader('Content-Type');
-        if (! isset($contentType[0]) || $contentType[0] != 'application/json') {
-            throw new Exception\RequestException('Could not get valid "application/json" response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($contentType[0]) || $contentType[0] != 'application/json') {
+            throw new Exception\RequestException('Could not get valid "application/json" response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         $content = json_decode($response->getBody()->getContents());
@@ -142,14 +142,14 @@ 
          * No result
          */
         if (isset($content->error->code) && $content->error->code == 'useragent_not_found') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*
          * Missing data?
          */
-        if (! $content instanceof stdClass || ! isset($content->data)) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Data is missing "' . $response->getBody()->getContents() . '"');
+        if (!$content instanceof stdClass || !isset($content->data)) {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Data is missing "'.$response->getBody()->getContents().'"');
         }
 
         return $content->data;

src/Provider/Http/WhatIsMyBrowserCom.php

Spacing +12 added lines, -12 removed lines

@@ -123,7 +123,7 @@ 
          * an empty UserAgent makes no sense
          */
         if ($userAgent == '') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         $params = [
@@ -141,8 +141,8 @@ 
          * no json returned?
          */
         $contentType = $response->getHeader('Content-Type');
-        if (! isset($contentType[0]) || $contentType[0] != 'application/json') {
-            throw new Exception\RequestException('Could not get valid "application/json" response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($contentType[0]) || $contentType[0] != 'application/json') {
+            throw new Exception\RequestException('Could not get valid "application/json" response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         $content = json_decode($response->getBody()->getContents());
@@ -151,36 +151,36 @@ 
          * No result
          */
         if (isset($content->message_code) && $content->message_code == 'no_user_agent') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*
          * Limit exceeded
          */
         if (isset($content->message_code) && $content->message_code == 'usage_limit_exceeded') {
-            throw new Exception\LimitationExceededException('Exceeded the maximum number of request with API key "' . $this->apiKey . '" for ' . $this->getName());
+            throw new Exception\LimitationExceededException('Exceeded the maximum number of request with API key "'.$this->apiKey.'" for '.$this->getName());
         }
 
         /*
          * Error
          */
         if (isset($content->message_code) && $content->message_code == 'no_api_user_key') {
-            throw new Exception\InvalidCredentialsException('Missing API key for ' . $this->getName());
+            throw new Exception\InvalidCredentialsException('Missing API key for '.$this->getName());
         }
 
         if (isset($content->message_code) && $content->message_code == 'user_key_invalid') {
-            throw new Exception\InvalidCredentialsException('Your API key "' . $this->apiKey . '" is not valid for ' . $this->getName());
+            throw new Exception\InvalidCredentialsException('Your API key "'.$this->apiKey.'" is not valid for '.$this->getName());
         }
 
-        if (! isset($content->result) || $content->result !== 'success') {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($content->result) || $content->result !== 'success') {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         /*
          * Missing data?
          */
-        if (! $content instanceof stdClass || ! isset($content->parse) || ! $content->parse instanceof stdClass) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . print_r($content, true) . '"');
+        if (!$content instanceof stdClass || !isset($content->parse) || !$content->parse instanceof stdClass) {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.print_r($content, true).'"');
         }
 
         return $content->parse;
@@ -289,7 +289,7 @@ 
          * No result found?
          */
         if ($this->hasResult($resultRaw) !== true) {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*

src/Provider/Http/NeutrinoApiCom.php

Spacing +10 added lines, -10 removed lines

@@ -119,7 +119,7 @@ 
          * an empty UserAgent makes no sense
          */
         if ($userAgent == '') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         $params = [
@@ -144,7 +144,7 @@ 
             $prevEx = $ex->getPrevious();
 
             if ($prevEx->hasResponse() === true && $prevEx->getResponse()->getStatusCode() === 403) {
-                throw new Exception\InvalidCredentialsException('Your API userId "' . $this->apiUserId . '" and key "' . $this->apiKey . '" is not valid for ' . $this->getName(), null, $ex);
+                throw new Exception\InvalidCredentialsException('Your API userId "'.$this->apiUserId.'" and key "'.$this->apiKey.'" is not valid for '.$this->getName(), null, $ex);
             }
 
             throw $ex;
@@ -154,8 +154,8 @@ 
          * no json returned?
          */
         $contentType = $response->getHeader('Content-Type');
-        if (! isset($contentType[0]) || $contentType[0] != 'application/json;charset=UTF-8') {
-            throw new Exception\RequestException('Could not get valid "application/json" response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($contentType[0]) || $contentType[0] != 'application/json;charset=UTF-8') {
+            throw new Exception\RequestException('Could not get valid "application/json" response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         $content = json_decode($response->getBody()->getContents());
@@ -167,15 +167,15 @@ 
             switch ($content->api_error) {
 
                 case 1:
-                    throw new Exception\RequestException('"' . $content->api_error_msg . '" response from "' . $request->getUri() . '". Response is "' . print_r($content, true) . '"');
+                    throw new Exception\RequestException('"'.$content->api_error_msg.'" response from "'.$request->getUri().'". Response is "'.print_r($content, true).'"');
                     break;
 
                 case 2:
-                    throw new Exception\LimitationExceededException('Exceeded the maximum number of request with API userId "' . $this->apiUserId . '" and key "' . $this->apiKey . '" for ' . $this->getName());
+                    throw new Exception\LimitationExceededException('Exceeded the maximum number of request with API userId "'.$this->apiUserId.'" and key "'.$this->apiKey.'" for '.$this->getName());
                     break;
 
                 default:
-                    throw new Exception\RequestException('"' . $content->api_error_msg . '" response from "' . $request->getUri() . '". Response is "' . print_r($content, true) . '"');
+                    throw new Exception\RequestException('"'.$content->api_error_msg.'" response from "'.$request->getUri().'". Response is "'.print_r($content, true).'"');
                     break;
             }
         }
@@ -183,8 +183,8 @@ 
         /*
          * Missing data?
          */
-        if (! $content instanceof stdClass) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!$content instanceof stdClass) {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         return $content;
@@ -297,7 +297,7 @@ 
          * No result found?
          */
         if ($this->hasResult($resultRaw) !== true) {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*

src/Provider/Http/DeviceAtlasCom.php

Spacing +12 added lines, -12 removed lines

@@ -79,20 +79,20 @@ 
          * an empty UserAgent makes no sense
          */
         if ($userAgent == '') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
-        $parameters = '?licencekey=' . rawurlencode($this->apiKey);
-        $parameters .= '&useragent=' . rawurlencode($userAgent);
+        $parameters = '?licencekey='.rawurlencode($this->apiKey);
+        $parameters .= '&useragent='.rawurlencode($userAgent);
 
-        $uri = self::$uri . $parameters;
+        $uri = self::$uri.$parameters;
 
         // key to lower
         $headers = array_change_key_case($headers);
 
         $newHeaders = [];
         foreach ($headers as $key => $value) {
-            $newHeaders['X-DA-' . $key] = $value;
+            $newHeaders['X-DA-'.$key] = $value;
         }
 
         $newHeaders['User-Agent'] = 'ThaDafinser/UserAgentParser:v1.4';
@@ -106,7 +106,7 @@ 
             $prevEx = $ex->getPrevious();
 
             if ($prevEx->hasResponse() === true && $prevEx->getResponse()->getStatusCode() === 403) {
-                throw new Exception\InvalidCredentialsException('Your API key "' . $this->apiKey . '" is not valid for ' . $this->getName(), null, $ex);
+                throw new Exception\InvalidCredentialsException('Your API key "'.$this->apiKey.'" is not valid for '.$this->getName(), null, $ex);
             }
 
             throw $ex;
@@ -116,21 +116,21 @@ 
          * no json returned?
          */
         $contentType = $response->getHeader('Content-Type');
-        if (! isset($contentType[0]) || $contentType[0] != 'application/json; charset=UTF-8') {
-            throw new Exception\RequestException('Could not get valid "application/json" response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($contentType[0]) || $contentType[0] != 'application/json; charset=UTF-8') {
+            throw new Exception\RequestException('Could not get valid "application/json" response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         $content = json_decode($response->getBody()->getContents());
 
-        if (! $content instanceof stdClass || ! isset($content->properties)) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!$content instanceof stdClass || !isset($content->properties)) {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         /*
          * No result found?
          */
-        if (! $content->properties instanceof stdClass || count((array) $content->properties) === 0) {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+        if (!$content->properties instanceof stdClass || count((array) $content->properties) === 0) {
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         return $content->properties;

Doc Comments +4 added lines, -1 removed lines

@@ -73,6 +73,9 @@ 
         $this->apiKey = $apiKey;
     }
 
+    /**
+     * @param string $userAgent
+     */
     protected function getResult($userAgent, array $headers)
     {
         /*
@@ -182,7 +185,7 @@ 
 
     /**
      *
-     * @param Model\UserAgent $device
+     * @param Model\Device $device
      * @param stdClass        $resultRaw
      */
     private function hydrateDevice(Model\Device $device, stdClass $resultRaw)

src/Provider/Http/UserAgentStringCom.php

Spacing +8 added lines, -8 removed lines

@@ -96,13 +96,13 @@ 
          * an empty UserAgent makes no sense
          */
         if ($userAgent == '') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
-        $parameters = 'uas=' . rawurlencode($userAgent);
+        $parameters = 'uas='.rawurlencode($userAgent);
         $parameters .= '&getJSON=all';
 
-        $uri = self::$uri . '?' . $parameters;
+        $uri = self::$uri.'?'.$parameters;
 
         $request = new Request('GET', $uri);
 
@@ -112,14 +112,14 @@ 
          * no json returned?
          */
         $contentType = $response->getHeader('Content-Type');
-        if (! isset($contentType[0]) || $contentType[0] != 'application/json') {
-            throw new Exception\RequestException('Could not get valid "application/json" response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($contentType[0]) || $contentType[0] != 'application/json') {
+            throw new Exception\RequestException('Could not get valid "application/json" response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         $content = json_decode($response->getBody()->getContents());
 
-        if (! $content instanceof stdClass) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!$content instanceof stdClass) {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         return $content;
@@ -216,7 +216,7 @@ 
          * No result found?
          */
         if ($this->hasResult($resultRaw) !== true) {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*

src/Provider/Http/UdgerCom.php

Spacing +9 added lines, -9 removed lines

@@ -97,7 +97,7 @@ 
          * an empty UserAgent makes no sense
          */
         if ($userAgent == '') {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         $params = [
@@ -117,8 +117,8 @@ 
          * no json returned?
          */
         $contentType = $response->getHeader('Content-Type');
-        if (! isset($contentType[0]) || $contentType[0] != 'application/json') {
-            throw new Exception\RequestException('Could not get valid "application/json" response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!isset($contentType[0]) || $contentType[0] != 'application/json') {
+            throw new Exception\RequestException('Could not get valid "application/json" response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         $content = json_decode($response->getBody()->getContents());
@@ -127,29 +127,29 @@ 
          * No result found?
          */
         if (isset($content->flag) && $content->flag == 3) {
-            throw new Exception\NoResultFoundException('No result found for user agent: ' . $userAgent);
+            throw new Exception\NoResultFoundException('No result found for user agent: '.$userAgent);
         }
 
         /*
          * Errors
          */
         if (isset($content->flag) && $content->flag == 4) {
-            throw new Exception\InvalidCredentialsException('Your API key "' . $this->apiKey . '" is not valid for ' . $this->getName());
+            throw new Exception\InvalidCredentialsException('Your API key "'.$this->apiKey.'" is not valid for '.$this->getName());
         }
 
         if (isset($content->flag) && $content->flag == 6) {
-            throw new Exception\LimitationExceededException('Exceeded the maximum number of request with API key "' . $this->apiKey . '" for ' . $this->getName());
+            throw new Exception\LimitationExceededException('Exceeded the maximum number of request with API key "'.$this->apiKey.'" for '.$this->getName());
         }
 
         if (isset($content->flag) && $content->flag > 3) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         /*
          * Missing data?
          */
-        if (! $content instanceof stdClass || ! isset($content->info)) {
-            throw new Exception\RequestException('Could not get valid response from "' . $request->getUri() . '". Response is "' . $response->getBody()->getContents() . '"');
+        if (!$content instanceof stdClass || !isset($content->info)) {
+            throw new Exception\RequestException('Could not get valid response from "'.$request->getUri().'". Response is "'.$response->getBody()->getContents().'"');
         }
 
         return $content;