webmarketingroi / optimizely-php

lib/WebMarketingROI/OptimizelyPHP/Resource/v2/ExperimentVariationReach.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
-                $cleanedOptions[$name] = $value;
+            if ($value!==null) {
+                            $cleanedOptions[$name] = $value;
+            }
         }
         
         return $cleanedOptions;

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
                     break;                
                 }
                 default:
-                    throw new Exception('Unknown option: ' . $name);
+                    throw new Exception('Unknown option: '.$name);
             }
         }
     }
@@ -97,7 +97,7 @@ 
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
+            if ($value !== null)
                 $cleanedOptions[$name] = $value;
         }
         

lib/WebMarketingROI/OptimizelyPHP/Resource/v2/Experiment.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
-                $cleanedOptions[$name] = $value;
+            if ($value!==null) {
+                            $cleanedOptions[$name] = $value;
+            }
         }
         
         return $cleanedOptions;

Spacing +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
                 case 'id': $this->setId($value); break;
                 case 'is_classic': $this->setIsClassic($value); break;                
                 default:
-                    throw new Exception('Unknown option: ' . $name);
+                    throw new Exception('Unknown option: '.$name);
             }
         }
     }
@@ -183,7 +183,7 @@ 
             'last_modified' => $this->getLastModified(),
             'metrics' => array(),
             'name' => $this->getName(),
-            'schedule' => $this->getSchedule()?$this->getSchedule()->toArray():null,
+            'schedule' => $this->getSchedule() ? $this->getSchedule()->toArray() : null,
             'status' => $this->getStatus(),
             'variations' => array(),
             'id' => $this->getId(),
@@ -205,7 +205,7 @@ 
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
+            if ($value !== null)
                 $cleanedOptions[$name] = $value;
         }
         

lib/WebMarketingROI/OptimizelyPHP/Resource/v2/Event.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
-                $cleanedOptions[$name] = $value;
+            if ($value!==null) {
+                            $cleanedOptions[$name] = $value;
+            }
         }
         
         return $cleanedOptions;

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
                 case 'is_classic': $this->setIsClassic($value); break;
                 case 'is_editable': $this->setIsEditable($value); break;
                 default:
-                    throw new Exception('Unknown option: ' . $name);
+                    throw new Exception('Unknown option: '.$name);
             }
         }
     }
@@ -140,7 +140,7 @@ 
             'category' => $this->getCategory(),
             'created' => $this->getCreated(),
             'description' => $this->getDescription(),
-            'event_filter' => $this->getEventFilter()?$this->getEventFilter()->toArray():null,
+            'event_filter' => $this->getEventFilter() ? $this->getEventFilter()->toArray() : null,
             'event_type' => $this->getEventType(),
             'key' => $this->getKey(),
             'name' => $this->getName(),
@@ -154,7 +154,7 @@ 
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
+            if ($value !== null)
                 $cleanedOptions[$name] = $value;
         }
         

lib/WebMarketingROI/OptimizelyPHP/Resource/v2/VariantResults.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
-                $cleanedOptions[$name] = $value;
+            if ($value!==null) {
+                            $cleanedOptions[$name] = $value;
+            }
         }
         
         return $cleanedOptions;

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
                 case 'value': $this->setValue($value); break;
                 case 'variation_id': $this->setVariationId($value); break;
                 default:
-                    throw new Exception('Unknown option: ' . $name);
+                    throw new Exception('Unknown option: '.$name);
             }
         }
     }
@@ -101,11 +101,11 @@ 
         $options = array(
             'experiment_id' => $this->getExperimentId(),
             'is_baseline' => $this->getIsBaseline(),
-            'lift' => $this->getLift()?$this->getLift()->toArray():null,
+            'lift' => $this->getLift() ? $this->getLift()->toArray() : null,
             'name' => $this->getName(),
             'rate' => $this->getRate(),
             'scope' => $this->getScope(),
-            'total_increase' => $this->getTotalIncrease()?$this->getTotalIncrease()->toArray():null,
+            'total_increase' => $this->getTotalIncrease() ? $this->getTotalIncrease()->toArray() : null,
             'value' => $this->getValue(),
             'variation_id' => $this->getVariationId()
         );
@@ -113,7 +113,7 @@ 
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
+            if ($value !== null)
                 $cleanedOptions[$name] = $value;
         }
         

