update composer settings

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "lib"]
  path = lib
- url = ../fatfree-core.git
+ url = https://github.com/bcosca/fatfree-core.git

composer.json

@@ -2,17 +2,9 @@
  "name": "bcosca/fatfree",
  "description": "A powerful yet easy-to-use PHP micro-framework designed to help you build dynamic and robust Web applications - fast!",
  "homepage": "http://fatfreeframework.com/",
+ "type": "project",
  "license": "GPL-3.0",
  "require": {
- "php": ">=5.4"
- },
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/bcosca/fatfree"
- }
- ],
- "autoload": {
- "files": ["lib/base.php"]
+ "bcosca/fatfree-core": "^3.8"
  }
 }

index.php

@@ -1,7 +1,16 @@
 <?php
 
-// Kickstart the framework
-$f3=require('lib/base.php');
+if (file_exists('vendor/autoload.php')) {
+ // load via composer
+ require_once('vendor/autoload.php');
+ $f3 = \Base::instance();
+} elseif (!file_exists('lib/base.php')) {
+ die('fatfree-core not found. Run `git submodule init` and `git submodule update` or install via composer with `composer install`.');
+} else {
+ // load via submodule
+ /** @var Base $f3 */
+ $f3=require('lib/base.php');
+}
 
 $f3->set('DEBUG',1);
 if ((float)PCRE_VERSION<8.0)