webmarketingroi / optimizely-php

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

Braces +3 added lines, -2 removed lines

@@ -91,8 +91,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

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

tests/OptimizelyPHPTest/Service/v2/BaseServiceTest.php

Indentation +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         $credentials = file_get_contents(dirname(__FILE__) . '/../../../auth_credentials.json');
         if ($credentials===false) {
             $this->fail("Couldn't read OAuth credentials from auth_credentials.json. Make sure " .
-                 "the file exists (if not, copy from auth_credentials.json.dist).");
+                    "the file exists (if not, copy from auth_credentials.json.dist).");
         }
 
         $credentials = json_decode($credentials, true);

Spacing +5 added lines, -5 removed lines

@@ -8,9 +8,9 @@ 
     public function loadCredentialsFromFile()
     {
         // Get OAuth 2.0 credentials from auth_credentials.json file.
-        $credentials = file_get_contents(dirname(__FILE__) . '/../../../auth_credentials.json');
-        if ($credentials===false) {
-            $this->fail("Couldn't read OAuth credentials from auth_credentials.json. Make sure " .
+        $credentials = file_get_contents(dirname(__FILE__).'/../../../auth_credentials.json');
+        if ($credentials === false) {
+            $this->fail("Couldn't read OAuth credentials from auth_credentials.json. Make sure ".
                  "the file exists (if not, copy from auth_credentials.json.dist).");
         }
 
@@ -20,8 +20,8 @@ 
         }
 
         // Try to read access_token.json and merge it with the rest of credentials.
-        if (is_readable(dirname(__FILE__) . '/../../../access_token.json')) {
-            $accessToken = file_get_contents(dirname(__FILE__) . '/access_token.json');
+        if (is_readable(dirname(__FILE__).'/../../../access_token.json')) {
+            $accessToken = file_get_contents(dirname(__FILE__).'/access_token.json');
 
             $accessToken = json_decode($accessToken, true);
             if (!is_array($accessToken)) {

tests/OptimizelyPHPTest/Service/v2/ProjectsTest.php

Indentation +44 added lines, -44 removed lines

@@ -109,16 +109,16 @@ 
                             "platform" => "web",
                             "status" => "active",
                             "web_snippet" => array(
-                              "enable_force_variation" => false,
-                              "exclude_disabled_experiments" => false,
-                              "exclude_names" => true,
-                              "include_jquery" => true,
-                              "ip_anonymization" => false,
-                              "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
-                              "library" => "jquery-1.11.3-trim",
-                              "project_javascript" => "alert(\"Active Experiment\")",
-                              "code_revision" => 0,
-                              "js_file_size" => 63495
+                                "enable_force_variation" => false,
+                                "exclude_disabled_experiments" => false,
+                                "exclude_names" => true,
+                                "include_jquery" => true,
+                                "ip_anonymization" => false,
+                                "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
+                                "library" => "jquery-1.11.3-trim",
+                                "project_javascript" => "alert(\"Active Experiment\")",
+                                "code_revision" => 0,
+                                "js_file_size" => 63495
                             ),
                             "created" => "2016-10-17T07:04:59.991Z",
                             "id" => 1000,
@@ -137,14 +137,14 @@ 
             "platform" => "web",
             "status" => "active",
             "web_snippet" => array(
-              "enable_force_variation" => false,
-              "exclude_disabled_experiments" => false,
-              "exclude_names" => true,
-              "include_jquery" => true,
-              "ip_anonymization" => false,
-              "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
-              "library" => "jquery-1.11.3-trim",
-              "project_javascript" => "alert(\"Active Experiment\")"
+                "enable_force_variation" => false,
+                "exclude_disabled_experiments" => false,
+                "exclude_names" => true,
+                "include_jquery" => true,
+                "ip_anonymization" => false,
+                "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
+                "library" => "jquery-1.11.3-trim",
+                "project_javascript" => "alert(\"Active Experiment\")"
             )
         ));
         
@@ -173,16 +173,16 @@ 
                             "platform" => "web",
                             "status" => "active",
                             "web_snippet" => array(
-                              "enable_force_variation" => false,
-                              "exclude_disabled_experiments" => false,
-                              "exclude_names" => true,
-                              "include_jquery" => true,
-                              "ip_anonymization" => false,
-                              "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
-                              "library" => "jquery-1.11.3-trim",
-                              "project_javascript" => "alert(\"Active Experiment\")",
-                              "code_revision" => 0,
-                              "js_file_size" => 63495
+                                "enable_force_variation" => false,
+                                "exclude_disabled_experiments" => false,
+                                "exclude_names" => true,
+                                "include_jquery" => true,
+                                "ip_anonymization" => false,
+                                "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
+                                "library" => "jquery-1.11.3-trim",
+                                "project_javascript" => "alert(\"Active Experiment\")",
+                                "code_revision" => 0,
+                                "js_file_size" => 63495
                             ),
                             "created" => "2016-10-17T07:04:59.999Z",
                             "id" => 1000,
@@ -199,14 +199,14 @@ 
             "name" => "Test Project",
             "status" => "active",
             "web_snippet" => array(
-              "enable_force_variation" => false,
-              "exclude_disabled_experiments" => false,
-              "exclude_names" => true,
-              "include_jquery" => true,
-              "ip_anonymization" => false,
-              "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
-              "library" => "jquery-1.11.3-trim",
-              "project_javascript" => "alert(\"Active Experiment\")"
+                "enable_force_variation" => false,
+                "exclude_disabled_experiments" => false,
+                "exclude_names" => true,
+                "include_jquery" => true,
+                "ip_anonymization" => false,
+                "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
+                "library" => "jquery-1.11.3-trim",
+                "project_javascript" => "alert(\"Active Experiment\")"
             )
         ));
         
@@ -236,14 +236,14 @@ 
             "platform" => "web",
             "status" => "active",
             "web_snippet" => array(
-              "enable_force_variation" => false,
-              "exclude_disabled_experiments" => false,
-              "exclude_names" => true,
-              "include_jquery" => true,
-              "ip_anonymization" => false,
-              "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
-              "library" => "jquery-1.11.3-trim",
-              "project_javascript" => "alert(\"Active Experiment\")"
+                "enable_force_variation" => false,
+                "exclude_disabled_experiments" => false,
+                "exclude_names" => true,
+                "include_jquery" => true,
+                "ip_anonymization" => false,
+                "ip_filter" => "^206\\.23\\.100\\.([5-9][0-9]|1([0-4][0-9]|50))$",
+                "library" => "jquery-1.11.3-trim",
+                "project_javascript" => "alert(\"Active Experiment\")"
             )
         ));
         