lib/WebMarketingROI/OptimizelyPHP/Resource/v2/Campaign.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
-                $cleanedOptions[$name] = $value;
+            if ($value!==null) {
+                            $cleanedOptions[$name] = $value;
+            }
         }
         
         return $cleanedOptions;

Spacing +2 added lines, -2 removed lines

@@ -134,7 +134,7 @@ 
                 case 'type': $this->setType($value); break;
                 case 'id': $this->setId($value); break;
                 default:
-                    throw new Exception('Unknown option: ' . $name);
+                    throw new Exception('Unknown option: '.$name);
             }
         }
     }
@@ -172,7 +172,7 @@ 
         // Remove options with empty values
         $cleanedOptions = array();
         foreach ($options as $name=>$value) {
-            if ($value!==null)
+            if ($value !== null)
                 $cleanedOptions[$name] = $value;
         }
         

lib/WebMarketingROI/OptimizelyPHP/Exception.php

Doc Comments -2 removed lines

@@ -82,7 +82,6 @@ 
             
     /**
      * Set HTTP response code.
-     * @param integer $code
      */
     public function setHttpCode($httpCode)
     {
@@ -100,7 +99,6 @@ 
             
     /**
      * Set message
-     * @param string $message
      */
     public function setUuid($uuid)
     {

Braces +15 added lines, -10 removed lines

@@ -55,20 +55,25 @@
     {
         parent::__construct($message, $code);
         
-        if (isset($options['http_code']))
-            $this->setHttpCode($options['http_code']);
+        if (isset($options['http_code'])) {
+                    $this->setHttpCode($options['http_code']);
+        }
                 
-        if (isset($options['uuid']))
-            $this->setUuid($options['uuid']);
+        if (isset($options['uuid'])) {
+                    $this->setUuid($options['uuid']);
+        }
         
-        if (isset($options['rate_limit']))
-            $this->setRateLimit($options['rate_limit']);
+        if (isset($options['rate_limit'])) {
+                    $this->setRateLimit($options['rate_limit']);
+        }
         
-        if (isset($options['rate_limit_remaining']))
-            $this->setRateLimitRemaining($options['rate_limit_remaining']);
+        if (isset($options['rate_limit_remaining'])) {
+                    $this->setRateLimitRemaining($options['rate_limit_remaining']);
+        }
         
-        if (isset($options['rate_limit_reset']))
-            $this->setRateLimitReset($options['rate_limit_reset']);
+        if (isset($options['rate_limit_reset'])) {
+                    $this->setRateLimitReset($options['rate_limit_reset']);
+        }
     }
     
     /**

lib/WebMarketingROI/OptimizelyPHP/OptimizelyApiClient.php

Doc Comments +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
      * @param array $queryParams The list of query parameters.
      * @param string $method HTTP method (GET or POST).
      * @param array $postData Data send in request body (only for POST method).
-     * @return array Optimizely response in form of array.
+     * @return Result Optimizely response in form of array.
      * @throws Exception
      */
     public function sendApiRequest($url, $queryParams = array(), $method='GET', 
@@ -188,7 +188,7 @@ 
      * @param array $queryParams The list of query parameters.
      * @param string $method HTTP method (GET or POST).
      * @param array $postData Data send in request body (only for POST method).
-     * @return array Optimizely response in form of array.
+     * @return Result Optimizely response in form of array.
      * @throws Exception
      */
     private function sendHttpRequest($url, $queryParams = array(), $method='GET', 

Spacing +40 added lines, -40 removed lines

@@ -50,13 +50,13 @@ 
      * @param array $authCredentials Auth credentials.
      * @param string $apiVersion Optional. Currently supported 'v2' only.     
      */
-    public function __construct($authCredentials, $apiVersion='v2')
+    public function __construct($authCredentials, $apiVersion = 'v2')
     {
         if (!is_array($authCredentials)) {
             throw new Exception('Auth credentials must be an array');            
         }
         
-        if ($apiVersion!='v2') {
+        if ($apiVersion != 'v2') {
             throw new Exception('Invalid API version passed');
         }
         
@@ -85,7 +85,7 @@ 
      */
     public function setApiVersion($apiVersion)
     {
-        if ($apiVersion!='v2') {
+        if ($apiVersion != 'v2') {
             throw new Exception('Invalid API version passed');
         }
         
@@ -107,7 +107,7 @@ 
      */
     public function setAuthCredentials($authCredentials)
     {
-        if (!is_array($authCredentials) || count($authCredentials)==0) {
+        if (!is_array($authCredentials) || count($authCredentials) == 0) {
             throw new Exception('Auth credentials must be an array');            
         }
         
@@ -166,16 +166,16 @@ 
      * @return array Optimizely response in form of array.
      * @throws Exception
      */
-    public function sendApiRequest($url, $queryParams = array(), $method='GET', 
+    public function sendApiRequest($url, $queryParams = array(), $method = 'GET', 
             $postData = array())
     {
         // If access token has expired, try to get another one with refresh token.
-        if ($this->isAccessTokenExpired() && $this->getRefreshToken()!=null) {
+        if ($this->isAccessTokenExpired() && $this->getRefreshToken() != null) {
             $this->getAccessTokenByRefreshToken();
         }
         
         // Produce absolute URL
-        $url = 'https://api.optimizely.com/' . $this->apiVersion . $url;
+        $url = 'https://api.optimizely.com/'.$this->apiVersion.$url;
         
         $result = $this->sendHttpRequest($url, $queryParams, $method, $postData);
         
@@ -191,7 +191,7 @@ 
      * @return array Optimizely response in form of array.
      * @throws Exception
      */
-    private function sendHttpRequest($url, $queryParams = array(), $method='GET', 
+    private function sendHttpRequest($url, $queryParams = array(), $method = 'GET', 
             $postData = array())
     {
         // Reset diagnostics info.
@@ -199,41 +199,41 @@ 
         
         // Check if CURL is initialized (it should have been initialized in 
         // constructor).
-        if ($this->curlHandle==false) {
+        if ($this->curlHandle == false) {
             throw new Exception('CURL is not initialized', 
                     Exception::CODE_CURL_ERROR);
         }
         
-        if ($method!='GET' && $method!='POST' && $method!='PUT' && 
-            $method!='PATCH' && $method!='DELETE') {
-            throw new Exception('Invalid HTTP method passed: ' . $method);
+        if ($method != 'GET' && $method != 'POST' && $method != 'PUT' && 
+            $method != 'PATCH' && $method != 'DELETE') {
+            throw new Exception('Invalid HTTP method passed: '.$method);
         }
         
         if (!isset($this->authCredentials['access_token'])) {
-            throw new Exception('OAuth access token is not set. You should pass ' . 
+            throw new Exception('OAuth access token is not set. You should pass '. 
                     'it to the class constructor when initializing the Optimizely client.');
         }
                 
         // Append query parameters to URL.
-        if (count($queryParams)!=0) {            
+        if (count($queryParams) != 0) {            
             $query = http_build_query($queryParams);
-            $url .= '?' . $query;
+            $url .= '?'.$query;
         }
         
         $headers = array(
-            "Authorization: Bearer " . $this->authCredentials['access_token'],
+            "Authorization: Bearer ".$this->authCredentials['access_token'],
             "Content-Type: application/json"
             );
         $content = '';
-        if (count($postData)!=0) {
+        if (count($postData) != 0) {
             $content = json_encode($postData);            
         }
-        $headers[] = "Content-length:" . strlen($content);            
+        $headers[] = "Content-length:".strlen($content);            
         
         // Set HTTP options.
         curl_setopt($this->curlHandle, CURLOPT_URL, $url);
         curl_setopt($this->curlHandle, CURLOPT_CUSTOMREQUEST, $method);        
-        if (count($postData)!=0) {
+        if (count($postData) != 0) {
             curl_setopt($this->curlHandle, CURLOPT_POSTFIELDS, $content);            
         }
         curl_setopt($this->curlHandle, CURLOPT_RETURNTRANSFER, true);
@@ -251,7 +251,7 @@ 
         if ($result === false) {
             $code = curl_errno($this->curlHandle);
             $error = curl_error($this->curlHandle);
-            throw new Exception("Failed to send HTTP request $method '$url', " . 
+            throw new Exception("Failed to send HTTP request $method '$url', ". 
                     "the error code was $code, error message was: '$error'", 
                     Exception::CODE_CURL_ERROR, $code, $error);
         }        
@@ -265,12 +265,12 @@ 
         $headers = explode("\n", $headers);
         $parsedHeaders = array();
         foreach ($headers as $i=>$header) {
-            if ($i==0)
+            if ($i == 0)
                 continue; // Skip first line (http code).
             $pos = strpos($header, ':');
-            if ($pos!=false) {
+            if ($pos != false) {
                 $headerName = trim(strtolower(substr($header, 0, $pos)));
-                $headerValue = trim(substr($header, $pos+1));
+                $headerValue = trim(substr($header, $pos + 1));
                 $parsedHeaders[$headerName] = $headerValue;
             }
         }
@@ -302,21 +302,21 @@ 
         
         // JSON-decode payload.
         $decodedPayload = json_decode($body, true);
-        if ($decodedPayload===false) {
-            throw new Exception('Could not JSON-decode the Optimizely API response. Request was ' . 
-                    $method . ' "' . $url . '". The response was: "' . $body . '"',
+        if ($decodedPayload === false) {
+            throw new Exception('Could not JSON-decode the Optimizely API response. Request was '. 
+                    $method.' "'.$url.'". The response was: "'.$body.'"',
                     Exception::CODE_API_ERROR, array('http_code'=>$httpCode));
         }
         
         // Check HTTP response code.
-        if ($httpCode<200 || $httpCode>299) {
+        if ($httpCode < 200 || $httpCode > 299) {
             
             if (!isset($decodedPayload['message']) || 
                 !isset($decodedPayload['code']) ||
                 !isset($decodedPayload['uuid']) ||
                 $httpCode != !isset($decodedPayload['code'])) {
-                throw new Exception('Optimizely API responded with error code ' . $httpCode . 
-                    ', but response format was unexpected. Request was ' . $method . ' "' . $url . '". Response was "' . $body . '"',
+                throw new Exception('Optimizely API responded with error code '.$httpCode. 
+                    ', but response format was unexpected. Request was '.$method.' "'.$url.'". Response was "'.$body.'"',
                     Exception::CODE_API_ERROR, array(
                         'http_code' => $httpCode,
                         'rate_limit' => $rateLimit,
@@ -348,7 +348,7 @@ 
             $matched = preg_match_all('/<(.+)>;\s+rel=(\w+)(,|\z)/U', 
                     $parsedHeaders['link'], $matches, PREG_SET_ORDER);
             if (!$matched) {
-                throw new Exception('Error parsing LINK header: ' . 
+                throw new Exception('Error parsing LINK header: '. 
                         $parsedHeaders['link'], Exception::CODE_API_ERROR, $httpCode);
             }
             
@@ -358,22 +358,22 @@ 
                 $rel = $match[2];
                 
                 $matched = preg_match('/page=(\d+)/U', $url, $pageMatches);
-                if (!$matched || count($pageMatches)!=2) {
-                    throw new Exception('Error extracting page argument while parsing LINK header: ' . 
+                if (!$matched || count($pageMatches) != 2) {
+                    throw new Exception('Error extracting page argument while parsing LINK header: '. 
                             $parsedHeaders['link'], Exception::CODE_API_ERROR, 
                             array('http_code'=>$httpCode));
                 }
                 
                 $pageNumber = $pageMatches[1];
                 
-                if ($rel=='prev') {
+                if ($rel == 'prev') {
                     $result->setPrevPage($pageNumber);
-                } else if ($rel=='next') {
+                } else if ($rel == 'next') {
                     $result->setNextPage($pageNumber);
-                } else if ($rel=='last') {
+                } else if ($rel == 'last') {
                     $result->setLastPage($pageNumber);
                 } else {
-                    throw new Exception('Unexpected rel argument while parsing LINK header: ' . 
+                    throw new Exception('Unexpected rel argument while parsing LINK header: '. 
                             $parsedHeaders['link'], Exception::CODE_API_ERROR, 
                             array('http_code'=>$httpCode));
                 }
@@ -391,7 +391,7 @@ 
      */
     private function isAccessTokenExpired() 
     {
-        if(!isset($this->authCredentials['access_token'])) {
+        if (!isset($this->authCredentials['access_token'])) {
             return true; // We do not have access token.
         }
         
@@ -432,15 +432,15 @@ 
         $clientSecret = $this->authCredentials['client_secret'];
         $refreshToken = $this->authCredentials['refresh_token'];
         
-        $url = "https://app.optimizely.com/oauth2/token?refresh_token=$refreshToken" . 
+        $url = "https://app.optimizely.com/oauth2/token?refresh_token=$refreshToken". 
                 "&client_id=$clientId&client_secret=$clientSecret&grant_type=refresh_token";
         
         $response = $this->sendHttpRequest($url, array(), 'POST');
         $decodedJsonData = $response->getDecodedJsonData();
         
         if (!isset($decodedJsonData['access_token'])) {
-            throw new Exception('Not found access token in response. Request URL was "' . 
-                    $url. '". Response was "' . print_r(json_encode($decodedJsonData), true). '"',
+            throw new Exception('Not found access token in response. Request URL was "'. 
+                    $url.'". Response was "'.print_r(json_encode($decodedJsonData), true).'"',
                     Exception::CODE_API_ERROR, $response->getHttpCode());
         }
         

Braces +13 added lines, -8 removed lines

@@ -265,8 +265,10 @@ 
         $headers = explode("\n", $headers);
         $parsedHeaders = array();
         foreach ($headers as $i=>$header) {
-            if ($i==0)
-                continue; // Skip first line (http code).
+            if ($i==0) {
+                            continue;
+            }
+            // Skip first line (http code).
             $pos = strpos($header, ':');
             if ($pos!=false) {
                 $headerName = trim(strtolower(substr($header, 0, $pos)));
@@ -419,14 +421,17 @@ 
      */
     private function getAccessTokenByRefreshToken()
     {
-        if (!isset($this->authCredentials['client_id']))
-            throw new Exception('OAuth 2.0 client ID is not set');
+        if (!isset($this->authCredentials['client_id'])) {
+                    throw new Exception('OAuth 2.0 client ID is not set');
+        }
         
-        if (!isset($this->authCredentials['client_secret']))
-            throw new Exception('OAuth 2.0 client secret is not set');
+        if (!isset($this->authCredentials['client_secret'])) {
+                    throw new Exception('OAuth 2.0 client secret is not set');
+        }
         
-        if (!isset($this->authCredentials['refresh_token']))
-            throw new Exception('Refresh token is not set');
+        if (!isset($this->authCredentials['refresh_token'])) {
+                    throw new Exception('Refresh token is not set');
+        }
         
         $clientId = $this->authCredentials['client_id'];
         $clientSecret = $this->authCredentials['client_secret'];

lib/WebMarketingROI/OptimizelyPHP/Result.php

Doc Comments -3 removed lines

@@ -70,8 +70,6 @@ 
     /**
      * Constructor.
      * @param array $decodedJsonData
-     * @param string $rawHttpResponseData
-     * @param array[string] $rawHttpResponseHeaders
      */
     public function __construct($decodedJsonData, $httpCode)
     {
@@ -90,7 +88,6 @@ 
             
     /**
      * Set HTTP response code.
-     * @param integer $code
      */
     public function setHttpCode($httpCode)
     {

tests/OptimizelyPHPTest/Service/v2/PagesTest.php

Spacing +4 added lines, -4 removed lines

@@ -42,9 +42,9 @@ 
         $result = $pagesService->listAll(1000);
         $pages = $result->getPayload();
         
-        $this->assertTrue(count($pages)==1);
+        $this->assertTrue(count($pages) == 1);
         $this->assertTrue($pages[0] instanceOf Page);
-        $this->assertTrue($pages[0]->getName()=='Home Page');        
+        $this->assertTrue($pages[0]->getName() == 'Home Page');        
     }
     
     public function testGet()
@@ -127,7 +127,7 @@ 
         $createdPage = $result->getPayload();
         
         $this->assertTrue($createdPage instanceOf Page);
-        $this->assertTrue($createdPage->getName()=='Home Page');                
+        $this->assertTrue($createdPage->getName() == 'Home Page');                
     }
     
     public function testUpdate()
@@ -175,7 +175,7 @@ 
         $updatedPage = $result->getPayload();
         
         $this->assertTrue($updatedPage instanceOf Page);
-        $this->assertTrue($updatedPage->getName()=='Home Page');                  
+        $this->assertTrue($updatedPage->getName() == 'Home Page');                  
     }
     
     public function testDelete()