#116 - Remove helper function config()

Author: Jeckerson

.gitignore

@@ -7,6 +7,5 @@
 
 composer.lock
 vendor/
-app/config/config.dev.php
 .env
 boxfile.yml

psalm.xml.dist

@@ -9,7 +9,7 @@
     autoloader="vendor/autoload.php"
 >
     <projectFiles>
-        <directory name="app" />
+        <directory name="src" />
         <file name="public/index.php" />
         <ignoreFiles>
             <directory name="vendor" />

src/Helpers.php

@@ -22,26 +22,6 @@ function container()
     return call_user_func_array([$default, 'get'], $args);
 }
 
-/**
- * Get configuration value
- *
- * Also can access nested values.
- * Example: config('config.db.name')
- *
- * @return mixed
- */
-function config()
-{
-    $args   = func_get_args();
-    $config = Di::getDefault()->getShared('config');
-
-    if (empty($args)) {
-        return $config;
-    }
-
-    return call_user_func_array([$config, 'path'], $args);
-}
-
 /**
  * Get projects relative root path
  *

src/Providers/CryptProvider.php

@@ -15,7 +15,6 @@
 use Phalcon\Crypt;
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
-use function Vokuro\config;
 
 class CryptProvider implements ServiceProviderInterface
 {
@@ -32,7 +31,7 @@ class CryptProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         /** @var string $cryptSalt */
-        $cryptSalt = config('application.cryptSalt');
+        $cryptSalt = $di->getShared('config')->path('application.cryptSalt');
 
         $di->set($this->providerName, function () use ($cryptSalt) {
             $crypt = new Crypt();

src/Providers/DbProvider.php

@@ -17,7 +17,6 @@
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
 use RuntimeException;
-use function Vokuro\config;
 use function Vokuro\root_path;
 
 class DbProvider implements ServiceProviderInterface
@@ -47,7 +46,8 @@ class DbProvider implements ServiceProviderInterface
      */
     public function register(DiInterface $di): void
     {
-        $config = config('database');
+        /** @var Config $config */
+        $config = $di->getShared('config')->get('database');
         $class  = $this->getClass($config);
         $config = $this->createConfig($config);
 

src/Providers/LoggerProvider.php

@@ -17,7 +17,6 @@
 use Phalcon\Di\ServiceProviderInterface;
 use Phalcon\Logger\Adapter\Stream as FileLogger;
 use Phalcon\Logger\Formatter\Line as FormatterLine;
-use function Vokuro\config;
 
 /**
  * Logger service
@@ -37,7 +36,7 @@ class LoggerProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         /** @var Config $loggerConfigs */
-        $loggerConfigs = config('logger');
+        $loggerConfigs = $di->getShared('config')->get('logger');
 
         $di->set($this->providerName, function () use ($loggerConfigs) {
             $filename = trim($loggerConfigs->get('filename'), '\\/');

src/Providers/ModelsMetadataProvider.php

@@ -15,7 +15,6 @@
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
 use Phalcon\Mvc\Model\Metadata\Stream as MetaDataAdapter;
-use function Vokuro\config;
 
 class ModelsMetadataProvider implements ServiceProviderInterface
 {
@@ -31,9 +30,11 @@ class ModelsMetadataProvider implements ServiceProviderInterface
      */
     public function register(DiInterface $di): void
     {
-        $di->set($this->providerName, function () {
+        /** @var string $cacheDir */
+        $cacheDir = $di->getShared('config')->path('application.cacheDir');
+        $di->set($this->providerName, function () use ($cacheDir) {
             return new MetaDataAdapter([
-                'metaDataDir' => config('application.cacheDir') . 'metaData/',
+                'metaDataDir' => $cacheDir . 'metaData/',
             ]);
         });
     }

src/Providers/SessionProvider.php

@@ -19,7 +19,6 @@
 use Phalcon\Session\Adapter\Stream as SessionAdapter;
 use Phalcon\Session\Manager as SessionManager;
 use Phalcon\Version;
-use function Vokuro\config;
 
 class SessionProvider implements ServiceProviderInterface
 {
@@ -36,7 +35,7 @@ class SessionProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         /** @var string $savePath */
-        $savePath = config('application.sessionSavePath');
+        $savePath = $di->getShared('config')->path('application.sessionSavePath');
         $handler  = $this->getSessionAdapter($savePath);
 
         $di->set($this->providerName, function () use ($handler) {

src/Providers/UrlProvider.php

@@ -15,7 +15,6 @@
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
 use Phalcon\Url as UrlResolver;
-use function Vokuro\config;
 
 class UrlProvider implements ServiceProviderInterface
 {
@@ -30,7 +29,7 @@ class UrlProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         /** @var string $baseUri */
-        $baseUri = config('application.baseUri');
+        $baseUri = $di->getShared('config')->path('application.baseUri');
 
         $di->setShared($this->providerName, function () use ($baseUri) {
             $url = new UrlResolver();

src/Providers/ViewProvider.php

@@ -12,11 +12,11 @@
 
 namespace Vokuro\Providers;
 
+use Phalcon\Config;
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\View\Engine\Volt;
-use function Vokuro\config;
 
 class ViewProvider implements ServiceProviderInterface
 {
@@ -30,10 +30,12 @@ class ViewProvider implements ServiceProviderInterface
      */
     public function register(DiInterface $di): void
     {
+        /** @var Config $config */
+        $config = $di->getShared('config');
         /** @var string $viewsDir */
-        $viewsDir = config('application.viewsDir');
+        $viewsDir = $config->path('application.viewsDir');
         /** @var string $cacheDir */
-        $cacheDir = config('application.cacheDir');
+        $cacheDir = $config->path('application.cacheDir');
 
         $di->setShared($this->providerName, function () use ($viewsDir, $cacheDir, $di) {
             $view = new View();