Fixed the tests and dependencies

Nyholm · Nyholm · commit 0a2810261c16 · 2015-12-25T11:24:34.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -15,7 +14,7 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.4
+    - php: 5.5
       env:
         - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
         - COVERAGE=true
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -35,6 +35,7 @@ public function getConfigTreeBuilder()
                     return !empty($v['classes']['client'])
                         || !empty($v['classes']['message_factory'])
                         || !empty($v['classes']['uri_factory'])
+                        || !empty($v['classes']['stream_factory'])
                     ;
                 })
                 ->then(function ($v) {
@@ -59,6 +60,7 @@ public function getConfigTreeBuilder()
                         ->scalarNode('client')->defaultValue('httplug.client.default')->end()
                         ->scalarNode('message_factory')->defaultValue('httplug.message_factory.default')->end()
                         ->scalarNode('uri_factory')->defaultValue('httplug.uri_factory.default')->end()
+                        ->scalarNode('stream_factory')->defaultValue('httplug.stream_factory.default')->end()
                     ->end()
                 ->end()
                 ->arrayNode('classes')
@@ -68,6 +70,7 @@ public function getConfigTreeBuilder()
                         ->scalarNode('client')->defaultNull()->end()
                         ->scalarNode('message_factory')->defaultNull()->end()
                         ->scalarNode('uri_factory')->defaultNull()->end()
+                        ->scalarNode('stream_factory')->defaultNull()->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/Tests/Resources/Fixtures/config/full.php b/Tests/Resources/Fixtures/config/full.php
@@ -5,10 +5,12 @@
         'client' => 'my_client',
         'message_factory' => 'my_message_factory',
         'uri_factory' => 'my_uri_factory',
+        'stream_factory' => 'my_stream_factory',
     ),
     'classes' => array(
         'client' => 'Http\Adapter\Guzzle6HttpAdapter',
-        'message_factory' => 'Http\Discovery\MessageFactory\GuzzleFactory',
-        'uri_factory' => 'Http\Discovery\UriFactory\GuzzleFactory',
+        'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
+        'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
+        'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
     ),
 ));
diff --git a/Tests/Resources/Fixtures/config/full.xml b/Tests/Resources/Fixtures/config/full.xml
@@ -6,12 +6,13 @@
             <client>my_client</client>
             <message-factory>my_message_factory</message-factory>
             <uri-factory>my_uri_factory</uri-factory>
+            <stream-factory>my_stream_factory</stream-factory>
         </main-alias>
         <classes>
             <client>Http\Adapter\Guzzle6HttpAdapter</client>
-            <message-factory>Http\Discovery\MessageFactory\GuzzleFactory</message-factory>
-            <uri-factory>Http\Discovery\UriFactory\GuzzleFactory</uri-factory>
-
+            <message-factory>Http\Message\MessageFactory\GuzzleMessageFactory</message-factory>
+            <uri-factory>Http\Message\UriFactory\GuzzleUriFactory</uri-factory>
+            <stream-factory>Http\Message\StreamFactory\GuzzleStreamFactory</stream-factory>
         </classes>
     </config>
 
diff --git a/Tests/Resources/Fixtures/config/full.yml b/Tests/Resources/Fixtures/config/full.yml
@@ -3,7 +3,9 @@ httplug:
         client: my_client
         message_factory: my_message_factory
         uri_factory: my_uri_factory
+        stream_factory: my_stream_factory
     classes:
         client: Http\Adapter\Guzzle6HttpAdapter
-        message_factory: Http\Discovery\MessageFactory\GuzzleFactory
-        uri_factory: Http\Discovery\UriFactory\GuzzleFactory
+        message_factory: Http\Message\MessageFactory\GuzzleMessageFactory
+        uri_factory: Http\Message\UriFactory\GuzzleUriFactory
+        stream_factory: Http\Message\StreamFactory\GuzzleStreamFactory
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -28,11 +28,13 @@ public function testEmptyConfiguration()
                 'client' => 'httplug.client.default',
                 'message_factory' => 'httplug.message_factory.default',
                 'uri_factory' => 'httplug.uri_factory.default',
+                'stream_factory' => 'httplug.stream_factory.default',
             ),
             'classes' => array(
                 'client' => null,
                 'message_factory' => null,
                 'uri_factory' => null,
+                'stream_factory' => null,
             ),
             'clients'=>array(),
         );
