Merge pull request #13 from rorteg/feature-12

Rename the config folder to etc. Issue reference: #12
rorteg · Feb 22, 2019 · 28a4e26 · 28a4e26
2 parents 50a5ace + 6ca3a62
commit 28a4e26
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 6 deletions.
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -41,10 +41,10 @@
 date_default_timezone_set('America/Sao_Paulo');
 
 // Modules Settings
-$modulesConfig = Factory::fromFiles(glob(BP . '/app/code/*/*/config/*.*'), true);
+$modulesConfig = Factory::fromFiles(glob(BP . '/app/code/*/*/etc/*.*'), true);
 
 // Global Settings
-$globalConfig = Factory::fromFiles(glob(BP . '/app/config/*.*'), true);
+$globalConfig = Factory::fromFiles(glob(BP . '/app/etc/*.*'), true);
 $configMerged = $modulesConfig->merge($globalConfig)->toArray();
 
 $serviceManager = new ServiceManager();

diff --git a/app/code/Shelf/Admin/config/routes.php → app/code/Shelf/Admin/etc/routes.php b/app/code/Shelf/Admin/config/routes.php → app/code/Shelf/Admin/etc/routes.php
diff --git a/app/code/Shelf/Admin/config/view.php → app/code/Shelf/Admin/etc/view.php b/app/code/Shelf/Admin/config/view.php → app/code/Shelf/Admin/etc/view.php
diff --git a/app/code/Shelf/App/config/routes.php → app/code/Shelf/App/etc/routes.php b/app/code/Shelf/App/config/routes.php → app/code/Shelf/App/etc/routes.php
diff --git a/app/code/Shelf/App/config/view.php → app/code/Shelf/App/etc/view.php b/app/code/Shelf/App/config/view.php → app/code/Shelf/App/etc/view.php
diff --git a/app/code/Shelf/Auth/config/dependencies.php → app/code/Shelf/Auth/etc/dependencies.php b/app/code/Shelf/Auth/config/dependencies.php → app/code/Shelf/Auth/etc/dependencies.php
diff --git a/app/code/Shelf/Auth/config/routes.php → app/code/Shelf/Auth/etc/routes.php b/app/code/Shelf/Auth/config/routes.php → app/code/Shelf/Auth/etc/routes.php
diff --git a/app/code/Shelf/Auth/config/view.php → app/code/Shelf/Auth/etc/view.php b/app/code/Shelf/Auth/config/view.php → app/code/Shelf/Auth/etc/view.php
diff --git a/app/code/Shelf/Db/Test/Integration/ConnectionTest.php b/app/code/Shelf/Db/Test/Integration/ConnectionTest.php
@@ -22,7 +22,7 @@ final class ConnectionTest extends TestCase
 
     protected function setUp()
     {
-        $config = require dirname(__DIR__) . '/../../../../config/db.php';
+        $config = require dirname(__DIR__) . '/../../../../etc/db.php';
         $dbConfig = $config['db'];
 
         $pdo = new \PDO($dbConfig['dns'], $dbConfig['username'], $dbConfig['password']);
@@ -33,7 +33,7 @@ protected function setUp()
 
     public static function setUpBeforeClass()
     {
-        $config = require dirname(__DIR__) . '/../../../../config/db.php';
+        $config = require dirname(__DIR__) . '/../../../../etc/db.php';
         $dbConfig = $config['db'];
 
         $pdo = new \PDO($dbConfig['dns'], $dbConfig['username'], $dbConfig['password']);

diff --git a/app/code/Shelf/Db/config/dependencies.php → app/code/Shelf/Db/etc/dependencies.php b/app/code/Shelf/Db/config/dependencies.php → app/code/Shelf/Db/etc/dependencies.php
diff --git a/...e/Shelf/Framework/config/dependencies.php → ...code/Shelf/Framework/etc/dependencies.php b/...e/Shelf/Framework/config/dependencies.php → ...code/Shelf/Framework/etc/dependencies.php
diff --git a/app/code/Shelf/Framework/config/view.php → app/code/Shelf/Framework/etc/view.php b/app/code/Shelf/Framework/config/view.php → app/code/Shelf/Framework/etc/view.php
diff --git a/app/code/Shelf/User/config/dependencies.php → app/code/Shelf/User/etc/dependencies.php b/app/code/Shelf/User/config/dependencies.php → app/code/Shelf/User/etc/dependencies.php
diff --git a/app/code/Shelf/User/config/routes.php → app/code/Shelf/User/etc/routes.php b/app/code/Shelf/User/config/routes.php → app/code/Shelf/User/etc/routes.php
diff --git a/app/code/Shelf/User/config/view.php → app/code/Shelf/User/etc/view.php b/app/code/Shelf/User/config/view.php → app/code/Shelf/User/etc/view.php
diff --git a/app/config/db.php → app/etc/db.php b/app/config/db.php → app/etc/db.php
@@ -2,7 +2,7 @@
 
 $host = 'localhost';
 $username = 'root';
-$password = '';
+$password = 'magento';
 $database = 'shelf_dev';
 
 return [

diff --git a/app/config/view.php → app/etc/view.php b/app/config/view.php → app/etc/view.php
@@ -3,7 +3,7 @@
 return [
     'view' => [
         // Twig Cache
-        //'cache' => false,
+        'cache' => false,
         // Twig Debug
         'debug' => false,
         'twig_extensions' => [