francis94c / ci-rest

libraries/REST.php

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
    * [PACKAGE description]
    * @var string
    */
-  const   PACKAGE    = "francis94c/ci-rest";
+  const   PACKAGE = "francis94c/ci-rest";
   /**
    * [RATE_LIMIT description]
    * @var string
@@ -89,15 +89,15 @@ 
    * [__construct description]
    * @param [type] $params [description]
    */
-  function __construct($params=null) {
-    $this->ci =& get_instance();
+  function __construct($params = null) {
+    $this->ci = & get_instance();
     // Load Config If Exists.
     $this->ci->config->load('rest', true, true);
     // Load Database.
     $this->ci->load->database();
     // 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,
       'users_id_column'       => $this->ci->config->item('rest')['basic_auth']['id_column'] ?? null,
@@ -176,7 +176,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.
@@ -209,11 +209,11 @@ 
    * [api_key_auth description]
    */
   private function api_key_auth():void {
-    if (!isset($_SERVER['HTTP_' . str_replace("-", "_", $this->apiKeyHeader)])) {
+    if (!isset($_SERVER['HTTP_'.str_replace("-", "_", $this->apiKeyHeader)])) {
       $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::API_KEY); // Exits.
     }
     $apiKey = $this->rest_model->getAPIKeyData(
-      $_SERVER['HTTP_' . str_replace("-", "_", $this->apiKeyHeader)]
+      $_SERVER['HTTP_'.str_replace("-", "_", $this->apiKeyHeader)]
     );
     if ($apiKey == null) {
       $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::API_KEY); // Exits.
@@ -229,7 +229,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 = [];
@@ -312,7 +312,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"]);
     } else if (isset($_SERVER['HTTP_AUTHORIZATION'])) { //Nginx or fast CGI
@@ -333,7 +333,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");
     if (isset($this->ci->config->item('rest')['response_callbacks'][$code])) {

libraries/RESTAuth.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
    * [BasicAuth description]
    * @var string
    */
-  const BASIC   = "Basic";
+  const BASIC = "Basic";
   /**
    * [API_KEY description]
    * @var string
@@ -16,12 +16,12 @@ 
    * [BEARER description]
    * @var string
    */
-  const BEARER  = "Bearer";
+  const BEARER = "Bearer";
   /**
    * [OAUTH2 description]
    * @var string
    */
-  const OAUTH2  = "OAUTH2";
+  const OAUTH2 = "OAUTH2";
   /**
    * [CUSTOM description]
    * @param  string $header [description]

models/RESTModel.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
    * @param  string $apiKey [description]
    * @return array          [description]
    */
-  public function getAPIKeyData(string $apiKey):?array {
+  public function getAPIKeyData(string $apiKey): ?array {
     // Preliminary Check.
     if ($this->api_key_table == null || $this->api_key_column == null) return null;
     // Query.
@@ -120,7 +120,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];

phpunit/RESTTest.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@ 
    */
   public static function setUpBeforeClass(): void {
     echo "IN TEST";
-    self::$ci =& get_instance();
+    self::$ci = & get_instance();
     self::$ci->load->database('mysqli://root@localhost/test_db');
     self::$ci->load->helper("url");
-    $queries = explode("#@@@", file_get_contents(FCPATH . 'application/splints/' . self::PACKAGE . '/phpunit/database.sql'));
+    $queries = explode("#@@@", file_get_contents(FCPATH.'application/splints/'.self::PACKAGE.'/phpunit/database.sql'));
     self::assertTrue(count($queries) > 0);
     self::$ci->load->database();
     foreach ($queries as $query) {
@@ -43,7 +43,7 @@ 
     // However, for the purpose of this test, we are going to Hack Code CodeIgniter
     // with a Splint Config variable to allow us load config files from where
     // ever we want. This happens below.
-    self::$ci->load->add_package_path(APPPATH . 'splints/' . self::PACKAGE . "/phpunit/");
+    self::$ci->load->add_package_path(APPPATH.'splints/'.self::PACKAGE."/phpunit/");
     //self::$ci->config->set_item('st_config_path_prefix', '../splints/' . self::PACKAGE . "/phpunit/config/");
   }
   /**
@@ -55,7 +55,7 @@ 
     // Simulate Basic Authorization
     $_SERVER['PHP_AUTH_USER'] = "francis94c";
     $_SERVER['PHP_AUTH_PW'] = "0123456789";
-    self::$ci->load->splint(self::PACKAGE, '+REST', null, 'rest_' . $this->obj_count++);
+    self::$ci->load->splint(self::PACKAGE, '+REST', null, 'rest_'.$this->obj_count++);
     $this->assertEquals(1, self::$ci->{'rest_'.($this->obj_count - 1)}->userId);
   }
   /**

phpunit/config/rest.php

Spacing +4 added lines, -4 removed lines

@@ -9,19 +9,19 @@
 
 $config['auth_callbacks'] = [
 
-  RESTAuth::CUSTOM('X-APP-ID')    => function (&$context, $value):bool {
+  RESTAuth::CUSTOM('X-APP-ID')    => function(&$context, $value):bool {
     return true;
   },
 
-  RESTAuth::CUSTOM('X-DEVICE-ID') => function (&$context, $value):bool {
+  RESTAuth::CUSTOM('X-DEVICE-ID') => function(&$context, $value):bool {
     return true;
   },
 
-  RESTAuth::BEARER                => function (&$context, $token):bool {
+  RESTAuth::BEARER                => function(&$context, $token):bool {
     return true;
   },
 
-  RESTAuth::OAUTH2                => function (&$context, $token):bool {
+  RESTAuth::OAUTH2                => function(&$context, $token):bool {
     return true;
   }