Fixed a inconsistency in the namespace

Author: sergeyklay

README.md

@@ -216,7 +216,7 @@ single-service-provider/
 │   │   │   └── IndexController.php
 │   │   └── routes.php
 │   ├── Models
-│   └── Services
+│   └── Providers
 │       ├── AbstractServiceProvider.php
 │       ├── ConfigServiceProvider.php
 │       ├── DatabaseServiceProvider.php

single-service-provider/app/Bootstrap.php

@@ -5,7 +5,7 @@
 use Phalcon\Di;
 use Phalcon\DiInterface;
 use Phalcon\Mvc\Application;
-use App\Services\ServiceProviderInterface;
+use App\Providers\ServiceProviderInterface;
 
 /**
  * \App\Bootstrap
@@ -110,20 +110,29 @@ protected function getOutput()
     }
 
     /**
+     * Initialize Services in the Dependency Injector Container.
+     *
      * @param string[] $providers
      */
     protected function initializeServices(array $providers)
     {
         foreach ($providers as $name => $class) {
-            $serviceProvider = new $class($name, $this->di);
-            if (!$serviceProvider instanceof ServiceProviderInterface) {
-                throw new \InvalidArgumentException(
-                    "The service '$name' must implement " . ServiceProviderInterface::class
-                );
-            }
-
-            $serviceProvider->register();
-            $this->serviceProviders[$name] = $serviceProvider;
+            $this->initializeService(new $class($this->di));
         }
     }
+
+    /**
+     * Initialize the Service in the Dependency Injector Container.
+     *
+     * @param ServiceProviderInterface $serviceProvider
+     *
+     * @return $this
+     */
+    protected function initializeService(ServiceProviderInterface $serviceProvider)
+    {
+        $serviceProvider->register();
+        $this->serviceProviders[$serviceProvider->getName()] = $serviceProvider;
+
+        return $this;
+    }
 }

