Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating to the latest version of composer so that Guzzle uses requir…

…e-dev and --dev configuration options
  • Loading branch information...
commit f57169a2d6c8f001ddce442a1265706a7f1e79c8 1 parent ce221df
@mtdowling mtdowling authored
View
2  .travis.yml
@@ -4,7 +4,7 @@ php:
- 5.4
before_script:
- wget --quiet http://getcomposer.org/composer.phar
- - COMPOSER=composer-test.json php composer.phar install
+ - php composer.phar install --dev
- cp phpunit.xml.dist phpunit.xml
- ~/.nvm/nvm.sh install v0.6.14
- ~/.nvm/nvm.sh run v0.6.14 tests/Guzzle/Tests/Http/server.js &
View
4 README.md
@@ -183,9 +183,9 @@ If you do not have Phing installed, you will need to perform the installation st
curl -s http://getcomposer.org/installer | php
# Install Guzzle's testing dependencies
-COMPOSER=composer-test.json php composer.phar install
+php composer.phar install --dev
# Now kick off PHPUnit to run the tests
cp phpunit.xml.dist phpunit.xml
phpunit
-```
+```
View
2  build.xml
@@ -12,7 +12,7 @@
<exec command="curl -s http://getcomposer.org/installer | php" passthru="true" />
</else>
</if>
- <exec command="COMPOSER=composer-test.json php composer.phar install" passthru="true" />
+ <exec command="php composer.phar install --dev" passthru="true" />
<copy file="phpunit.xml.dist" tofile="phpunit.xml" overwrite="false" />
</target>
View
158 composer-test.json
@@ -1,158 +0,0 @@
-{
- "name": "guzzle/guzzle",
- "type": "library",
- "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
- "keywords": ["framework", "http", "rest", "web service", "curl"],
- "homepage": "http://www.guzzlephp.org/",
- "license": "MIT",
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "Guzzle Community",
- "homepage": "https://github.com/guzzle/guzzle/contributors"
- }
- ],
- "repositories": [
- {
- "type": "package",
- "package": {
- "name": "zend/zend-log",
- "version": "2.0.0beta3",
- "dist": {
- "url": "http://packages.zendframework.com/get/Zend_Log-2.0.0beta3.tgz",
- "type": "pear"
- },
- "autoload": {
- "psr-0": {
- "Zend\\Log": "php/"
- }
- }
- }
- },
- {
- "type":"package",
- "package": {
- "name": "zend/zend-cache",
- "version": "2.0.0beta3",
- "dist": {
- "url": "http://packages.zendframework.com/get/Zend_Cache-2.0.0beta3.tgz",
- "type": "pear"
- },
- "autoload": {
- "psr-0": {
- "Zend\\Cache": "php/"
- }
- }
- }
- },
- {
- "type":"package",
- "package": {
- "name": "zend/zend-loader",
- "version": "2.0.0beta3",
- "dist": {
- "url": "http://packages.zendframework.com/get/Zend_Loader-2.0.0beta3.tgz",
- "type": "pear"
- },
- "autoload": {
- "psr-0": {
- "Zend\\Loader": "php/"
- }
- }
- }
- },
- {
- "type":"package",
- "package": {
- "name": "zend/zend-stdlib",
- "version": "2.0.0beta3",
- "dist": {
- "url": "http://packages.zendframework.com/get/Zend_Stdlib-2.0.0beta3.tgz",
- "type": "pear"
- },
- "autoload": {
- "psr-0": {
- "Zend\\Stdlib": "php/"
- }
- }
- }
- },
- {
- "type":"package",
- "package": {
- "name": "zend/zend-eventmanager",
- "version": "2.0.0beta3",
- "dist": {
- "url": "http://packages.zendframework.com/get/Zend_EventManager-2.0.0beta3.tgz",
- "type": "pear"
- },
- "autoload": {
- "psr-0": {
- "Zend\\EventManager": "php/"
- }
- }
- }
- },
- {
- "type":"package",
- "package": {
- "name": "zend/zend-log1",
- "version": "1.11",
- "source": {
- "url": "http://framework.zend.com/svn",
- "type": "svn",
- "reference": "framework/standard/trunk/library/Zend/Log/"
- },
- "target-dir": "Zend/Log",
- "autoload": {
- "psr-0": {
- "Zend_Log": "/"
- }
- }
- }
- },
- {
- "type":"package",
- "package": {
- "name": "zend/zend-cache1",
- "version": "1.11",
- "source": {
- "url": "http://framework.zend.com/svn",
- "type": "svn",
- "reference": "framework/standard/trunk/library/Zend/Cache/"
- },
- "target-dir": "Zend/Cache",
- "autoload": {
- "psr-0": {
- "Zend_Cache": "/"
- }
- }
- }
- }
- ],
- "require": {
- "php": ">=5.3.2",
- "ext-curl": "*",
- "symfony/event-dispatcher": "*",
- "symfony/validator": "*",
- "symfony/class-loader": "*",
- "monolog/monolog": "*",
- "zend/zend-cache": "2.0.0beta3",
- "zend/zend-log": "2.0.0beta3",
- "zend/zend-loader": "2.0.0beta3",
- "zend/zend-stdlib": "2.0.0beta3",
- "zend/zend-eventmanager": "2.0.0beta3",
- "zend/zend-log1": "1.11",
- "zend/zend-cache1": "1.11"
- },
- "autoload": {
- "psr-0": {
- "Guzzle\\Tests": "tests/",
- "Guzzle": "src/"
- }
- }
-}
View
138 composer.json
@@ -5,6 +5,7 @@
"keywords": ["framework", "http", "rest", "web service", "curl"],
"homepage": "http://www.guzzlephp.org/",
"license": "MIT",
+
"authors": [
{
"name": "Michael Dowling",
@@ -16,15 +17,150 @@
"homepage": "https://github.com/guzzle/guzzle/contributors"
}
],
+
"require": {
"php": ">=5.3.2",
"ext-curl": "*",
"symfony/event-dispatcher": "*",
"symfony/validator": "*"
},
+
"autoload": {
"psr-0": {
+ "Guzzle\\Tests": "tests/",
"Guzzle": "src/"
}
- }
+ },
+
+ "require-dev": {
+ "doctrine/common": "*",
+ "symfony/class-loader": "*",
+ "monolog/monolog": "*",
+ "zend/zend-cache": "2.0.0beta3",
+ "zend/zend-log": "2.0.0beta3",
+ "zend/zend-loader": "2.0.0beta3",
+ "zend/zend-stdlib": "2.0.0beta3",
+ "zend/zend-eventmanager": "2.0.0beta3",
+ "zend/zend-log1": "1.11",
+ "zend/zend-cache1": "1.11"
+ },
+
+ "repositories": [
+ {
+ "type": "package",
+ "package": {
+ "name": "zend/zend-log",
+ "version": "2.0.0beta3",
+ "dist": {
+ "url": "http://packages.zendframework.com/get/Zend_Log-2.0.0beta3.tgz",
+ "type": "pear"
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Log": "php/"
+ }
+ }
+ }
+ },
+ {
+ "type":"package",
+ "package": {
+ "name": "zend/zend-cache",
+ "version": "2.0.0beta3",
+ "dist": {
+ "url": "http://packages.zendframework.com/get/Zend_Cache-2.0.0beta3.tgz",
+ "type": "pear"
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Cache": "php/"
+ }
+ }
+ }
+ },
+ {
+ "type":"package",
+ "package": {
+ "name": "zend/zend-loader",
+ "version": "2.0.0beta3",
+ "dist": {
+ "url": "http://packages.zendframework.com/get/Zend_Loader-2.0.0beta3.tgz",
+ "type": "pear"
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Loader": "php/"
+ }
+ }
+ }
+ },
+ {
+ "type":"package",
+ "package": {
+ "name": "zend/zend-stdlib",
+ "version": "2.0.0beta3",
+ "dist": {
+ "url": "http://packages.zendframework.com/get/Zend_Stdlib-2.0.0beta3.tgz",
+ "type": "pear"
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\Stdlib": "php/"
+ }
+ }
+ }
+ },
+ {
+ "type":"package",
+ "package": {
+ "name": "zend/zend-eventmanager",
+ "version": "2.0.0beta3",
+ "dist": {
+ "url": "http://packages.zendframework.com/get/Zend_EventManager-2.0.0beta3.tgz",
+ "type": "pear"
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend\\EventManager": "php/"
+ }
+ }
+ }
+ },
+ {
+ "type":"package",
+ "package": {
+ "name": "zend/zend-log1",
+ "version": "1.11",
+ "source": {
+ "url": "http://framework.zend.com/svn",
+ "type": "svn",
+ "reference": "framework/standard/trunk/library/Zend/Log/"
+ },
+ "target-dir": "Zend/Log",
+ "autoload": {
+ "psr-0": {
+ "Zend_Log": "/"
+ }
+ }
+ }
+ },
+ {
+ "type":"package",
+ "package": {
+ "name": "zend/zend-cache1",
+ "version": "1.11",
+ "source": {
+ "url": "http://framework.zend.com/svn",
+ "type": "svn",
+ "reference": "framework/standard/trunk/library/Zend/Cache/"
+ },
+ "target-dir": "Zend/Cache",
+ "autoload": {
+ "psr-0": {
+ "Zend_Cache": "/"
+ }
+ }
+ }
+ }
+ ]
}
View
6 tests/bootstrap.php
@@ -3,9 +3,9 @@
error_reporting(E_ALL | E_STRICT);
// Ensure that composer has installed all dependencies
-if (!file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'composer-test.lock')) {
- die("Dependencies must be installed using composer:\n\nCOMPOSER=composer-test.json composer.phar install\n\n"
- . "See https://github.com/composer/composer/blob/master/README.md for help with installing composer\n");
+if (!file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'composer.lock')) {
+ die("Dependencies must be installed using composer:\n\nphp composer.phar install --dev\n\n"
+ . "See http://getcomposer.org for help with installing composer\n");
}
require_once 'PHPUnit/TextUI/TestRunner.php';
Please sign in to comment.
Something went wrong with that request. Please try again.