Braces +8 added lines, -8 removed lines

@@ -324,8 +324,9 @@ 
     
     public function testIntegration()
     {
-        if (!getenv('OPTIMIZELY_PHP_TEST_INTEGRATION')) 
-            $this->markTestSkipped('OPTIMIZELY_PHP_TEST_INTEGRATION env var is not set');
+        if (!getenv('OPTIMIZELY_PHP_TEST_INTEGRATION')) {
+                    $this->markTestSkipped('OPTIMIZELY_PHP_TEST_INTEGRATION env var is not set');
+        }
         
         $credentials = $this->loadCredentialsFromFile();
         
@@ -387,13 +388,13 @@ 
                     }
                 }
 
-                if ($result->getNextPage()==null)
-                    break;
+                if ($result->getNextPage()==null) {
+                                    break;
+                }
 
                 $page ++;
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             // Handle error.
             $code = $e->getCode();
             $httpCode = $e->getHttpCode();
@@ -407,8 +408,7 @@ 
         // Try a non-existing project by ID - assume failure
         try {
             $result = $optimizelyClient->projects()->get(12345678);        
-        } 
-        catch(Exception $e) {
+        } catch(Exception $e) {
             //print_r($optimizelyClient->getDiagnosticsInfo());
             $this->assertEquals(Exception::CODE_API_ERROR, $e->getCode());
             $this->assertEquals('not_found', $e->getHttpCode());

Spacing +14 added lines, -14 removed lines

@@ -51,9 +51,9 @@ 
         $result = $projectsService->listAll();
         $projects = $result->getPayload();
         
-        $this->assertTrue(count($projects)==1);
+        $this->assertTrue(count($projects) == 1);
         $this->assertTrue($projects[0] instanceOf Project);
-        $this->assertTrue($projects[0]->getName()=='Some Optimizely Project');        
+        $this->assertTrue($projects[0]->getName() == 'Some Optimizely Project');        
     }
     
     /**
@@ -126,7 +126,7 @@ 
         $project = $result->getPayload();
         
         $this->assertTrue($project instanceOf Project);
-        $this->assertTrue($project->getName()=='Some Optimizely Project');        
+        $this->assertTrue($project->getName() == 'Some Optimizely Project');        
     }
     
     /**
@@ -206,8 +206,8 @@ 
         $createdProject = $result->getPayload();
         
         $this->assertTrue($createdProject instanceOf Project);
-        $this->assertTrue($createdProject->getName()=='Test Project');        
-        $this->assertTrue($createdProject->getAccountId()==12345);        
+        $this->assertTrue($createdProject->getName() == 'Test Project');        
+        $this->assertTrue($createdProject->getAccountId() == 12345);        
     }
     
     /**
@@ -286,8 +286,8 @@ 
         $updatedProject = $result->getPayload();
         
         $this->assertTrue($updatedProject instanceOf Project);
-        $this->assertTrue($updatedProject->getName()=='Test Project');        
-        $this->assertTrue($updatedProject->getAccountId()==12345);        
+        $this->assertTrue($updatedProject->getName() == 'Test Project');        
+        $this->assertTrue($updatedProject->getAccountId() == 12345);        
     }
     
     /**
@@ -330,7 +330,7 @@ 
         $credentials = $this->loadCredentialsFromFile();
         
         $optimizelyClient = new OptimizelyApiClient($credentials, 'v2');
-        $this->assertTrue($optimizelyClient!=null);
+        $this->assertTrue($optimizelyClient != null);
                 
         // Create new project        
         $curDate = date('Y-m-d H:i:s');
@@ -381,18 +381,18 @@ 
                 $projects = $result->getPayload();
 
                 foreach ($projects as $project) {
-                    echo "Name: " . $project->getName() . "\n";
-                    if ($project->getName()=="Test Project $curDate") {
+                    echo "Name: ".$project->getName()."\n";
+                    if ($project->getName() == "Test Project $curDate") {
                         $projectId = $project->getId();
                         $projectFound = true;
                         break;
                     }
                 }
 
-                if ($result->getNextPage()==null)
+                if ($result->getNextPage() == null)
                     break;
 
-                $page ++;
+                $page++;
             }
         }
         catch (Exception $e) {
@@ -410,11 +410,11 @@ 
         try {
             $result = $optimizelyClient->projects()->get(12345678);        
         } 
-        catch(Exception $e) {
+        catch (Exception $e) {
             //print_r($optimizelyClient->getDiagnosticsInfo());
             $this->assertEquals(Exception::CODE_API_ERROR, $e->getCode());
             $this->assertEquals('not_found', $e->getHttpCode());
-            $this->assertTrue(strlen($e->getUuid())!=0);
+            $this->assertTrue(strlen($e->getUuid()) != 0);
             //$this->assertTrue($e->getRateLimit()>0);
             //$this->assertTrue($e->getRateLimitRemaining()>0);
             //$this->assertTrue($e->getRateLimitReset()>0);

tests/OptimizelyPHPTest/Resource/v2/CampaignResultsTest.php

Indentation +36 added lines, -36 removed lines

@@ -13,47 +13,47 @@ 
             "confidence_threshold" => 0,
             "end_time" => "2016-10-14T05:08:42.966Z",
             "metrics" => array(
-              array(
+                array(
                 "event" => "string",
                 "event_name" => "string",
                 "measure" => "conversions",
                 "metric_id" => "string",
                 "priority" => 0,
                 "results" => array(
-                  "campaign" => array(
+                    "campaign" => array(
                     "experiment_id" => 0,
                     "is_baseline" => true,
                     "lift" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "name" => "Blue Button",
                     "rate" => 0,
                     "scope" => "variation",
                     "total_increase" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "value" => 0,
                     "variation_id" => "string"
-                  )
+                    )
                 ),
                 "unit" => "session"
-              )
+                )
             ),
             "start_time" => "2016-10-14T05:08:42.967Z"
         );
@@ -71,47 +71,47 @@ 
             "confidence_threshold" => 0,
             "end_time" => "2016-10-14T05:08:42.966Z",
             "metrics" => array(
-              array(
+                array(
                 "event" => "string",
                 "event_name" => "string",
                 "measure" => "conversions",
                 "metric_id" => "string",
                 "priority" => 0,
                 "results" => array(
-                  "campaign" => array(
+                    "campaign" => array(
                     "experiment_id" => 0,
                     "is_baseline" => true,
                     "lift" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "name" => "Blue Button",
                     "rate" => 0,
                     "scope" => "variation",
                     "total_increase" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "value" => 0,
                     "variation_id" => "string"
-                  )
+                    )
                 ),
                 "unit" => "session"
-              )
+                )
             ),
             "start_time" => "2016-10-14T05:08:42.967Z"
         );

tests/OptimizelyPHPTest/Resource/v2/AudienceTest.php

Indentation +14 added lines, -14 removed lines

@@ -14,12 +14,12 @@ 
         $audience->setConditions(array(
             "and",
             array(
-              "value" => "es",
-              "type" => "language"
+                "value" => "es",
+                "type" => "language"
             ),
             array(
-              "value" => "US-CA-SANFRANCISCO",
-              "type" => "location"
+                "value" => "US-CA-SANFRANCISCO",
+                "type" => "location"
             )
         ));
         $audience->setDescription('People that speak spanish and are in San Francisco');
@@ -46,15 +46,15 @@ 
             "project_id" => 1000,
             "archived" => false,
             "conditions" => array(
-              "and",
-              array(
+                "and",
+                array(
                 "value" => "es",
                 "type" => "language"
-              ),
-              array(
+                ),
+                array(
                 "value" => "US-CA-SANFRANCISCO",
                 "type" => "location"
-              )
+                )
             ),
             "description" => "People that speak spanish and are in San Francisco",
             "name" => "Spanish speaking San Franciscans",
@@ -77,15 +77,15 @@ 
             "project_id" => 1000,
             "archived" => false,
             "conditions" => array(
-              "and",
-              array(
+                "and",
+                array(
                 "value" => "es",
                 "type" => "language"
-              ),
-              array(
+                ),
+                array(
                 "value" => "US-CA-SANFRANCISCO",
                 "type" => "location"
-              )
+                )
             ),
             "description" => "People that speak spanish and are in San Francisco",
             "name" => "Spanish speaking San Franciscans",

tests/OptimizelyPHPTest/Resource/v2/ExperimentResultsTest.php

Indentation +58 added lines, -58 removed lines

@@ -13,7 +13,7 @@ 
             "end_time" => "2016-10-14T05:08:43.031Z",
             "experiment_id" => 3000,
             "metrics" => array(
-              array(
+                array(
                 "event" => "string",
                 "event_name" => "string",
                 "measure" => "conversions",
@@ -21,54 +21,54 @@ 
                 "priority" => 1,
                 "unit" => "session",
                 "variation_results" => array(
-                  "9000" => array(
+                    "9000" => array(
                     "experiment_id" => 0,
                     "is_baseline" => true,
                     "lift" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "name" => "Blue Button",
                     "rate" => 0,
                     "scope" => "variation",
                     "total_increase" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "value" => 0,
                     "variation_id" => "string"
-                  )
+                    )
+                )
                 )
-              )
             ),
             "reach" => array(
-              "baseline_count" => 0,
-              "baseline_reach" => 0,
-              "total_count" => 0,
-              "treatment_count" => 0,
-              "treatment_reach" => 0,
-              "variations" => array(
+                "baseline_count" => 0,
+                "baseline_reach" => 0,
+                "total_count" => 0,
+                "treatment_count" => 0,
+                "treatment_reach" => 0,
+                "variations" => array(
                 "9000" => array(
-                  "count" => 0,
-                  "name" => "Blue Button",
-                  "variation_id" => "string",
-                  "variation_reach" => 0
+                    "count" => 0,
+                    "name" => "Blue Button",
+                    "variation_id" => "string",
+                    "variation_reach" => 0
+                )
                 )
-              )
             ),
             "start_time" => "2016-10-14T05:08:43.032Z"
         );
@@ -86,7 +86,7 @@ 
             "end_time" => "2016-10-14T05:08:43.031Z",
             "experiment_id" => 3000,
             "metrics" => array(
-              array(
+                array(
                 "event" => "string",
                 "event_name" => "string",
                 "measure" => "conversions",
@@ -94,54 +94,54 @@ 
                 "priority" => 1,
                 "unit" => "session",
                 "variation_results" => array(
-                  "9000" => array(
+                    "9000" => array(
                     "experiment_id" => 0,
                     "is_baseline" => true,
                     "lift" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "name" => "Blue Button",
                     "rate" => 0,
                     "scope" => "variation",
                     "total_increase" => array(
-                      "confidence_interval" => array(
+                        "confidence_interval" => array(
                         0.010399560300730457,
                         0.0850821459929161
-                      ),
-                      "is_most_conclusive" => true,
-                      "is_significant" => true,
-                      "significance" => 0,
-                      "value" => 0,
-                      "visitors_remaining" => 0
+                        ),
+                        "is_most_conclusive" => true,
+                        "is_significant" => true,
+                        "significance" => 0,
+                        "value" => 0,
+                        "visitors_remaining" => 0
                     ),
                     "value" => 0,
                     "variation_id" => "string"
-                  )
+                    )
+                )
                 )
-              )
             ),
             "reach" => array(
-              "baseline_count" => 0,
-              "baseline_reach" => 0,
-              "total_count" => 0,
-              "treatment_count" => 0,
-              "treatment_reach" => 0,
-              "variations" => array(
+                "baseline_count" => 0,
+                "baseline_reach" => 0,
+                "total_count" => 0,
+                "treatment_count" => 0,
+                "treatment_reach" => 0,
+                "variations" => array(
                 "9000" => array(
-                  "count" => 0,
-                  "name" => "Blue Button",
-                  "variation_id" => "string",
-                  "variation_reach" => 0
+                    "count" => 0,
+                    "name" => "Blue Button",
+                    "variation_id" => "string",
+                    "variation_reach" => 0
+                )
                 )
-              )
             ),
             "start_time" => "2016-10-14T05:08:43.032Z"
         );

tests/OptimizelyPHPTest/Resource/v2/EventTest.php

Indentation +4 added lines, -4 removed lines

@@ -43,8 +43,8 @@ 
             "category" => "add_to_cart",
             "description" => "Item added to cart",
             "event_filter" => array(
-              "filter_type" => "target_selector",
-              "selector" => ".menu-options"
+                "filter_type" => "target_selector",
+                "selector" => ".menu-options"
             ),
             "event_type" => "custom",
             "key" => "add_to_cart",
@@ -73,8 +73,8 @@ 
             "category" => "add_to_cart",
             "description" => "Item added to cart",
             "event_filter" => array(
-              "filter_type" => "target_selector",
-              "selector" => ".menu-options"
+                "filter_type" => "target_selector",
+                "selector" => ".menu-options"
             ),
             "event_type" => "custom",
             "key" => "add_to_cart",

examples/Utils.php

Spacing +5 added lines, -5 removed lines

@@ -13,9 +13,9 @@ 
 function load_credentials_from_file()
 {
     // Get OAuth 2.0 credentials from auth_credentials.json file.
-    $credentials = file_get_contents(dirname(__FILE__) . '/auth_credentials.json');
-    if ($credentials===false) {
-        throw new \Exception("Couldn't read OAuth credentials from auth_credentials.json. Make sure " .
+    $credentials = file_get_contents(dirname(__FILE__).'/auth_credentials.json');
+    if ($credentials === false) {
+        throw new \Exception("Couldn't read OAuth credentials from auth_credentials.json. Make sure ".
              "the file exists (if not, copy from auth_credentials.json.dist).");
     }
 
@@ -25,8 +25,8 @@ 
     }
 
     // Try to read access_token.json and merge it with the rest of credentials.
-    if (is_readable(dirname(__FILE__) . '/access_token.json')) {
-        $accessToken = file_get_contents(dirname(__FILE__) . '/access_token.json');
+    if (is_readable(dirname(__FILE__).'/access_token.json')) {
+        $accessToken = file_get_contents(dirname(__FILE__).'/access_token.json');
 
         $accessToken = json_decode($accessToken, true);
         if (!is_array($accessToken)) {

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     $credentials = file_get_contents(dirname(__FILE__) . '/auth_credentials.json');
     if ($credentials===false) {
         throw new \Exception("Couldn't read OAuth credentials from auth_credentials.json. Make sure " .
-             "the file exists (if not, copy from auth_credentials.json.dist).");
+                "the file exists (if not, copy from auth_credentials.json.dist).");
     }
 
     $credentials = json_decode($credentials, true);

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', 

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'];

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 non-empty 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,36 +199,36 @@ 
         
         // 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);            
         
         // Reset CURL state.
         if (!function_exists('curl_reset')) {
@@ -241,7 +241,7 @@ 
         // 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);
@@ -260,7 +260,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);
         }        
@@ -274,12 +274,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;
             }
         }
@@ -311,20 +311,20 @@ 
         
         // 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'])) {
-                throw new Exception('Optimizely API responded with error code ' . $httpCode . 
-                    '. Request was ' . $method . ' "' . $url . '". Response was "' . $body . '"',
+                throw new Exception('Optimizely API responded with error code '.$httpCode. 
+                    '. Request was '.$method.' "'.$url.'". Response was "'.$body.'"',
                     Exception::CODE_API_ERROR, array(
                         'http_code' => $httpCode,
                         'rate_limit' => $rateLimit,
@@ -356,7 +356,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);
             }
             
@@ -366,22 +366,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));
                 }
@@ -399,7 +399,7 @@ 
      */
     private function isAccessTokenExpired() 
     {
-        if(!isset($this->authCredentials['access_token'])) {
+        if (!isset($this->authCredentials['access_token'])) {
             return true; // We do not have access token.
         }
         
@@ -440,15 +440,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());
         }