andela-tolotin / Emoji-REST-API

src/Auth/Oauth.php

Doc Comments -1 removed lines

@@ -16,7 +16,6 @@
      * This method authenticate user and log them in if the supplied
      * credentials are valid.
      *
-     * @param array $loginParams
      *
      * @return json jwt
      */

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
                 return $response->withJson($validateResponse, 400);
             }
 
-            if (! $this->verifyUserRegistration($userParams['username'], $userParams['email'])) {
+            if (!$this->verifyUserRegistration($userParams['username'], $userParams['email'])) {
                 $boolResponse = $user->createUser([
                     'firstname'  => $userParams['firstname'],
                     'lastname'   => $userParams['lastname'],
@@ -141,7 +141,7 @@ 
         $tokenId = base64_encode(mcrypt_create_iv(32));
         $issuedAt = time();
         $notBefore = $issuedAt;
-        $expire =  (float) strtotime('+30 days'); // Adding 30 days expiry date
+        $expire = (float) strtotime('+30 days'); // Adding 30 days expiry date
         $serverName = 'http://localhost:8000/emojis'; // the server name
 
         /*
@@ -149,12 +149,12 @@ 
          * Create the token params as an array
          */
         $data = [
-            'iat'  => $issuedAt,         // Issued at: time when the token was generated
-            'jti'  => $tokenId,          // Json Token Id: an unique identifier for the token
-            'iss'  => $serverName,       // Issuer
-            'nbf'  => $notBefore,        // Not before
-            'exp'  => $expire,           // Expire
-            'dat'  => $userData,          // User Information retrieved from the database
+            'iat'  => $issuedAt, // Issued at: time when the token was generated
+            'jti'  => $tokenId, // Json Token Id: an unique identifier for the token
+            'iss'  => $serverName, // Issuer
+            'nbf'  => $notBefore, // Not before
+            'exp'  => $expire, // Expire
+            'dat'  => $userData, // User Information retrieved from the database
         ];
 
         $loadEnv = DatabaseConnection::loadEnv();
@@ -162,7 +162,7 @@ 
         $secretKey = base64_decode(getenv('secret'));
 
         $jwt = JWT::encode(
-        $data,      //Data to be encoded in the JWT
+        $data, //Data to be encoded in the JWT
         $secretKey, // The signing key
         'HS512'     // Algorithm used to sign the token
         );

src/Auth/Middleware.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $authHeader = $request->getHeader('HTTP_AUTHORIZATION');
 
         try {
-            if (is_array($authHeader) && ! empty($authHeader)) {
+            if (is_array($authHeader) && !empty($authHeader)) {
                 $secretKey = base64_decode(getenv('secret'));
                 $jwt = json_decode($authHeader[0], true);
                 //decode the JWT using the key from config

src/Model/Emoji.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

src/Model/Keyword.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

src/Model/Category.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

index.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

src/Database/Schema.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

Spacing +8 added lines, -8 removed lines

@@ -25,8 +25,8 @@ 
      */
     public function createUser()
     {
-        if (! Capsule::schema()->hasTable('users')) {
-            Capsule::schema()->create('users', function ($table) {
+        if (!Capsule::schema()->hasTable('users')) {
+            Capsule::schema()->create('users', function($table) {
                 $table->increments('id');
                 $table->string('firstname');
                 $table->string('lastname');
@@ -43,8 +43,8 @@ 
      */
     public function createKeyword()
     {
-        if (! Capsule::schema()->hasTable('keywords')) {
-            Capsule::schema()->create('keywords', function ($table) {
+        if (!Capsule::schema()->hasTable('keywords')) {
+            Capsule::schema()->create('keywords', function($table) {
                 $table->increments('id');
                 $table->integer('emoji_id');
                 $table->string('keyword_name');
@@ -58,8 +58,8 @@ 
      */
     public function createCategory()
     {
-        if (! Capsule::schema()->hasTable('categories')) {
-            Capsule::schema()->create('categories', function ($table) {
+        if (!Capsule::schema()->hasTable('categories')) {
+            Capsule::schema()->create('categories', function($table) {
                 $table->increments('id');
                 $table->string('category_name');
                 $table->timestamps();
@@ -73,8 +73,8 @@ 
      */
     public function createEmoji()
     {
-        if (! Capsule::schema()->hasTable('emojis')) {
-            Capsule::schema()->create('emojis', function ($table) {
+        if (!Capsule::schema()->hasTable('emojis')) {
+            Capsule::schema()->create('emojis', function($table) {
                 $table->increments('id');
                 $table->string('name');
                 $table->string('char');

src/Route/SlimRouteApp.php

Indentation +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 
@@ -46,7 +46,7 @@ 
         $auth = $this->auth;
         $emoji = $this->emoji;
 
-       /*
+        /*
         * This verb returns error 404
         *
         * @param $request

Spacing +11 added lines, -11 removed lines

@@ -49,7 +49,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->get('/', function (Request $request, Response $response) {
+        $this->slimApp->get('/', function(Request $request, Response $response) {
             return $response->withJson(['message' => 'Welcome to Sweet Emoji'], 200);
 
         });
@@ -64,7 +64,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->post('/', function (Request $request, Response $response) {
+        $this->slimApp->post('/', function(Request $request, Response $response) {
             return $response->withStatus(404);
 
         });
@@ -79,7 +79,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->post('/auth/register', function (Request $request, Response $response) use ($auth) {
+        $this->slimApp->post('/auth/register', function(Request $request, Response $response) use ($auth) {
             return $auth->registerUser($request, $response);
 
 
@@ -95,7 +95,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->post('/auth/login', function (Request $request, Response $response) use ($auth) {
+        $this->slimApp->post('/auth/login', function(Request $request, Response $response) use ($auth) {
             return $auth->loginUser($request, $response);
 
         });
@@ -113,7 +113,7 @@ 
         *
         */
 
-        $this->slimApp->get('/auth/logout', function (Request $request, Response $response, $args) use ($auth) {
+        $this->slimApp->get('/auth/logout', function(Request $request, Response $response, $args) use ($auth) {
             return $auth->logoutUser($request, $response, $args);
 
         })->add(new Middleware());
@@ -128,7 +128,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->get('/emojis', function (Request $request, Response $response) use ($emoji) {
+        $this->slimApp->get('/emojis', function(Request $request, Response $response) use ($emoji) {
             return $emoji->listAllEmoji($response);
 
         });
@@ -143,7 +143,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->get('/emojis/{id}', function (Request $request, Response $response, $args) use ($emoji) {
+        $this->slimApp->get('/emojis/{id}', function(Request $request, Response $response, $args) use ($emoji) {
             return $emoji->getSingleEmoji($response, $args);
 
         });
@@ -158,7 +158,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->post('/emojis', function (Request $request, Response $response) use ($emoji) {
+        $this->slimApp->post('/emojis', function(Request $request, Response $response) use ($emoji) {
             return $emoji->createEmoji($request, $response);
 
         })->add(new Middleware());
@@ -177,7 +177,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->put('/emojis/{id}', function (Request $request, Response $response, $args) use ($emoji) {
+        $this->slimApp->put('/emojis/{id}', function(Request $request, Response $response, $args) use ($emoji) {
             return $emoji->updateEmojiByPutVerb($request, $response, $args);
 
         })->add(new Middleware());
@@ -194,7 +194,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->patch('/emojis/{id}', function (Request $request, Response $response, $args) use ($emoji) {
+        $this->slimApp->patch('/emojis/{id}', function(Request $request, Response $response, $args) use ($emoji) {
             return $emoji->updateEmojiByPatchVerb($request, $response, $args);
 
         })->add(new Middleware());
@@ -211,7 +211,7 @@ 
         * @return json $response
         *
         */
-        $this->slimApp->delete('/emojis/{id}', function (Request $request, Response $response, $args) use ($emoji) {
+        $this->slimApp->delete('/emojis/{id}', function(Request $request, Response $response, $args) use ($emoji) {
             return $emoji->deleteEmoji($request, $response, $args);
 
         })->add(new Middleware());

src/Controller/UserController.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author   Temitope Olotin <temitope.olotin@andela.com>
- * @license  <https://opensource.org/license/MIT> MIT
- */
+     * @author   Temitope Olotin <temitope.olotin@andela.com>
+     * @license  <https://opensource.org/license/MIT> MIT
+     */
 
 namespace Laztopaz\EmojiRestfulAPI;
 

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      *
      * @param $data
      *
-     * @return bool true
+     * @return boolean|null true
      */
     public function createUser(array $data)
     {