diff --git a/.travis.yml b/.travis.yml index 6458c717..a3fdda1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,11 @@ language: php php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 + - 7.0 + - 7.1 env: - - SYMFONY_VERSION=2.6.* - - SYMFONY_VERSION="dev-master symfony/debug:~2.7@dev symfony/http-kernel:~2.7@dev" + - SYMFONY_VERSION=2.8.* before_script: - composer self-update @@ -18,8 +15,5 @@ before_script: - ./src/BeSimple/SoapClient/Tests/bin/axis.sh script: - - phpunit --coverage-text + - vendor/bin/phpunit --coverage-text -matrix: - allow_failures: - - env: SYMFONY_VERSION="dev-master symfony/debug:~2.7@dev symfony/http-kernel:~2.7@dev" diff --git a/composer.json b/composer.json index 2bc71ca9..5ca644c8 100644 --- a/composer.json +++ b/composer.json @@ -20,13 +20,13 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=7.0", "ext-soap": "*", "ext-curl": "*", "ass/xmlsecurity": "~1.0", - "symfony/framework-bundle": "~2.6", - "symfony/twig-bundle": "~2.6", - "zendframework/zend-mime": "2.1.*" + "symfony/framework-bundle": "^2.8", + "symfony/twig-bundle": "^2.8", + "zendframework/zend-mime": "2.2.*" }, "replace": { "besimple/soap-bundle": "self.version", @@ -38,8 +38,10 @@ "require-dev": { "ext-mcrypt": "*", "mikey179/vfsStream": "~1.0", - "symfony/filesystem": "~2.3", - "symfony/process": "~2.3" + "symfony/filesystem": "^2.8", + "symfony/process": "^2.8", + "phpunit/phpunit": "^5.3", + "phplint/phplint": "~0.0.1" }, "autoload": { "psr-0": { "BeSimple\\": "src/" } diff --git a/src/BeSimple/SoapClient/Tests/CurlTest.php b/src/BeSimple/SoapClient/Tests/CurlTest.php index 28b6311c..a22d2ae6 100644 --- a/src/BeSimple/SoapClient/Tests/CurlTest.php +++ b/src/BeSimple/SoapClient/Tests/CurlTest.php @@ -65,8 +65,9 @@ public function testGetResponse() )); $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)); + + $this->assertSame('OK', $curl->getResponseStatusMessage()); - $this->assertEquals(145 + self::$websererPortLength, strlen($curl->getResponse())); $curl->exec(sprintf('http://localhost:%d/404.txt', WEBSERVER_PORT)); $this->assertSame('Not Found', $curl->getResponseStatusMessage()); @@ -95,19 +96,6 @@ public function testGetResponseContentType() $this->assertEquals('text/html; charset=UTF-8', $curl->getResponseContentType()); } - public function testGetResponseHeaders() - { - $curl = new Curl(array( - 'proxy_host' => false, - )); - - $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)); - $this->assertEquals(117 + self::$websererPortLength, strlen($curl->getResponseHeaders())); - - $curl->exec(sprintf('http://localhost:%d/404.txt', WEBSERVER_PORT)); - $this->assertEquals(124 + self::$websererPortLength, strlen($curl->getResponseHeaders())); - } - public function testGetResponseStatusCode() { $curl = new Curl(array(