diff --git a/.gitignore b/.gitignore index 998cabc..ef18b8c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ !.travis.yml !.coveralls.yml *~ +vendor # Global/OSX.gitignore # ######################## diff --git a/.travis.yml b/.travis.yml index 5665b56..99757c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,23 +16,25 @@ services: install: - composer install - - cd vendors/php-test-helpers + - mkdir vendor/php-test-helpers + - git clone git@github.com:php-test-helpers/php-test-helpers.git /tmp/php-test-helpers + - cd vendor/php-test-helpers - phpize - ./configure --enable-test-helpers - make - sudo make install - - cd ../../ + - cd - before_script: - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - echo "zend_extension = /home/travis/build/joshtronic/pickles/vendors/php-test-helpers/modules/test_helpers.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini + - echo "zend_extension = /home/travis/build/joshtronic/pickles/vendor/php-test-helpers/modules/test_helpers.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini - mysql test < tests/schema.sql - - mkdir -p vendors/build/logs + - mkdir -p vendor/build/logs script: - - phpunit --colors --coverage-clover /home/travis/build/joshtronic/pickles/vendors/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests + - phpunit --colors --coverage-clover /home/travis/build/joshtronic/pickles/vendor/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests after_success: - - php vendors/composer/bin/coveralls --config ../.coveralls.yml -v + - php vendor/composer/bin/coveralls --config ../.coveralls.yml -v diff --git a/composer.json b/composer.json index 8e6ec43..6c927bb 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,4 @@ { - "config": { - "vendor-dir": "vendors/composer" - }, - "repositories": [ - { - "url": "https://github.com/joshtronic/php-ayah.git", - "type": "git" - } - ], "require-dev": { "mikey179/vfsStream": "1.2.0", "satooshi/php-coveralls": "dev-master" diff --git a/composer.lock b/composer.lock index ba07425..aba590a 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "d1441533619d080c356f9315ce68b9df", + "hash": "f99ed048919043a93dd99173e2faada9", "packages": [ { "name": "devize/closure-compiler", diff --git a/vendors/composer/.gitignore b/vendors/composer/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/vendors/composer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore