ijeffro / laralocker

src/LearningLocker/Stores/StoreHandler.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      *
      * @return  $response
      */
-    public function get($selected = []) {
+    public function get($selected = [ ]) {
         try {
             $url = $this->url . $this->api . $this->v2 . $this->store . '/' . $this->id ?? $this->id;
             $response = $this->request($url);

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
             $url = $this->url . $this->api . $this->v2 . $this->store . '/' . $this->id ?? $this->id;
             $response = $this->request($url);
 
-            if ($selected) $response = $this->select($selected, $response);
+            if ($selected) {
+                $response = $this->select($selected, $response);
+            }
 
             return $response;
 

src/LearningLocker/Dashboards/DashboardHandler.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     private $v2 = '/v2';
 
     protected $headers = [
-      'Content-Type' => 'application/json'
+        'Content-Type' => 'application/json'
     ];
 
     public function __construct($id = null) {

src/LearningLocker/Dashboards/DashboardInterface.php

Indentation +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 namespace Ijeffro\Laralocker\LearningLocker\Dashboards;
 
 interface DashboardInterface {
-  function get();
+    function get();
 }

src/LearningLocker/Connection.php

Indentation +17 added lines, -17 removed lines

@@ -18,16 +18,16 @@ 
 
 class Connection {
 
-  protected $org;
-  protected $url;
-  protected $key;
-  protected $secret;
-  protected $headers;
-  protected $settings;
-  protected $endpoint;
-  protected $connection;
-
-  public function __construct($key = null, $secret = null, $url = null) {
+    protected $org;
+    protected $url;
+    protected $key;
+    protected $secret;
+    protected $headers;
+    protected $settings;
+    protected $endpoint;
+    protected $connection;
+
+    public function __construct($key = null, $secret = null, $url = null) {
     // $this->org = $org;
     // $this->settings = $settings;
     // $this->endpoint = $settings[LearningLocker::URL] ?? null;
@@ -43,17 +43,17 @@ 
         'Content-Type' => 'application/json'
     ];
 
-  }
+    }
 
-  protected function client() {
+    protected function client() {
     return new Client();
-  }
+    }
 
-  protected function auth() {
+    protected function auth() {
     return [$this->key, $this->secret];
-  }
+    }
 
-  protected function headers() {
+    protected function headers() {
     return $this->headers;
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
   }
 
   protected function auth() {
-    return [$this->key, $this->secret];
+    return [ $this->key, $this->secret ];
   }
 
   protected function headers() {

src/LearningLocker/Client/Client.php

Indentation +15 added lines, -15 removed lines

@@ -6,39 +6,39 @@
 
 class Client extends Connection {
   
-  private $client = '/client';
-  private $api = '/api';
-  private $v2 = '/v2';
+    private $client = '/client';
+    private $api = '/api';
+    private $v2 = '/v2';
   
-  private $headers = [
+    private $headers = [
     'content-type' => 'application/json'
-  ];
+    ];
 
 
-  public function check() {
+    public function check() {
     try {
-      $request = $this->get();
+        $request = $this->get();
     } catch (Exception $e) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
-  public function get() {
+    public function get() {
     $url = $this->endpoint . $this->api . $this->v2 . $this->client . '/';
     $request = $this->getClient()->get($url, [
-      'auth' => $this->getAuth(),
-      'headers' => [
+        'auth' => $this->getAuth(),
+        'headers' => [
         'content-type' => 'application/json'
-      ],
+        ],
     ]);
 
     if($request->getStatusCode() === 404) {
-      throw new Exception('There was a issue connecting to Learning Locker.');
+        throw new Exception('There was a issue connecting to Learning Locker.');
     }
 
     $response = $request->json();
 
     return true;
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
       ],
     ]);
 
-    if($request->getStatusCode() === 404) {
+    if ($request->getStatusCode() === 404) {
       throw new Exception('There was a issue connecting to Learning Locker.');
     }
 

src/LearningLocker/Client/ClientHandler.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      *
      * @return  $response
      */
-    public function get($selected = []) {
+    public function get($selected = [ ]) {
         try {
             $url = $this->url . $this->api . $this->v2 . $this->client . '/' . $this->id ??  $this->id;
             $response = $this->request($url);

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
             $url = $this->url . $this->api . $this->v2 . $this->client . '/' . $this->id ??  $this->id;
             $response = $this->request($url);
 
-            if ($selected) $response = $this->select($selected, $response);
+            if ($selected) {
+                $response = $this->select($selected, $response);
+            }
 
             return $response;
         } catch (Exception $e) {

src/LearningLocker/Exports/ExportHandler.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     private $v2 = '/v2';
 
     protected $headers = [
-      'content-type' => 'application/json'
+        'content-type' => 'application/json'
     ];
 
     function __construct($id = null) {

src/LearningLocker/Exports/ExportInterface.php

Indentation +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 namespace Ijeffro\Laralocker\LearningLocker\Exports;
 
 interface ExportInterface {
-  function get();
+    function get();
 }

src/LearningLocker/Statements/StatementGenerator.php

Indentation +125 added lines, -125 removed lines

@@ -34,26 +34,26 @@ 
 
     public function __construct( $endpoints=array() ) {
 
-      $this->log = \App::make('xapi.log');
-      $this->endpoints = $endpoints;
+        $this->log = \App::make('xapi.log');
+        $this->endpoints = $endpoints;
     }
 
     /**
-  * Checks a passed array has a defined key, returns a default if not set
-  * @param array $array The array to check
-  * @param string $key Key to check
-  * @param type $default Default to return if key is not set
-  * @return mixed
-  */
+     * Checks a passed array has a defined key, returns a default if not set
+     * @param array $array The array to check
+     * @param string $key Key to check
+     * @param type $default Default to return if key is not set
+     * @return mixed
+     */
     private static function checkKey( $array, $key, $default='' ){
         return (isset($array[$key]) && !empty($array[$key])) ? $array[$key] : $default;
     }
 
-  /**
-  * Creates a statement from an array, with defaults if needed
-  * @param Array $data Holds the actor, verb and object information
-  */
-  public function buildStatement($data) {
+    /**
+     * Creates a statement from an array, with defaults if needed
+     * @param Array $data Holds the actor, verb and object information
+     */
+    public function buildStatement($data) {
 
     $actor      = $this->checkKey($data, 'actor');
     $verb       = $this->checkKey($data, 'verb',        self::getVerb('experienced') );
@@ -64,10 +64,10 @@ 
     $timestamp  = $this->checkKey($data, 'timestamp',   Carbon::now()->format("c") );
 
     $this->statement = array(
-      'actor'     => $actor,
-      'verb'      => $verb,
-      'object'    => $object,
-      'timestamp' => $timestamp
+        'actor'     => $actor,
+        'verb'      => $verb,
+        'object'    => $object,
+        'timestamp' => $timestamp
     );
 
     if( isset($result) && !empty($result) ){
@@ -81,24 +81,24 @@ 
     if( isset($context) && !empty($context) ){
         $this->statement['context'] = $context;
     } else {
-      $this->statement['context'] = $this->createContext();
+        $this->statement['context'] = $this->createContext();
     }
 
     //Add the org to the contextActivites
     $org = \Organisation::userCurrent();
     if( $org ){
-      if( !isset($this->statement['context']['contextActivities']) ){
+        if( !isset($this->statement['context']['contextActivities']) ){
         $this->statement['context']['contextActivities'] = [];
-      }
+        }
 
-      if( !isset($this->statement['context']['contextActivities']['grouping']) ){
+        if( !isset($this->statement['context']['contextActivities']['grouping']) ){
         $this->statement['context']['contextActivities']['grouping'] = [];
-      } elseif( !isset($this->statement['context']['contextActivities']['grouping'][0])){
+        } elseif( !isset($this->statement['context']['contextActivities']['grouping'][0])){
         $val = $this->statement['context']['contextActivities']['grouping'];
         $this->statement['context']['contextActivities']['grouping'] = [ $val ];
-      }
+        }
 
-      $this->statement['context']['contextActivities']['grouping'][] = $org->tcExtension();
+        $this->statement['context']['contextActivities']['grouping'][] = $org->tcExtension();
     }
 
     // remove context.platform if NOT an activity (xAPI 4.1.6)
@@ -107,25 +107,25 @@ 
         && isset($this->statement['object'], $this->statement['object']['objectType'])
         && strtolower($this->statement['object']['objectType']) !== strtolower('activity')
         ) {
-      if (isset($this->statement['context']['platform'])) {
+        if (isset($this->statement['context']['platform'])) {
         unset($this->statement['context']['platform']);
-      }
-      if (isset($this->statement['context']['revision'])) {
+        }
+        if (isset($this->statement['context']['revision'])) {
         unset($this->statement['context']['revision']);
-      }
+        }
     }
 
 
     return $this->statement;
-  }
-
-  /**
-  * Static method
-  * Generates the actor part of the statement
-  * @param string $name
-  * @param string $email
-  * @return array
-  */
+    }
+
+    /**
+     * Static method
+     * Generates the actor part of the statement
+     * @param string $name
+     * @param string $email
+     * @return array
+     */
     public static function createMboxActor( $name, $email ){
         return array(
             'name'          =>  $name,
@@ -143,11 +143,11 @@ 
      * @return array
      */
     public static function createAccountActor( $name, $homepage, $ref ){
-      return [
-          'name'          => $name,
-          'account'       => ['homePage' => $homepage, 'name' => $ref],
-          'objectType'    => 'Agent'
-      ];
+        return [
+            'name'          => $name,
+            'account'       => ['homePage' => $homepage, 'name' => $ref],
+            'objectType'    => 'Agent'
+        ];
     }
 
     /**
@@ -189,7 +189,7 @@ 
         );
 
         if( !empty($extensions) ){
-          $context['extensions'] = $extensions;
+            $context['extensions'] = $extensions;
         }
 
         if( !is_null($additional) ){
@@ -200,12 +200,12 @@ 
 
     }
 
-  /**
-  * Static method
-  * Returns a predefined verb or 'experienced' if not found
-  * @param string $key The verb to use
-  * @return array
-  */
+    /**
+     * Static method
+     * Returns a predefined verb or 'experienced' if not found
+     * @param string $key The verb to use
+     * @return array
+     */
     public static function getVerb( $key ){
 
         $verbs = array();
@@ -369,128 +369,128 @@ 
 
 
 
-  public function sendRequests() {
+    public function sendRequests() {
     foreach( $this->endpoints as $name => $ep ){
 
-      $username = $ep->username;
-      $password = $ep->key;
-      $url = $ep->url;
+        $username = $ep->username;
+        $password = $ep->key;
+        $url = $ep->url;
 
-      if(substr($url, -1) !== '/') {
+        if(substr($url, -1) !== '/') {
         $url .= '/';
-      }
+        }
 
-      \Queue::push('\HT2\Queues\XAPIService', [
+        \Queue::push('\HT2\Queues\XAPIService', [
         'endpoint'  => $url,
         'type'      => 'basic',
         'username'  => $username,
         'password'  => $password,
         'statement' => $this->statement
-      ]);
+        ]);
 
     }
-  }
+    }
 
-  /**
-  * Send the request to all end points defined in the endpoints array
-  * @return array An array of all requests sent and their responses
-  */
+    /**
+     * Send the request to all end points defined in the endpoints array
+     * @return array An array of all requests sent and their responses
+     */
     public function sendRequestsOld(){
-      $error = $this->checkError();
-      if( $error ) return false;
+        $error = $this->checkError();
+        if( $error ) return false;
 
-      $results = array();
+        $results = array();
 
 
-      foreach( $this->endpoints as $name => $ep ){
+        foreach( $this->endpoints as $name => $ep ){
 
-          $username = $ep->username;
-          $password = $ep->key;
-          $url = $ep->url;
-          $auth = base64_encode( $username.':'.$password );
+            $username = $ep->username;
+            $password = $ep->key;
+            $url = $ep->url;
+            $auth = base64_encode( $username.':'.$password );
 
-          $result = $this->make_request($auth, $url, $this->statement);
-          $error = false;
-          $error_type = "";
-          $body = "";
+            $result = $this->make_request($auth, $url, $this->statement);
+            $error = false;
+            $error_type = "";
+            $body = "";
 
-          if( isset($result['error']) ){
+            if( isset($result['error']) ){
             $error = true;
             $error_type = "cURL error";
-          } else {
+            } else {
 
             $body = isset($result['body']) ? json_decode($result['body']) : "";
 
             if( isset($body->success) ){
-              if( $body->success == false ){
+                if( $body->success == false ){
                 $error = true;
                 $error_type = "LRS returned success as false";
-              }
+                }
             }
 
             if( isset($body->error) ){
-              if( $body->error == true ){
+                if( $body->error == true ){
                 $error = true;
                 $error_type = "LRS returned error as true";
-              }
+                }
             }
             if( isset($result['status']) ){
-              $status = $result['status'];
+                $status = $result['status'];
 
-              switch( intval($status) ){
+                switch( intval($status) ){
                 case 400:
                 case 404:
                 case 500:
                   $error = true;
-                  $error_type = "LRS returned HTTP code ".$status;
+                    $error_type = "LRS returned HTTP code ".$status;
                 break;
-              }
+                }
+            }
             }
-          }
 
-          if( $error ){
+            if( $error ){
             $this->log->error( 'Statement Failed', array(
-              'curl_result' =>  $result,
-              'type'        =>  $error_type,
-              'url'         =>  $ep->url,
-              'statement'   =>  $this->statement
+                'curl_result' =>  $result,
+                'type'        =>  $error_type,
+                'url'         =>  $ep->url,
+                'statement'   =>  $this->statement
             ));
-          } else {
+            } else {
             $this->log->info( 'Sent', array(
-              'url'         =>  $ep->url,
-              'statement'   =>  $this->statement
+                'url'         =>  $ep->url,
+                'statement'   =>  $this->statement
             ));
-          }
+            }
 
-          $results[$url] = $body;
-      }
+            $results[$url] = $body;
+        }
 
 
-      return array(
-          'statement' =>  $this->statement,
-          'endpoints' =>  $this->endpoints,
-          'results'   =>  $results
-      );
-  }
+        return array(
+            'statement' =>  $this->statement,
+            'endpoints' =>  $this->endpoints,
+            'results'   =>  $results
+        );
+    }
 
-  /**
-  * Send statement
-  * @param string $auth The base64 basic auth info for the request
-  * @param string $url The endpoint
-  * @param array $statement The statement to be encoded
-  * @return boolean/array Returns false on fail, array of details on success
-  */
-  public function make_request( $auth, $url, $statement ) {
+    /**
+     * Send statement
+     * @param string $auth The base64 basic auth info for the request
+     * @param string $url The endpoint
+     * @param array $statement The statement to be encoded
+     * @return boolean/array Returns false on fail, array of details on success
+     */
+    public function make_request( $auth, $url, $statement ) {
 
     $headers =   array(
-      'Authorization: Basic '.$auth,
-      'Content-Type: application/json; charset=UTF-8',
-      'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-      'X-Experience-API-Version: 1.0.0'
+        'Authorization: Basic '.$auth,
+        'Content-Type: application/json; charset=UTF-8',
+        'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'X-Experience-API-Version: 1.0.0'
     );
 
     if(substr($url, -1) !== '/') {
-      $url .= '/';
+        $url .= '/';
     }
 
     $ch = curl_init( $url . 'statements' );
@@ -502,26 +502,26 @@ 
     curl_setopt($ch, CURLOPT_HTTPHEADER, $headers );
 
     if( substr($url, 0, 5) == "https" ){
-      curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-      curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-      curl_setopt ($ch, CURLOPT_CAINFO, storage_path()."/cacert.pem");
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+        curl_setopt ($ch, CURLOPT_CAINFO, storage_path()."/cacert.pem");
     }
 
     $response = curl_exec( $ch );
     if( $response === false ){
-      return array('error'=>true, 'curl_error'=>curl_error($ch));
+        return array('error'=>true, 'curl_error'=>curl_error($ch));
     } else {
-      $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-      $header = substr($response, 0, $header_size);
-      $body = substr($response, $header_size);
-      return array(
+        $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        $header = substr($response, 0, $header_size);
+        $body = substr($response, $header_size);
+        return array(
         'ch'      =>  $ch,
         'status'  =>  curl_getinfo($ch, CURLINFO_HTTP_CODE),
         'header'  =>  $header,
         'body'    =>  $body
-      );
+        );
+    }
     }
-  }
 
     private function checkError(){
         if( empty($this->statement) ){

Spacing +153 added lines, -153 removed lines

@@ -7,12 +7,12 @@ 
 
 class StatementGenerator {
 
-    const LL_COURSE_EXTENSION  = 'http://learninglocker.net/extensions/course';
-    const COMMENT_EXTENSION  = 'http://curatr3.com/define/extension/commentText';
-    const BADGE_EXTENSION  = 'http://specification.openbadges.org/xapi/extensions/badgeassertion';
-    const MCQ_SINGLE_EXTENSION  = 'http://curatr3.com/define/extension/single-mcq-option';
-    const MCQ_MULTIPLE_EXTENSION  = 'http://curatr3.com/define/extension/multiple-mcq-options';
-    const CONTRIBUTION_OBJECT  = 'http://curatr3.com/define/extension/contribution-object';
+    const LL_COURSE_EXTENSION = 'http://learninglocker.net/extensions/course';
+    const COMMENT_EXTENSION = 'http://curatr3.com/define/extension/commentText';
+    const BADGE_EXTENSION = 'http://specification.openbadges.org/xapi/extensions/badgeassertion';
+    const MCQ_SINGLE_EXTENSION = 'http://curatr3.com/define/extension/single-mcq-option';
+    const MCQ_MULTIPLE_EXTENSION = 'http://curatr3.com/define/extension/multiple-mcq-options';
+    const CONTRIBUTION_OBJECT = 'http://curatr3.com/define/extension/contribution-object';
     const BADGE_TYPE = 'http://activitystrea.ms/schema/1.0/badge';
     const CATEGORY_TYPE = 'http://activitystrea.ms/schema/1.0/collection';
     const COLLECTION_TYPE = 'http://curatr3.com/define/type/collection';
@@ -32,7 +32,7 @@ 
 
     public $url, $statement, $endpoints, $log;
 
-    public function __construct( $endpoints=array() ) {
+    public function __construct($endpoints = array()) {
 
       $this->log = \App::make('xapi.log');
       $this->endpoints = $endpoints;
@@ -45,8 +45,8 @@ 
   * @param type $default Default to return if key is not set
   * @return mixed
   */
-    private static function checkKey( $array, $key, $default='' ){
-        return (isset($array[$key]) && !empty($array[$key])) ? $array[$key] : $default;
+    private static function checkKey($array, $key, $default = '') {
+        return (isset($array[ $key ]) && !empty($array[ $key ])) ? $array[ $key ] : $default;
     }
 
   /**
@@ -56,12 +56,12 @@ 
   public function buildStatement($data) {
 
     $actor      = $this->checkKey($data, 'actor');
-    $verb       = $this->checkKey($data, 'verb',        self::getVerb('experienced') );
+    $verb       = $this->checkKey($data, 'verb', self::getVerb('experienced'));
     $object     = $this->checkKey($data, 'object');
-    $authority  = $this->checkKey($data, 'authority', []);
-    $context    = $this->checkKey($data, 'context', [] );
-    $result     = $this->checkKey($data, 'result', [] );
-    $timestamp  = $this->checkKey($data, 'timestamp',   Carbon::now()->format("c") );
+    $authority  = $this->checkKey($data, 'authority', [ ]);
+    $context    = $this->checkKey($data, 'context', [ ]);
+    $result     = $this->checkKey($data, 'result', [ ]);
+    $timestamp  = $this->checkKey($data, 'timestamp', Carbon::now()->format("c"));
 
     $this->statement = array(
       'actor'     => $actor,
@@ -70,48 +70,48 @@ 
       'timestamp' => $timestamp
     );
 
-    if( isset($result) && !empty($result) ){
-        $this->statement['result'] = $result;
+    if (isset($result) && !empty($result)) {
+        $this->statement[ 'result' ] = $result;
     }
 
-    if( isset($authority) && !empty($authority) ){
-        $this->statement['authority'] = $authority;
+    if (isset($authority) && !empty($authority)) {
+        $this->statement[ 'authority' ] = $authority;
     }
 
-    if( isset($context) && !empty($context) ){
-        $this->statement['context'] = $context;
+    if (isset($context) && !empty($context)) {
+        $this->statement[ 'context' ] = $context;
     } else {
-      $this->statement['context'] = $this->createContext();
+      $this->statement[ 'context' ] = $this->createContext();
     }
 
     //Add the org to the contextActivites
     $org = \Organisation::userCurrent();
-    if( $org ){
-      if( !isset($this->statement['context']['contextActivities']) ){
-        $this->statement['context']['contextActivities'] = [];
+    if ($org) {
+      if (!isset($this->statement[ 'context' ][ 'contextActivities' ])) {
+        $this->statement[ 'context' ][ 'contextActivities' ] = [ ];
       }
 
-      if( !isset($this->statement['context']['contextActivities']['grouping']) ){
-        $this->statement['context']['contextActivities']['grouping'] = [];
-      } elseif( !isset($this->statement['context']['contextActivities']['grouping'][0])){
-        $val = $this->statement['context']['contextActivities']['grouping'];
-        $this->statement['context']['contextActivities']['grouping'] = [ $val ];
+      if (!isset($this->statement[ 'context' ][ 'contextActivities' ][ 'grouping' ])) {
+        $this->statement[ 'context' ][ 'contextActivities' ][ 'grouping' ] = [ ];
+      } elseif (!isset($this->statement[ 'context' ][ 'contextActivities' ][ 'grouping' ][ 0 ])) {
+        $val = $this->statement[ 'context' ][ 'contextActivities' ][ 'grouping' ];
+        $this->statement[ 'context' ][ 'contextActivities' ][ 'grouping' ] = [ $val ];
       }
 
-      $this->statement['context']['contextActivities']['grouping'][] = $org->tcExtension();
+      $this->statement[ 'context' ][ 'contextActivities' ][ 'grouping' ][ ] = $org->tcExtension();
     }
 
     // remove context.platform if NOT an activity (xAPI 4.1.6)
     if (
-        isset($this->statement['context'])
-        && isset($this->statement['object'], $this->statement['object']['objectType'])
-        && strtolower($this->statement['object']['objectType']) !== strtolower('activity')
+        isset($this->statement[ 'context' ])
+        && isset($this->statement[ 'object' ], $this->statement[ 'object' ][ 'objectType' ])
+        && strtolower($this->statement[ 'object' ][ 'objectType' ]) !== strtolower('activity')
         ) {
-      if (isset($this->statement['context']['platform'])) {
-        unset($this->statement['context']['platform']);
+      if (isset($this->statement[ 'context' ][ 'platform' ])) {
+        unset($this->statement[ 'context' ][ 'platform' ]);
       }
-      if (isset($this->statement['context']['revision'])) {
-        unset($this->statement['context']['revision']);
+      if (isset($this->statement[ 'context' ][ 'revision' ])) {
+        unset($this->statement[ 'context' ][ 'revision' ]);
       }
     }
 
@@ -126,7 +126,7 @@ 
   * @param string $email
   * @return array
   */
-    public static function createMboxActor( $name, $email ){
+    public static function createMboxActor($name, $email) {
         return array(
             'name'          =>  $name,
             'mbox'          =>  'mailto:' . $email,
@@ -142,10 +142,10 @@ 
      * @param string $ref
      * @return array
      */
-    public static function createAccountActor( $name, $homepage, $ref ){
+    public static function createAccountActor($name, $homepage, $ref) {
       return [
           'name'          => $name,
-          'account'       => ['homePage' => $homepage, 'name' => $ref],
+          'account'       => [ 'homePage' => $homepage, 'name' => $ref ],
           'objectType'    => 'Agent'
       ];
     }
@@ -157,7 +157,7 @@ 
      * @param string $email
      * @return array
      */
-    public static function createAuthority( $name, $email ){
+    public static function createAuthority($name, $email) {
         return array(
             'name'          =>  $name,
             'mbox'          =>  'mailto:' . $email,
@@ -170,7 +170,7 @@ 
      * Generates the result part of the statement
      * @return array
      */
-    public static function createResult( $result=array() ){
+    public static function createResult($result = array()) {
 
         return $result;
 
@@ -182,18 +182,18 @@ 
      * @todo hardcoded for now
      * @return array
      */
-    public static function createContext( $extensions = array(), $additional=null ){
+    public static function createContext($extensions = array(), $additional = null) {
 
         $context = array(
             'platform'  =>  'Curatr'
         );
 
-        if( !empty($extensions) ){
-          $context['extensions'] = $extensions;
+        if (!empty($extensions)) {
+          $context[ 'extensions' ] = $extensions;
         }
 
-        if( !is_null($additional) ){
-            $context = array_merge($context, $additional );
+        if (!is_null($additional)) {
+            $context = array_merge($context, $additional);
         }
 
         return $context;
@@ -206,119 +206,119 @@ 
   * @param string $key The verb to use
   * @return array
   */
-    public static function getVerb( $key ){
+    public static function getVerb($key) {
 
         $verbs = array();
 
         $available_verbs = self::returnAvailableVerbs();
 
         // add all official verbs
-        foreach( $available_verbs as $v ){
-            $verbs[$v] = array(
+        foreach ($available_verbs as $v) {
+            $verbs[ $v ] = array(
                 "id"        =>  "http://adlnet.gov/expapi/verbs/{$v}",
-                "display"   =>  array( "en-GB" =>  $v ),
+                "display"   =>  array("en-GB" =>  $v),
             );
         }
 
         // Standard Verbs
-        $verbs['commented'] = array(
+        $verbs[ 'commented' ] = array(
             "id"        =>  "http://adlnet.gov/expapi/verbs/commented",
-            "display"   =>  array(  "en-GB" =>  "commented on" )
+            "display"   =>  array("en-GB" =>  "commented on")
         );
-        $verbs['coached'] = array(
+        $verbs[ 'coached' ] = array(
             "id"        =>  "http://learninglocker.net/verbs/coached-in",
-            "display"   =>  array(  "en-GB" =>  "coached in" )
+            "display"   =>  array("en-GB" =>  "coached in")
         );
-        $verbs['mentored'] = array(
+        $verbs[ 'mentored' ] = array(
             "id"        =>  "http://learninglocker.net/verbs/mentored-in",
-            "display"   =>  array(  "en-GB" =>  "mentored in" )
+            "display"   =>  array("en-GB" =>  "mentored in")
         );
-        $verbs['observed'] = array(
+        $verbs[ 'observed' ] = array(
             "id"        =>  "http://learninglocker.net/verbs/observed-in",
-            "display"   =>  array(  "en-GB" =>  "observed in" )
+            "display"   =>  array("en-GB" =>  "observed in")
         );
-        $verbs['trained'] = array(
+        $verbs[ 'trained' ] = array(
             "id"        =>  "http://learninglocker.net/verbs/trained-in",
-            "display"   =>  array(  "en-GB" =>  "trained in" )
+            "display"   =>  array("en-GB" =>  "trained in")
         );
-        $verbs['endorsed'] = array(
+        $verbs[ 'endorsed' ] = array(
             "id"        =>  "http://learninglocker.net/verbs/endorsed-in",
-            "display"   =>  array(  "en-GB" =>  "endorsed in" )
+            "display"   =>  array("en-GB" =>  "endorsed in")
         );
-        $verbs['posted'] = array(
+        $verbs[ 'posted' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/posted",
-            "display"   =>  array( "en-GB" =>  "posted" )
+            "display"   =>  array("en-GB" =>  "posted")
         );
-        $verbs['published'] = array(
+        $verbs[ 'published' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/published",
-            "display"   =>  array( "en-GB" =>  "published" )
+            "display"   =>  array("en-GB" =>  "published")
         );
-        $verbs['read'] = array(
+        $verbs[ 'read' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/read",
-            "display"   =>  array( "en-GB" =>  "read" )
+            "display"   =>  array("en-GB" =>  "read")
         );
-        $verbs['liked'] = array(
+        $verbs[ 'liked' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/liked",
-            "display"   =>  array( "en-GB" =>  "liked" )
+            "display"   =>  array("en-GB" =>  "liked")
         );
-        $verbs['bookmarked'] = array(
+        $verbs[ 'bookmarked' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/bookmarked",
-            "display"   =>  array( "en-GB" =>  "bookmarked" )
+            "display"   =>  array("en-GB" =>  "bookmarked")
         );
-        $verbs['earned'] = array(
+        $verbs[ 'earned' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/earned",
-            "display"   =>  array( "en-GB" =>  "earned" )
+            "display"   =>  array("en-GB" =>  "earned")
         );
-        $verbs['badge_earned'] = array(
+        $verbs[ 'badge_earned' ] = array(
             "id"        =>  "http://specification.openbadges.org/xapi/verbs/earned",
-            "display"   =>  array( "en-GB" =>  "earned" )
+            "display"   =>  array("en-GB" =>  "earned")
         );
-        $verbs['login'] = array(
+        $verbs[ 'login' ] = array(
             "id"        =>  "https://brindlewaye.com/xAPITerms/verbs/loggedin/",
-            "display"   =>  array(  "en-GB" =>  "logged in to" )
+            "display"   =>  array("en-GB" =>  "logged in to")
         );
-        $verbs['logout'] = array(
+        $verbs[ 'logout' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/logout",
-            "display"   =>  array(  "en-GB" =>  "logged out of" )
+            "display"   =>  array("en-GB" =>  "logged out of")
         );
-        $verbs['edited'] = array(
+        $verbs[ 'edited' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/edited",
-            "display"   =>  array( "en-GB" =>  "edited" )
+            "display"   =>  array("en-GB" =>  "edited")
         );
-        $verbs['uploaded'] = array(
+        $verbs[ 'uploaded' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/uploaded",
-            "display"   =>  array( "en-GB" =>  "uploaded" )
+            "display"   =>  array("en-GB" =>  "uploaded")
         );
-        $verbs['accessed'] = array(
+        $verbs[ 'accessed' ] = array(
             "id"        =>  "http://activitystrea.ms/schema/1.0/access",
-            "display"   =>  array( "en-GB" =>  "accessed" )
+            "display"   =>  array("en-GB" =>  "accessed")
         );
-        $verbs['voted-up'] = array(
+        $verbs[ 'voted-up' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/voted-up",
-            "display"   =>  array(  "en-GB" =>  "voted up" )
+            "display"   =>  array("en-GB" =>  "voted up")
         );
-        $verbs['voted-down'] = array(
+        $verbs[ 'voted-down' ] = array(
             "id"        =>  "http://curatr3.com/define/verb/voted-down",
-            "display"   =>  array(  "en-GB" =>  "voted down" )
+            "display"   =>  array("en-GB" =>  "voted down")
         );
-        $verbs['flag-as-inappropriate'] = array(
+        $verbs[ 'flag-as-inappropriate' ] = array(
             "id"        =>  "http://activitystrea.ms/schema/1.0/flag-as-inappropriate",
-            "display"   =>  array( "en-GB" =>  "flagged as inappropriate" )
+            "display"   =>  array("en-GB" =>  "flagged as inappropriate")
         );
-        $verbs['join'] = array(
+        $verbs[ 'join' ] = array(
             "id"        =>  "http://activitystrea.ms/schema/1.0/join",
-            "display"   =>  array( "en-GB" =>  "joined" )
+            "display"   =>  array("en-GB" =>  "joined")
         );
-        $verbs['leave'] = array(
+        $verbs[ 'leave' ] = array(
             "id"        =>  "http://activitystrea.ms/schema/1.0/leave",
-            "display"   =>  array( "en-GB" =>  "left" )
+            "display"   =>  array("en-GB" =>  "left")
         );
-        $verbs['opened'] = array(
+        $verbs[ 'opened' ] = array(
             "id"        =>  "http://activitystrea.ms/schema/1.0/open",
-            "display"   =>  array( "en-GB" =>  "opened" )
+            "display"   =>  array("en-GB" =>  "opened")
         );
 
-        return self::checkKey( $verbs, $key, $verbs['experienced']);
+        return self::checkKey($verbs, $key, $verbs[ 'experienced' ]);
     }
 
     /**
@@ -331,7 +331,7 @@ 
      * @return array
      *
      */
-    public static function createObject( $id, $name=null, $description=null, $type=null, $extensions = array() )
+    public static function createObject($id, $name = null, $description = null, $type = null, $extensions = array())
     {
         $object = array(
         'objectType'    => 'Activity',
@@ -341,27 +341,27 @@ 
         $definition = array();
 
         if (!empty($name)) {
-        $definition['name'] = [
+        $definition[ 'name' ] = [
             'en-GB' => $name
         ];
         }
 
-        if( !empty($description)){
-            $definition['description'] = [
+        if (!empty($description)) {
+            $definition[ 'description' ] = [
             'en-GB'=>$description
         ];
         }
 
-        if( !empty($type)){
-        $definition['type'] = $type;
+        if (!empty($type)) {
+        $definition[ 'type' ] = $type;
         }
 
-        if( !empty($extensions) ){
-        $definition['extensions'] = $extensions;
+        if (!empty($extensions)) {
+        $definition[ 'extensions' ] = $extensions;
         }
 
         if (!empty($definition)) {
-        $object['definition'] = $definition;
+        $object[ 'definition' ] = $definition;
         }
 
         return $object;
@@ -370,13 +370,13 @@ 
 
 
   public function sendRequests() {
-    foreach( $this->endpoints as $name => $ep ){
+    foreach ($this->endpoints as $name => $ep) {
 
       $username = $ep->username;
       $password = $ep->key;
       $url = $ep->url;
 
-      if(substr($url, -1) !== '/') {
+      if (substr($url, -1) !== '/') {
         $url .= '/';
       }
 
@@ -395,74 +395,74 @@ 
   * Send the request to all end points defined in the endpoints array
   * @return array An array of all requests sent and their responses
   */
-    public function sendRequestsOld(){
+    public function sendRequestsOld() {
       $error = $this->checkError();
-      if( $error ) return false;
+      if ($error) return false;
 
       $results = array();
 
 
-      foreach( $this->endpoints as $name => $ep ){
+      foreach ($this->endpoints as $name => $ep) {
 
           $username = $ep->username;
           $password = $ep->key;
           $url = $ep->url;
-          $auth = base64_encode( $username.':'.$password );
+          $auth = base64_encode($username . ':' . $password);
 
           $result = $this->make_request($auth, $url, $this->statement);
           $error = false;
           $error_type = "";
           $body = "";
 
-          if( isset($result['error']) ){
+          if (isset($result[ 'error' ])) {
             $error = true;
             $error_type = "cURL error";
           } else {
 
-            $body = isset($result['body']) ? json_decode($result['body']) : "";
+            $body = isset($result[ 'body' ]) ? json_decode($result[ 'body' ]) : "";
 
-            if( isset($body->success) ){
-              if( $body->success == false ){
+            if (isset($body->success)) {
+              if ($body->success == false) {
                 $error = true;
                 $error_type = "LRS returned success as false";
               }
             }
 
-            if( isset($body->error) ){
-              if( $body->error == true ){
+            if (isset($body->error)) {
+              if ($body->error == true) {
                 $error = true;
                 $error_type = "LRS returned error as true";
               }
             }
-            if( isset($result['status']) ){
-              $status = $result['status'];
+            if (isset($result[ 'status' ])) {
+              $status = $result[ 'status' ];
 
-              switch( intval($status) ){
+              switch (intval($status)) {
                 case 400:
                 case 404:
                 case 500:
                   $error = true;
-                  $error_type = "LRS returned HTTP code ".$status;
+                  $error_type = "LRS returned HTTP code " . $status;
                 break;
               }
             }
           }
 
-          if( $error ){
-            $this->log->error( 'Statement Failed', array(
+          if ($error) {
+            $this->log->error('Statement Failed', array(
               'curl_result' =>  $result,
               'type'        =>  $error_type,
               'url'         =>  $ep->url,
               'statement'   =>  $this->statement
             ));
           } else {
-            $this->log->info( 'Sent', array(
+            $this->log->info('Sent', array(
               'url'         =>  $ep->url,
               'statement'   =>  $this->statement
             ));
           }
 
-          $results[$url] = $body;
+          $results[ $url ] = $body;
       }
 
 
@@ -480,35 +480,35 @@ 
   * @param array $statement The statement to be encoded
   * @return boolean/array Returns false on fail, array of details on success
   */
-  public function make_request( $auth, $url, $statement ) {
+  public function make_request($auth, $url, $statement) {
 
-    $headers =   array(
-      'Authorization: Basic '.$auth,
+    $headers = array(
+      'Authorization: Basic ' . $auth,
       'Content-Type: application/json; charset=UTF-8',
       'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
       'X-Experience-API-Version: 1.0.0'
     );
 
-    if(substr($url, -1) !== '/') {
+    if (substr($url, -1) !== '/') {
       $url .= '/';
     }
 
-    $ch = curl_init( $url . 'statements' );
-    curl_setopt( $ch, CURLOPT_POST, 1);
-    curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode($statement) );
-    curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
-    curl_setopt( $ch, CURLOPT_HEADER, 1);
-    curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers );
+    $ch = curl_init($url . 'statements');
+    curl_setopt($ch, CURLOPT_POST, 1);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($statement));
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+    curl_setopt($ch, CURLOPT_HEADER, 1);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
-    if( substr($url, 0, 5) == "https" ){
+    if (substr($url, 0, 5) == "https") {
       curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
       curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-      curl_setopt ($ch, CURLOPT_CAINFO, storage_path()."/cacert.pem");
+      curl_setopt($ch, CURLOPT_CAINFO, storage_path() . "/cacert.pem");
     }
 
-    $response = curl_exec( $ch );
-    if( $response === false ){
+    $response = curl_exec($ch);
+    if ($response === false) {
       return array('error'=>true, 'curl_error'=>curl_error($ch));
     } else {
       $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
@@ -523,23 +523,23 @@ 
     }
   }
 
-    private function checkError(){
-        if( empty($this->statement) ){
+    private function checkError() {
+        if (empty($this->statement)) {
             $this->error("No data set");
             return true;
         }
 
-        if( !isset($this->statement['actor']) ){
+        if (!isset($this->statement[ 'actor' ])) {
             $this->error("No actor set");
             return true;
         }
 
-        if( !isset($this->statement['verb']) ){
+        if (!isset($this->statement[ 'verb' ])) {
             $this->error("No verb set");
             return true;
         }
 
-        if( !isset($this->statement['object']) ){
+        if (!isset($this->statement[ 'object' ])) {
             $this->error("No object set");
             return true;
         }
@@ -547,15 +547,15 @@ 
         return false;
     }
 
-    private function error( $message ){
-        $this->log->error( "Statement Generator Error: ".$message );
+    private function error($message) {
+        $this->log->error("Statement Generator Error: " . $message);
     }
 
     /**
      * We will probably move this to the db, or hook into an existing service?
      *
      **/
-    private static function returnAvailableVerbs(){
+    private static function returnAvailableVerbs() {
         return array(
             'answered',
             'asked',
@@ -584,7 +584,7 @@ 
             'voided');
     }
 
-    public static function makeEndpoint( $url, $username, $password ){
+    public static function makeEndpoint($url, $username, $password) {
         $ep = new \stdClass;
         $ep->url = $url;
         $ep->username = $username;

Braces +3 added lines, -1 removed lines

@@ -397,7 +397,9 @@
   */
     public function sendRequestsOld(){
       $error = $this->checkError();
-      if( $error ) return false;
+      if( $error ) {
+          return false;
+      }
 
       $results = array();