Merge pull request #203 from php-http/patch-global

Moved TEST_COMMAND to global section

Author: fbourigault

.travis.yml

@@ -11,9 +11,11 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
 env:
-    - TEST_COMMAND="composer test"
+    global:
+        - TEST_COMMAND="composer test"
 
 branches:
     except:
@@ -24,7 +26,7 @@ matrix:
     include:
         - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
-        - php: 7.1
+        - php: 7.2
           env: DEPENDENCIES=dev
         - php: hhvm
           dist: trusty
@@ -35,6 +37,7 @@ matrix:
 before_install:
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
     - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
+    - if [ $COVERAGE != true ]; then phpenv config-rm xdebug.ini; fi;
 
 install:
     - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction

DependencyInjection/Configuration.php

@@ -470,15 +470,19 @@ private function createAuthenticationPluginNode()
                         switch ($config['type']) {
                             case 'basic':
                                 $this->validateAuthenticationType(['username', 'password'], $config, 'basic');
+
                                 break;
                             case 'bearer':
                                 $this->validateAuthenticationType(['token'], $config, 'bearer');
+
                                 break;
                             case 'service':
                                 $this->validateAuthenticationType(['service'], $config, 'service');
+
                                 break;
                             case 'wsse':
                                 $this->validateAuthenticationType(['username', 'password'], $config, 'wsse');
+
                                 break;
                         }
 

DependencyInjection/HttplugExtension.php

@@ -274,7 +274,8 @@ private function configureClient(ContainerBuilder $container, $clientName, array
 
         $plugins = [];
         foreach ($arguments['plugins'] as $plugin) {
-            list($pluginName, $pluginConfig) = each($plugin);
+            $pluginName = key($plugin);
+            $pluginConfig = current($plugin);
             if ('reference' === $pluginName) {
                 $plugins[] = $pluginConfig['id'];
             } elseif ('authentication' === $pluginName) {

Tests/Functional/ProfilingTest.php

@@ -15,11 +15,12 @@
 use Http\Message\Formatter\CurlCommandFormatter;
 use Http\Message\Formatter\FullHttpMessageFormatter;
 use Http\Mock\Client;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class ProfilingTest extends \PHPUnit_Framework_TestCase
+class ProfilingTest extends TestCase
 {
     /**
      * @var Collector
@@ -63,14 +64,15 @@ public function testProfilingWithCachePlugin()
         $this->assertEquals('example.com', $stack->getRequestHost());
     }
 
+    /**
+     * @expectedException \Exception
+     */
     public function testProfilingWhenPluginThrowException()
     {
         $client = $this->createClient([
             new ExceptionThrowerPlugin(),
         ]);
 
-        $this->setExpectedException(\Exception::class);
-
         try {
             $client->sendRequest(new Request('GET', 'https://example.com'));
         } finally {

Tests/Unit/ClientFactory/BuzzFactoryTest.php

@@ -5,11 +5,12 @@
 use Http\Adapter\Buzz\Client;
 use Http\HttplugBundle\ClientFactory\BuzzFactory;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class BuzzFactoryTest extends \PHPUnit_Framework_TestCase
+class BuzzFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/CurlFactoryTest.php

@@ -6,11 +6,12 @@
 use Http\Client\Curl\Client;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class CurlFactoryTest extends \PHPUnit_Framework_TestCase
+class CurlFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/Guzzle6FactoryTest.php

@@ -4,11 +4,12 @@
 
 use Http\HttplugBundle\ClientFactory\Guzzle6Factory;
 use Http\Adapter\Guzzle6\Client;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class Guzzle6FactoryTest extends \PHPUnit_Framework_TestCase
+class Guzzle6FactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/ReactFactoryTest.php

@@ -5,11 +5,12 @@
 use Http\Adapter\React\Client;
 use Http\HttplugBundle\ClientFactory\ReactFactory;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class ReactFactoryTest extends \PHPUnit_Framework_TestCase
+class ReactFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/SocketFactoryTest.php

@@ -5,11 +5,12 @@
 use Http\Client\Socket\Client;
 use Http\HttplugBundle\ClientFactory\SocketFactory;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class SocketFactoryTest extends \PHPUnit_Framework_TestCase
+class SocketFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/Collector/CollectorTest.php

@@ -4,8 +4,9 @@
 
 use Http\HttplugBundle\Collector\Collector;
 use Http\HttplugBundle\Collector\Stack;
+use PHPUnit\Framework\TestCase;
 
-class CollectorTest extends \PHPUnit_Framework_TestCase
+class CollectorTest extends TestCase
 {
     public function testCollectClientNames()
     {