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

Merge pull request #3 from Cadoles/php-cs-fixer 

Passe générale php-cs-fixer
This commit is contained in:
scriptted 2019-09-24 08:50:42 -04:00 committed by GitHub
parent 408d88f164 77403fcfbb
commit 30850d7a01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 134 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
composer.lock
composer.phar
phpunit.xml
.php_cs.cache

2
src/BeSimple/SoapBundle/Converter/TypeRepository.php
View File

@ -48,7 +48,7 @@ class TypeRepository
public function fixTypeInformation(ServiceDefinition $definition)
{
foreach($definition->getAllTypes() as $type) {
foreach ($definition->getAllTypes() as $type) {
$phpType = $type->getPhpType();
$xmlType = $type->getXmlType();

2
src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
View File

@ -60,7 +60,7 @@ class BeSimpleSoapExtension extends Extension
$container->setParameter('besimple.soap.definition.dumper.options.stylesheet', $config['wsdl_dumper']['stylesheet']);
foreach($config['services'] as $name => $serviceConfig) {
foreach ($config['services'] as $name => $serviceConfig) {
$serviceConfig['name'] = $name;
$this->createWebServiceContext($serviceConfig, $container);
}

8
src/BeSimple/SoapBundle/DependencyInjection/Configuration.php
View File

@ -96,8 +96,12 @@ class Configuration
->info('proxy configuration')
->addDefaultsIfNotSet()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->then(function ($v) { return array('host' => null === $v ? false : $v); })
->ifTrue(function ($v) {
return !is_array($v);
})
->then(function ($v) {
return array('host' => null === $v ? false : $v);
})
->end()
->children()
->scalarNode('host')->defaultFalse()->end()

4
src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestMessageBinder.php
View File

@ -19,14 +19,14 @@ class DocumentLiteralWrappedRequestMessageBinder implements MessageBinderInterfa
{
public function processMessage(Method $messageDefinition, $message)
{
if(count($message) > 1) {
if (count($message) > 1) {
throw new \InvalidArgumentException();
}
$result = array();
$message = $message[0];
foreach($messageDefinition->getArguments() as $argument) {
foreach ($messageDefinition->getArguments() as $argument) {
$result[$argument->getName()] = $message->{$argument->getName()};
}

2
src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php
View File

@ -24,5 +24,5 @@ interface MessageBinderInterface
*
* @return mixed
*/
function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
}

3
src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php
View File

@ -44,7 +44,8 @@ class ServiceBinder
* @param MessageBinderInterface $requestMessageBinder
* @param MessageBinderInterface $responseMessageBinder
*/
public function __construct(Definition $definition, MessageBinderInterface $requestHeaderMessageBinder, MessageBinderInterface $requestMessageBinder, MessageBinderInterface $responseMessageBinder) {
public function __construct(Definition $definition, MessageBinderInterface $requestHeaderMessageBinder, MessageBinderInterface $requestMessageBinder, MessageBinderInterface $responseMessageBinder)
{
$this->definition = $definition;
$this->requestHeaderMessageBinder = $requestHeaderMessageBinder;

2
src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ConfigurationInterface.php
View File

@ -22,5 +22,5 @@ interface ConfigurationInterface
*
* @return string
*/
function getAliasName();
public function getAliasName();
}

8
src/BeSimple/SoapBundle/ServiceDefinition/Annotation/TypedElementInterface.php
View File

@ -12,8 +12,8 @@ namespace BeSimple\SoapBundle\ServiceDefinition\Annotation;
interface TypedElementInterface
{
function getPhpType();
function getXmlType();
function setPhpType($phpType);
function setXmlType($xmlType);
public function getPhpType();
public function getXmlType();
public function setPhpType($phpType);
public function setXmlType($xmlType);
}

2
src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
View File

@ -133,7 +133,7 @@ class AnnotationClassLoader extends Loader
*/
private function getController(\ReflectionClass $class, \ReflectionMethod $method, Annotation\Method $annotation)
{
if(null !== $annotation->getService()) {
if (null !== $annotation->getService()) {
return $annotation->getService() . ':' . $method->name;
} else {
return $class->name . '::' . $method->name;

16
src/BeSimple/SoapBundle/Soap/SoapRequest.php
View File

@ -69,7 +69,7 @@ class SoapRequest extends Request
*/
public function getSoapMessage()
{
if(null === $this->soapMessage) {
if (null === $this->soapMessage) {
$this->soapMessage = $this->initializeSoapMessage();
}
@ -88,12 +88,12 @@ class SoapRequest extends Request
protected function initializeSoapMessage()
{
if($this->server->has('CONTENT_TYPE')) {
if ($this->server->has('CONTENT_TYPE')) {
$type = $this->splitContentTypeHeader($this->server->get('CONTENT_TYPE'));
switch($type['_type']) {
switch ($type['_type']) {
case 'multipart/related':
if($type['type'] == 'application/xop+xml') {
if ($type['type'] == 'application/xop+xml') {
return $this->initializeMtomSoapMessage($type, $this->getContent());
} else {
//log error
@ -114,7 +114,7 @@ class SoapRequest extends Request
protected function initializeMtomSoapMessage(array $contentTypeHeader, $content)
{
if(!isset($contentTypeHeader['start']) || !isset($contentTypeHeader['start-info']) || !isset($contentTypeHeader['boundary'])) {
if (!isset($contentTypeHeader['start']) || !isset($contentTypeHeader['start-info']) || !isset($contentTypeHeader['boundary'])) {
throw new \InvalidArgumentException();
}
@ -129,11 +129,11 @@ class SoapRequest extends Request
// TODO: add more checks to achieve full compatibility to MTOM spec
// http://www.w3.org/TR/soap12-mtom/
if($rootPart->id != $soapMimePartId || $rootPartType['_type'] != 'application/xop+xml' || $rootPartType['type'] != $soapMimePartType) {
if ($rootPart->id != $soapMimePartId || $rootPartType['_type'] != 'application/xop+xml' || $rootPartType['type'] != $soapMimePartType) {
throw new \InvalidArgumentException();
}
foreach($mimeParts as $mimePart) {
foreach ($mimeParts as $mimePart) {
$this->soapAttachments->add(new SoapAttachment(
$mimePart->id,
$mimePart->type,
@ -153,7 +153,7 @@ class SoapRequest extends Request
$result['_type'] = array_shift($parts);
foreach($parts as $part) {
foreach ($parts as $part) {
list($key, $value) = explode('=', trim($part), 2);
$result[$key] = trim($value, '"');

2
src/BeSimple/SoapBundle/Util/Assert.php
View File

@ -21,7 +21,7 @@ class Assert
public static function thatArgument($name, $condition, $message = self::ARGUMENT_INVALID)
{
if(!$condition) {
if (!$condition) {
throw new \InvalidArgumentException(sprintf($message, $name));
}
}

4
src/BeSimple/SoapBundle/Util/String.php
View File

@ -27,7 +27,7 @@ class String
*/
public static function startsWith($str, $substr)
{
if(is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
if (is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
return $substr == substr($str, 0, strlen($substr));
}
}
@ -42,7 +42,7 @@ class String
*/
public static function endsWith($str, $substr)
{
if(is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
if (is_string($str) && is_string($substr) && strlen($str) >= strlen($substr)) {
return $substr == substr($str, strlen($str) - strlen($substr));
}
}

4
src/BeSimple/SoapBundle/WebServiceContext.php
View File

@ -68,10 +68,10 @@ class WebServiceContext
public function getWsdlFile($endpoint = null)
{
$file = sprintf ('%s/%s.%s.wsdl', $this->options['cache_dir'], $this->options['name'], md5($endpoint));
$file = sprintf('%s/%s.%s.wsdl', $this->options['cache_dir'], $this->options['name'], md5($endpoint));
$cache = new ConfigCache($file, $this->options['debug']);
if(!$cache->isFresh()) {
if (!$cache->isFresh()) {
$definition = $this->getServiceDefinition();
if ($endpoint) {

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];
}

4
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);
},
);

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/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);

1
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);
}

1
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. :)';

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

1
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];
}

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));

26
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->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)
{
@ -149,9 +149,7 @@ class WsdlDownloader
*
* @param string $xml XML file
* @param string $cacheFilePath Cache file name
* @param boolean $parentFilePath Parent file name
*
* @return void
* @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
}
}
}
}
}

2
src/BeSimple/SoapCommon/AbstractSoapBuilder.php
View File

@ -27,7 +27,7 @@ abstract class AbstractSoapBuilder
/**
* @return AbstractSoapBuilder
*/
static public function createWithDefaults()
public static function createWithDefaults()
{
$builder = new static();

28
src/BeSimple/SoapCommon/Cache.php
View File

@ -25,24 +25,24 @@ class Cache
const TYPE_MEMORY = WSDL_CACHE_MEMORY;
const TYPE_DISK_MEMORY = WSDL_CACHE_BOTH;
static protected $types = array(
protected static $types = array(
self::TYPE_NONE,
self::TYPE_DISK,
self::TYPE_MEMORY,
self::TYPE_DISK_MEMORY,
);
static public function getTypes()
public static function getTypes()
{
return self::$types;
}
static public function isEnabled()
public static function isEnabled()
{
return self::iniGet('soap.wsdl_cache_enabled');
}
static public function setEnabled($enabled)
public static function setEnabled($enabled)
{
if (!in_array($enabled, array(self::ENABLED, self::DISABLED), true)) {
throw new \InvalidArgumentException();
@ -51,12 +51,12 @@ class Cache
self::iniSet('soap.wsdl_cache_enabled', $enabled);
}
static public function getType()
public static function getType()
{
return self::iniGet('soap.wsdl_cache');
}
static public function setType($type)
public static function setType($type)
{
if (!in_array($type, self::getTypes(), true)) {
throw new \InvalidArgumentException('The cache type has to be either Cache::TYPE_NONE, Cache::TYPE_DISK, Cache::TYPE_MEMORY or Cache::TYPE_DISK_MEMORY');
@ -65,12 +65,12 @@ class Cache
self::iniSet('soap.wsdl_cache', $type);
}
static public function getDirectory()
public static function getDirectory()
{
return self::iniGet('soap.wsdl_cache_dir');
}
static public function setDirectory($directory)
public static function setDirectory($directory)
{
if (!is_dir($directory)) {
mkdir($directory, 0777, true);
@ -79,32 +79,32 @@ class Cache
self::iniSet('soap.wsdl_cache_dir', $directory);
}
static public function getLifetime()
public static function getLifetime()
{
return self::iniGet('soap.wsdl_cache_ttl');
}
static public function setLifetime($lifetime)
public static function setLifetime($lifetime)
{
self::iniSet('soap.wsdl_cache_ttl', $lifetime);
}
static public function getLimit()
public static function getLimit()
{
return self::iniGet('soap.wsdl_cache_limit');
}
static public function setLimit($limit)
public static function setLimit($limit)
{
self::iniSet('soap.wsdl_cache_limit', $limit);
}
static protected function iniGet($key)
protected static function iniGet($key)
{
return ini_get($key);
}
static protected function iniSet($key, $value)
protected static function iniSet($key, $value)
{
ini_set($key, $value);
}

1
src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
View File

@ -44,4 +44,3 @@ class DateTimeTypeConverter implements TypeConverterInterface
return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d\TH:i:sP'));
}
}

1
src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
View File

@ -44,4 +44,3 @@ class DateTypeConverter implements TypeConverterInterface
return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d'));
}
}

2
src/BeSimple/SoapCommon/Converter/MtomTypeConverter.php
View File

@ -65,10 +65,8 @@ class MtomTypeConverter implements TypeConverterInterface, SoapKernelAwareInterf
$contentId = urldecode(substr($ref, 4));
if (null !== ($part = $this->soapKernel->getAttachment($contentId))) {
return $part->getContent();
} else {
return null;
}
}

2
src/BeSimple/SoapCommon/Converter/SoapKernelAwareInterface.php
View File

@ -28,5 +28,5 @@ interface SoapKernelAwareInterface
*
* @return void
*/
function setKernel(SoapKernel $soapKernel);
public function setKernel(SoapKernel $soapKernel);
}

2
src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php
View File

@ -61,10 +61,8 @@ class SwaTypeConverter implements TypeConverterInterface, SoapKernelAwareInterfa
$contentId = urldecode(substr($ref, 4));
if (null !== ($part = $this->soapKernel->getAttachment($contentId))) {
return $part->getContent();
} else {
return null;
}
}

4
src/BeSimple/SoapCommon/Converter/TypeConverterCollection.php
View File

@ -74,10 +74,10 @@ class TypeConverterCollection
$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);
},
);

8
src/BeSimple/SoapCommon/Converter/TypeConverterInterface.php
View File

@ -24,14 +24,14 @@ interface TypeConverterInterface
*
* @return string
*/
function getTypeNamespace();
public function getTypeNamespace();
/**
* Get type name.
*
* @return string
*/
function getTypeName();
public function getTypeName();
/**
* Convert given XML string to PHP type.
@ -40,7 +40,7 @@ interface TypeConverterInterface
*
* @return mixed
*/
function convertXmlToPhp($data);
public function convertXmlToPhp($data);
/**
* Convert PHP type to XML string.
@ -49,5 +49,5 @@ interface TypeConverterInterface
*
* @return string
*/
function convertPhpToXml($data);
public function convertPhpToXml($data);
}

7
src/BeSimple/SoapCommon/Helper.php
View File

@ -172,7 +172,8 @@ class Helper
return sprintf(
'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
// 32 bits for "time_low"
mt_rand(0, 0xffff), mt_rand(0, 0xffff),
mt_rand(0, 0xffff),
mt_rand(0, 0xffff),
// 16 bits for "time_mid"
mt_rand(0, 0xffff),
// 16 bits for "time_hi_and_version",
@ -183,7 +184,9 @@ class Helper
// two most significant bits holds zero and one for variant DCE1.1
mt_rand(0, 0x3fff) | 0x8000,
// 48 bits for "node"
mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
mt_rand(0, 0xffff),
mt_rand(0, 0xffff),
mt_rand(0, 0xffff)
);
}

2
src/BeSimple/SoapCommon/SoapMessage.php
View File

@ -47,7 +47,7 @@ abstract class SoapMessage
*
* @var array(string=>string)
*/
static protected $versionToContentTypeMap = array(
protected static $versionToContentTypeMap = array(
SOAP_1_1 => 'text/xml; charset=utf-8',
SOAP_1_2 => 'application/soap+xml; charset=utf-8'
);

1
src/BeSimple/SoapCommon/SoapRequest.php
View File

@ -22,5 +22,4 @@ use BeSimple\SoapCommon\SoapMessage;
*/
class SoapRequest extends SoapMessage
{
}

1
src/BeSimple/SoapCommon/SoapResponse.php
View File

@ -22,5 +22,4 @@ use BeSimple\SoapCommon\SoapMessage;
*/
class SoapResponse extends SoapMessage
{
}

1
src/BeSimple/SoapCommon/Tests/Converter/DateTimeTypeConverterTest.php
View File

@ -51,4 +51,3 @@ class DateTimeTypeConverterTest extends \PHPUnit_Framework_TestCase
$this->assertNull($date);
}
}

1
src/BeSimple/SoapCommon/Tests/Converter/DateTypeConverterTest.php
View File

@ -49,4 +49,3 @@ class DateTypeConverterTest extends \PHPUnit_Framework_TestCase
$this->assertNull($date);
}
}

6
src/BeSimple/SoapCommon/Tests/Mime/MultiPartTest.php
View File

@ -131,13 +131,13 @@ class MultiPartTest extends \PHPUnit_Framework_TestCase
$mp->addPart($p2);
$withoutMain = array(
trim($p2->getHeader('Content-ID'),'<>') => $p2,
trim($p2->getHeader('Content-ID'), '<>') => $p2,
);
$this->assertEquals($withoutMain, $mp->getParts());
$withMain = array(
trim($p1->getHeader('Content-ID'),'<>') => $p1,
trim($p2->getHeader('Content-ID'),'<>') => $p2,
trim($p1->getHeader('Content-ID'), '<>') => $p1,
trim($p2->getHeader('Content-ID'), '<>') => $p2,
);
$this->assertEquals($withMain, $mp->getParts(true));
}

1
src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php
View File

@ -338,7 +338,6 @@ abstract class WsSecurityFilterClientServer
return XmlSecurityKey::factory($algorithm, $key, false, XmlSecurityKey::TYPE_PRIVATE);
} elseif (Helper::NS_WSS === $referencedNode->namespaceURI
&& 'BinarySecurityToken' == $referencedNode->localName) {
$key = XmlSecurityPem::formatKeyInPemFormat($referencedNode->textContent);
return XmlSecurityKey::factory(XmlSecurityKey::RSA_SHA1, $key, false, XmlSecurityKey::TYPE_PUBLIC);

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

@ -62,7 +62,7 @@ class SoapRequest extends CommonSoapRequest
} else {
$url .= 'http://';
}
$url .= isset( $_SERVER['SERVER_NAME'] ) ? $_SERVER['SERVER_NAME'] : '';
$url .= isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) {
$url .= ":{$_SERVER['SERVER_PORT']}";
}

4
src/BeSimple/SoapServer/SoapServer.php
View File

@ -158,10 +158,10 @@ class SoapServer extends \SoapServer
$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);
},
);

2
src/BeSimple/SoapServer/SoapServerBuilder.php
View File

@ -33,7 +33,7 @@ class SoapServerBuilder extends AbstractSoapBuilder
*
* @return \BeSimple\SoapServer\SoapServerBuilder
*/
static public function createWithDefaults()
public static function createWithDefaults()
{
return parent::createWithDefaults()
->withErrorReporting(false);

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

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