From 4e7f442f86d0d918a4ef066983e1ae45059f9f27 Mon Sep 17 00:00:00 2001
From: Joshua Sherman <josh@gravityblvd.com>
Date: Mon, 20 Jan 2014 22:29:08 -0500
Subject: [PATCH] Fixed vendor paths and build path

---
 .travis.yml         | 2 +-
 pickles.php         | 3 +--
 tests/bootstrap.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9c5512..9bfef13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ services:
 install:
   - composer install
   - 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
   - phpize
   - ./configure --enable-test-helpers
diff --git a/pickles.php b/pickles.php
index 218a9b9..882066c 100644
--- a/pickles.php
+++ b/pickles.php
@@ -84,7 +84,6 @@ function __autoload($class)
 	$pickles_path  = dirname(__FILE__) . '/';
 	$pickles_paths = [
 		'class'  => $pickles_path . 'classes/',
-		'vendor' => $pickles_path . 'vendors/',
 	];
 
 	// 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__) . '/';
 
 // 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
 if (is_array($config->php) && count($config->php))
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 702e69c..8fc2639 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -13,7 +13,7 @@ set_exit_overload(function($status = false)
 ob_start();
 @session_start();
 
-require_once 'vendors/composer/autoload.php';
+require_once 'vendor/composer/autoload.php';
 
 $root = org\bovigo\vfs\vfsStream::setup('site');