joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:joshtronic/pickles

Browse source
This commit is contained in:
Josh Sherman 2014-09-23 07:23:36 -04:00
commit 55f45b8d8f
2 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

56
composer.json
View file

@ -1,33 +1,33 @@
{ {
"name": "joshtronic/pickles", "name": "joshtronic/pickles",
"description": "PHP Interface Collection of Killer Libraries to Enhance Stuff", "description": "PHP Interface Collection of Killer Libraries to Enhance Stuff",
"type": "library", "type": "library",
"keywords": ["pickles", "framework", "rapid", "development", "mvc"], "keywords": ["pickles", "framework", "rapid", "development", "mvc"],
"homepage": "https://github.com/joshtronic/pickles", "homepage": "https://github.com/joshtronic/pickles",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
{ {
"name": "Josh Sherman", "name": "Josh Sherman",
"email": "josh@gravityblvd.com", "email": "josh@gravityblvd.com",
"homepage": "http://joshtronic.com" "homepage": "http://joshtronic.com"
} }
], ],
"repositories": [{ "repositories": [{
"type": "vcs", "type": "vcs",
"url": "https://github.com/joshtronic/php-ayah" "url": "https://github.com/joshtronic/php-ayah"
}], }],
"require-dev": { "require-dev": {
"mikey179/vfsStream": "dev-master", "mikey179/vfsStream": "dev-master",
"satooshi/php-coveralls": "dev-master" "satooshi/php-coveralls": "dev-master"
}, },
"require": { "require": {
"php": ">=5.4", "php": ">=5.4",
"devize/closure-compiler": "dev-master", "devize/closure-compiler": "dev-master",
"joshtronic/php-ayah": "dev-master", "joshtronic/php-ayah": "dev-master",
"leafo/lessphp": "dev-master", "leafo/lessphp": "dev-master",
"leafo/scssphp": "dev-master" "leafo/scssphp": "dev-master"
}, },
"autoload": { "autoload": {
"classmap": ["src/"] "classmap": ["src/"]
} }
} }

3
src/pickles.php
View file

@ -123,9 +123,6 @@ $config = Config::getInstance();
// Injects PICKLES variables into the config // Injects PICKLES variables into the config
$config->data['pickles']['path'] = dirname(__FILE__) . '/'; $config->data['pickles']['path'] = dirname(__FILE__) . '/';
// Requires the Composer autoloader
require_once $config->pickles['path'] . '../vendor/autoload.php';
// Configures any available PHP configuration options // Configures any available PHP configuration options
if (is_array($config->php) && count($config->php)) if (is_array($config->php) && count($config->php))
{ {