ijeffro / laralocker

src/LearningLocker/Organisation/OrganisationInterface.php

Indentation +1 added lines, -1 removed lines

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

src/LearningLocker/Journeys/JourneyInterface.php

Indentation +1 added lines, -1 removed lines

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

src/LearningLocker/Journeys/JourneyHandler.php

Indentation +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
      */
     public function progress($id = null)
     {
-        if ($this->journey_progress) return $this->journey_progress;
+        if ($this->journey_progress) {
+            return $this->journey_progress;
+        }
 
         $this->journey_progress = new JourneyProgressHandler($id ? $id : null);
         return $this->progress($id ? $id : null);

src/LearningLocker/StatementForwarding/StatementForward.php

Indentation +129 added lines, -129 removed lines

@@ -9,44 +9,44 @@ 
 
 class StatementForward extends Connection {
 
-  private $statementForward = '/statementforwarding';
-  private $api = '/api';
-  private $v2 = '/v2';
+    private $statementForward = '/statementforwarding';
+    private $api = '/api';
+    private $v2 = '/v2';
 
-  private $headers = [
+    private $headers = [
     'content-type' => 'application/json'
-  ];
-
-  /**
-   * Generate the Query for Learning Locker's
-   * Statement Forward.
-   *
-   * @return  true
-   * @return  false
-   */
-  public function updateStatementForwardQuery($statementForwardId, $isEnabled) {
+    ];
+
+    /**
+     * Generate the Query for Learning Locker's
+     * Statement Forward.
+     *
+     * @return  true
+     * @return  false
+     */
+    public function updateStatementForwardQuery($statementForwardId, $isEnabled) {
     $query = Query::statementForward($this->org->id);
     if ($query === false || !$isEnabled) {
-      $message = $query === false && $isEnabled ? '(No objects)' : null;
-      return $this->disable($statementForwardId, $message);
+        $message = $query === false && $isEnabled ? '(No objects)' : null;
+        return $this->disable($statementForwardId, $message);
     }
     // pass in the query to prevent regeneration in the enable method
     return $this->enable($statementForwardId, $query);
-  }
+    }
 
-  public static function getSigner() {
+    public static function getSigner() {
     return new Sha256;
-  }
+    }
 
-  public static function getOrgIssuer($org) {
+    public static function getOrgIssuer($org) {
     return \Curatr\Helper::getSubdomainURL($org->alias);
-  }
+    }
 
-  public static function getOrgSigningKey($org) {
+    public static function getOrgSigningKey($org) {
     return $org->jwt_secret ?? 'default_key';
-  }
+    }
 
-  public function createSignedBearer() {
+    public function createSignedBearer() {
     $signer = self::getSigner();
     $issuer = self::getOrgIssuer($this->org);
     $token = (new Builder())->setIssuer($issuer) // Configures the issuer (iss claim)
@@ -55,155 +55,155 @@ 
                         ->sign($signer, self::getOrgSigningKey($this->org))
                         ->getToken(); // Retrieves the generated token
     return $token->__toString();
-  }
+    }
 
-  private function title($message = "") {
+    private function title($message = "") {
     return trim($this->org->app_name . ' - ' . $this->org->name . ' - Object Completions ' . $message);
-  }
-
-  /**
-   * Enable the Learning Locker Statement Forward.
-   *
-   * @param   $statementForwardId
-   * @return  $response
-   */
-  public function enable($statementForwardId, $query = null) {
+    }
+
+    /**
+     * Enable the Learning Locker Statement Forward.
+     *
+     * @param   $statementForwardId
+     * @return  $response
+     */
+    public function enable($statementForwardId, $query = null) {
     $data = [
-      "active" => true,
-      "description" => $this->title(),
-      "query" => $query ?: Query::statementForward($this->org->id),
-      'configuration' => [
+        "active" => true,
+        "description" => $this->title(),
+        "query" => $query ?: Query::statementForward($this->org->id),
+        'configuration' => [
         'authType' => 'token',
         'secret' => $this->createSignedBearer()
-      ]
+        ]
     ];
     return $this->update($statementForwardId, $data);
-  }
-
-  /**
-   * Disable the Learning Locker Statement Forward.
-   *
-   * @param   $id
-   * @return  $response
-   */
-  public function disable($statementForwardId, $message) {
+    }
+
+    /**
+     * Disable the Learning Locker Statement Forward.
+     *
+     * @param   $id
+     * @return  $response
+     */
+    public function disable($statementForwardId, $message) {
     $message = $message ?? '(Service Disabled)';
     $data = array(
-      "active" => false,
-      "description" => $this->title($message),
-      "query" => json_encode(['$comment' => Query::COMMENT, 'disabled' => $message])
+        "active" => false,
+        "description" => $this->title($message),
+        "query" => json_encode(['$comment' => Query::COMMENT, 'disabled' => $message])
     );
     return $response = $this->update($statementForwardId, $data);
-  }
-
-  /**
-   * Get the Learning Locker Statement Forward by ID.
-   *
-   * @param   $id
-   * @return  $response
-   */
-  public function check($statementForwardId) {
+    }
+
+    /**
+     * Get the Learning Locker Statement Forward by ID.
+     *
+     * @param   $id
+     * @return  $response
+     */
+    public function check($statementForwardId) {
     if (empty($statementForwardId)) return false;
     return $this->get($statementForwardId);
-  }
-
-  /**
-   * Get the Learning Locker Statement Forward by ID.
-   *
-   * @param   $statementForwardId
-   * @return  $response
-   */
-  public function get($statementForwardId) {
+    }
+
+    /**
+     * Get the Learning Locker Statement Forward by ID.
+     *
+     * @param   $statementForwardId
+     * @return  $response
+     */
+    public function get($statementForwardId) {
     try {
-      $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward . '/' . $statementForwardId;
-      $request = $this->getClient()->get($url, [
+        $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward . '/' . $statementForwardId;
+        $request = $this->getClient()->get($url, [
         'auth' => $this->getAuth(),
         'headers' => [
-          'content-type' => 'application/json'
+            'content-type' => 'application/json'
         ],
-      ]);
+        ]);
 
-      if($request->getStatusCode() === 404) {
+        if($request->getStatusCode() === 404) {
         throw new GuzzleHttp\Exception\ClientException('There was a issue connecting to Learning Locker.');
-      }
-      return $request->json();
+        }
+        return $request->json();
     } catch (Exception $e) {      
-      if ($e instanceof \GuzzleHttp\Exception\ClientException) {
+        if ($e instanceof \GuzzleHttp\Exception\ClientException) {
         $responseBody = $e->getResponse()->getBody(true);
         \Log::error('Error fetching statement forward', [
-          'id' => $statementForwardId,
-          'org_id'=>$this->org->id,
-          'responseBody' => $responseBody
+            'id' => $statementForwardId,
+            'org_id'=>$this->org->id,
+            'responseBody' => $responseBody
         ]);
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Store the Learning Locker Statement Forward.
-   *
-   * @param   $data
-   * @return  $response
-   */ 
-  public function store($data, $startEnabled = true) {
+        }
+        return false;
+    }
+    }
+
+    /**
+     * Store the Learning Locker Statement Forward.
+     *
+     * @param   $data
+     * @return  $response
+     */ 
+    public function store($data, $startEnabled = true) {
     $store = json_encode($data);
     try {
-      $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward;
-      $request = $this->getClient()->post($url, array(
+        $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward;
+        $request = $this->getClient()->post($url, array(
         'auth' => $this->getAuth(),
         'headers' => $this->headers,
         'body' => $store,
-      ));
-      $request = $request->json();
-      if (isset($request['_id'])) {
+        ));
+        $request = $request->json();
+        if (isset($request['_id'])) {
         return $this->updateStatementForwardQuery($request['_id'], $startEnabled);
-      }
-      return false;
+        }
+        return false;
     } catch (Exception $e) {      
-      if ($e instanceof \GuzzleHttp\Exception\ClientException) {
+        if ($e instanceof \GuzzleHttp\Exception\ClientException) {
         $responseBody = $e->getResponse()->getBody(true);
         \Log::error('Error creating statement forward', [
-          'data' => $data,
-          'org_id'=>$this->org->id,
-          'responseBody' => $responseBody
+            'data' => $data,
+            'org_id'=>$this->org->id,
+            'responseBody' => $responseBody
         ]);
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Update the Learning Locker Statement Forward.
-   *
-   * @param   $statementForwardId, $data
-   * @return  $response
-   */
-  protected function update($statementForwardId, $data) {
+        }
+        return false;
+    }
+    }
+
+    /**
+     * Update the Learning Locker Statement Forward.
+     *
+     * @param   $statementForwardId, $data
+     * @return  $response
+     */
+    protected function update($statementForwardId, $data) {
     if (empty($statementForwardId)) return false;
     $update = json_encode($data);
     try {
-      $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward . '/' . $statementForwardId;
-      $request = $this->getClient()->patch($url, array(
+        $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward . '/' . $statementForwardId;
+        $request = $this->getClient()->patch($url, array(
         'auth' => $this->getAuth(), 
         'headers' => [
-          'content-type' => 'application/json'
+            'content-type' => 'application/json'
         ],
         'body' => $update,
-      ));
-      return $request->json();
+        ));
+        return $request->json();
     } catch (Exception $e) {      
-      if ($e instanceof \GuzzleHttp\Exception\ClientException) {
+        if ($e instanceof \GuzzleHttp\Exception\ClientException) {
         $responseBody = $e->getResponse()->getBody(true);
         \Log::error('Error updating statement forward', [
-          'id' => $statementForwardId,
-          'data' => $data,
-          'org_id'=>$this->org->id,
-          'responseBody' => $responseBody
+            'id' => $statementForwardId,
+            'data' => $data,
+            'org_id'=>$this->org->id,
+            'responseBody' => $responseBody
         ]);
-      }
-      return false;
+        }
+        return false;
+    }
     }
-  }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
     $data = array(
       "active" => false,
       "description" => $this->title($message),
-      "query" => json_encode(['$comment' => Query::COMMENT, 'disabled' => $message])
+      "query" => json_encode([ '$comment' => Query::COMMENT, 'disabled' => $message ])
     );
     return $response = $this->update($statementForwardId, $data);
   }
@@ -123,7 +123,7 @@ 
         ],
       ]);
 
-      if($request->getStatusCode() === 404) {
+      if ($request->getStatusCode() === 404) {
         throw new GuzzleHttp\Exception\ClientException('There was a issue connecting to Learning Locker.');
       }
       return $request->json();
@@ -156,8 +156,8 @@ 
         'body' => $store,
       ));
       $request = $request->json();
-      if (isset($request['_id'])) {
-        return $this->updateStatementForwardQuery($request['_id'], $startEnabled);
+      if (isset($request[ '_id' ])) {
+        return $this->updateStatementForwardQuery($request[ '_id' ], $startEnabled);
       }
       return false;
     } catch (Exception $e) {      

Braces +6 added lines, -2 removed lines

@@ -103,7 +103,9 @@ 
    * @return  $response
    */
   public function check($statementForwardId) {
-    if (empty($statementForwardId)) return false;
+    if (empty($statementForwardId)) {
+        return false;
+    }
     return $this->get($statementForwardId);
   }
 
@@ -180,7 +182,9 @@ 
    * @return  $response
    */
   protected function update($statementForwardId, $data) {
-    if (empty($statementForwardId)) return false;
+    if (empty($statementForwardId)) {
+        return false;
+    }
     $update = json_encode($data);
     try {
       $url = $this->endpoint . $this->api . $this->v2 . $this->statementForward . '/' . $statementForwardId;

src/LearningLocker/StatementForwarding/StatementForwardingHandler.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/StatementForwarding/Query.php

Indentation +36 added lines, -36 removed lines

@@ -8,28 +8,28 @@ 
 
 class Query {
 
-  const COMMENT = "AUTOGENERATED BY - DO NOT MANUALLY AMEND";
+    const COMMENT = "AUTOGENERATED BY - DO NOT MANUALLY AMEND";
 
-  /**
-   * Generate the Statement Forward Query
-   * based on the Object Completion Criteria
-   */
-  public static function statementForward($org_id) {
+    /**
+     * Generate the Statement Forward Query
+     * based on the Object Completion Criteria
+     */
+    public static function statementForward($org_id) {
     $criteria = ObjectCompletionCriterion::where('org_id', $org_id)->whereHas(\Object::class, function($q){
-      $q->where("completion_type", Types::XAPI);
+        $q->where("completion_type", Types::XAPI);
     })->with('object')->get();
 
     if (sizeof($criteria) === 0 ){
-      // if there are no criteria
-      return false;
+        // if there are no criteria
+        return false;
     } else {
-      //if there is criteria
-      $queries = [];
+        //if there is criteria
+        $queries = [];
 
-      foreach ($criteria as $criterion) {
+        foreach ($criteria as $criterion) {
         $course = $criterion->object->course;
         if (empty($course) || ($course && !empty($course->deleted_at))) {
-          continue;
+            continue;
         }
         $criteriaQuery = [];
         $criteriaQuery['$comment'] = 'id:'  . $criterion->id . ', object_id:' . $criterion->object_id;
@@ -42,48 +42,48 @@ 
         if (is_numeric($criterion->scaled)) $criteriaQuery['statement.result.score.scaled'] = ['$gte' => floatval($criterion->scaled)];
 
         if (sizeof($criteriaQuery) > 0) {
-          $queries[] = $criteriaQuery;
+            $queries[] = $criteriaQuery;
+        }
         }
-      }
-      if (sizeof($queries) === 0 ){
+        if (sizeof($queries) === 0 ){
         // if there are no quries
         return false;
-      }
+        }
 
-      $query = [
+        $query = [
         '$comment' => self::COMMENT,
         '$or'=>$queries
-      ];
+        ];
     }
 
     return json_encode($query);
-  }
+    }
 
-  /**
-   * Get the Learning Locker Statement Forward by ID.
-   *
-   * @param   $id
-   * @return  $response
-   */
-  protected function get() {
+    /**
+     * Get the Learning Locker Statement Forward by ID.
+     *
+     * @param   $id
+     * @return  $response
+     */
+    protected function get() {
     try {
-      $url = $this->endpoint . $this->api . $this->v2 . $this->query . '/';
-      $request = $this->getClient()->get($url, [
+        $url = $this->endpoint . $this->api . $this->v2 . $this->query . '/';
+        $request = $this->getClient()->get($url, [
         'auth' => $this->getAuth(),
         'headers' => [
-          'content-type' => 'application/json'
+            'content-type' => 'application/json'
         ],
-      ]);
+        ]);
 
-      if($request->getStatusCode() === 404) {
+        if($request->getStatusCode() === 404) {
         throw new ClientException('There was a issue connecting to Learning Locker.');
-      }
-      $response = $request->json();
+        }
+        $response = $request->json();
     } catch (ClientException $e) {
-      return $e;
+        return $e;
     }
 
     return $response;
-  }
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -15,37 +15,37 @@ 
    * based on the Object Completion Criteria
    */
   public static function statementForward($org_id) {
-    $criteria = ObjectCompletionCriterion::where('org_id', $org_id)->whereHas(\Object::class, function($q){
+    $criteria = ObjectCompletionCriterion::where('org_id', $org_id)->whereHas(\Object::class, function($q) {
       $q->where("completion_type", Types::XAPI);
     })->with('object')->get();
 
-    if (sizeof($criteria) === 0 ){
+    if (sizeof($criteria) === 0) {
       // if there are no criteria
       return false;
     } else {
       //if there is criteria
-      $queries = [];
+      $queries = [ ];
 
       foreach ($criteria as $criterion) {
         $course = $criterion->object->course;
         if (empty($course) || ($course && !empty($course->deleted_at))) {
           continue;
         }
-        $criteriaQuery = [];
-        $criteriaQuery['$comment'] = 'id:'  . $criterion->id . ', object_id:' . $criterion->object_id;
+        $criteriaQuery = [ ];
+        $criteriaQuery[ '$comment' ] = 'id:' . $criterion->id . ', object_id:' . $criterion->object_id;
         $activity_id = $criterion->use_curatr_activity ? $criterion->object->getXapiUrl(true, true) : $criterion->activity_id;
-        $criteriaQuery['statement.object.id'] = $activity_id;
-        if (!empty($criterion->verb)) $criteriaQuery['statement.verb.id'] = $criterion->verb;
-        if (!empty($criterion->completion)) $criteriaQuery['statement.result.completion'] = true;
-        if (!empty($criterion->success)) $criteriaQuery['statement.result.success'] = true;
-        if (is_numeric($criterion->raw)) $criteriaQuery['statement.result.score.raw'] = ['$gte' => floatval($criterion->raw)];
-        if (is_numeric($criterion->scaled)) $criteriaQuery['statement.result.score.scaled'] = ['$gte' => floatval($criterion->scaled)];
+        $criteriaQuery[ 'statement.object.id' ] = $activity_id;
+        if (!empty($criterion->verb)) $criteriaQuery[ 'statement.verb.id' ] = $criterion->verb;
+        if (!empty($criterion->completion)) $criteriaQuery[ 'statement.result.completion' ] = true;
+        if (!empty($criterion->success)) $criteriaQuery[ 'statement.result.success' ] = true;
+        if (is_numeric($criterion->raw)) $criteriaQuery[ 'statement.result.score.raw' ] = [ '$gte' => floatval($criterion->raw) ];
+        if (is_numeric($criterion->scaled)) $criteriaQuery[ 'statement.result.score.scaled' ] = [ '$gte' => floatval($criterion->scaled) ];
 
         if (sizeof($criteriaQuery) > 0) {
-          $queries[] = $criteriaQuery;
+          $queries[ ] = $criteriaQuery;
         }
       }
-      if (sizeof($queries) === 0 ){
+      if (sizeof($queries) === 0) {
         // if there are no quries
         return false;
       }
@@ -75,7 +75,7 @@ 
         ],
       ]);
 
-      if($request->getStatusCode() === 404) {
+      if ($request->getStatusCode() === 404) {
         throw new ClientException('There was a issue connecting to Learning Locker.');
       }
       $response = $request->json();

Braces +15 added lines, -5 removed lines

@@ -35,11 +35,21 @@
         $criteriaQuery['$comment'] = 'id:'  . $criterion->id . ', object_id:' . $criterion->object_id;
         $activity_id = $criterion->use_curatr_activity ? $criterion->object->getXapiUrl(true, true) : $criterion->activity_id;
         $criteriaQuery['statement.object.id'] = $activity_id;
-        if (!empty($criterion->verb)) $criteriaQuery['statement.verb.id'] = $criterion->verb;
-        if (!empty($criterion->completion)) $criteriaQuery['statement.result.completion'] = true;
-        if (!empty($criterion->success)) $criteriaQuery['statement.result.success'] = true;
-        if (is_numeric($criterion->raw)) $criteriaQuery['statement.result.score.raw'] = ['$gte' => floatval($criterion->raw)];
-        if (is_numeric($criterion->scaled)) $criteriaQuery['statement.result.score.scaled'] = ['$gte' => floatval($criterion->scaled)];
+        if (!empty($criterion->verb)) {
+            $criteriaQuery['statement.verb.id'] = $criterion->verb;
+        }
+        if (!empty($criterion->completion)) {
+            $criteriaQuery['statement.result.completion'] = true;
+        }
+        if (!empty($criterion->success)) {
+            $criteriaQuery['statement.result.success'] = true;
+        }
+        if (is_numeric($criterion->raw)) {
+            $criteriaQuery['statement.result.score.raw'] = ['$gte' => floatval($criterion->raw)];
+        }
+        if (is_numeric($criterion->scaled)) {
+            $criteriaQuery['statement.result.score.scaled'] = ['$gte' => floatval($criterion->scaled)];
+        }
 
         if (sizeof($criteriaQuery) > 0) {
           $queries[] = $criteriaQuery;

src/LearningLocker/Queries/QueryHandler.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/Visualisations/VisualisationHandler.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/Visualisations/VisualisationInterface.php

Indentation +1 added lines, -1 removed lines

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