Merge pull request #8 from IvanAquino/master

Reestructuracion de los directorios, se movieron los componentes a un…
NeoRazorX · Jun 11, 2017 · 0312aa0 · 0312aa0
2 parents fbe8675 + 4d2262a
commit 0312aa0
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -20,9 +20,7 @@
     },
     "autoload": {
         "psr-4": {
-            "FacturaScripts\\Base\\": "base/",
-            "FacturaScripts\\controller\\": "controller/",
-            "FacturaScripts\\Plugins\\": "plugins/"
+            "FacturaScripts\\": "src/"
         }
     }
 }
diff --git a/index.php b/index.php
@@ -52,8 +52,8 @@
 }
 
 /// ¿Buscamos en /controller?
-if ($controller == "" && class_exists("FacturaScripts\\controller\\{$controllerName}")) {
-    $controller = "FacturaScripts\\controller\\{$controllerName}";
+if ($controller == "" && class_exists("FacturaScripts\\Controller\\{$controllerName}")) {
+    $controller = "FacturaScripts\\Controller\\{$controllerName}";
 }
 
 /// Si hemos encontrado el controlador, lo cargamos
@@ -80,8 +80,8 @@
     /// Cargamos el motor de plantillas
     $twigLoader = new Twig_Loader_Filesystem(__DIR__ . '/view');
     foreach ($pluginList as $pName) {
-        if (file_exists(__DIR__ . '/plugins/' . $pName . '/view')) {
-            $twigLoader->prependPath(__DIR__ . '/plugins/' . $pName . '/view');
+        if (file_exists(__DIR__ . '/src/Plugins/' . $pName . '/view')) {
+            $twigLoader->prependPath(__DIR__ . '/src/Plugins/' . $pName . '/view');
         }
     }
     ///$twig = new Twig_Environment($twigLoader, array('cache' => 'cache/twig'));

diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/base/fs_controller.php → src/Base/fs_controller.php b/base/fs_controller.php → src/Base/fs_controller.php
diff --git a/base/fs_i18n.php → src/Base/fs_i18n.php b/base/fs_i18n.php → src/Base/fs_i18n.php
diff --git a/base/fs_plugin_manager.php → src/Base/fs_plugin_manager.php b/base/fs_plugin_manager.php → src/Base/fs_plugin_manager.php
diff --git a/controller/admin_home.php → src/Controller/admin_home.php b/controller/admin_home.php → src/Controller/admin_home.php
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace FacturaScripts\controller;
+namespace FacturaScripts\Controller;
 
 use FacturaScripts\Base\fs_controller;
 use FacturaScripts\Base\fs_plugin_manager;
@@ -33,10 +33,10 @@ class admin_home extends fs_controller {
     public function __construct($folder = '', $className = __CLASS__) {
         parent::__construct($folder, $className);
     }
-    
+
     public function run() {
         parent::run();
-        
+
         if ($this->request->get('enable', '') != '') {
             $pluginManager = new fs_plugin_manager();
             $pluginManager->enable($this->request->get('enable'));

diff --git a/plugins/test/controller/admin_home.php → src/Plugins/test/controller/admin_home.php b/plugins/test/controller/admin_home.php → src/Plugins/test/controller/admin_home.php
diff --git a/plugins/test/i18n/es_ES.json → src/Plugins/test/i18n/es_ES.json b/plugins/test/i18n/es_ES.json → src/Plugins/test/i18n/es_ES.json
diff --git a/plugins/test/view/admin_home.html → src/Plugins/test/view/admin_home.html b/plugins/test/view/admin_home.html → src/Plugins/test/view/admin_home.html