francis94c / ci-rest

models/RESTModel.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
    * @param  string $apiKey [description]
    * @return array          [description]
    */
-  public function getAPIKeyData(string $apiKey):?object {
+  public function getAPIKeyData(string $apiKey): ?object {
     // Preliminary Check.
     if ($this->api_key_table == null || $this->api_key_column == null) return null;
     // Query.
@@ -119,7 +119,7 @@ 
    * @param  string $group  [description]
    * @return [type]         [description]
    */
-  public function getLimitData(string $client, string $group):?array {
+  public function getLimitData(string $client, string $group): ?array {
     $sql = 'SELECT count, start, (`start` + INTERVAL (1 - TIMESTAMPDIFF(HOUR, UTC_TIMESTAMP(), NOW())) HOUR) AS reset_epoch FROM rest_api_rate_limit WHERE client = ? AND _group = ?';
     $query = $this->db->query($sql, [$client, $group]);
     if (!is_scalar($query) && $query->num_rows() > 0) return $query->result_array()[0];

libraries/REST.php

Spacing +7 added lines, -7 removed lines

@@ -117,9 +117,9 @@ 
    * @param array|null $params Initialization parameters from the Slint system.
    *                           There's no use for this arg yet.
    */
-  function __construct(?array $params=null)
+  function __construct(?array $params = null)
   {
-    $this->ci =& get_instance();
+    $this->ci = & get_instance();
 
     if ($this->ci->input->is_cli_request()) return;
 
@@ -137,7 +137,7 @@ 
 
     // Load Model.
     $this->ci->load->splint(self::PACKAGE, '*RESTModel', 'rest_model');
-    $this->rest_model =& $this->ci->rest_model;
+    $this->rest_model = & $this->ci->rest_model;
 
     $config = [
       'users_table'           => $this->ci->config->item('rest')['basic_auth']['users_table'] ?? null,
@@ -263,7 +263,7 @@ 
   /**
    * [bearer_auth description]
    */
-  private function bearer_auth($auth=RESTAuth::BEARER):void {
+  private function bearer_auth($auth = RESTAuth::BEARER):void {
     $authorization = $this->get_authorization_header();
     if ($authorization == null || substr_count($authorization, " ") != 1) {
       $this->handle_response(RESTResponse::BAD_REQUEST, $auth); // Exits.
@@ -325,7 +325,7 @@ 
       }
       // Should we acyually Limit?
       if ($this->per_hour > 0) {
-        $client = hash('md5', $this->ci->input->ip_address() . "%" . $apiKey->{$this->api_key_column});
+        $client = hash('md5', $this->ci->input->ip_address()."%".$apiKey->{$this->api_key_column});
         $limitData = $this->rest_model->getLimitData($client, '_api_keyed_user');
         if ($limitData == null) {
           $limitData = [];
@@ -409,7 +409,7 @@ 
    * [get_authorization_header description]
    * @return [type] [description]
    */
-  private function get_authorization_header():?string
+  private function get_authorization_header(): ?string
   {
     if (isset($_SERVER['Authorization'])) {
       return trim($_SERVER["Authorization"]);
@@ -432,7 +432,7 @@ 
    * [handle_response description]
    * @param int $code [description]
    */
-  private function handle_response(int $code, $auth=null):void
+  private function handle_response(int $code, $auth = null):void
   {
     http_response_code($code);
     header("Content-Type: application/json");