single-service-provider/app/Providers/AbstractServiceProvider.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Providers;
+
+use Phalcon\DiInterface;
+use Phalcon\Mvc\User\Component;
+
+/**
+ * \App\Providers\AbstractServiceProvider
+ *
+ * @package App\Providers
+ */
+abstract class AbstractServiceProvider extends Component implements ServiceProviderInterface
+{
+    /**
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName;
+
+    /**
+     * AbstractServiceProvider constructor.
+     *
+     * @param DiInterface $di The Dependency Injector.
+     */
+    public function __construct(DiInterface $di)
+    {
+        $this->setDI($di);
+    }
+
+    /**
+     * Gets the Service name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->serviceName;
+    }
+}

…r/app/Services/ConfigServiceProvider.php …/app/Providers/ConfigServiceProvider.phpsingle-service-provider/app/Services/ConfigServiceProvider.php renamed to single-service-provider/app/Providers/ConfigServiceProvider.php single-service-provider/app/Services/ConfigServiceProvider.php renamed to single-service-provider/app/Providers/ConfigServiceProvider.php

@@ -1,18 +1,24 @@
 <?php
 
-namespace App\Services;
+namespace App\Providers;
 
 use Phalcon\Config;
 
 /**
- * \App\Services\ConfigServiceProvider
+ * \App\Providers\ConfigServiceProvider
  *
- * @package App\Services
+ * @package App\Providers
  */
 class ConfigServiceProvider extends AbstractServiceProvider
 {
     /**
-     * Initialize the Configuration.
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'config';
+
+    /**
+     * Register application service.
      *
      * @return void
      */

…app/Services/DatabaseServiceProvider.php …pp/Providers/DatabaseServiceProvider.phpsingle-service-provider/app/Services/DatabaseServiceProvider.php renamed to single-service-provider/app/Providers/DatabaseServiceProvider.php single-service-provider/app/Services/DatabaseServiceProvider.php renamed to single-service-provider/app/Providers/DatabaseServiceProvider.php

@@ -1,19 +1,24 @@
 <?php
 
-namespace App\Services;
+namespace App\Providers;
 
 use Phalcon\Db\Adapter\Pdo\Mysql;
 
 /**
- * \App\Services\DatabaseServiceProvider
+ * \App\Providers\DatabaseServiceProvider
  *
- * @package App\Services
+ * @package App\Providers
  */
 class DatabaseServiceProvider extends AbstractServiceProvider
 {
     /**
-     * Initialize the Database Connection.
-     * Database connection is created based in the parameters defined in the configuration file.
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'database';
+
+    /**
+     * Register application service.
      *
      * @return void
      */

…/app/Services/EscaperServiceProvider.php …app/Providers/EscaperServiceProvider.phpsingle-service-provider/app/Services/EscaperServiceProvider.php renamed to single-service-provider/app/Providers/EscaperServiceProvider.php single-service-provider/app/Services/EscaperServiceProvider.php renamed to single-service-provider/app/Providers/EscaperServiceProvider.php

@@ -1,18 +1,24 @@
 <?php
 
-namespace App\Services;
+namespace App\Providers;
 
 use Phalcon\Escaper;
 
 /**
- * \App\Services\EscaperServiceProvider
+ * \App\Providers\EscaperServiceProvider
  *
- * @package App\Services
+ * @package App\Providers
  */
 class EscaperServiceProvider extends AbstractServiceProvider
 {
     /**
-     * Initialize the Escaper Service.
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'escaper';
+
+    /**
+     * Register application service.
      *
      * @return void
      */

…Services/EventManagerServiceProvider.php …roviders/EventManagerServiceProvider.phpsingle-service-provider/app/Services/EventManagerServiceProvider.php renamed to single-service-provider/app/Providers/EventManagerServiceProvider.php single-service-provider/app/Services/EventManagerServiceProvider.php renamed to single-service-provider/app/Providers/EventManagerServiceProvider.php

@@ -1,18 +1,24 @@
 <?php
 
-namespace App\Services;
+namespace App\Providers;
 
 use Phalcon\Events\Manager;
 
 /**
- * \App\Services\EventManagerServiceProvider
+ * \App\Providers\EventManagerServiceProvider
  *
- * @package App\Services
+ * @package App\Providers
  */
 class EventManagerServiceProvider extends AbstractServiceProvider
 {
     /**
-     * Initialize the Events Manager.
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'eventsManager';
+
+    /**
+     * Register application service.
      *
      * @return void
      */

…rvices/ModelsMetadataServiceProvider.php …viders/ModelsMetadataServiceProvider.phpsingle-service-provider/app/Services/ModelsMetadataServiceProvider.php renamed to single-service-provider/app/Providers/ModelsMetadataServiceProvider.php single-service-provider/app/Services/ModelsMetadataServiceProvider.php renamed to single-service-provider/app/Providers/ModelsMetadataServiceProvider.php

@@ -1,18 +1,24 @@
 <?php
 
-namespace App\Services;
+namespace App\Providers;
 
 use Phalcon\Mvc\Model\Metadata\Memory;
 
 /**
- * \App\Services\ModelsMetadataServiceProvider
+ * \App\Providers\ModelsMetadataServiceProvider
  *
- * @package App\Services
+ * @package App\Providers
  */
 class ModelsMetadataServiceProvider extends AbstractServiceProvider
 {
     /**
-     * Initialize the Metadata Adapter.
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'modelsMetadata';
+
+    /**
+     * Register application service.
      *
      * @return void
      */

single-service-provider/app/Providers/MvcDispatcherServiceProvider.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Providers;
+
+use Phalcon\Mvc\Dispatcher;
+
+/**
+ * \App\Providers\MvcDispatcherServiceProvider
+ *
+ * @package App\Providers
+ */
+class MvcDispatcherServiceProvider extends AbstractServiceProvider
+{
+    /**
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'dispatcher';
+
+    /**
+     * This namespace is applied to the controller routes in your routes file.
+     * @var string
+     */
+    protected $namespace = 'App\Http\Controllers';
+
+    /**
+     * Register application service.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $namespace = $this->namespace;
+
+        $this->di->setShared(
+            $this->serviceName,
+            function () use ($namespace) {
+                $dispatcher = new Dispatcher();
+                $dispatcher->setDefaultNamespace($namespace);
+
+                return $dispatcher;
+            }
+        );
+    }
+}

…ces/PhpTemplateEngineServiceProvider.php …ers/PhpTemplateEngineServiceProvider.phpsingle-service-provider/app/Services/PhpTemplateEngineServiceProvider.php renamed to single-service-provider/app/Providers/PhpTemplateEngineServiceProvider.php single-service-provider/app/Services/PhpTemplateEngineServiceProvider.php renamed to single-service-provider/app/Providers/PhpTemplateEngineServiceProvider.php

@@ -1,21 +1,26 @@
 <?php
 
-namespace App\Services;
+namespace App\Providers;
 
 use Phalcon\DiInterface;
 use Phalcon\Mvc\ViewBaseInterface;
 use Phalcon\Mvc\View\Engine\Php as PhpEngine;
 
 /**
- * \App\Services\PhpTemplateEngineServiceProvider
+ * \App\Providers\PhpTemplateEngineServiceProvider
  *
- * @package App\Services
+ * @package App\Providers
  */
 class PhpTemplateEngineServiceProvider extends AbstractServiceProvider
 {
     /**
-     * Initialize the Php Template Engine.
-     * Generate Template files uses PHP itself as the template engine.
+     * The Service name.
+     * @var string
+     */
+    protected $serviceName = 'phpEngine';
+
+    /**
+     * Register application service.
      *
      * @return void
      */