Continue cleaning up

scrutinizer.yml

@@ -35,7 +35,6 @@ filter:
     - 'storage/*'
     - 'vendor/*'
     - 'phinx.php'
-    - 'src/Http/SwooleRequest.php' #it need to be this big , since the phalcon interfase requires it
 
 build_failure_conditions:
     # No classes/methods with a rating of D or worse

src/Api/Controllers/AppsPlansController.php

@@ -9,9 +9,9 @@
 use Phalcon\Http\Response;
 use Stripe\Customer as StripeCustomer;
 use Phalcon\Validation\Validator\PresenceOf;
-use Canvas\Http\Exception\NotFoundException;
-use Canvas\Http\Exception\UnauthorizedException;
-use Canvas\Http\Exception\UnprocessableEntityException;
+use Baka\Http\Exception\NotFoundException;
+use Baka\Http\Exception\UnauthorizedException;
+use Baka\Http\Exception\UnprocessableEntityException;
 use Canvas\Models\Subscription as CanvasSubscription;
 use Phalcon\Cashier\Subscription;
 use Canvas\Models\UserCompanyApps;

src/Api/Controllers/AuthController.php

@@ -11,8 +11,8 @@
 use Canvas\Auth\Auth;
 use Canvas\Auth\Factory;
 use Canvas\Exception\ModelException;
-use Canvas\Http\Exception\InternalServerErrorException;
-use Canvas\Http\Exception\NotFoundException;
+use Baka\Http\Exception\InternalServerErrorException;
+use Baka\Http\Exception\NotFoundException;
 use Canvas\Models\Sources;
 use Canvas\Models\UserLinkedSources;
 use Canvas\Models\Users;

src/Api/Controllers/CompaniesBranchesController.php

@@ -5,7 +5,7 @@
 namespace Canvas\Api\Controllers;
 
 use Phalcon\Http\Response;
