update code to use composer instead

f3-factory · Jul 8, 2018 · 151cbc2 · 151cbc2
1 parent 839bd27
commit 151cbc2
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /.idea/
 temp/
+vendor/
diff --git a/composer.json b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "bcosca/fatfree-core": "^3.6"
+    }
+}
diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -7,13 +7,15 @@
 compliance with the license. Any of the license terms and conditions
 can be waived if you get permission from the copyright holder.
 
-Copyright (c) 2016 F3-Junkies
-http://www.fatfreeframework.com
+Copyright (c) 2018 F3::Community
+https://fatfreeframework.com
 
 @version 0.9.0
 */
 
-$f3 = require __DIR__.'/lib/base.php';
+require 'vendor/autoload.php';
+
+$f3 = Base::instance();
 
 // set global vars
 $f3->set('AUTOLOAD', 'inc/;app/');

diff --git a/lib b/lib
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     /.idea/
     temp/
+    vendor/