Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[BC] Moving things around for subtree splits.

Moving Inflection into Common. Moving Guzzle\Http\Parser to Guzzle\Parser.
Adding composer.json files for each subtree split
Fixing failing curl test
  • Loading branch information...
commit 142e2460f25207bf25561cacf962bf2fc2406e03 1 parent 569cdb1
@mtdowling mtdowling authored
Showing with 151 additions and 99 deletions.
  1. +8 −2 composer.json
  2. +1 −1  src/Guzzle/{ → Common}/Inflection/Inflector.php
  3. +1 −1  src/Guzzle/{ → Common}/Inflection/InflectorInterface.php
  4. +1 −1  src/Guzzle/{ → Common}/Inflection/MemoizingInflector.php
  5. +1 −1  src/Guzzle/{ → Common}/Inflection/PreComputedInflector.php
  6. +15 −0 src/Guzzle/Common/composer.json
  7. +2 −2 src/Guzzle/Http/Client.php
  8. +1 −1  src/Guzzle/Http/ClientInterface.php
  9. +1 −1  src/Guzzle/Http/CookieJar/ArrayCookieJar.php
  10. +1 −1  src/Guzzle/Http/Curl/CurlHandle.php
  11. +1 −1  src/Guzzle/Http/Message/RequestFactory.php
  12. +1 −1  src/Guzzle/Http/Message/Response.php
  13. +1 −1  src/Guzzle/Http/Url.php
  14. +16 −0 src/Guzzle/Http/composer.json
  15. +1 −1  src/Guzzle/{Http → }/Parser/Cookie/CookieParser.php
  16. +1 −1  src/Guzzle/{Http → }/Parser/Cookie/CookieParserInterface.php
  17. +1 −1  src/Guzzle/{Http → }/Parser/Message/AbstractMessageParser.php
  18. +1 −1  src/Guzzle/{Http → }/Parser/Message/MessageParser.php
  19. +1 −1  src/Guzzle/{Http → }/Parser/Message/MessageParserInterface.php
  20. +1 −1  src/Guzzle/{Http → }/Parser/Message/PeclHttpMessageParser.php
  21. +5 −5 src/Guzzle/{Http → }/Parser/ParserRegistry.php
  22. +1 −1  src/Guzzle/{Http → }/Parser/UriTemplate/UriTemplate.php
  23. +1 −1  src/Guzzle/{Http → }/Parser/UriTemplate/UriTemplateInterface.php
  24. +1 −1  src/Guzzle/{Http → }/Parser/Url/UrlParser.php
  25. +1 −1  src/Guzzle/{Http → }/Parser/Url/UrlParserInterface.php
  26. +14 −0 src/Guzzle/Parser/composer.json
  27. +2 −2 src/Guzzle/Service/Client.php
  28. +1 −1  src/Guzzle/Service/ClientInterface.php
  29. +1 −1  src/Guzzle/Service/Command/DynamicCommand.php
  30. +2 −2 src/Guzzle/Service/Command/Factory/ConcreteClassFactory.php
  31. +1 −1  src/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php
  32. +1 −1  src/Guzzle/Service/Description/ApiCommand.php
  33. +2 −2 src/Guzzle/Service/Resource/ResourceIteratorClassFactory.php
  34. +3 −3 tests/Guzzle/Tests/{ → Common}/Inflection/InflectorTest.php
  35. +5 −5 tests/Guzzle/Tests/{ → Common}/Inflection/MemoizingInflectorTest.php
  36. +6 −6 tests/Guzzle/Tests/{ → Common}/Inflection/PreComputedInflectorTest.php
  37. +1 −1  tests/Guzzle/Tests/Http/ClientTest.php
  38. +4 −3 tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
  39. +1 −1  tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php
  40. +0 −11 tests/Guzzle/Tests/Http/Parser/Cookie/CookieParserTest.php
  41. +1 −1  tests/Guzzle/Tests/Http/UrlTest.php
  42. +2 −2 tests/Guzzle/Tests/{Http → }/Parser/Cookie/CookieParserProvider.php
  43. +11 −0 tests/Guzzle/Tests/Parser/Cookie/CookieParserTest.php
  44. +1 −1  tests/Guzzle/Tests/{Http → }/Parser/Message/MessageParserProvider.php
  45. +7 −7 tests/Guzzle/Tests/{Http → }/Parser/Message/MessageParserTest.php
  46. +4 −4 tests/Guzzle/Tests/{Http → }/Parser/Message/PeclHttpMessageParserTest.php
  47. +5 −5 tests/Guzzle/Tests/{Http → }/Parser/ParserRegistryTest.php
  48. +3 −3 tests/Guzzle/Tests/{Http → }/Parser/UriTemplate/UriTemplateTest.php
  49. +1 −1  tests/Guzzle/Tests/{Http → }/Parser/Url/UrlParserProvider.php
  50. +3 −3 tests/Guzzle/Tests/{Http → }/Parser/Url/UrlParserTest.php
  51. +2 −2 tests/Guzzle/Tests/Service/ClientTest.php
  52. +1 −1  tests/Guzzle/Tests/Service/Command/Factory/ServiceDescriptionFactoryTest.php
