Skip to content

Commit

Permalink
update to FuelPHP 1.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ve3 committed Aug 25, 2014
1 parent 12c5271 commit 73e0409
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 73 deletions.
14 changes: 11 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,24 @@
],
"require": {
"php": ">=5.3.3",
"monolog/monolog": "1.5.*",
"fuelphp/upload": "2.0.1"
"composer/installers": "~1.0",
"monolog/monolog": "1.5.*"
},
"suggest": {
"dwoo/dwoo" : "Allow Dwoo templating with the Parser package",
"mustache/mustache": "Allow Mustache templating with the Parser package",
"smarty/smarty": "Allow Smarty templating with the Parser package",
"twig/twig": "Allow Twig templating with the Parser package",
"pyrocms/lex": "Allow Lex templating with the Parser package",
"mthaml/mthaml": "Allow Haml templating with Twig supports with the Parser package"
},
"config": {
"vendor-dir": "fuel/vendor"
}
},
"scripts": {
"post-install-cmd": [
"php oil r install"
]
},
"minimum-stability": "dev"
}
141 changes: 72 additions & 69 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand Down Expand Up @@ -40,6 +40,10 @@
defined('FUEL_START_TIME') or define('FUEL_START_TIME', microtime(true));
defined('FUEL_START_MEM') or define('FUEL_START_MEM', memory_get_usage());

// Load in the Fuel autoloader
require COREPATH.'classes'.DIRECTORY_SEPARATOR.'autoloader.php';
class_alias('Fuel\\Core\\Autoloader', 'Autoloader');

// Boot the app
require APPPATH.'bootstrap.php';

Expand Down

0 comments on commit 73e0409

Please sign in to comment.