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

Fixed vendor paths and build path

Browse source
This commit is contained in:
Joshua Sherman 2014-01-20 22:29:08 -05:00
parent ec02d03457
commit 4e7f442f86
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -17,7 +17,7 @@ services:
install: install:
- composer install - composer install
- mkdir vendor/php-test-helpers - mkdir vendor/php-test-helpers
- git clone https://github.com/php-test-helpers/php-test-helpers.git /tmp/php-test-helpers - git clone https://github.com/php-test-helpers/php-test-helpers.git vendor/php-test-helpers
- cd vendor/php-test-helpers - cd vendor/php-test-helpers
- phpize - phpize
- ./configure --enable-test-helpers - ./configure --enable-test-helpers

3
pickles.php
View file

@ -84,7 +84,6 @@ function __autoload($class)
$pickles_path = dirname(__FILE__) . '/'; $pickles_path = dirname(__FILE__) . '/';
$pickles_paths = [ $pickles_paths = [
'class' => $pickles_path . 'classes/', 'class' => $pickles_path . 'classes/',
'vendor' => $pickles_path . 'vendors/',
]; ];
// Path as the key, boolean value is whether ot not to convert back to hyphenated // Path as the key, boolean value is whether ot not to convert back to hyphenated
@ -125,7 +124,7 @@ $config = Config::getInstance();
$config->data['pickles']['path'] = dirname(__FILE__) . '/'; $config->data['pickles']['path'] = dirname(__FILE__) . '/';
// Requires the Composer autoloader // Requires the Composer autoloader
require_once $config->pickles['path'] . 'vendors/composer/autoload.php'; require_once $config->pickles['path'] . 'vendor/composer/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))

2
tests/bootstrap.php
View file

@ -13,7 +13,7 @@ set_exit_overload(function($status = false)
ob_start(); ob_start();
@session_start(); @session_start();
require_once 'vendors/composer/autoload.php'; require_once 'vendor/composer/autoload.php';
$root = org\bovigo\vfs\vfsStream::setup('site'); $root = org\bovigo\vfs\vfsStream::setup('site');