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

Passe générale php-cs-fixer

Browse Source
This commit is contained in:
Teddy Cornaut
2019-09-24 08:23:19 -04:00
parent 408d88f164
commit dad2b76165
75 changed files with 134 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,6 @@ class Curl
$errorCodeMapping = $this->getErrorCodeMapping();
$errorNumber = curl_errno($this->ch);
if (isset($errorCodeMapping[$errorNumber])) {
return $errorCodeMapping[$errorNumber];
}

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

@ -338,10 +338,10 @@ class SoapClient extends \SoapClient
$options['typemap'][] = array(
'type_name' => $converter->getTypeName(),
'type_ns' => $converter->getTypeNamespace(),
'from_xml' => function($input) use ($converter) {
'from_xml' => function ($input) use ($converter) {
return $converter->convertXmlToPhp($input);
},
'to_xml' => function($input) use ($converter) {
'to_xml' => function ($input) use ($converter) {
return $converter->convertPhpToXml($input);
},
);
@ -380,4 +380,4 @@ class SoapClient extends \SoapClient
return $cacheFileName;
}
}
}

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

@ -45,4 +45,4 @@ class SoapRequest extends CommonSoapRequest
return $request;
}
}
}

4
src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php
View File

@ -23,8 +23,8 @@ abstract class AbstractWebServerTest extends \PHPUnit_Framework_TestCase
/**
* @var ProcessBuilder
*/
static protected $webserver;
static protected $websererPortLength;
protected static $webserver;
protected static $websererPortLength;
public static function setUpBeforeClass()
{

2
src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentRequest.php
View File

@ -4,4 +4,4 @@ namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
class AttachmentRequest extends AttachmentType
{
}
}

2
src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentType.php
View File

@ -6,4 +6,4 @@ class AttachmentType
{
public $fileName;
public $binaryData;
}
}

2
src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php
View File

@ -20,4 +20,4 @@ class TestCase extends \PHPUnit_Framework_TestCase
curl_close($ch);
}
}
}

2
src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php
View File

@ -74,7 +74,7 @@ class WsSecurityUserPassAxisInteropTest extends TestCase
$sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $this->options);
$wssFilter = new BeSimpleWsSecurityFilter(true, 600);
$wssFilter->addUserData( 'libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST );
$wssFilter->addUserData('libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST);
$soapKernel = $sc->getSoapKernel();
$soapKernel->registerFilter($wssFilter);

2
src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentRequest.php
View File

@ -4,4 +4,4 @@ namespace BeSimple\SoapClient\Tests\ServerInterop\Fixtures;
class AttachmentRequest extends AttachmentType
{
}
}

2
src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentType.php
View File

@ -6,4 +6,4 @@ class AttachmentType
{
public $fileName;
public $binaryData;
}
}

3
src/BeSimple/SoapClient/Tests/ServerInterop/MTOMClient.php
View File