View
10 composer.json
@@ -2,8 +2,8 @@
"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", "client"],
- "homepage": "http://www.guzzlephp.org/",
+ "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
+ "homepage": "http://guzzlephp.org/",
"license": "MIT",
"authors": [
@@ -18,6 +18,12 @@
}
],
+ "replace": {
+ "guzzle/common": "self.version",
+ "guzzle/http": "self.version",
+ "guzzle/parser": "self.version"
+ },
+
"require": {
"php": ">=5.3.2",
"ext-curl": "*",
View
2  src/Guzzle/Inflection/Inflector.php → src/Guzzle/Common/Inflection/Inflector.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Inflection;
+namespace Guzzle\Common\Inflection;
/**
* Default inflection implementation
View
2  src/Guzzle/Inflection/InflectorInterface.php → src/Guzzle/Common/Inflection/InflectorInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Inflection;
+namespace Guzzle\Common\Inflection;
/**
* Inflector interface used to convert the casing of words
View
2  src/Guzzle/Inflection/MemoizingInflector.php → src/Guzzle/Common/Inflection/MemoizingInflector.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Inflection;
+namespace Guzzle\Common\Inflection;
/**
* Decorator used to add memoization to previously inflected words
View
2  src/Guzzle/Inflection/PreComputedInflector.php → ...Guzzle/Common/Inflection/PreComputedInflector.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Inflection;
+namespace Guzzle\Common\Inflection;
/**
* Decorator used to add pre-computed inflection mappings to an inflector
View
15 src/Guzzle/Common/composer.json
@@ -0,0 +1,15 @@
+{
+ "name": "guzzle/common",
+ "homepage": "http://guzzlephp.org/",
+ "description": "Common libraries used by Guzzle",
+ "keywords": ["common", "cache", "log", "event", "socket", "batch", "inflection", "validation"],
+ "license": "MIT",
+ "require": {
+ "php": ">=5.3.2",
+ "symfony/event-dispatcher": "2.*"
+ },
+ "autoload": {
+ "psr-0": { "Guzzle\\Common": "" }
+ },
+ "target-dir": "Guzzle/Common"
+}
View
4 src/Guzzle/Http/Client.php
@@ -9,8 +9,8 @@
use Guzzle\Http\Utils;
use Guzzle\Http\Url;
use Guzzle\Http\EntityBody;
-use Guzzle\Http\Parser\ParserRegistry;
-use Guzzle\Http\Parser\UriTemplate\UriTemplateInterface;
+use Guzzle\Parser\ParserRegistry;
+use Guzzle\Parser\UriTemplate\UriTemplateInterface;
use Guzzle\Http\Message\RequestInterface;
use Guzzle\Http\Message\RequestFactory;
use Guzzle\Http\Message\RequestFactoryInterface;
View
2  src/Guzzle/Http/ClientInterface.php
@@ -6,7 +6,7 @@
use Guzzle\Common\Collection;
use Guzzle\Http\Message\RequestInterface;
use Guzzle\Http\Message\RequestFactoryInterface;
-use Guzzle\Http\Parser\UriTemplate\UriTemplateInterface;
+use Guzzle\Parser\UriTemplate\UriTemplateInterface;
use Guzzle\Http\Curl\CurlMultiInterface;
/**
View
2  src/Guzzle/Http/CookieJar/ArrayCookieJar.php
@@ -5,7 +5,7 @@
use Guzzle\Http\Cookie;
use Guzzle\Http\Message\RequestInterface;
use Guzzle\Http\Message\Response;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
/**
* Cookie cookieJar that stores cookies an an array
View
2  src/Guzzle/Http/Curl/CurlHandle.php
@@ -6,7 +6,7 @@
use Guzzle\Common\Exception\RuntimeException;
use Guzzle\Common\Collection;
use Guzzle\Http\Message\RequestInterface;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
use Guzzle\Http\Message\EntityEnclosingRequestInterface;
use Guzzle\Http\Url;
View
2  src/Guzzle/Http/Message/RequestFactory.php
@@ -5,7 +5,7 @@
use Guzzle\Common\Collection;
use Guzzle\Http\EntityBody;
use Guzzle\Http\Url;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
/**
* Default HTTP request factory used to create the default
View
2  src/Guzzle/Http/Message/Response.php
@@ -5,7 +5,7 @@
use Guzzle\Common\Collection;
use Guzzle\Http\EntityBody;
use Guzzle\Http\Exception\BadResponseException;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
/**
* Guzzle HTTP response object
View
2  src/Guzzle/Http/Url.php
@@ -2,7 +2,7 @@
namespace Guzzle\Http;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
/**
* Parses and generates URLs based on URL parts. In favor of performance,
View
16 src/Guzzle/Http/composer.json
@@ -0,0 +1,16 @@
+{
+ "name": "guzzle/http",
+ "homepage": "http://guzzlephp.org/",
+ "description": "HTTP libraries used by Guzzle",
+ "keywords": ["http client", "http", "client", "Guzzle", "curl"],
+ "license": "MIT",
+ "require": {
+ "php": ">=5.3.2",
+ "guzzle/common": "*",
+ "symfony/event-dispatcher": "2.*"
+ },
+ "autoload": {
+ "psr-0": { "Guzzle\\Http": "" }
+ },
+ "target-dir": "Guzzle/Http"
+}
View
2  src/Guzzle/Http/Parser/Cookie/CookieParser.php → src/Guzzle/Parser/Cookie/CookieParser.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Cookie;
+namespace Guzzle\Parser\Cookie;
/**
* Default Guzzle implementation of a Cookie parser
View
2  ...zzle/Http/Parser/Cookie/CookieParserInterface.php → src/Guzzle/Parser/Cookie/CookieParserInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Cookie;
+namespace Guzzle\Parser\Cookie;
/**
* Cookie parser interface
View
2  ...zle/Http/Parser/Message/AbstractMessageParser.php → src/Guzzle/Parser/Message/AbstractMessageParser.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Message;
+namespace Guzzle\Parser\Message;
/**
* Implements shared message parsing functionality
View
2  src/Guzzle/Http/Parser/Message/MessageParser.php → src/Guzzle/Parser/Message/MessageParser.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Message;
+namespace Guzzle\Parser\Message;
/**
* Default request and response parser used by Guzzle. Optimized for speed.
View
2  ...le/Http/Parser/Message/MessageParserInterface.php → src/Guzzle/Parser/Message/MessageParserInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Message;
+namespace Guzzle\Parser\Message;
/**
* HTTP message parser interface used to parse HTTP messages into an array
View
2  ...zle/Http/Parser/Message/PeclHttpMessageParser.php → src/Guzzle/Parser/Message/PeclHttpMessageParser.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Message;
+namespace Guzzle\Parser\Message;
/**
* Pecl HTTP message parser
View
10 src/Guzzle/Http/Parser/ParserRegistry.php → src/Guzzle/Parser/ParserRegistry.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser;
+namespace Guzzle\Parser;
/**
* Registry of parsers used by the application
@@ -16,10 +16,10 @@ class ParserRegistry
* @var array Mapping of parser name to default class
*/
protected static $mapping = array(
- 'message' => 'Guzzle\\Http\\Parser\\Message\\MessageParser',
- 'cookie' => 'Guzzle\\Http\\Parser\\Cookie\\CookieParser',
- 'url' => 'Guzzle\\Http\\Parser\\Url\\UrlParser',
- 'uri_template' => 'Guzzle\\Http\\Parser\\UriTemplate\\UriTemplate',
+ 'message' => 'Guzzle\\Parser\\Message\\MessageParser',
+ 'cookie' => 'Guzzle\\Parser\\Cookie\\CookieParser',
+ 'url' => 'Guzzle\\Parser\\Url\\UrlParser',
+ 'uri_template' => 'Guzzle\\Parser\\UriTemplate\\UriTemplate',
);
/**
View
2  src/Guzzle/Http/Parser/UriTemplate/UriTemplate.php → src/Guzzle/Parser/UriTemplate/UriTemplate.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\UriTemplate;
+namespace Guzzle\Parser\UriTemplate;
/**
* Expands URI templates using an array of variables
View
2  .../Http/Parser/UriTemplate/UriTemplateInterface.php → ...uzzle/Parser/UriTemplate/UriTemplateInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\UriTemplate;
+namespace Guzzle\Parser\UriTemplate;
/**
* Expands URI templates using an array of variables
View
2  src/Guzzle/Http/Parser/Url/UrlParser.php → src/Guzzle/Parser/Url/UrlParser.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Url;
+namespace Guzzle\Parser\Url;
/**
* Parses URLs into parts using PHP's built-in parse_url() function
View
2  src/Guzzle/Http/Parser/Url/UrlParserInterface.php → src/Guzzle/Parser/Url/UrlParserInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Http\Parser\Url;
+namespace Guzzle\Parser\Url;
/**
* URL parser interface
View
14 src/Guzzle/Parser/composer.json
@@ -0,0 +1,14 @@
+{
+ "name": "guzzle/parser",
+ "homepage": "http://guzzlephp.org/",
+ "description": "Interchangeable parsers used by Guzzle",
+ "keywords": ["HTTP", "message", "cookie", "URL", "URI Template"],
+ "license": "MIT",
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "autoload": {
+ "psr-0": { "Guzzle\\Parser": "" }
+ },
+ "target-dir": "Guzzle/Parser"
+}
View
4 src/Guzzle/Service/Client.php
@@ -5,8 +5,8 @@
use Guzzle\Common\Collection;
use Guzzle\Common\Exception\InvalidArgumentException;
use Guzzle\Common\Exception\BadMethodCallException;
-use Guzzle\Inflection\InflectorInterface;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\InflectorInterface;
+use Guzzle\Common\Inflection\Inflector;
use Guzzle\Http\Client as HttpClient;
use Guzzle\Http\Message\RequestInterface;
use Guzzle\Service\Command\CommandInterface;
View
2  src/Guzzle/Service/ClientInterface.php
@@ -4,7 +4,7 @@
use Guzzle\Common\FromConfigInterface;
use Guzzle\Common\Exception\InvalidArgumentException;
-use Guzzle\Inflection\InflectorInterface;
+use Guzzle\Common\Inflection\InflectorInterface;
use Guzzle\Http\ClientInterface as HttpClientInterface;
use Guzzle\Service\Command\CommandInterface;
use Guzzle\Service\Description\ServiceDescription;
View
2  src/Guzzle/Service/Command/DynamicCommand.php
@@ -4,7 +4,7 @@
use Guzzle\Http\EntityBody;
use Guzzle\Http\Url;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
use Guzzle\Http\Message\PostFileInterface;
/**
View
4 src/Guzzle/Service/Command/Factory/ConcreteClassFactory.php
@@ -2,8 +2,8 @@
namespace Guzzle\Service\Command\Factory;
-use Guzzle\Inflection\InflectorInterface;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\InflectorInterface;
+use Guzzle\Common\Inflection\Inflector;
use Guzzle\Service\ClientInterface;
/**
View
2  src/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php
@@ -3,7 +3,7 @@
namespace Guzzle\Service\Command\Factory;
use Guzzle\Service\Description\ServiceDescription;
-use Guzzle\Inflection\InflectorInterface;
+use Guzzle\Common\Inflection\InflectorInterface;
/**
* Command factory used to create commands based on service descriptions
View
2  src/Guzzle/Service/Description/ApiCommand.php
@@ -4,7 +4,7 @@
use Guzzle\Common\Collection;
use Guzzle\Common\Exception\InvalidArgumentException;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\Inflector;
use Guzzle\Service\Exception\ValidationException;
use Guzzle\Service\Inspector;
View
4 src/Guzzle/Service/Resource/ResourceIteratorClassFactory.php
@@ -3,8 +3,8 @@
namespace Guzzle\Service\Resource;
use Guzzle\Common\Exception\InvalidArgumentException;
-use Guzzle\Inflection\InflectorInterface;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\InflectorInterface;
+use Guzzle\Common\Inflection\Inflector;
use Guzzle\Service\Command\CommandInterface;
/**
View
6 tests/Guzzle/Tests/Inflection/InflectorTest.php → .../Guzzle/Tests/Common/Inflection/InflectorTest.php
@@ -1,11 +1,11 @@
<?php
-namespace Guzzle\Tests\Inflection;
+namespace Guzzle\Tests\Common\Inflection;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\Inflector;
/**
- * @covers Guzzle\Inflection\Inflector
+ * @covers Guzzle\Common\Inflection\Inflector
*/
class InflectorTest extends \Guzzle\Tests\GuzzleTestCase
{
View
10 ...uzzle/Tests/Inflection/MemoizingInflectorTest.php → ...ests/Common/Inflection/MemoizingInflectorTest.php
@@ -1,18 +1,18 @@
<?php
-namespace Guzzle\Tests\Inflection;
+namespace Guzzle\Tests\Common\Inflection;
-use Guzzle\Inflection\MemoizingInflector;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\MemoizingInflector;
+use Guzzle\Common\Inflection\Inflector;
/**
- * @covers Guzzle\Inflection\MemoizingInflector
+ * @covers Guzzle\Common\Inflection\MemoizingInflector
*/
class MemoizingInflectorTest extends \Guzzle\Tests\GuzzleTestCase
{
public function testUsesCache()
{
- $mock = $this->getMock('Guzzle\Inflection\Inflector', array('snake', 'camel'));
+ $mock = $this->getMock('Guzzle\Common\Inflection\Inflector', array('snake', 'camel'));
$mock->expects($this->once())->method('snake')->will($this->returnValue('foo_bar'));
$mock->expects($this->once())->method('camel')->will($this->returnValue('FooBar'));
View
12 ...zle/Tests/Inflection/PreComputedInflectorTest.php → ...ts/Common/Inflection/PreComputedInflectorTest.php
@@ -1,17 +1,17 @@
<?php
-namespace Guzzle\Tests\Inflection;
+namespace Guzzle\Tests\Common\Inflection;
-use Guzzle\Inflection\PreComputedInflector;
+use Guzzle\Common\Inflection\PreComputedInflector;
/**
- * @covers Guzzle\Inflection\PreComputedInflector
+ * @covers Guzzle\Common\Inflection\PreComputedInflector
*/
class PreComputedInflectorTest extends \Guzzle\Tests\GuzzleTestCase
{
public function testUsesPreComputedHash()
{
- $mock = $this->getMock('Guzzle\Inflection\Inflector', array('snake', 'camel'));
+ $mock = $this->getMock('Guzzle\Common\Inflection\Inflector', array('snake', 'camel'));
$mock->expects($this->once())->method('snake')->with('Test')->will($this->returnValue('test'));
$mock->expects($this->once())->method('camel')->with('Test')->will($this->returnValue('Test'));
$inflector = new PreComputedInflector($mock, array('FooBar' => 'foo_bar'), array('foo_bar' => 'FooBar'));
@@ -23,7 +23,7 @@ public function testUsesPreComputedHash()
public function testMirrorsPrecomputedValues()
{
- $mock = $this->getMock('Guzzle\Inflection\Inflector', array('snake', 'camel'));
+ $mock = $this->getMock('Guzzle\Common\Inflection\Inflector', array('snake', 'camel'));
$mock->expects($this->never())->method('snake');
$mock->expects($this->never())->method('camel');
$inflector = new PreComputedInflector($mock, array('Zeep' => 'zeep'), array(), true);
@@ -33,7 +33,7 @@ public function testMirrorsPrecomputedValues()
public function testMirrorsPrecomputedValuesByMerging()
{
- $mock = $this->getMock('Guzzle\Inflection\Inflector', array('snake', 'camel'));
+ $mock = $this->getMock('Guzzle\Common\Inflection\Inflector', array('snake', 'camel'));
$mock->expects($this->never())->method('snake');
$mock->expects($this->never())->method('camel');
$inflector = new PreComputedInflector($mock, array('Zeep' => 'zeep'), array('foo' => 'Foo'), true);
View
2  tests/Guzzle/Tests/Http/ClientTest.php
@@ -4,7 +4,7 @@
use Guzzle\Common\Collection;
use Guzzle\Common\Log\ClosureLogAdapter;
-use Guzzle\Http\Parser\UriTemplate\UriTemplate;
+use Guzzle\Parser\UriTemplate\UriTemplate;
use Guzzle\Http\Message\Response;
use Guzzle\Http\Message\RequestFactory;
use Guzzle\Http\Plugin\ExponentialBackoffPlugin;
View
7 tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
@@ -139,8 +139,9 @@ public function testWrapsErrorsAndInfo()
}
$settings = array(
- CURLOPT_PORT => 123,
- CURLOPT_CONNECTTIMEOUT_MS => 1
+ CURLOPT_PORT => 123,
+ CURLOPT_CONNECTTIMEOUT_MS => 1,
+ CURLOPT_TIMEOUT_MS => 1
);
$handle = curl_init($this->getServer()->getUrl());
@@ -149,7 +150,7 @@ public function testWrapsErrorsAndInfo()
@curl_exec($handle);
$errors = array(
- CURLE_COULDNT_CONNECT => "couldn't connect to host",
+ CURLE_COULDNT_CONNECT => "couldn't connect to host",
CURLE_OPERATION_TIMEOUTED => 'timeout was reached'
);
View
2  tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php
@@ -9,7 +9,7 @@
use Guzzle\Http\Message\RequestFactory;
use Guzzle\Http\Message\PostFile;
use Guzzle\Http\QueryString;
-use Guzzle\Http\Parser\Message\MessageParser;
+use Guzzle\Parser\Message\MessageParser;
/**
* @group server
View
11 tests/Guzzle/Tests/Http/Parser/Cookie/CookieParserTest.php
@@ -1,11 +0,0 @@
-<?php
-
-namespace Guzzle\Tests\Http\Parser\Cookie;
-
-/**
- * @covers Guzzle\Http\Parser\Cookie\CookieParser
- */
-class CookieParserTest extends CookieParserProvider
-{
- protected $cookieParserClass = 'Guzzle\Http\Parser\Cookie\CookieParser';
-}
View
2  tests/Guzzle/Tests/Http/UrlTest.php
@@ -4,7 +4,7 @@
use Guzzle\Http\QueryString;
use Guzzle\Http\Url;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
class UrlTest extends \Guzzle\Tests\GuzzleTestCase
{
View
4 ...Tests/Http/Parser/Cookie/CookieParserProvider.php → ...zzle/Tests/Parser/Cookie/CookieParserProvider.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Tests\Http\Parser\Cookie;
+namespace Guzzle\Tests\Parser\Cookie;
use Guzzle\Http\Url;
@@ -251,7 +251,7 @@ public function cookieParserDataProvider()
/**
* @dataProvider cookieParserDataProvider
- * @covers Guzzle\Http\Parser\Cookie\CookieParser
+ * @covers Guzzle\Parser\Cookie\CookieParser
*/
public function testParseCookie($cookie, $parsed, $url = null)
{
View
11 tests/Guzzle/Tests/Parser/Cookie/CookieParserTest.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Guzzle\Tests\Parser\Cookie;
+
+/**
+ * @covers Guzzle\Parser\Cookie\CookieParser
+ */
+class CookieParserTest extends CookieParserProvider
+{
+ protected $cookieParserClass = 'Guzzle\Parser\Cookie\CookieParser';
+}
View
2  ...sts/Http/Parser/Message/MessageParserProvider.php → ...le/Tests/Parser/Message/MessageParserProvider.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Tests\Http\Parser\Message;
+namespace Guzzle\Tests\Parser\Message;
class MessageParserProvider extends \Guzzle\Tests\GuzzleTestCase
{
View
14 ...e/Tests/Http/Parser/Message/MessageParserTest.php → ...Guzzle/Tests/Parser/Message/MessageParserTest.php
@@ -1,15 +1,15 @@
<?php
-namespace Guzzle\Tests\Http\Parser\Message;
+namespace Guzzle\Tests\Parser\Message;
-use Guzzle\Http\Parser\Message\MessageParser;
+use Guzzle\Parser\Message\MessageParser;
class MessageParserTest extends MessageParserProvider
{
/**
- * @covers Guzzle\Http\Parser\Message\AbstractMessageParser::getUrlPartsFromMessage
- * @covers Guzzle\Http\Parser\Message\MessageParser::parseMessage
- * @covers Guzzle\Http\Parser\Message\MessageParser::parseRequest
+ * @covers Guzzle\Parser\Message\AbstractMessageParser::getUrlPartsFromMessage
+ * @covers Guzzle\Parser\Message\MessageParser::parseMessage
+ * @covers Guzzle\Parser\Message\MessageParser::parseRequest
* @dataProvider requestProvider
*/
public function testParsesRequests($message, $parts)
@@ -19,8 +19,8 @@ public function testParsesRequests($message, $parts)
}
/**
- * @covers Guzzle\Http\Parser\Message\MessageParser::parseMessage
- * @covers Guzzle\Http\Parser\Message\MessageParser::parseResponse
+ * @covers Guzzle\Parser\Message\MessageParser::parseMessage
+ * @covers Guzzle\Parser\Message\MessageParser::parseResponse
* @dataProvider responseProvider
*/
public function testParsesResponses($message, $parts)
View
8 ...Http/Parser/Message/PeclHttpMessageParserTest.php → ...ests/Parser/Message/PeclHttpMessageParserTest.php
@@ -1,8 +1,8 @@
<?php
-namespace Guzzle\Tests\Http\Parser\Message;
+namespace Guzzle\Tests\Parser\Message;
-use Guzzle\Http\Parser\Message\PeclHttpMessageParser;
+use Guzzle\Parser\Message\PeclHttpMessageParser;
class PeclHttpMessageParserTest extends MessageParserProvider
{
@@ -14,7 +14,7 @@ protected function setUp()
}
/**
- * @covers Guzzle\Http\Parser\Message\PeclHttpMessageParser::parseRequest
+ * @covers Guzzle\Parser\Message\PeclHttpMessageParser::parseRequest
* @dataProvider requestProvider
*/
public function testParsesRequests($message, $parts)
@@ -24,7 +24,7 @@ public function testParsesRequests($message, $parts)
}
/**
- * @covers Guzzle\Http\Parser\Message\PeclHttpMessageParser::parseResponse
+ * @covers Guzzle\Parser\Message\PeclHttpMessageParser::parseResponse
* @dataProvider responseProvider
*/
public function testParsesResponses($message, $parts)
View
10 ...s/Guzzle/Tests/Http/Parser/ParserRegistryTest.php → tests/Guzzle/Tests/Parser/ParserRegistryTest.php
@@ -1,11 +1,11 @@
<?php
-namespace Guzzle\Tests\Http\Parser;
+namespace Guzzle\Tests\Parser;
-use Guzzle\Http\Parser\ParserRegistry;
+use Guzzle\Parser\ParserRegistry;
/**
- * Guzzle\Http\Parser\ParserRegistry
+ * Guzzle\Parser\ParserRegistry
*/
class ParserRegistryTest extends \Guzzle\Tests\GuzzleTestCase
{
@@ -24,13 +24,13 @@ public function testReturnsNullWhenNotFound()
public function testReturnsLazyLoadedDefault()
{
// Clear out what might be cached
- $refObject = new \ReflectionClass('Guzzle\Http\Parser\ParserRegistry');
+ $refObject = new \ReflectionClass('Guzzle\Parser\ParserRegistry');
$refProperty = $refObject->getProperty('instances');
$refProperty->setAccessible(true);
$refProperty->setValue(null, array());
$c = ParserRegistry::get('cookie');
- $this->assertInstanceOf('Guzzle\Http\Parser\Cookie\CookieParser', $c);
+ $this->assertInstanceOf('Guzzle\Parser\Cookie\CookieParser', $c);
$this->assertSame($c, ParserRegistry::get('cookie'));
}
}
View
6 ...Tests/Http/Parser/UriTemplate/UriTemplateTest.php → ...zzle/Tests/Parser/UriTemplate/UriTemplateTest.php
@@ -1,11 +1,11 @@
<?php
-namespace Guzzle\Tests\Http\Parsers\UriTemplate;
+namespace Guzzle\Tests\Parsers\UriTemplate;
-use Guzzle\Http\Parser\UriTemplate\UriTemplate;
+use Guzzle\Parser\UriTemplate\UriTemplate;
/**
- * @covers Guzzle\Http\Parser\UriTemplate\UriTemplate
+ * @covers Guzzle\Parser\UriTemplate\UriTemplate
*/
class UriTemplateTest extends \Guzzle\Tests\GuzzleTestCase
{
View
2  ...uzzle/Tests/Http/Parser/Url/UrlParserProvider.php → tests/Guzzle/Tests/Parser/Url/UrlParserProvider.php
@@ -1,6 +1,6 @@
<?php
-namespace Guzzle\Tests\Http\Parser\Url;
+namespace Guzzle\Tests\Parser\Url;
class UrlParserProvider extends \Guzzle\Tests\GuzzleTestCase
{
View
6 tests/Guzzle/Tests/Http/Parser/Url/UrlParserTest.php → tests/Guzzle/Tests/Parser/Url/UrlParserTest.php
@@ -1,12 +1,12 @@
<?php
-namespace Guzzle\Tests\Http\Parser\Url;
+namespace Guzzle\Tests\Parser\Url;
-use Guzzle\Http\Parser\Url\UrlParser;
+use Guzzle\Parser\Url\UrlParser;
use Guzzle\Http\Url;
/**
- * @covers Guzzle\Http\Parser\Url\UrlParser
+ * @covers Guzzle\Parser\Url\UrlParser
*/
class UrlParserTest extends UrlParserProvider
{
View
4 tests/Guzzle/Tests/Service/ClientTest.php
@@ -4,7 +4,7 @@
use Guzzle\Common\Collection;
use Guzzle\Common\Log\ClosureLogAdapter;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\Inflector;
use Guzzle\Http\Message\Response;
use Guzzle\Http\Message\RequestFactory;
use Guzzle\Http\Curl\CurlMulti;
@@ -361,7 +361,7 @@ public function testClientCreatesIteratorsWithCommands()
public function testClientHoldsInflector()
{
$client = new Mock\MockClient();
- $this->assertInstanceOf('Guzzle\Inflection\MemoizingInflector', $client->getInflector());
+ $this->assertInstanceOf('Guzzle\Common\Inflection\MemoizingInflector', $client->getInflector());
$inflector = new Inflector();
$client->setInflector($inflector);
View
2  tests/Guzzle/Tests/Service/Command/Factory/ServiceDescriptionFactoryTest.php
@@ -4,7 +4,7 @@
use Guzzle\Service\Description\ServiceDescription;
use Guzzle\Service\Command\Factory\ServiceDescriptionFactory;
-use Guzzle\Inflection\Inflector;
+use Guzzle\Common\Inflection\Inflector;
/**
* @covers Guzzle\Service\Command\Factory\ServiceDescriptionFactory
Please sign in to comment.
Something went wrong with that request. Please try again.