-use Canvas\Http\Exception\UnprocessableEntityException;
+use Baka\Http\Exception\UnprocessableEntityException;
 use Canvas\Models\CompaniesBranches;
 
 /**

src/Api/Controllers/CompaniesController.php

@@ -5,7 +5,7 @@
 namespace Canvas\Api\Controllers;
 
 use Baka\Http\Contracts\Api\CrudCustomFieldsBehaviorTrait;
-use Canvas\Http\Exception\UnauthorizedException;
+use Baka\Http\Exception\UnauthorizedException;
 use Canvas\Models\Companies;
 use Phalcon\Http\Response;
 

src/Api/Controllers/CustomFieldsModulesController.php

@@ -7,8 +7,8 @@
 use Canvas\Models\CustomFieldsModules;
 use Canvas\CustomFields\CustomFields;
 use Phalcon\Http\Response;
-use Canvas\Http\Exception\NotFoundException;
-use Canvas\Http\Exception\UnauthorizedException;
+use Baka\Http\Exception\NotFoundException;
+use Baka\Http\Exception\UnauthorizedException;
 use Canvas\Dto\CustomFieldsModules as CustomFieldsModulesDto;
 use Canvas\Mapper\CustomFieldsModulesMapper;
 use Canvas\Contracts\Controllers\ProcessOutputMapperTrait;

src/Api/Controllers/EmailTemplatesController.php

@@ -4,7 +4,7 @@
 
 namespace Canvas\Api\Controllers;
 
-use Canvas\Http\Exception\NotFoundException;
+use Baka\Http\Exception\NotFoundException;
 use Canvas\Models\EmailTemplates;
 use Canvas\Models\Users;
 use Phalcon\Http\Response;

src/Api/Controllers/IndexController.php

@@ -4,7 +4,7 @@
 
 namespace Canvas\Api\Controllers;
 
-use Canvas\Http\Exception\InternalServerErrorException;
+use Baka\Http\Exception\InternalServerErrorException;
 use Exception;
 use PDOException;
 use Phalcon\Http\Response;
@@ -74,8 +74,6 @@ public function status() : Response
         } catch (Exception $e) {
             $this->log->error("RabbitMQ isn't working. {$e->getMessage()}", $e->getTrace());
             $response['errors']['RabbitMQ'] = "RabbitMQ isn't working.";
-        } finally {
-            $this->queue->close();
         }
 
         //Try to connect to db
@@ -93,6 +91,6 @@ public function status() : Response
             return $this->response(['OK']);
         }
 
-        throw new InternalServerErrorException(json_encode($response));
+        throw InternalServerErrorException::create('Internal Server Error', $response);
     }
 }

src/Api/Controllers/PaymentsController.php

@@ -4,7 +4,7 @@
 
 namespace Canvas\Api\Controllers;
 
-use Canvas\Http\Exception\NotFoundException;
+use Baka\Http\Exception\NotFoundException;
 use Baka\Contracts\Cashier\StripeWebhookHandlersTrait;
 use Phalcon\Http\Response;
 use Canvas\Models\Users;

src/Api/Controllers/RolesAccessListController.php

@@ -7,7 +7,7 @@
 use Baka\Database\Exception\ModelNotFoundException;
 use function Baka\getShortClassName;
 use Baka\Validation as CanvasValidation;
-use Canvas\Http\Exception\NotFoundException;
+use Baka\Http\Exception\NotFoundException;
 use Canvas\Models\AccessList;
 use Canvas\Models\Roles;
 use Phalcon\Acl\Role;

src/Api/Controllers/UserLinkedSourcesController.php

@@ -11,7 +11,7 @@
 use Baka\Validation as CanvasValidation;
 use Baka\ASDecoder;
 
-use Canvas\Http\Exception\InternalServerErrorException;
+use Baka\Http\Exception\InternalServerErrorException;
 
 /**
  * Class LanguagesController.

src/Api/Controllers/UserWebhooksController.php

@@ -6,7 +6,7 @@
 
 use function Baka\isJson;
 use Baka\Validation;
-use Canvas\Http\Exception\UnprocessableEntityException;
+use Baka\Http\Exception\UnprocessableEntityException;
 use Canvas\Models\UserWebhooks;
 use Canvas\Webhooks;
 use Phalcon\Http\Response;

src/Api/Controllers/UsersController.php

@@ -8,7 +8,7 @@
 use Baka\Validation as CanvasValidation;
 use Canvas\Contracts\Controllers\ProcessOutputMapperTrait;
 use Canvas\Dto\User as UserDto;
-use Canvas\Http\Exception\InternalServerErrorException;
+use Baka\Http\Exception\InternalServerErrorException;
 use Canvas\Mapper\UserMapper;
 use Canvas\Models\Users;
 use Canvas\Models\UsersAssociatedApps;

src/Api/Controllers/UsersInviteController.php

@@ -7,7 +7,7 @@
 use Baka\Http\Exception\NotFoundException;
 use Baka\Validation as CanvasValidation;
 use Canvas\Auth\Auth;
-use Canvas\Http\Exception\UnprocessableEntityException;
+use Baka\Http\Exception\UnprocessableEntityException;
 use Canvas\Models\Roles;
 use Canvas\Models\Users;
 use Canvas\Models\UsersInvite;

src/Auth/App.php

@@ -5,7 +5,7 @@
 namespace Canvas\Auth;
 
 use Baka\Auth\Auth;
-use Canvas\Hashing\Password;
+use Baka\Hashing\Password;
 use Canvas\Models\Users;
 use Exception;
 use Phalcon\Di;

src/Cli/jobs/Apps.php

@@ -2,8 +2,8 @@
 
 namespace Canvas\Cli\Jobs;
 
-use Canvas\Contracts\Queue\QueueableJobInterface;
-use Canvas\Jobs\Job;
+use Baka\Contracts\Queue\QueueableJobInterface;
+use Baka\Jobs\Job;
 use Phalcon\Di;
 use Canvas\Models\Apps as CanvasApps;
 use Phalcon\Security\Random;

src/Cli/jobs/PushNotifications.php

@@ -2,8 +2,8 @@
 
 namespace Canvas\Cli\Jobs;
 
-use Canvas\Contracts\Queue\QueueableJobInterface;
-use Canvas\Jobs\Job;
+use Baka\Contracts\Queue\QueueableJobInterface;
+use Baka\Jobs\Job;
 use Phalcon\Di;
 use GuzzleHttp\Client as GuzzleClient;
 use Http\Adapter\Guzzle6\Client as GuzzleAdapter;

src/Cli/jobs/Pusher.php

@@ -2,8 +2,8 @@
 
 namespace Canvas\Cli\Jobs;
 
-use Canvas\Contracts\Queue\QueueableJobInterface;
-use Canvas\Jobs\Job;
+use Baka\Contracts\Queue\QueueableJobInterface;
+use Baka\Jobs\Job;
 use Canvas\Notifications\PusherNotification;
 use Phalcon\Di;
 

src/Cli/tasks/QueueTask.php

@@ -2,9 +2,9 @@
 
 namespace Canvas\Cli\Tasks;
 
-use Canvas\Contracts\Queue\QueueableJobInterface;
+use Baka\Contracts\Queue\QueueableJobInterface;
 use Canvas\Models\Users;
-use Canvas\Queue\Queue;
+use Baka\Queue\Queue;
 use Phalcon\Cli\Task as PhTask;
 use Phalcon\Mvc\Model;
 use Throwable;

src/Core/config.php

@@ -16,7 +16,7 @@
         ],
     ],
     'app' => [
-        //GEWAER is a multi entity app encosystem so we need what is the current api ID for this api
+        //GEWAER is a multi entity app ecosystem so we need what is the current api ID for this api
         'id' => envValue('GEWAER_APP_ID', 1),
         'frontEndUrl' => envValue('FRONTEND_URL'),
         'version' => envValue('VERSION', time()),

src/CustomFields/AbstractCustomFieldsModel.php

@@ -65,16 +65,4 @@ public function getAllCustomFields(array $fields = [])
 
         return $listOfCustomFields;
     }
-
-    /**
-    * Before create.
-    *
-    * @return void
-    */
-    public function beforeCreate()
-    {
-        $this->created_at = date('Y-m-d H:i:s');
-        $this->updated_at = null;
-        $this->is_deleted = 0;
-    }
 }