Composer

.gitignore

@@ -17,3 +17,4 @@ config.ini
 node_modules
 _wiki
 .env
+vendor/

README.md

@@ -57,7 +57,9 @@ A third party app is available for Android: [Selfoss](https://play.google.com/st
 DEVELOPMENT
 -----------
 
-Selfoss uses [git submodules](https://www.git-scm.com/book/en/v2/Git-Tools-Submodules) for some external libaries. When you clone the repository you have to issue a `git submodule init` as well as a `git submodule update` to retrieve the external sources.
+Selfoss uses [composer](https://getcomposer.org/) for installing external libraries. When you clone the repository you have to issue `composer install` to retrieve the external sources.
+
+Additionally, [git submodules](https://www.git-scm.com/book/en/v2/Git-Tools-Submodules) are used for obtaining fultextrss filters. When you clone the repository you have to issue a `git submodule init` as well as a `git submodule update` to retrieve them.
 
 CREDITS
 -------

common.php

@@ -1,10 +1,12 @@
 <?php
 
-$f3 = require(__DIR__.'/libs/f3/base.php');
+require __DIR__ . '/vendor/autoload.php';
+
+$f3 = $f3 = Base::instance();
 
 $f3->set('DEBUG',0);
 $f3->set('version','2.17-SNAPSHOT');
-$f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/;libs/fulltextrss/content-extractor/;libs/fulltextrss/readability/;libs/WillWashburn/');
+$f3->set('AUTOLOAD', false);
 $f3->set('cache',__dir__.'/data/cache');
 $f3->set('BASEDIR',__dir__);
 $f3->set('LOCALES',__dir__.'/public/lang/');

composer.json

@@ -0,0 +1,33 @@
+{
+    "name": "ssilence/selfoss",
+    "description": "Multipurpose rss reader, live stream, mashup, aggregation web application",
+    "type": "project",
+    "require": {
+        "abraham/twitteroauth": "^0.7.2",
+        "bcosca/fatfree-core": "^3.6",
+        "htmlawed/htmlawed": "^1.1",
+        "j0k3r/php-readability": "^1.1.5",
+        "linkorb/jsmin-php": "^1.0",
+        "mibe/feedwriter": "^1.0",
+        "natxet/CssMin": "^3.0",
+        "simplepie/simplepie": "^1.3",
+        "smottt/wideimage": "^1.1",
+        "willwashburn/phpamo": "^1.0"
+    },
+    "license": "GPL-3.0",
+    "authors": [
+        {
+            "name": "SSilence",
+            "email": "[email protected]"
+        }
+    ],
+    "autoload": {
+        "classmap": [
+            "controllers/",
+            "daos/",
+            "helpers/",
+            "libs/",
+            "spouts/"
+        ]
+    }
+}