ijeffro / laralocker

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/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();
 }

src/LearningLocker/Personas/PersonaInterface.php

Indentation +1 added lines, -1 removed lines

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

src/Providers/LaralockerServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__.'/../../publishable/config/laralocker.php' => config_path('laralocker.php'),
+                __DIR__ . '/../../publishable/config/laralocker.php' => config_path('laralocker.php'),
             ], 'config');
 
             // Publishing the views.
@@ -64,21 +64,21 @@ 
 
 
         // Automatically apply the package configuration
-        $this->mergeConfigFrom(__DIR__.'/../../publishable/config/laralocker.php', 'laralocker');
+        $this->mergeConfigFrom(__DIR__ . '/../../publishable/config/laralocker.php', 'laralocker');
 
 
         // Register the main class to use with the facade
-        $this->app->bind('laralocker', function () {
+        $this->app->bind('laralocker', function() {
             return new Laralocker;
         });
 
         // Register the main class to use with the facade
-        $this->app->bind('learninglocker', function () {
+        $this->app->bind('learninglocker', function() {
             return new LearningLocker;
         });
 
         // Register the main class to use with the facade
-        $this->app->bind('xapi', function () {
+        $this->app->bind('xapi', function() {
             return new xAPI;
         });
     }

src/LearningLocker.php

Spacing +2 added lines, -2 removed lines

@@ -439,7 +439,7 @@ 
      */
     public function routes()
     {
-        require __DIR__.'/../routes/laralocker.php';
+        require __DIR__ . '/../routes/laralocker.php';
     }
 
     /**
@@ -491,7 +491,7 @@ 
                 break;
             default:
 
-            $message = ["error" => "Please supply a Learning Locker model", "docs" => "http://docs.learninglocker.net/"];
+            $message = [ "error" => "Please supply a Learning Locker model", "docs" => "http://docs.learninglocker.net/" ];
 
             return $message->toJosn();
         }

Braces +84 added lines, -28 removed lines

@@ -65,7 +65,9 @@ 
      */
     public function connect($key, $secret, $url)
     {
-        if ($this->connection) return $this;
+        if ($this->connection) {
+            return $this;
+        }
 
         $this->connection = new Connection($key, $secret, $url);
         return $this->connect($key, $secret, $url);
@@ -78,7 +80,9 @@ 
      */
     public function clients()
     {
-        if ($this->clients) return $this->clients;
+        if ($this->clients) {
+            return $this->clients;
+        }
 
         $this->clients = new ClientHandler;
         return $this->clients();
@@ -92,7 +96,9 @@ 
      */
     public function client($id = null)
     {
-        if ($this->client) return $this->client;
+        if ($this->client) {
+            return $this->client;
+        }
         $this->client = new ClientHandler($id ? $id : null);
         return $this->client($id ? $id : null);
     }
@@ -104,7 +110,9 @@ 
      */
     public function users()
     {
-        if ($this->users) return $this->users;
+        if ($this->users) {
+            return $this->users;
+        }
 
         $this->users = new UserHandler;
         return $this->users();
@@ -118,7 +126,9 @@ 
      */
     public function user($id = null)
     {
-        if ($this->user) return $this->user;
+        if ($this->user) {
+            return $this->user;
+        }
 
         $this->user = new UserHandler($id ? $id : null);
         return $this->user($id ? $id : null);
@@ -131,7 +141,9 @@ 
      */
     public function roles()
     {
-        if ($this->roles) return $this->roles;
+        if ($this->roles) {
+            return $this->roles;
+        }
 
         $this->roles = new RoleHandler;
         return $this->roles();
@@ -145,7 +157,9 @@ 
      */
     public function role($id = null)
     {
-        if ($this->role) return $this->role;
+        if ($this->role) {
+            return $this->role;
+        }
 
         $this->role = new RoleHandler($id ? $id : null);
         return $this->role($id ? $id : null);
@@ -158,7 +172,9 @@ 
      */
     public function stores()
     {
-        if ($this->stores) return $this->stores;
+        if ($this->stores) {
+            return $this->stores;
+        }
 
         $this->stores = new StoreHandler;
         return $this->stores();
@@ -172,7 +188,9 @@ 
      */
     public function store($id = null)
     {
-        if ($this->store) return $this->store;
+        if ($this->store) {
+            return $this->store;
+        }
 
         $this->store = new StoreHandler($id ? $id : null);
         return $this->store($id ? $id : null);
@@ -185,7 +203,9 @@ 
      */
     public function queries()
     {
-        if ($this->queries) return $this->queries;
+        if ($this->queries) {
+            return $this->queries;
+        }
 
         $this->queries = new QueryHandler;
         return $this->queries();
@@ -198,7 +218,9 @@ 
      */
     public function query($id = null)
     {
-        if ($this->query) return $this->query;
+        if ($this->query) {
+            return $this->query;
+        }
 
         $this->query = new QueryHandler($id ? $id : null);
         return $this->query($id ? $id : null);
@@ -211,7 +233,9 @@ 
      */
     public function exports()
     {
-        if ($this->exports) return $this->exports;
+        if ($this->exports) {
+            return $this->exports;
+        }
 
         $this->exports = new ExportHandler;
         return $this->exports();
@@ -224,7 +248,9 @@ 
      */
     public function export($id = null)
     {
-        if ($this->export) return $this->export;
+        if ($this->export) {
+            return $this->export;
+        }
 
         $this->export = new ExportHandler($id ? $id : null);
         return $this->export($id ? $id : null);
@@ -237,7 +263,9 @@ 
      */
     public function personas()
     {
-        if ($this->personas) return $this->personas;
+        if ($this->personas) {
+            return $this->personas;
+        }
 
         $this->personas = new PersonaHandler;
         return $this->personas();
@@ -251,7 +279,9 @@ 
      */
     public function persona($id = null)
     {
-        if ($this->persona) return $this->persona;
+        if ($this->persona) {
+            return $this->persona;
+        }
 
         $this->persona = new PersonaHandler($id ? $id : null);
         return $this->persona($id ? $id : null);
@@ -264,7 +294,9 @@ 
      */
     public function journeys()
     {
-        if ($this->journeys) return $this->journeys;
+        if ($this->journeys) {
+            return $this->journeys;
+        }
 
         $this->journeys = new JourneyHandler;
         return $this->journeys();
@@ -278,7 +310,9 @@ 
      */
     public function journey($id = null)
     {
-        if ($this->journey) return $this->journey;
+        if ($this->journey) {
+            return $this->journey;
+        }
 
         $this->journey = new JourneyHandler($id ? $id : null);
         return $this->journey($id ? $id : null);
@@ -292,7 +326,9 @@ 
      */
     public function journeyProgress($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->journeyProgress($id ? $id : null);
@@ -305,7 +341,9 @@ 
      */
     public function dashboards()
     {
-        if ($this->dashboards) return $this->dashboards;
+        if ($this->dashboards) {
+            return $this->dashboards;
+        }
 
         $this->dashboards = new DashboardHandler;
         return $this->dashboards();
@@ -319,7 +357,9 @@ 
      */
     public function dashboard($id = null)
     {
-        if ($this->dashboard) return $this->dashboard;
+        if ($this->dashboard) {
+            return $this->dashboard;
+        }
 
         $this->dashboard = new DashboardHandler($id ? $id : null);
         return $this->dashboard($id ? $id : null);
@@ -332,7 +372,9 @@ 
      */
     public function downloads()
     {
-        if ($this->downloads) return $this->downloads;
+        if ($this->downloads) {
+            return $this->downloads;
+        }
 
         $this->downloads = new DownloadHandler;
         return $this->downloads();
@@ -345,7 +387,9 @@ 
      */
     public function download($id)
     {
-        if ($this->download) return $this->download;
+        if ($this->download) {
+            return $this->download;
+        }
 
         $this->download = new DownloadHandler($id);
         return $this->download($id);
@@ -358,7 +402,9 @@ 
      */
     public function statements()
     {
-        if ($this->statements) return $this->statements;
+        if ($this->statements) {
+            return $this->statements;
+        }
 
         $this->statements = new StatementHandler;
         return $this->statements();
@@ -372,7 +418,9 @@ 
      */
     public function statement($id = null)
     {
-        if ($this->statement) return $this->statement;
+        if ($this->statement) {
+            return $this->statement;
+        }
 
         $this->statement = new StatementHandler($id ?? $id);
         return $this->statement($id ?? $id);
@@ -385,7 +433,9 @@ 
      */
     public function statementForwarding($id = null)
     {
-        if ($this->statement_forwarding) return $this->statement_forwarding;
+        if ($this->statement_forwarding) {
+            return $this->statement_forwarding;
+        }
 
         $this->statement_forwarding = new StatementForwardingHandler($id ?? $id);
         return $this->statementForwarding($id ?? $id);
@@ -399,7 +449,9 @@ 
      */
     public function organisation($id)
     {
-        if ($this->organisation) return $this->organisation;
+        if ($this->organisation) {
+            return $this->organisation;
+        }
 
         $this->organisation = new OrganisationHandler($id);
         return $this->organisation($id);
@@ -413,7 +465,9 @@ 
      */
     public function visualisations()
     {
-        if ($this->visualisations) return $this->visualisations;
+        if ($this->visualisations) {
+            return $this->visualisations;
+        }
 
         $this->visualisations = new VisualisationHandler;
         return $this->visualisations();
@@ -427,7 +481,9 @@ 
      */
     public function visualisation($id = null)
     {
-        if ($this->visualisation) return $this->visualisation;
+        if ($this->visualisation) {
+            return $this->visualisation;
+        }
 
         $this->visualisation = new VisualisationHandler($id ? $id : null);
         return $this->visualisation($id ? $id : null);

src/Commands/LearningLocker/ClientCommand.php

Indentation +1 added lines, -1 removed lines

@@ -484,7 +484,7 @@
         if ($this->learning_locker_api->check()) {
             $this->info('Successfully connected to Learning Locker®');
         } else {
-           return $this->error(' << Could not connect to Learning Locker® ');
+            return $this->error(' << Could not connect to Learning Locker® ');
         }
 
     }

Spacing +36 added lines, -36 removed lines

@@ -14,8 +14,8 @@ 
 class SetupClientommand extends Command
 {
 
-    protected $seedersPath = __DIR__.'/../../publishable/database/seeds/';
-    protected $migrationsPath = __DIR__.'/../../publishable/database/migrations/';
+    protected $seedersPath = __DIR__ . '/../../publishable/database/seeds/';
+    protected $migrationsPath = __DIR__ . '/../../publishable/database/migrations/';
 
     /**
      * The console command name.
@@ -34,7 +34,7 @@ 
     protected function getOptions()
     {
         return [
-            ['setup', null, InputOption::VALUE_NONE, 'Add new Learning Locker® Client', null],
+            [ 'setup', null, InputOption::VALUE_NONE, 'Add new Learning Locker® Client', null ],
         ];
     }
 
@@ -158,7 +158,7 @@ 
 
         elseif ($this->confirm("Setup a single client with database?")):
 
-            if($this->confirm("Add new columns to an existing database table?")) {
+            if ($this->confirm("Add new columns to an existing database table?")) {
 
                 $migratedDatabaseTables = \DB::connection()->getDoctrineSchemaManager()->listTableNames();
                 $selectedTable = $this->anticipate("Which database table?", $migratedDatabaseTables); echo "\n";
@@ -166,16 +166,16 @@ 
                 $tableColumns = \Schema::getColumnListing($selectedTable);
 
                 $this->line(ucfirst($selectedTable) . " Table"); echo "\n";
-                $this->table($tableColumns, []);
+                $this->table($tableColumns, [ ]);
 
                 $keyColumn = $this->anticipate("Which column for the Learning Locker client key?", $tableColumns); echo "\n";
                 $secretColumn = $this->anticipate("Which column for the Learning Locker client secret?", $tableColumns); echo "\n";
 
-                $headers = [$keyColumn, $secretColumn];
+                $headers = [ $keyColumn, $secretColumn ];
 
                 $key = str_random(10);
                 $secret = str_random(10);
-                $tableColumns = [$key, $secret];
+                $tableColumns = [ $key, $secret ];
 
                 $this->table($headers, $tableColumns);
                 dd($tableColumns);
@@ -187,17 +187,17 @@ 
                 $migrationsDirectory = database_path("/migrations/*");
                 $migrationFiles = glob($migrationsDirectory);
 
-                $migrationFileNames = [];
-                $addColumnMigrations = [];
+                $migrationFileNames = [ ];
+                $addColumnMigrations = [ ];
 
                 //Loop through the array that glob returned.
-                foreach($migrationFiles as $migrationFile) {
+                foreach ($migrationFiles as $migrationFile) {
 
-                    if(strpos($migrationFile, "add_learning_locker_client_to_$table")) {
-                        $addColumnMigrations[] = $migrationFile;
+                    if (strpos($migrationFile, "add_learning_locker_client_to_$table")) {
+                        $addColumnMigrations[ ] = $migrationFile;
                     }
 
-                    $migrationFileNames[] = $migrationFile;
+                    $migrationFileNames[ ] = $migrationFile;
                 }
                 dd($addColumnMigrations);
 
@@ -216,23 +216,23 @@ 
                         break;
                 }
 
-                if(isset($addColumnMigrations) && count($addColumnMigrations) > 1) {
+                if (isset($addColumnMigrations) && count($addColumnMigrations) > 1) {
 
                     $this->question(" << You have " . count($addColumnMigrations) . " migrations which will add client credential columns to the $table table ");
 
-                    if($this->confirm("Would you like to overwrite these files with the new database migration?")) {
+                    if ($this->confirm("Would you like to overwrite these files with the new database migration?")) {
 
 
-                        foreach($addColumnMigrations as $addColumnMigrations) {
-                            if(is_file($addColumnMigrations))
+                        foreach ($addColumnMigrations as $addColumnMigrations) {
+                            if (is_file($addColumnMigrations))
                             unlink($addColumnMigrations); //delete file
                         }
 
-                        $makeMigration = $this->call("make:migration", ['name' => "add_learning_locker_client_to_$table"]);
+                        $makeMigration = $this->call("make:migration", [ 'name' => "add_learning_locker_client_to_$table" ]);
 
-                    } elseif($this->confirm("Would you like to save the new database migration and keep existing migrations?")) {
+                    } elseif ($this->confirm("Would you like to save the new database migration and keep existing migrations?")) {
 
-                        $makeMigration = $this->call("make:migration", ['name' => "add_learning_locker_client_to_$table"]);
+                        $makeMigration = $this->call("make:migration", [ 'name' => "add_learning_locker_client_to_$table" ]);
 
                     }
 
@@ -303,7 +303,7 @@ 
             $this->error(" << Client Setup Failed: Laralocker requires a Learning Locker url, client key and secret ");
             $this->error(" << Docs: (https://docs.learninglocker.net/http-clients/) ");
 
-            if($this->confirm("Attempt to conigure client details?")) {
+            if ($this->confirm("Attempt to conigure client details?")) {
                 $this->setupClient();
             }
 
@@ -351,13 +351,13 @@ 
                 $domain = $this->anticipate("What's the new learning Locker url?", [
                     'https://saas.learninglocker.net', 'http://saas.learninglocker.net'
                 ]);
-                $this->setEnv([strtoupper(LearningLockerConstants::URL) => $domain]);
+                $this->setEnv([ strtoupper(LearningLockerConstants::URL) => $domain ]);
 
                 $key = $this->ask("What's the new learning Locker client key?");
-                $this->setEnv([strtoupper(LearningLockerConstants::KEY) => $key]);
+                $this->setEnv([ strtoupper(LearningLockerConstants::KEY) => $key ]);
 
                 $secret = $this->secret("What's the new learning Locker client secret");
-                $this->setEnv([strtoupper(LearningLockerConstants::SECRET) => $secret]);
+                $this->setEnv([ strtoupper(LearningLockerConstants::SECRET) => $secret ]);
             }
 
         } else {
@@ -370,14 +370,14 @@ 
                             $domain = $this->anticipate("What's the new learning Locker domain?", [
                                 'https://saas.learninglocker.net', 'http://saas.learninglocker.net'
                             ]);
-                            $this->setEnv([strtoupper(LearningLockerConstants::URL) => $domain]);
+                            $this->setEnv([ strtoupper(LearningLockerConstants::URL) => $domain ]);
                         }
                         break;
                     case $url_has_variable_with_no_value:
                             $domain = $this->anticipate("What's your Learning Locker url?", [
                                 'https://saas.learninglocker.net', 'http://saas.learninglocker.net'
                             ]);
-                            $this->setEnv([strtoupper(LearningLockerConstants::URL) => $domain]);
+                            $this->setEnv([ strtoupper(LearningLockerConstants::URL) => $domain ]);
                         break;
                     case $url_has_no_variable_and_no_value:
                             $domain = $this->anticipate("What's your Learning Locker url?", [
@@ -392,12 +392,12 @@ 
                     case $key_has_variable_and_value:
                         if ($this->confirm('Update Learning Locker client key?')) {
                             $key = $this->ask("What's the new learning Locker client key?");
-                            $this->setEnv([strtoupper(LearningLockerConstants::KEY) => $key]);
+                            $this->setEnv([ strtoupper(LearningLockerConstants::KEY) => $key ]);
                         }
                         break;
                     case $key_has_variable_with_no_value:
                             $key = $this->ask("What's your Learning Locker client key?");
-                            $this->setEnv([strtoupper(LearningLockerConstants::KEY) => $key]);
+                            $this->setEnv([ strtoupper(LearningLockerConstants::KEY) => $key ]);
                         break;
                     case $key_has_no_variable_and_no_value:
                             $key = $this->ask("What's your Learning Locker client key?");
@@ -410,12 +410,12 @@ 
                     case $secret_has_variable_and_value:
                         if ($this->confirm('Update Learning Locker client secret?')) {
                             $secret = $this->secret("What's the new learning Locker client secret");
-                            $this->setEnv([strtoupper(LearningLockerConstants::KEY) => $key]);
+                            $this->setEnv([ strtoupper(LearningLockerConstants::KEY) => $key ]);
                         }
                         break;
                     case $secret_has_variable_with_no_value:
                             $secret = $this->secret("What's your Learning Locker client secret");
-                            $this->setEnv([strtoupper(LearningLockerConstants::KEY) => $secret]);
+                            $this->setEnv([ strtoupper(LearningLockerConstants::KEY) => $secret ]);
                         break;
                     case $secret_has_no_variable_and_no_value:
                             $secret = $this->secret("What's your Learning Locker client secret");
@@ -450,8 +450,8 @@ 
      */
     protected function findComposer()
     {
-        if (file_exists(getcwd().'/composer.phar')) {
-            return '"'.PHP_BINARY.'" '.getcwd().'/composer.phar';
+        if (file_exists(getcwd() . '/composer.phar')) {
+            return '"' . PHP_BINARY . '" ' . getcwd() . '/composer.phar';
         }
 
         return 'composer';
@@ -472,8 +472,8 @@ 
 
     public function publishVendor()
     {
-        $tags = ['config'];
-        $this->call('vendor:publish', ['--provider' => LaraLockerServiceProvider::class, '--tag' => $tags]);
+        $tags = [ 'config' ];
+        $this->call('vendor:publish', [ '--provider' => LaraLockerServiceProvider::class, '--tag' => $tags ]);
     }
 
     public function checkLearningLockerConnection()
@@ -521,7 +521,7 @@ 
             foreach ($variables as $variable) {
                 $env_variable = $this->getEnv($variable);
                 $contents = file_get_contents($env);
-                $contents = str_replace(strtoupper($variable) . '=' . $env_variable, strtoupper($variable) . '=' . $data[$variable], $contents);
+                $contents = str_replace(strtoupper($variable) . '=' . $env_variable, strtoupper($variable) . '=' . $data[ $variable ], $contents);
                 file_put_contents($env, $contents);
             }
         }
@@ -541,7 +541,7 @@ 
             $env_contents = $filesystem->get($env);
 
             if (false === strpos($env_contents, $key)) {
-                $filesystem->append($env, "\n" . strtoupper($key) . '=' .  strtolower($value));
+                $filesystem->append($env, "\n" . strtoupper($key) . '=' . strtolower($value));
                 return $this->info("Created Environment variable $value successfully.");
             }
         }

Braces +15 added lines, -23 removed lines

@@ -87,12 +87,11 @@ 
 
             } else {
                 $this->error(" << Not sure of any other way to to setup an single client in an existing database");
-            }
-
-
-        else:
+            } else {
+            :
 
             $this->error(" << Unable to setup client credentials for Learning Locker® ");
+        }
 
             if ($this->confirm("Would you like to run through the client setup again?")) {
                 return $this->setupClient();
@@ -122,13 +121,7 @@ 
 
             } else {
                 $this->error(" << Not sure of any other way to to setup an single client in an existing database");
-            }
-
-
-
-
-
-        elseif ($this->confirm("Setup multiply Learning Locker® clients in the database?")):
+            } elseif ($this->confirm("Setup multiply Learning Locker® clients in the database?")):
 
 
 
@@ -141,13 +134,10 @@ 
 
             } else {
                 $this->error(" << Not sure of any other way to to setup an single client in an existing database");
-            }
-
-
-
-
-        else:
+            } else {
+            :
             $this->error(" << Not sure of any other way to to setup an single client in an existing database");
+        }
 
             if ($this->confirm("Would you like to run through the setup process again?")) {
             }
@@ -224,8 +214,10 @@ 
 
 
                         foreach($addColumnMigrations as $addColumnMigrations) {
-                            if(is_file($addColumnMigrations))
-                            unlink($addColumnMigrations); //delete file
+                            if(is_file($addColumnMigrations)) {
+                                                        unlink($addColumnMigrations);
+                            }
+                            //delete file
                         }
 
                         $makeMigration = $this->call("make:migration", ['name' => "add_learning_locker_client_to_$table"]);
@@ -293,14 +285,14 @@ 
                 dump("Single client in the database");
             } else {
                 dump("Single client in the database");
-            }
-
-        elseif ($this->confirm("Setup multiple Learning Locker client's with database?")):
+            } elseif ($this->confirm("Setup multiple Learning Locker client's with database?")):
             dump("database setup");
 
-        else:
+        else {
+            :
 
             $this->error(" << Client Setup Failed: Laralocker requires a Learning Locker url, client key and secret ");
+        }
             $this->error(" << Docs: (https://docs.learninglocker.net/http-clients/) ");
 
             if($this->confirm("Attempt to conigure client details?")) {