use composer autoload instead of fatfree

fossar · Feb 13, 2016 · 9270133 · 9270133
1 parent 479a732
commit 9270133
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/cliupdate.php b/cliupdate.php
@@ -1,6 +1,8 @@
 <?php
 
 chdir(__DIR__);
+
+require(__DIR__.'/vendor/autoload.php');
 require(__DIR__.'/common.php');
 
 $f3->set('FTRSS_DATA_DIR', __dir__.'/data/fulltextrss');

diff --git a/common.php b/common.php
@@ -4,7 +4,7 @@
 
 $f3->set('DEBUG',0);
 $f3->set('version','2.15-SNAPSHOT');
-$f3->set('AUTOLOAD',__dir__.'/;vendor/others/');
+$f3->set('AUTOLOAD', false);
 $f3->set('cache',__dir__.'/data/cache');
 $f3->set('BASEDIR',__dir__);
 $f3->set('LOCALES',__dir__.'/public/lang/');

diff --git a/composer.json b/composer.json
@@ -21,5 +21,13 @@
             "name": "SSilence",
             "email": "[email protected]"
         }
-    ]
+    ],
+    "autoload": {
+        "psr-4": {
+            "controllers\\": "controllers/",
+            "daos\\": "daos/",
+            "helpers\\": "helpers/",
+            "spouts\\": "spouts/"
+        }
+    }
 }