Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into postContentFix

  • Loading branch information...
2 parents ec33307 + b1e5611 commit 35209eb7e789402583f1e6984ade155813afb02c Bruno CHALOPIN committed Jun 14, 2012
Showing with 20 additions and 24 deletions.
  1. +2 −2 Goutte/Client.php
  2. +2 −4 Goutte/Tests/ClientTest.php
  3. +16 −18 composer.lock
  4. BIN goutte.phar
View
@@ -59,7 +59,7 @@ public function setHeader($name, $value)
return $this;
}
- public function setAuth($user, $password = '', $type = GuzzleRequestInterface::AUTH_BASIC)
+ public function setAuth($user, $password = '', $type = CURLAUTH_BASIC)
{
$this->auth = array(
'user' => $user,
@@ -81,7 +81,7 @@ protected function doRequest($request)
}
$guzzleRequest = $this->getClient()->createRequest(
- strtoupper($request->getMethod()),
+ $request->getMethod(),
$request->getUri(),
array_merge($this->headers, $headers),
in_array($request->getMethod(), array('GET','HEAD')) ? null : null !== $request->getContent() ? $request->getContent() : $request->getParameters()
@@ -19,6 +19,7 @@
use Guzzle\Http\Plugin\MockPlugin;
use Guzzle\Http\Plugin\HistoryPlugin;
use Guzzle\Http\Message\Response;
+use Guzzle\Http\Message\PostFile;
/**
* Goutte Client Test
@@ -106,10 +107,7 @@ public function testUsesPostFiles()
$this->assertEquals(array(
'test' => array(
- array(
- 'file' => __FILE__,
- 'type' => 'text/x-php'
- )
+ new PostFile('test', __FILE__, 'text/x-php')
)
), $request->getPostFiles());
}
View
@@ -3,43 +3,43 @@
"packages": [
{
"package": "guzzle/guzzle",
- "version": "v2.6.3"
+ "version": "v2.6.4"
},
{
"package": "symfony/browser-kit",
"version": "dev-master",
- "source-reference": "6ab1b5f07dd972d2c5e3b5d48c9776d0823149c7",
- "alias-pretty-version": "2.1.x-dev",
- "alias-version": "2.1.9999999.9999999-dev"
+ "source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e"
},
{
"package": "symfony/browser-kit",
"version": "dev-master",
- "source-reference": "6ab1b5f07dd972d2c5e3b5d48c9776d0823149c7"
+ "source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
},
{
"package": "symfony/css-selector",
"version": "dev-master",
- "source-reference": "b542ab7df00bc12b8fa7fe318e399522bc873485"
+ "source-reference": "d0a98b37fbb57188766fd7c7d757354397ee6ead"
},
{
"package": "symfony/css-selector",
"version": "dev-master",
- "source-reference": "b542ab7df00bc12b8fa7fe318e399522bc873485",
+ "source-reference": "d0a98b37fbb57188766fd7c7d757354397ee6ead",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
},
{
"package": "symfony/dom-crawler",
"version": "dev-master",
- "source-reference": "49d80fac919321c1e255757fe47b97910f667271",
- "alias-pretty-version": "2.1.x-dev",
- "alias-version": "2.1.9999999.9999999-dev"
+ "source-reference": "49d80fac919321c1e255757fe47b97910f667271"
},
{
"package": "symfony/dom-crawler",
"version": "dev-master",
- "source-reference": "49d80fac919321c1e255757fe47b97910f667271"
+ "source-reference": "49d80fac919321c1e255757fe47b97910f667271",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
},
{
"package": "symfony/event-dispatcher",
@@ -56,31 +56,29 @@
{
"package": "symfony/finder",
"version": "dev-master",
- "source-reference": "a2cef64d5072b284b671ee8e06b8ebc38c2969e1"
+ "source-reference": "9ee9a907afeef52956187e862714a7702ca26590"
},
{
"package": "symfony/finder",
"version": "dev-master",
- "source-reference": "a2cef64d5072b284b671ee8e06b8ebc38c2969e1",
+ "source-reference": "9ee9a907afeef52956187e862714a7702ca26590",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
},
{
"package": "symfony/process",
"version": "dev-master",
- "source-reference": "106f2db51cecf2fe5ee59e428b8f4a918c4034fa"
+ "source-reference": "f4f101fc7c1adb8b157058dcc1715f28f1d53208"
},
{
"package": "symfony/process",
"version": "dev-master",
- "source-reference": "106f2db51cecf2fe5ee59e428b8f4a918c4034fa",
+ "source-reference": "f4f101fc7c1adb8b157058dcc1715f28f1d53208",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
}
],
- "packages-dev": [
-
- ],
+ "packages-dev": null,
"aliases": [
],
View
Binary file not shown.

0 comments on commit 35209eb

Please sign in to comment.