Cadoles
/
BeSimpleSoap
20
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Several WS and CS fixes

This commit is contained in:
Andreas Schamberger 2012-01-15 11:42:21 +01:00
parent efc6500ead
commit 7f96a20f66
9 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BeSimple/SoapClient/Curl.php
View File

@ -72,7 +72,7 @@ class Curl
CURLOPT_HEADER => true, CURLOPT_HEADER => true,
CURLOPT_USERAGENT => $options['user_agent'], CURLOPT_USERAGENT => $options['user_agent'],
CURLINFO_HEADER_OUT => true, CURLINFO_HEADER_OUT => true,
); );
curl_setopt_array($this->ch, $curlOptions); curl_setopt_array($this->ch, $curlOptions);
if (isset($options['compression']) && !($options['compression'] & SOAP_COMPRESSION_ACCEPT)) { if (isset($options['compression']) && !($options['compression'] & SOAP_COMPRESSION_ACCEPT)) {
curl_setopt($this->ch, CURLOPT_ENCODING, 'identity'); curl_setopt($this->ch, CURLOPT_ENCODING, 'identity');
@ -215,7 +215,7 @@ class Curl
67 => 'Could not connect to host', //CURLE_LOGIN_DENIED 67 => 'Could not connect to host', //CURLE_LOGIN_DENIED
77 => 'Could not connect to host', //CURLE_SSL_CACERT_BADFILE 77 => 'Could not connect to host', //CURLE_SSL_CACERT_BADFILE
80 => 'Error Fetching http body, No Content-Length, connection closed or chunked data', //CURLE_SSL_SHUTDOWN_FAILED 80 => 'Error Fetching http body, No Content-Length, connection closed or chunked data', //CURLE_SSL_SHUTDOWN_FAILED
); );
} }
/** /**

2
src/BeSimple/SoapClient/SoapClient.php
View File

@ -77,7 +77,7 @@ class SoapClient extends \SoapClient
private $lastResponse = ''; private $lastResponse = '';
/** /**
* Last response. * Soap kernel.
* *
* @var \BeSimple\SoapCommon\SoapKernel * @var \BeSimple\SoapCommon\SoapKernel
*/ */

1
src/BeSimple/SoapClient/SoapClientBuilder.php
View File