@ -36,7 +36,6 @@ try {
$attachment->binaryData = $b64;
var_dump($sc->attachment($attachment));
} catch (Exception $e) {
var_dump($e);
}
@ -46,4 +45,4 @@ try {
// $sc->__getLastRequest(),
// $sc->__getLastResponseHeaders(),
// $sc->__getLastResponse()
// );
// );

3
src/BeSimple/SoapClient/Tests/ServerInterop/SwaClient.php
View File

@ -29,7 +29,6 @@ $options = array(
$sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/SwA.wsdl', $options);
try {
$upload = new uploadFile();
$upload->name = 'upload.txt';
$upload->data = 'This is a test. :)';
@ -49,4 +48,4 @@ try {
// $sc->__getLastRequest(),
// $sc->__getLastResponseHeaders(),
// $sc->__getLastResponse()
// );
// );

2
src/BeSimple/SoapClient/Tests/ServerInterop/TestCase.php
View File

@ -26,4 +26,4 @@ class TestCase extends \PHPUnit_Framework_TestCase
curl_close($ch);
}
}
}

1
src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerClient.php
View File

@ -69,7 +69,6 @@ try {
$ab->type = 'scifi';
var_dump($sc->addBook($ab));
} catch (Exception $e) {
var_dump($e);
}

1
src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerClient.php
View File

@ -54,7 +54,6 @@ try {
$ab->type = 'scifi';
var_dump($sc->addBook($ab));
} catch (Exception $e) {
var_dump($e);
}

2
src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php
View File

@ -63,7 +63,7 @@ class WsSecurityUserPassServerInteropTest extends TestCase
$sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $this->options);
$wssFilter = new BeSimpleWsSecurityFilter(true, 600);
$wssFilter->addUserData( 'libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST );
$wssFilter->addUserData('libuser', 'books', BeSimpleWsSecurityFilter::PASSWORD_TYPE_DIGEST);
$soapKernel = $sc->getSoapKernel();
$soapKernel->registerFilter($wssFilter);

4
src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php
View File

@ -25,9 +25,9 @@ use org\bovigo\vfs\vfsStreamWrapper;
*/
class WsdlDownloaderTest extends AbstractWebserverTest
{
static protected $filesystem;
protected static $filesystem;
static protected $fixturesPath;
protected static $fixturesPath;
/**
* @dataProvider provideDownload

3
src/BeSimple/SoapClient/WsAddressingFilter.php
View File

@ -157,7 +157,6 @@ class WsAddressingFilter implements SoapRequestFilter, SoapResponseFilter
public function getReferenceParameter($ns, $parameter)
{
if (isset($this->referenceParametersRecieved[$ns][$parameter])) {
return $this->referenceParametersRecieved[$ns][$parameter];
}
@ -344,4 +343,4 @@ class WsAddressingFilter implements SoapRequestFilter, SoapResponseFilter
}
}
}
}
}

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

@ -151,7 +151,6 @@ class WsSecurityFilter extends WsSecurityFilterClientServer implements SoapReque
if (null !== $this->password
&& (null === $this->userSecurityKey
|| (null !== $this->userSecurityKey && !$this->userSecurityKey->hasPrivateKey()))) {
if (self::PASSWORD_TYPE_DIGEST === $this->passwordType) {
$nonce = mt_rand();
$password = base64_encode(sha1($nonce . $createdTimestamp . $this->password, true));

32
src/BeSimple/SoapClient/WsdlDownloader.php
View File

@ -56,7 +56,7 @@ class WsdlDownloader
/**
* Resolve WSDl/XSD includes.
*
* @var boolean
* @var bool
*/
protected $resolveRemoteIncludes = true;
@ -64,13 +64,13 @@ class WsdlDownloader
* Constructor.
*
* @param \BeSimple\SoapClient\Curl $curl Curl instance
* @param boolean $resolveRemoteIncludes WSDL/XSD include enabled?
* @param boolean $cacheWsdl Cache constant
* @param bool $resolveRemoteIncludes WSDL/XSD include enabled?
* @param bool $cacheWsdl Cache constant
*/
public function __construct(Curl $curl, $resolveRemoteIncludes = true, $cacheWsdl = Cache::TYPE_DISK)
{
$this->curl = $curl;
$this->resolveRemoteIncludes = (Boolean) $resolveRemoteIncludes;
$this->curl = $curl;
$this->resolveRemoteIncludes = (bool) $resolveRemoteIncludes;
// get current WSDL caching config
$this->cacheEnabled = $cacheWsdl === Cache::TYPE_NONE ? Cache::DISABLED : Cache::ENABLED == Cache::isEnabled();
@ -107,13 +107,13 @@ class WsdlDownloader
file_put_contents($cacheFilePath, $response);
}
} else {
throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl ."'");
throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '".$wsdl."'");
}
} elseif (file_exists($wsdl)) {
$response = file_get_contents($wsdl);
$this->resolveRemoteIncludes($response, $cacheFilePath);
} else {
throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl ."'");
throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '".$wsdl."'");
}
}
@ -122,7 +122,7 @@ class WsdlDownloader
return realpath($wsdl);
}
throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl ."'");
throw new \ErrorException("SOAP-ERROR: Parsing WSDL: Couldn't load from '".$wsdl."'");
}
/**
@ -130,7 +130,7 @@ class WsdlDownloader
*
* @param string $file File URL/path
*
* @return boolean
* @return bool
*/
private function isRemoteFile($file)
{
@ -147,11 +147,9 @@ class WsdlDownloader
/**
* Resolves remote WSDL/XSD includes within the WSDL files.
*
* @param string $xml XML file
* @param string $cacheFilePath Cache file name
* @param boolean $parentFilePath Parent file name
*
* @return void
* @param string $xml XML file
* @param string $cacheFilePath Cache file name
* @param bool $parentFilePath Parent file name
*/
private function resolveRemoteIncludes($xml, $cacheFilePath, $parentFilePath = null)
{
@ -214,10 +212,10 @@ class WsdlDownloader
$urlParts = parse_url($base);
// combine base path with relative path
if (isset($urlParts['path']) && '/' === $relative{0}) {
if (isset($urlParts['path']) && '/' === $relative[0]) {
// $relative is absolute path from domain (starts with /)
$path = $relative;
} elseif (isset($urlParts['path']) && strrpos($urlParts['path'], '/') === (strlen($urlParts['path']) )) {
} elseif (isset($urlParts['path']) && strrpos($urlParts['path'], '/') === (strlen($urlParts['path']))) {
// base path is directory
$path = $urlParts['path'].$relative;
} elseif (isset($urlParts['path'])) {
@ -247,7 +245,7 @@ class WsdlDownloader
break;
}
$keyToDelete--;
--$keyToDelete;
}
unset($parts[$key]);

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

@ -65,6 +65,5 @@ class XmlMimeFilter implements SoapRequestFilter
}
}
}
}
}