Skip to content

Update with fork #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update with fork #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8963043
Update composer.json
calumbrodie Feb 17, 2014
d8549d1
Merge remote-tracking branch 'fork/master' into update-with-fork
gsdevme Aug 14, 2017
071a0fe
chore: update composer.json
gsdevme Aug 14, 2017
cedebe2
chore: remove pointless test
gsdevme Aug 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
14 changes: 8 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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/" }
Expand Down
16 changes: 2 additions & 14 deletions src/BeSimple/SoapClient/Tests/CurlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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(
Expand Down