@ -13,6 +13,7 @@
namespace BeSimple\SoapClient; namespace BeSimple\SoapClient;
use BeSimple\SoapCommon\AbstractSoapBuilder; use BeSimple\SoapCommon\AbstractSoapBuilder;
use BeSimple\SoapCommon\Helper;
/** /**
* Fluent interface builder for SoapClient instance. * Fluent interface builder for SoapClient instance.

16
tests/AxisInterop/MTOM.php
View File

@ -5,7 +5,21 @@ use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
require '../bootstrap.php'; require '../bootstrap.php';
echo '<pre>'; class base64Binary
{
public $_;
public $contentType;
}
class AttachmentType
{
public $fileName;
public $binaryData;
}
class AttachmentRequest extends AttachmentType
{
}
$options = array( $options = array(
'soap_version' => SOAP_1_1, 'soap_version' => SOAP_1_1,

2
tests/AxisInterop/SwA.php
View File

@ -5,8 +5,6 @@ use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
require '../bootstrap.php'; require '../bootstrap.php';
echo '<pre>';
$options = array( $options = array(
'soap_version' => SOAP_1_1, 'soap_version' => SOAP_1_1,
'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1

2
tests/AxisInterop/WsAddressing.php
View File

@ -5,8 +5,6 @@ use BeSimple\SoapClient\WsAddressingFilter as BeSimpleWsAddressingFilter;
require '../bootstrap.php'; require '../bootstrap.php';
echo '<pre>';
$options = array( $options = array(
'soap_version' => SOAP_1_2, 'soap_version' => SOAP_1_2,
'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1

2
tests/AxisInterop/WsSecurityUserPass.php
View File

@ -5,8 +5,6 @@ use BeSimple\SoapClient\WsSecurityFilter as BeSimpleWsSecurityFilter;
require '../bootstrap.php'; require '../bootstrap.php';
echo '<pre>';
$options = array( $options = array(
'soap_version' => SOAP_1_2, 'soap_version' => SOAP_1_2,
'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1

7
tests/BeSimple/Tests/SoapClient/CurlTest.php
View File

@ -23,11 +23,12 @@ class CurlTest extends \PHPUnit_Framework_TestCase
protected function startPhpWebserver() protected function startPhpWebserver()
{ {
if ('Windows' == substr(php_uname('s'), 0, 7 )) { $dir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures';
$powershellCommand = "\$app = start-process php.exe -ArgumentList '-S localhost:8000 -t ".__DIR__.DIRECTORY_SEPARATOR."Fixtures' -WindowStyle 'Hidden' -passthru; Echo \$app.Id;"; if ('Windows' == substr(php_uname('s'), 0, 7)) {
$powershellCommand = "\$app = start-process php.exe -ArgumentList '-S localhost:8000 -t ".$dir."' -WindowStyle 'Hidden' -passthru; Echo \$app.Id;";
$shellCommand = 'powershell -command "& {'.$powershellCommand.'}"'; $shellCommand = 'powershell -command "& {'.$powershellCommand.'}"';
} else { } else {
$shellCommand = "nohup php -S localhost:8000 -t ".__DIR__.DIRECTORY_SEPARATOR."Fixtures &"; $shellCommand = "nohup php -S localhost:8000 -t ".$dir." &";
} }
$output = array(); $output = array();
exec($shellCommand, $output); exec($shellCommand, $output);

29
tests/BeSimple/Tests/SoapClient/WsdlDownloaderTest.php
View File

@ -24,11 +24,12 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
protected function startPhpWebserver() protected function startPhpWebserver()
{ {
if ('Windows' == substr(php_uname('s'), 0, 7 )) { $dir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures';
$powershellCommand = "\$app = start-process php.exe -ArgumentList '-S localhost:8000 -t ".__DIR__.DIRECTORY_SEPARATOR."Fixtures' -WindowStyle 'Hidden' -passthru; Echo \$app.Id;"; if ('Windows' == substr(php_uname('s'), 0, 7)) {
$powershellCommand = "\$app = start-process php.exe -ArgumentList '-S localhost:8000 -t ".$dir."' -WindowStyle 'Hidden' -passthru; Echo \$app.Id;";
$shellCommand = 'powershell -command "& {'.$powershellCommand.'}"'; $shellCommand = 'powershell -command "& {'.$powershellCommand.'}"';
} else { } else {
$shellCommand = "nohup php -S localhost:8000 -t ".__DIR__.DIRECTORY_SEPARATOR."Fixtures &"; $shellCommand = "nohup php -S localhost:8000 -t ".$dir." &";
} }
$output = array(); $output = array();
exec($shellCommand, $output); exec($shellCommand, $output);
@ -38,7 +39,7 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
protected function stopPhpWebserver() protected function stopPhpWebserver()
{ {
if (!is_null($this->webserverProcessId)) { if (!is_null($this->webserverProcessId)) {
if ('Windows' == substr(php_uname('s'), 0, 7 )) { if ('Windows' == substr(php_uname('s'), 0, 7)) {
exec('TASKKILL /F /PID ' . $this->webserverProcessId); exec('TASKKILL /F /PID ' . $this->webserverProcessId);
} else { } else {
exec('kill ' . $this->webserverProcessId); exec('kill ' . $this->webserverProcessId);
@ -57,7 +58,7 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
$cacheDir = ini_get('soap.wsdl_cache_dir'); $cacheDir = ini_get('soap.wsdl_cache_dir');
if (!is_dir($cacheDir)) { if (!is_dir($cacheDir)) {
$cacheDir = sys_get_temp_dir(); $cacheDir = sys_get_temp_dir();
$cacheDirForRegExp = preg_quote( $cacheDir ); $cacheDirForRegExp = preg_quote($cacheDir);
} }
$tests = array( $tests = array(
@ -82,7 +83,7 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
foreach ($tests as $name => $values) { foreach ($tests as $name => $values) {
$cacheFileName = $wd->download($values['source']); $cacheFileName = $wd->download($values['source']);
$result = file_get_contents($cacheFileName); $result = file_get_contents($cacheFileName);
$this->assertRegExp($values['assertRegExp'],$result,$name); $this->assertRegExp($values['assertRegExp'], $result, $name);
unlink($cacheFileName); unlink($cacheFileName);
} }
@ -129,7 +130,7 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
$cacheDir = ini_get('soap.wsdl_cache_dir'); $cacheDir = ini_get('soap.wsdl_cache_dir');
if (!is_dir($cacheDir)) { if (!is_dir($cacheDir)) {
$cacheDir = sys_get_temp_dir(); $cacheDir = sys_get_temp_dir();
$cacheDirForRegExp = preg_quote( $cacheDir ); $cacheDirForRegExp = preg_quote($cacheDir);
} }
$remoteUrlAbsolute = 'http://localhost:8000/wsdlinclude/wsdlinctest_absolute.xml'; $remoteUrlAbsolute = 'http://localhost:8000/wsdlinclude/wsdlinctest_absolute.xml';
@ -162,10 +163,10 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
); );
foreach ($tests as $name => $values) { foreach ($tests as $name => $values) {
$wsdl = file_get_contents( $values['source'] ); $wsdl = file_get_contents($values['source']);
$method->invoke($wd, $wsdl, $values['cacheFile'],$values['remoteParentUrl']); $method->invoke($wd, $wsdl, $values['cacheFile'], $values['remoteParentUrl']);
$result = file_get_contents($values['cacheFile']); $result = file_get_contents($values['cacheFile']);
$this->assertRegExp($values['assertRegExp'],$result,$name); $this->assertRegExp($values['assertRegExp'], $result, $name);
unlink($values['cacheFile']); unlink($values['cacheFile']);
} }
@ -186,7 +187,7 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
$cacheDir = ini_get('soap.wsdl_cache_dir'); $cacheDir = ini_get('soap.wsdl_cache_dir');
if (!is_dir($cacheDir)) { if (!is_dir($cacheDir)) {
$cacheDir = sys_get_temp_dir(); $cacheDir = sys_get_temp_dir();
$cacheDirForRegExp = preg_quote( $cacheDir ); $cacheDirForRegExp = preg_quote($cacheDir);
} }
$remoteUrlAbsolute = 'http://localhost:8000/xsdinclude/xsdinctest_absolute.xml'; $remoteUrlAbsolute = 'http://localhost:8000/xsdinclude/xsdinctest_absolute.xml';
@ -219,10 +220,10 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
); );
foreach ($tests as $name => $values) { foreach ($tests as $name => $values) {
$wsdl = file_get_contents( $values['source'] ); $wsdl = file_get_contents($values['source']);
$method->invoke($wd, $wsdl, $values['cacheFile'],$values['remoteParentUrl']); $method->invoke($wd, $wsdl, $values['cacheFile'], $values['remoteParentUrl']);
$result = file_get_contents($values['cacheFile']); $result = file_get_contents($values['cacheFile']);
$this->assertRegExp($values['assertRegExp'],$result,$name); $this->assertRegExp($values['assertRegExp'], $result, $name);
unlink($values['cacheFile']); unlink($values['cacheFile']);
} }