Skip to content
This repository
Browse code

[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
Michael Dowling mtdowling authored

Showing 52 changed files with 151 additions and 99 deletions. Show diff stats Hide diff stats

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

0 comments on commit 142e246

Please sign in to comment.
Something went wrong with that request. Please try again.