From 1aeb4de0fae723801f0cdb555c77b5ee17ae1919 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 5 Feb 2015 14:43:01 -0800 Subject: [PATCH] Possible fix for #491 - solving for giticide on package dep --- .travis.yml | 10 ++- composer.json | 5 +- composer.lock | 177 ++++++++++++++++++++++++++------------------------ 3 files changed, 103 insertions(+), 89 deletions(-) mode change 100755 => 100644 composer.lock diff --git a/.travis.yml b/.travis.yml index 0ea812bcc253..239955973848 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +addons: + hosts: + - AlisonMBP + # see http://about.travis-ci.org/docs/user/languages/php/ for more hints language: php @@ -20,9 +24,9 @@ before_script: - composer self-update - composer install --prefer-source --no-interaction --no-dev - php artisan key:generate - - php artisan migrate:install --force - - php artisan migrate --package cartalyst/sentry --force - - php artisan migrate --force + - php artisan migrate:install + - php artisan migrate --package cartalyst/sentry + - php artisan migrate - php artisan db:seed # omitting "script:" will default to phpunit diff --git a/composer.json b/composer.json index ab3f4fbc7237..e9e33bccf4fe 100755 --- a/composer.json +++ b/composer.json @@ -8,8 +8,11 @@ "issues": "https://github.com/snipe/snipe-it/issues", "source": "https://github.com/snipe/snipe-it" }, + "replace": { + "mtdowling/classpreloader":"1.0.*" + }, "require": { - "classpreloader/classpreloader": "1.0.2", + "classpreloader/classpreloader": "1.2.0", "laravel/framework": "4.2.*", "cartalyst/sentry": "2.0.*", "barryvdh/laravel-debugbar": "1.x", diff --git a/composer.lock b/composer.lock old mode 100755 new mode 100644 index bec64169a9bd..5c70dad09dae --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "5afb6ea9dcaa7b13adc8871fb9041a18", + "hash": "b148618bc0cae3ff987f076105388668", "packages": [ { "name": "bacon/bacon-qr-code", @@ -257,50 +257,63 @@ }, { "name": "classpreloader/classpreloader", - "version": "1.0.2", + "version": "1.2.0", "source": { "type": "git", - "url": "https://github.com/mtdowling/ClassPreloader.git", - "reference": "2c9f3bcbab329570c57339895bd11b5dd3b00877" + "url": "https://github.com/ClassPreloader/ClassPreloader.git", + "reference": "f0bfbf71fb3335c9473f695d4d966ba2fb879a9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mtdowling/ClassPreloader/zipball/2c9f3bcbab329570c57339895bd11b5dd3b00877", - "reference": "2c9f3bcbab329570c57339895bd11b5dd3b00877", + "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/f0bfbf71fb3335c9473f695d4d966ba2fb879a9f", + "reference": "f0bfbf71fb3335c9473f695d4d966ba2fb879a9f", "shasum": "" }, "require": { - "nikic/php-parser": "~0.9", + "nikic/php-parser": "~1.0", "php": ">=5.3.3", "symfony/console": "~2.1", "symfony/filesystem": "~2.1", "symfony/finder": "~2.1" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, "bin": [ "classpreloader.php" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "autoload": { - "psr-0": { - "ClassPreloader": "src/" + "psr-4": { + "ClassPreloader\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], + "authors": [ + { + "name": "Graham Campbell", + "email": "graham@mineuk.com" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com" + } + ], "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case", "keywords": [ "autoload", "class", "preload" ], - "time": "2014-03-12 00:05:31" + "time": "2015-01-26 22:06:19" }, { "name": "d11wtq/boris", @@ -494,24 +507,24 @@ }, { "name": "jeremeamia/SuperClosure", - "version": "1.0.x-dev", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "4d89ca74994feab128ea46d5b3add92e6cb84554" + "reference": "dba99c01800510c2d78a15d8579a49673072f270" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/4d89ca74994feab128ea46d5b3add92e6cb84554", - "reference": "4d89ca74994feab128ea46d5b3add92e6cb84554", + "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/dba99c01800510c2d78a15d8579a49673072f270", + "reference": "dba99c01800510c2d78a15d8579a49673072f270", "shasum": "" }, "require": { - "nikic/php-parser": "~0.9", + "nikic/php-parser": "dev-master", "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~3.7" + "phpunit/phpunit": "3.7.*" }, "type": "library", "autoload": { @@ -528,7 +541,7 @@ "name": "Jeremy Lindblom" } ], - "description": "Doing interesting things with closures like serialization.", + "description": "Doing interesting things with closures like serialization and partial function application.", "homepage": "https://github.com/jeremeamia/super_closure", "keywords": [ "closure", @@ -538,31 +551,31 @@ "serialize", "tokenizer" ], - "time": "2015-01-10 01:09:28" + "time": "2013-06-14 07:20:08" }, { "name": "laravel/framework", - "version": "4.2.x-dev", + "version": "v4.2.9", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "a48fa75e3209691ba4b03fef09c05bc32098ca53" + "reference": "14665bc3c38c3ec24a12c904d013a663dc4a1d8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/a48fa75e3209691ba4b03fef09c05bc32098ca53", - "reference": "a48fa75e3209691ba4b03fef09c05bc32098ca53", + "url": "https://api.github.com/repos/laravel/framework/zipball/14665bc3c38c3ec24a12c904d013a663dc4a1d8f", + "reference": "14665bc3c38c3ec24a12c904d013a663dc4a1d8f", "shasum": "" }, "require": { - "classpreloader/classpreloader": "~1.0.2", + "classpreloader/classpreloader": "~1.0", "d11wtq/boris": "~1.0", "filp/whoops": "1.1.*", "ircmaxell/password-compat": "~1.0", - "jeremeamia/superclosure": "~1.0.1", + "jeremeamia/superclosure": "~1.0", "monolog/monolog": "~1.6", "nesbot/carbon": "~1.0", - "patchwork/utf8": "~1.1", + "patchwork/utf8": "1.1.*", "php": ">=5.4.0", "phpseclib/phpseclib": "0.3.*", "predis/predis": "0.8.*", @@ -653,7 +666,7 @@ "framework", "laravel" ], - "time": "2015-01-29 04:07:24" + "time": "2014-09-15 02:45:24" }, { "name": "maximebf/debugbar", @@ -661,12 +674,12 @@ "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "df23eae5b6bf67d1d4dd3d571be0e42f1c7810da" + "reference": "7b2006e6e095126b5a061ec33fca3d90ea8a8219" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/df23eae5b6bf67d1d4dd3d571be0e42f1c7810da", - "reference": "df23eae5b6bf67d1d4dd3d571be0e42f1c7810da", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7b2006e6e095126b5a061ec33fca3d90ea8a8219", + "reference": "7b2006e6e095126b5a061ec33fca3d90ea8a8219", "shasum": "" }, "require": { @@ -709,7 +722,7 @@ "keywords": [ "debug" ], - "time": "2015-02-02 13:33:06" + "time": "2015-02-05 07:51:20" }, { "name": "monolog/monolog", @@ -831,32 +844,32 @@ }, { "name": "nikic/php-parser", - "version": "0.9.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb" + "reference": "1366e833a16c4267883187da6da7b317f0582dd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb", - "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1366e833a16c4267883187da6da7b317f0582dd7", + "reference": "1366e833a16c4267883187da6da7b317f0582dd7", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.2" + "php": ">=5.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.9-dev" + "dev-master": "1.1-dev" } }, "autoload": { - "psr-0": { - "PHPParser": "lib/" - } + "files": [ + "lib/bootstrap.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -872,20 +885,20 @@ "parser", "php" ], - "time": "2014-07-23 18:24:17" + "time": "2015-01-31 21:59:38" }, { "name": "patchwork/utf8", - "version": "dev-master", + "version": "1.1.x-dev", "source": { "type": "git", "url": "https://github.com/tchwork/utf8.git", - "reference": "01f0ed1628db7794e2d4e336f55a09daef4248a5" + "reference": "ffa082111aa3cb23cf2479a17e6785ace91da982" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tchwork/utf8/zipball/01f0ed1628db7794e2d4e336f55a09daef4248a5", - "reference": "01f0ed1628db7794e2d4e336f55a09daef4248a5", + "url": "https://api.github.com/repos/tchwork/utf8/zipball/ffa082111aa3cb23cf2479a17e6785ace91da982", + "reference": "ffa082111aa3cb23cf2479a17e6785ace91da982", "shasum": "" }, "require": { @@ -895,15 +908,9 @@ "suggest": { "ext-iconv": "Use iconv for best performance", "ext-intl": "Use Intl for best performance", - "ext-mbstring": "Use Mbstring for best performance", - "ext-wfio": "Use WFIO for UTF-8 filesystem access on Windows" + "ext-mbstring": "Use Mbstring for best performance" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, "autoload": { "psr-0": { "Patchwork": "class/", @@ -929,7 +936,7 @@ "utf-8", "utf8" ], - "time": "2015-01-29 08:36:50" + "time": "2015-01-12 08:05:15" }, { "name": "phpseclib/phpseclib", @@ -1085,12 +1092,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11" + "reference": "1af1529b49a6e065ae6802e70192aba35d79b7d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/a78d6504ff5d4367497785ab2ade91db3a9fbe11", - "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11", + "url": "https://api.github.com/repos/php-fig/log/zipball/1af1529b49a6e065ae6802e70192aba35d79b7d8", + "reference": "1af1529b49a6e065ae6802e70192aba35d79b7d8", "shasum": "" }, "type": "library", @@ -1120,7 +1127,7 @@ "psr", "psr-3" ], - "time": "2014-01-18 15:33:09" + "time": "2015-02-05 09:32:11" }, { "name": "stack/builder", @@ -1285,12 +1292,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "f41807e67f00244f013bb96a66ac02f778a31209" + "reference": "767a4be52d062d49bb0ef5f593f5f5d06b2f5ff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/f41807e67f00244f013bb96a66ac02f778a31209", - "reference": "f41807e67f00244f013bb96a66ac02f778a31209", + "url": "https://api.github.com/repos/symfony/Console/zipball/767a4be52d062d49bb0ef5f593f5f5d06b2f5ff3", + "reference": "767a4be52d062d49bb0ef5f593f5f5d06b2f5ff3", "shasum": "" }, "require": { @@ -1331,7 +1338,7 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:37:39" + "time": "2015-02-05 06:31:40" }, { "name": "symfony/css-selector", @@ -1503,12 +1510,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7" + "reference": "e9298668dce8dd219d1ee2290c7f313954f1f984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7a26717d431dfb092198d7c55f06788b2de5aaf7", - "reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e9298668dce8dd219d1ee2290c7f313954f1f984", + "reference": "e9298668dce8dd219d1ee2290c7f313954f1f984", "shasum": "" }, "require": { @@ -1552,7 +1559,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2015-01-16 15:11:56" + "time": "2015-02-05 06:58:17" }, { "name": "symfony/filesystem", @@ -1655,12 +1662,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "89c650efaca9540101004852d232c96672bbb91c" + "reference": "749f478499b89aaf53bdd6c80743fc0c3a72cce4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/89c650efaca9540101004852d232c96672bbb91c", - "reference": "89c650efaca9540101004852d232c96672bbb91c", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/749f478499b89aaf53bdd6c80743fc0c3a72cce4", + "reference": "749f478499b89aaf53bdd6c80743fc0c3a72cce4", "shasum": "" }, "require": { @@ -1699,7 +1706,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2015-02-01 09:36:16" + "time": "2015-02-05 06:31:40" }, { "name": "symfony/http-kernel", @@ -1782,12 +1789,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "7b6632c849f87a062301e853f03f71d726520b58" + "reference": "daaa39a0d7462c225f711b20dc8f5896bdab92ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/7b6632c849f87a062301e853f03f71d726520b58", - "reference": "7b6632c849f87a062301e853f03f71d726520b58", + "url": "https://api.github.com/repos/symfony/Process/zipball/daaa39a0d7462c225f711b20dc8f5896bdab92ff", + "reference": "daaa39a0d7462c225f711b20dc8f5896bdab92ff", "shasum": "" }, "require": { @@ -1820,7 +1827,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:37:39" + "time": "2015-02-05 08:31:48" }, { "name": "symfony/routing", @@ -1829,12 +1836,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "3a9c35ca312d8cb6a308b751f9a1cd92cd5d9277" + "reference": "8743280059d6d74db4a7fb58bbe049bd795195a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/3a9c35ca312d8cb6a308b751f9a1cd92cd5d9277", - "reference": "3a9c35ca312d8cb6a308b751f9a1cd92cd5d9277", + "url": "https://api.github.com/repos/symfony/Routing/zipball/8743280059d6d74db4a7fb58bbe049bd795195a9", + "reference": "8743280059d6d74db4a7fb58bbe049bd795195a9", "shasum": "" }, "require": { @@ -1888,7 +1895,7 @@ "uri", "url" ], - "time": "2015-01-13 14:58:43" + "time": "2015-02-05 06:31:40" }, { "name": "symfony/security-core", @@ -2016,12 +2023,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "4b0c3c21c167fb2f192debe6a21b414a5e75ad37" + "reference": "32d9d37b10996006df9e298e05aee59dc53742af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4b0c3c21c167fb2f192debe6a21b414a5e75ad37", - "reference": "4b0c3c21c167fb2f192debe6a21b414a5e75ad37", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/32d9d37b10996006df9e298e05aee59dc53742af", + "reference": "32d9d37b10996006df9e298e05aee59dc53742af", "shasum": "" }, "require": { @@ -2064,7 +2071,7 @@ "debug", "dump" ], - "time": "2015-01-25 04:39:35" + "time": "2015-02-05 06:58:17" } ], "packages-dev": [ @@ -2481,12 +2488,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b1459cb7158438f2345aefb481f5b239127addfe" + "reference": "a972b59f661ecfc8a18f2045263f63e314d6bc00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b1459cb7158438f2345aefb481f5b239127addfe", - "reference": "b1459cb7158438f2345aefb481f5b239127addfe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a972b59f661ecfc8a18f2045263f63e314d6bc00", + "reference": "a972b59f661ecfc8a18f2045263f63e314d6bc00", "shasum": "" }, "require": { @@ -2545,7 +2552,7 @@ "testing", "xunit" ], - "time": "2015-02-03 14:14:24" + "time": "2015-02-05 15:42:36" }, { "name": "phpunit/phpunit-mock-objects",