#76 - Add namespaces for each .php file

app/Services.php

@@ -1,14 +1,18 @@
 <?php
+declare(strict_types=1);
 
-use Phalcon\Mvc\View;
-use Phalcon\DI\FactoryDefault;
+namespace Invo;
+
+use Invo\Plugins\NotFoundPlugin;
+use Invo\Plugins\SecurityPlugin;
+use Phalcon\Events\Manager as EventsManager;
+use Phalcon\Flash\Session as FlashSession;
 use Phalcon\Mvc\Dispatcher;
-use Phalcon\Mvc\Url as UrlProvider;
-use Phalcon\Mvc\View\Engine\Volt as VoltEngine;
 use Phalcon\Mvc\Model\Metadata\Memory as MetaData;
+use Phalcon\Url as UrlProvider;
+use Phalcon\Mvc\View;
+use Phalcon\Mvc\View\Engine\Volt as VoltEngine;
 use Phalcon\Session\Adapter\Files as SessionAdapter;
-use Phalcon\Flash\Session as FlashSession;
-use Phalcon\Events\Manager as EventsManager;
 
 class Services extends \Base\Services
 {

app/config/config.ini

@@ -14,4 +14,3 @@ pluginsDir     = app/plugins/
 formsDir       = app/forms/
 libraryDir     = app/library/
 baseUri        = /
-

app/controllers/AboutController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 class AboutController extends ControllerBase
 {

app/controllers/CompaniesController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Paginator\Adapter\Model as Paginator;

app/controllers/ContactController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 /**
  * ContactController

app/controllers/ControllerBase.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 use Phalcon\Mvc\Controller;
 
@@ -7,7 +10,6 @@ class ControllerBase extends Controller
     protected function initialize()
     {
         $this->tag->prependTitle('INVO | ');
-
         $this->view->setTemplateAfter('main');
     }
 }

app/controllers/ErrorsController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 /**
  * ErrorsController

app/controllers/IndexController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 class IndexController extends ControllerBase
 {

app/controllers/InvoicesController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 use Phalcon\Flash;
 use Phalcon\Session;

app/controllers/ProductsController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Paginator\Adapter\Model as Paginator;

app/controllers/ProducttypesController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Paginator\Adapter\Model as Paginator;

app/controllers/RegisterController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 /**
  * SessionController

app/controllers/SessionController.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
 /**
  * SessionController

app/forms/CompaniesForm.php

@@ -1,10 +1,12 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Forms;
 
-use Phalcon\Forms\Form;
-use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Form;
 use Phalcon\Validation\Validator\PresenceOf;
-use Phalcon\Validation\Validator\Email;
 
 class CompaniesForm extends Form
 {

app/forms/ContactForm.php

@@ -1,10 +1,13 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Forms;
 
-use Phalcon\Forms\Form;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Element\TextArea;
-use Phalcon\Validation\Validator\PresenceOf;
+use Phalcon\Forms\Form;
 use Phalcon\Validation\Validator\Email;
+use Phalcon\Validation\Validator\PresenceOf;
 
 class ContactForm extends Form
 {

app/forms/ProductTypesForm.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Forms;
 
 use Phalcon\Forms\Form;
 use Phalcon\Forms\Element\Text;

app/forms/ProductsForm.php

@@ -1,12 +1,14 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Controllers;
 
-use Phalcon\Forms\Form;
-use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Element\Hidden;
 use Phalcon\Forms\Element\Select;
-use Phalcon\Validation\Validator\PresenceOf;
-use Phalcon\Validation\Validator\Email;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Form;
 use Phalcon\Validation\Validator\Numericality;
+use Phalcon\Validation\Validator\PresenceOf;
 
 class ProductsForm extends Form
 {

app/forms/RegisterForm.php

@@ -1,10 +1,13 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Forms;
 
-use Phalcon\Forms\Form;
-use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Element\Password;
-use Phalcon\Validation\Validator\PresenceOf;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Form;
 use Phalcon\Validation\Validator\Email;
+use Phalcon\Validation\Validator\PresenceOf;
 
 class RegisterForm extends Form
 {

app/library/Base/Services.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Base;
 

app/models/Companies.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Models;
 
 use Phalcon\Mvc\Model;
 

app/models/Contact.php

@@ -1,7 +1,10 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Models;
 
-use Phalcon\Mvc\Model;
 use Phalcon\Db\RawValue;
+use Phalcon\Mvc\Model;
 
 class Contact extends Model
 {

app/models/ProductTypes.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Models;
 
 use Phalcon\Mvc\Model;
 

app/models/Products.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Models;
 
 use Phalcon\Mvc\Model;
 

app/models/Users.php

@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Invo\Models;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Validation;

app/plugins/NotFoundPlugin.php

@@ -1,36 +1,39 @@
 <?php
+declare(strict_types=1);
 
+namespace Invo\Plugins;
+
+use Exception;
+use Phalcon\Di\Injectable;
 use Phalcon\Events\Event;
-use Phalcon\Mvc\User\Plugin;
-use Phalcon\Dispatcher;
-use Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
 use Phalcon\Mvc\Dispatcher as MvcDispatcher;
+use Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
 
 /**
  * NotFoundPlugin
  *
  * Handles not-found controller/actions
  */
-class NotFoundPlugin extends Plugin
+class NotFoundPlugin extends Injectable
 {
     /**
      * This action is executed before perform any action in the application
      *
      * @param Event $event
      * @param MvcDispatcher $dispatcher
-     * @param \Exception $exception
+     * @param Exception $exception
      * @return boolean
      */
-    public function beforeException(Event $event, MvcDispatcher $dispatcher, \Exception $exception)
+    public function beforeException(Event $event, MvcDispatcher $dispatcher, Exception $exception)
     {
         error_log(
             $exception->getMessage() . PHP_EOL . $exception->getTraceAsString()
         );
 
         if ($exception instanceof DispatcherException) {
             switch ($exception->getCode()) {
-                case Dispatcher::EXCEPTION_HANDLER_NOT_FOUND:
-                case Dispatcher::EXCEPTION_ACTION_NOT_FOUND:
+                case MvcDispatcher::EXCEPTION_HANDLER_NOT_FOUND:
+                case MvcDispatcher::EXCEPTION_ACTION_NOT_FOUND:
                     $dispatcher->forward(
                         [
                             'controller' => 'errors',

app/plugins/SecurityPlugin.php

@@ -1,19 +1,21 @@
 <?php
+declare(strict_types=1);
 
-use Phalcon\Acl;
-use Phalcon\Acl\Role;
+namespace Invo\Plugins;
+
+use Phalcon\Acl\Adapter\Memory as AclList;
 use Phalcon\Acl\Resource;
+use Phalcon\Acl\Role;
+use Phalcon\Di\Injectable;
 use Phalcon\Events\Event;
-use Phalcon\Mvc\User\Plugin;
 use Phalcon\Mvc\Dispatcher;
-use Phalcon\Acl\Adapter\Memory as AclList;
 
 /**
  * SecurityPlugin
  *
  * This is the security plugin which controls that users only have access to the modules they're assigned to
  */
-class SecurityPlugin extends Plugin
+class SecurityPlugin extends Injectable
 {
     /**
      * Returns an existing or new access control list