From 89630432a22781c2b1046ab5cad4f3267355c457 Mon Sep 17 00:00:00 2001 From: Calum Brodie Date: Mon, 17 Feb 2014 18:10:53 +0000 Subject: [PATCH 1/3] Update composer.json Update requirement for zend-mime to 2.2.* --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cf535dcd..07bca215 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "ass/xmlsecurity": "~1.0", "symfony/framework-bundle": "~2.0", "symfony/twig-bundle": "~2.0", - "zendframework/zend-mime": "2.1.*" + "zendframework/zend-mime": "2.2.*" }, "replace": { "besimple/soap-bundle": "self.version", From 071a0fe63e0452bd6a65f635f8ba2b3775394236 Mon Sep 17 00:00:00 2001 From: Gavin Staniforth Date: Mon, 14 Aug 2017 11:05:29 +0100 Subject: [PATCH 2/3] chore: update composer.json --- .travis.yml | 14 ++++---------- composer.json | 11 ++++++----- 2 files changed, 10 insertions(+), 15 deletions(-) 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 c89b6cb2..eebcc623 100644 --- a/composer.json +++ b/composer.json @@ -20,12 +20,12 @@ } ], "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", + "symfony/framework-bundle": "^2.8", + "symfony/twig-bundle": "^2.8", "zendframework/zend-mime": "2.2.*" }, "replace": { @@ -38,8 +38,9 @@ "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" }, "autoload": { "psr-0": { "BeSimple\\": "src/" } From cedebe20e71576a8f194f67879c2b6fb167a5d91 Mon Sep 17 00:00:00 2001 From: Gavin Staniforth Date: Mon, 14 Aug 2017 13:13:26 +0100 Subject: [PATCH 3/3] chore: remove pointless test --- composer.json | 3 ++- src/BeSimple/SoapClient/Tests/CurlTest.php | 16 ++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index eebcc623..5ca644c8 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,8 @@ "mikey179/vfsStream": "~1.0", "symfony/filesystem": "^2.8", "symfony/process": "^2.8", - "phpunit/phpunit": "^5.3" + "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(