@@ -57,11 +59,13 @@ public function testSupportsAllConfigFormats()
                 'client' => 'my_client',
                 'message_factory' => 'my_message_factory',
                 'uri_factory' => 'my_uri_factory',
+                'stream_factory' => 'my_stream_factory',
             ),
             'classes' => array(
                 'client' => 'Http\Adapter\Guzzle6HttpAdapter',
-                'message_factory' => 'Http\Discovery\MessageFactory\GuzzleFactory',
-                'uri_factory' => 'Http\Discovery\UriFactory\GuzzleFactory',
+                'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
+                'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
+                'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
             ),
             'clients'=>array(),
         );
diff --git a/Tests/Unit/DependencyInjection/HttplugExtensionTest.php b/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
@@ -21,13 +21,14 @@ public function testConfigLoadDefault()
     {
         $this->load();
 
-        foreach (['client', 'message_factory', 'uri_factory'] as $type) {
+        foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
             $this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");
         }
 
         $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Client\HttpClient');
         $this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');
+        $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');
     }
 
     public function testConfigLoadClass()
@@ -38,13 +39,14 @@ public function testConfigLoadClass()
             ),
         ));
 
-        foreach (['client', 'message_factory', 'uri_factory'] as $type) {
+        foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
             $this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");
         }
 
         $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6HttpAdapter');
         $this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');
+        $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');
     }
 
     public function testConfigLoadService()
@@ -54,15 +56,17 @@ public function testConfigLoadService()
                 'client' => 'my_client_service',
                 'message_factory' => 'my_message_factory_service',
                 'uri_factory' => 'my_uri_factory_service',
+                'stream_factory' => 'my_stream_factory_service',
             ),
         ));
 
-        foreach (['client', 'message_factory', 'uri_factory'] as $type) {
+        foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
             $this->assertContainerBuilderHasAlias("httplug.$type", "my_{$type}_service");
         }
 
         $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Client\HttpClient');
         $this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');
+        $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');
     }
 }
diff --git a/composer.json b/composer.json
@@ -23,7 +23,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.4",
-        "php-http/guzzle5-adapter": "dev-master",
+        "php-http/guzzle6-adapter": "dev-master",
+        "php-http/message": "dev-master",
+        "php-http/client-common": "^0.1",
         "symfony/symfony": "^2.7|^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "~1.0",
         "matthiasnoback/symfony-dependency-injection-test": "^0.7"

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,14 @@ public function testConfigLoadDefault()`
`21`	`21`	`{`
`22`	`22`	`$this->load();`
`23`	`23`
`24`		`- foreach (['client', 'message_factory', 'uri_factory'] as $type) {`
	`24`	`+ foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {`
`25`	`25`	`$this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`$this->assertContainerBuilderHasService('httplug.client.default', 'Http\Client\HttpClient');`
`29`	`29`	`$this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');`
`30`	`30`	`$this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');`
	`31`	`+ $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public function testConfigLoadClass()`
`@@ -38,13 +39,14 @@ public function testConfigLoadClass()`
`38`	`39`	`),`
`39`	`40`	`));`
`40`	`41`
`41`		`- foreach (['client', 'message_factory', 'uri_factory'] as $type) {`
	`42`	`+ foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {`
`42`	`43`	`$this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`$this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6HttpAdapter');`
`46`	`47`	`$this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');`
`47`	`48`	`$this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');`
	`49`	`+ $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`public function testConfigLoadService()`
`@@ -54,15 +56,17 @@ public function testConfigLoadService()`
`54`	`56`	`'client' => 'my_client_service',`
`55`	`57`	`'message_factory' => 'my_message_factory_service',`
`56`	`58`	`'uri_factory' => 'my_uri_factory_service',`
	`59`	`+ 'stream_factory' => 'my_stream_factory_service',`
`57`	`60`	`),`
`58`	`61`	`));`
`59`	`62`
`60`		`- foreach (['client', 'message_factory', 'uri_factory'] as $type) {`
	`63`	`+ foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {`
`61`	`64`	`$this->assertContainerBuilderHasAlias("httplug.$type", "my_{$type}_service");`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`$this->assertContainerBuilderHasService('httplug.client.default', 'Http\Client\HttpClient');`
`65`	`68`	`$this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');`
`66`	`69`	`$this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');`
	`70`	`+ $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');`
`67`	`71`	`}`
`68`	`72`	`}`