diff --git a/.gitignore b/.gitignore
index c347960..fdf19e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 composer.lock
 composer.phar
 phpunit.xml
+.php_cs.cache
\ No newline at end of file
diff --git a/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php b/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
index e37cd2b..43b72e8 100644
--- a/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
+++ b/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
@@ -62,9 +62,9 @@ class SoapWebServiceController implements ContainerAwareInterface
      */
     private $headers = array();
 
-     /**
-     * {@inheritDoc}
-     */
+    /**
+    * {@inheritDoc}
+    */
     public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
diff --git a/src/BeSimple/SoapBundle/Converter/TypeRepository.php b/src/BeSimple/SoapBundle/Converter/TypeRepository.php
index 79b571e..8754468 100644
--- a/src/BeSimple/SoapBundle/Converter/TypeRepository.php
+++ b/src/BeSimple/SoapBundle/Converter/TypeRepository.php
@@ -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();
 
diff --git a/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php b/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
index ebb3623..a9e7bcf 100644
--- a/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
+++ b/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
@@ -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);
         }
diff --git a/src/BeSimple/SoapBundle/DependencyInjection/Configuration.php b/src/BeSimple/SoapBundle/DependencyInjection/Configuration.php
index 9374bff..7db8c30 100644
--- a/src/BeSimple/SoapBundle/DependencyInjection/Configuration.php
+++ b/src/BeSimple/SoapBundle/DependencyInjection/Configuration.php
@@ -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()
diff --git a/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestMessageBinder.php b/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestMessageBinder.php
index 5d779b0..8afb04e 100644
--- a/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestMessageBinder.php
+++ b/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedRequestMessageBinder.php
@@ -19,17 +19,17 @@ 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()};
         }
 
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedResponseMessageBinder.php b/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedResponseMessageBinder.php
index 21c72e0..2f46a0b 100644
--- a/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedResponseMessageBinder.php
+++ b/src/BeSimple/SoapBundle/ServiceBinding/DocumentLiteralWrappedResponseMessageBinder.php
@@ -24,4 +24,4 @@ class DocumentLiteralWrappedResponseMessageBinder implements MessageBinderInterf
 
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php b/src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php
index 7cda7d4..f17116d 100644
--- a/src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php
+++ b/src/BeSimple/SoapBundle/ServiceBinding/MessageBinderInterface.php
@@ -24,5 +24,5 @@ interface MessageBinderInterface
      *
      * @return mixed
      */
-    function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
+    public function processMessage(Method $messageDefinition, $message, TypeRepository $typeRepository);
 }
diff --git a/src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php b/src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php
index 7c78ade..8fb0bc4 100644
--- a/src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php
+++ b/src/BeSimple/SoapBundle/ServiceBinding/ServiceBinder.php
@@ -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;
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ComplexType.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ComplexType.php
index 85072d4..b98175a 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ComplexType.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ComplexType.php
@@ -53,4 +53,4 @@ class ComplexType extends Configuration
     {
         return 'complextype';
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ConfigurationInterface.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ConfigurationInterface.php
index c25656a..c3bdf45 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ConfigurationInterface.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/ConfigurationInterface.php
@@ -22,5 +22,5 @@ interface ConfigurationInterface
      *
      * @return string
      */
-    function getAliasName();
-}
\ No newline at end of file
+    public function getAliasName();
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Header.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Header.php
index f6ed406..b38c56d 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Header.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Header.php
@@ -19,4 +19,4 @@ class Header extends Param
     {
         return 'header';
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Method.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Method.php
index a7a2395..0a3bb83 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Method.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Method.php
@@ -42,4 +42,4 @@ class Method extends Configuration
     {
         return 'method';
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Param.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Param.php
index 330569b..1eaa9c8 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Param.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Param.php
@@ -53,4 +53,4 @@ class Param extends Configuration implements TypedElementInterface
     {
         return 'param';
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Result.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Result.php
index 0d86f8c..73c1244 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Result.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/Result.php
@@ -42,4 +42,4 @@ class Result extends Configuration implements TypedElementInterface
     {
         return 'result';
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/TypedElementInterface.php b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/TypedElementInterface.php
index 94eaeb3..baed448 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/TypedElementInterface.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Annotation/TypedElementInterface.php
@@ -12,8 +12,8 @@ namespace BeSimple\SoapBundle\ServiceDefinition\Annotation;
 
 interface TypedElementInterface
 {
-    function getPhpType();
-    function getXmlType();
-    function setPhpType($phpType);
-    function setXmlType($xmlType);
-}
\ No newline at end of file
+    public function getPhpType();
+    public function getXmlType();
+    public function setPhpType($phpType);
+    public function setXmlType($xmlType);
+}
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php b/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
index dcd1500..1b5a597 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
@@ -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;
diff --git a/src/BeSimple/SoapBundle/Soap/SoapRequest.php b/src/BeSimple/SoapBundle/Soap/SoapRequest.php
index 346f692..9cd5059 100644
--- a/src/BeSimple/SoapBundle/Soap/SoapRequest.php
+++ b/src/BeSimple/SoapBundle/Soap/SoapRequest.php
@@ -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, '"');
diff --git a/src/BeSimple/SoapBundle/Util/Assert.php b/src/BeSimple/SoapBundle/Util/Assert.php
index d428a27..21a9270 100644
--- a/src/BeSimple/SoapBundle/Util/Assert.php
+++ b/src/BeSimple/SoapBundle/Util/Assert.php
@@ -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));
         }
     }
diff --git a/src/BeSimple/SoapBundle/Util/Collection.php b/src/BeSimple/SoapBundle/Util/Collection.php
index 4ea5699..cb0776b 100644
--- a/src/BeSimple/SoapBundle/Util/Collection.php
+++ b/src/BeSimple/SoapBundle/Util/Collection.php
@@ -62,4 +62,4 @@ class Collection implements \IteratorAggregate, \Countable
     {
         return new \ArrayIterator($this->elements);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/Util/String.php b/src/BeSimple/SoapBundle/Util/String.php
index b95d53e..0a70057 100644
--- a/src/BeSimple/SoapBundle/Util/String.php
+++ b/src/BeSimple/SoapBundle/Util/String.php
@@ -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,8 +42,8 @@ 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));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapBundle/WebServiceContext.php b/src/BeSimple/SoapBundle/WebServiceContext.php
index 875659e..89576b3 100644
--- a/src/BeSimple/SoapBundle/WebServiceContext.php
+++ b/src/BeSimple/SoapBundle/WebServiceContext.php
@@ -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) {
diff --git a/src/BeSimple/SoapClient/Curl.php b/src/BeSimple/SoapClient/Curl.php
index e777fc8..59146c1 100644
--- a/src/BeSimple/SoapClient/Curl.php
+++ b/src/BeSimple/SoapClient/Curl.php
@@ -251,7 +251,6 @@ class Curl
         $errorCodeMapping = $this->getErrorCodeMapping();
         $errorNumber = curl_errno($this->ch);
         if (isset($errorCodeMapping[$errorNumber])) {
-
             return $errorCodeMapping[$errorNumber];
         }
 
diff --git a/src/BeSimple/SoapClient/SoapClient.php b/src/BeSimple/SoapClient/SoapClient.php
index 0fa3c7d..cbb1818 100644
--- a/src/BeSimple/SoapClient/SoapClient.php
+++ b/src/BeSimple/SoapClient/SoapClient.php
@@ -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;
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/SoapRequest.php b/src/BeSimple/SoapClient/SoapRequest.php
index 00580cb..7a56869 100644
--- a/src/BeSimple/SoapClient/SoapRequest.php
+++ b/src/BeSimple/SoapClient/SoapRequest.php
@@ -45,4 +45,4 @@ class SoapRequest extends CommonSoapRequest
 
         return $request;
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php b/src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php
index a7bc6d4..187d2cb 100644
--- a/src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php
+++ b/src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php
@@ -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()
     {
diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentRequest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentRequest.php
index e4f0236..83ff922 100644
--- a/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentRequest.php
+++ b/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentRequest.php
@@ -4,4 +4,4 @@ namespace BeSimple\SoapClient\Tests\AxisInterop\Fixtures;
 
 class AttachmentRequest extends AttachmentType
 {
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentType.php b/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentType.php
index c42f0d4..63c344f 100644
--- a/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentType.php
+++ b/src/BeSimple/SoapClient/Tests/AxisInterop/Fixtures/AttachmentType.php
@@ -6,4 +6,4 @@ class AttachmentType
 {
     public $fileName;
     public $binaryData;
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php b/src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php
index eb57435..9b50893 100644
--- a/src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php
+++ b/src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php
@@ -20,4 +20,4 @@ class TestCase extends \PHPUnit_Framework_TestCase
 
         curl_close($ch);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php
index 2ee71d6..0c34456 100644
--- a/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php
+++ b/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php
@@ -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);
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentRequest.php b/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentRequest.php
index 8be17dc..cb55746 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentRequest.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentRequest.php
@@ -4,4 +4,4 @@ namespace BeSimple\SoapClient\Tests\ServerInterop\Fixtures;
 
 class AttachmentRequest extends AttachmentType
 {
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentType.php b/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentType.php
index bdbd279..22d80e4 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentType.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/Fixtures/AttachmentType.php
@@ -6,4 +6,4 @@ class AttachmentType
 {
     public $fileName;
     public $binaryData;
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/MTOMClient.php b/src/BeSimple/SoapClient/Tests/ServerInterop/MTOMClient.php
index df5c5e9..d4c721d 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/MTOMClient.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/MTOMClient.php
@@ -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()
-// );
\ No newline at end of file
+// );
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/SwaClient.php b/src/BeSimple/SoapClient/Tests/ServerInterop/SwaClient.php
index 96f34fd..5c0ca68 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/SwaClient.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/SwaClient.php
@@ -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()
-// );
\ No newline at end of file
+// );
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/TestCase.php b/src/BeSimple/SoapClient/Tests/ServerInterop/TestCase.php
index b0f1f40..c214670 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/TestCase.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/TestCase.php
@@ -26,4 +26,4 @@ class TestCase extends \PHPUnit_Framework_TestCase
 
         curl_close($ch);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerClient.php b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerClient.php
index 1d529d6..428d0cc 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerClient.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerClient.php
@@ -69,7 +69,6 @@ try {
     $ab->type = 'scifi';
 
     var_dump($sc->addBook($ab));
-
 } catch (Exception $e) {
     var_dump($e);
 }
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerClient.php b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerClient.php
index 90cf534..f5e3661 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerClient.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerClient.php
@@ -54,7 +54,6 @@ try {
     $ab->type = 'scifi';
 
     var_dump($sc->addBook($ab));
-
 } catch (Exception $e) {
     var_dump($e);
 }
diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php
index efe86b5..0307eec 100644
--- a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php
+++ b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php
@@ -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);
diff --git a/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php b/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php
index 38905b5..f536da0 100644
--- a/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php
+++ b/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php
@@ -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
diff --git a/src/BeSimple/SoapClient/WsAddressingFilter.php b/src/BeSimple/SoapClient/WsAddressingFilter.php
index 721fe87..e7bdcf9 100644
--- a/src/BeSimple/SoapClient/WsAddressingFilter.php
+++ b/src/BeSimple/SoapClient/WsAddressingFilter.php
@@ -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
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapClient/WsSecurityFilter.php b/src/BeSimple/SoapClient/WsSecurityFilter.php
index af51a62..9e8f1b2 100644
--- a/src/BeSimple/SoapClient/WsSecurityFilter.php
+++ b/src/BeSimple/SoapClient/WsSecurityFilter.php
@@ -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));
diff --git a/src/BeSimple/SoapClient/WsdlDownloader.php b/src/BeSimple/SoapClient/WsdlDownloader.php
index 97a7d67..25cd8a3 100644
--- a/src/BeSimple/SoapClient/WsdlDownloader.php
+++ b/src/BeSimple/SoapClient/WsdlDownloader.php
@@ -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]);
diff --git a/src/BeSimple/SoapClient/XmlMimeFilter.php b/src/BeSimple/SoapClient/XmlMimeFilter.php
index ae8ed45..5b86f57 100644
--- a/src/BeSimple/SoapClient/XmlMimeFilter.php
+++ b/src/BeSimple/SoapClient/XmlMimeFilter.php
@@ -65,6 +65,5 @@ class XmlMimeFilter implements SoapRequestFilter
                 }
             }
         }
-
     }
 }
diff --git a/src/BeSimple/SoapCommon/AbstractSoapBuilder.php b/src/BeSimple/SoapCommon/AbstractSoapBuilder.php
index 7c4dfdf..b652176 100644
--- a/src/BeSimple/SoapCommon/AbstractSoapBuilder.php
+++ b/src/BeSimple/SoapCommon/AbstractSoapBuilder.php
@@ -27,7 +27,7 @@ abstract class AbstractSoapBuilder
     /**
      * @return AbstractSoapBuilder
      */
-    static public function createWithDefaults()
+    public static function createWithDefaults()
     {
         $builder = new static();
 
diff --git a/src/BeSimple/SoapCommon/Cache.php b/src/BeSimple/SoapCommon/Cache.php
index 547879f..e40b0b1 100644
--- a/src/BeSimple/SoapCommon/Cache.php
+++ b/src/BeSimple/SoapCommon/Cache.php
@@ -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,33 +79,33 @@ 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);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Classmap.php b/src/BeSimple/SoapCommon/Classmap.php
index 6f5fc4c..8717039 100644
--- a/src/BeSimple/SoapCommon/Classmap.php
+++ b/src/BeSimple/SoapCommon/Classmap.php
@@ -90,4 +90,4 @@ class Classmap
             $this->add($type, $classname);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php b/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
index 6b0a729..d312182 100644
--- a/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
+++ b/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
@@ -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'));
     }
 }
-
diff --git a/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php b/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
index 11d5ad2..66dcbd8 100644
--- a/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
+++ b/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
@@ -44,4 +44,3 @@ class DateTypeConverter implements TypeConverterInterface
         return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d'));
     }
 }
-
diff --git a/src/BeSimple/SoapCommon/Converter/MtomTypeConverter.php b/src/BeSimple/SoapCommon/Converter/MtomTypeConverter.php
index 52ea961..f80baec 100644
--- a/src/BeSimple/SoapCommon/Converter/MtomTypeConverter.php
+++ b/src/BeSimple/SoapCommon/Converter/MtomTypeConverter.php
@@ -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;
             }
         }
diff --git a/src/BeSimple/SoapCommon/Converter/SoapKernelAwareInterface.php b/src/BeSimple/SoapCommon/Converter/SoapKernelAwareInterface.php
index 655a258..ff2ab70 100644
--- a/src/BeSimple/SoapCommon/Converter/SoapKernelAwareInterface.php
+++ b/src/BeSimple/SoapCommon/Converter/SoapKernelAwareInterface.php
@@ -28,5 +28,5 @@ interface SoapKernelAwareInterface
      *
      * @return void
      */
-    function setKernel(SoapKernel $soapKernel);
-}
\ No newline at end of file
+    public function setKernel(SoapKernel $soapKernel);
+}
diff --git a/src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php b/src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php
index c199e3c..aff0cdf 100644
--- a/src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php
+++ b/src/BeSimple/SoapCommon/Converter/SwaTypeConverter.php
@@ -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;
             }
         }
diff --git a/src/BeSimple/SoapCommon/Converter/TypeConverterCollection.php b/src/BeSimple/SoapCommon/Converter/TypeConverterCollection.php
index 7f06142..7ed3844 100644
--- a/src/BeSimple/SoapCommon/Converter/TypeConverterCollection.php
+++ b/src/BeSimple/SoapCommon/Converter/TypeConverterCollection.php
@@ -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);
                 },
             );
diff --git a/src/BeSimple/SoapCommon/Converter/TypeConverterInterface.php b/src/BeSimple/SoapCommon/Converter/TypeConverterInterface.php
index e390963..50be071 100644
--- a/src/BeSimple/SoapCommon/Converter/TypeConverterInterface.php
+++ b/src/BeSimple/SoapCommon/Converter/TypeConverterInterface.php
@@ -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);
-}
\ No newline at end of file
+    public function convertPhpToXml($data);
+}
diff --git a/src/BeSimple/SoapCommon/FilterHelper.php b/src/BeSimple/SoapCommon/FilterHelper.php
index 01a1717..7806617 100644
--- a/src/BeSimple/SoapCommon/FilterHelper.php
+++ b/src/BeSimple/SoapCommon/FilterHelper.php
@@ -175,4 +175,4 @@ class FilterHelper
             $this->namespaces[$namespaceURI] = $prefix;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Helper.php b/src/BeSimple/SoapCommon/Helper.php
index c33a9df..81e9fc8 100644
--- a/src/BeSimple/SoapCommon/Helper.php
+++ b/src/BeSimple/SoapCommon/Helper.php
@@ -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)
         );
     }
 
@@ -218,4 +221,4 @@ class Helper
             return SOAP_1_1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Mime/MultiPart.php b/src/BeSimple/SoapCommon/Mime/MultiPart.php
index 1b8ffa3..06bc964 100644
--- a/src/BeSimple/SoapCommon/Mime/MultiPart.php
+++ b/src/BeSimple/SoapCommon/Mime/MultiPart.php
@@ -172,4 +172,4 @@ class MultiPart extends PartHeader
     {
         return 'urn:uuid:' . Helper::generateUUID();
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Mime/Parser.php b/src/BeSimple/SoapCommon/Mime/Parser.php
index c4a8c27..c61e0a1 100644
--- a/src/BeSimple/SoapCommon/Mime/Parser.php
+++ b/src/BeSimple/SoapCommon/Mime/Parser.php
@@ -184,4 +184,4 @@ class Parser
         }
         $part->setContent($content);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Mime/Part.php b/src/BeSimple/SoapCommon/Mime/Part.php
index 714f137..67f5516 100644
--- a/src/BeSimple/SoapCommon/Mime/Part.php
+++ b/src/BeSimple/SoapCommon/Mime/Part.php
@@ -166,4 +166,4 @@ class Part extends PartHeader
     {
         return 'urn:uuid:' . Helper::generateUUID();
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Mime/PartHeader.php b/src/BeSimple/SoapCommon/Mime/PartHeader.php
index ff0dcfc..bd2e42c 100644
--- a/src/BeSimple/SoapCommon/Mime/PartHeader.php
+++ b/src/BeSimple/SoapCommon/Mime/PartHeader.php
@@ -143,4 +143,4 @@ abstract class PartHeader
             return $string;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/SoapMessage.php b/src/BeSimple/SoapCommon/SoapMessage.php
index 1b91c1a..3559d48 100644
--- a/src/BeSimple/SoapCommon/SoapMessage.php
+++ b/src/BeSimple/SoapCommon/SoapMessage.php
@@ -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'
     );
diff --git a/src/BeSimple/SoapCommon/SoapRequest.php b/src/BeSimple/SoapCommon/SoapRequest.php
index 314d157..e92484d 100644
--- a/src/BeSimple/SoapCommon/SoapRequest.php
+++ b/src/BeSimple/SoapCommon/SoapRequest.php
@@ -22,5 +22,4 @@ use BeSimple\SoapCommon\SoapMessage;
  */
 class SoapRequest extends SoapMessage
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/SoapRequestFilter.php b/src/BeSimple/SoapCommon/SoapRequestFilter.php
index dbc990c..81dc433 100644
--- a/src/BeSimple/SoapCommon/SoapRequestFilter.php
+++ b/src/BeSimple/SoapCommon/SoapRequestFilter.php
@@ -28,4 +28,4 @@ interface SoapRequestFilter
      * @param SoapRequest $request SOAP request
      */
     public function filterRequest(SoapRequest $request);
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/SoapResponse.php b/src/BeSimple/SoapCommon/SoapResponse.php
index b6815b2..4d88315 100644
--- a/src/BeSimple/SoapCommon/SoapResponse.php
+++ b/src/BeSimple/SoapCommon/SoapResponse.php
@@ -22,5 +22,4 @@ use BeSimple\SoapCommon\SoapMessage;
  */
 class SoapResponse extends SoapMessage
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/SoapResponseFilter.php b/src/BeSimple/SoapCommon/SoapResponseFilter.php
index c7d6bb6..39eddc0 100644
--- a/src/BeSimple/SoapCommon/SoapResponseFilter.php
+++ b/src/BeSimple/SoapCommon/SoapResponseFilter.php
@@ -28,4 +28,4 @@ interface SoapResponseFilter
      * @param SoapResponse $response SOAP response
      */
     public function filterResponse(SoapResponse $response);
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Tests/ClassmapTest.php b/src/BeSimple/SoapCommon/Tests/ClassmapTest.php
index 2358244..e7b96f5 100644
--- a/src/BeSimple/SoapCommon/Tests/ClassmapTest.php
+++ b/src/BeSimple/SoapCommon/Tests/ClassmapTest.php
@@ -78,4 +78,4 @@ class ClassmapTest extends \PHPUnit_Framework_TestCase
         $this->setExpectedException('InvalidArgumentException');
         $classmap1->addClassmap($classmap2);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Tests/Converter/DateTimeTypeConverterTest.php b/src/BeSimple/SoapCommon/Tests/Converter/DateTimeTypeConverterTest.php
index 9546722..44d1ddd 100644
--- a/src/BeSimple/SoapCommon/Tests/Converter/DateTimeTypeConverterTest.php
+++ b/src/BeSimple/SoapCommon/Tests/Converter/DateTimeTypeConverterTest.php
@@ -51,4 +51,3 @@ class DateTimeTypeConverterTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($date);
     }
 }
-
diff --git a/src/BeSimple/SoapCommon/Tests/Converter/DateTypeConverterTest.php b/src/BeSimple/SoapCommon/Tests/Converter/DateTypeConverterTest.php
index 48bddcc..6bc4b53 100644
--- a/src/BeSimple/SoapCommon/Tests/Converter/DateTypeConverterTest.php
+++ b/src/BeSimple/SoapCommon/Tests/Converter/DateTypeConverterTest.php
@@ -49,4 +49,3 @@ class DateTypeConverterTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($date);
     }
 }
-
diff --git a/src/BeSimple/SoapCommon/Tests/Converter/TypeConverterCollectionTest.php b/src/BeSimple/SoapCommon/Tests/Converter/TypeConverterCollectionTest.php
index 0a955cd..47a2d82 100644
--- a/src/BeSimple/SoapCommon/Tests/Converter/TypeConverterCollectionTest.php
+++ b/src/BeSimple/SoapCommon/Tests/Converter/TypeConverterCollectionTest.php
@@ -90,4 +90,4 @@ class TypeConverterCollectionTest extends \PHPUnit_Framework_TestCase
         $this->setExpectedException('InvalidArgumentException');
         $converters1->addCollection($converters2);
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapCommon/Tests/Mime/MultiPartTest.php b/src/BeSimple/SoapCommon/Tests/Mime/MultiPartTest.php
index fe51190..70cf340 100644
--- a/src/BeSimple/SoapCommon/Tests/Mime/MultiPartTest.php
+++ b/src/BeSimple/SoapCommon/Tests/Mime/MultiPartTest.php
@@ -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));
     }
diff --git a/src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php b/src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php
index 15b0d25..8c1ef9d 100644
--- a/src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php
+++ b/src/BeSimple/SoapCommon/WsSecurityFilterClientServer.php
@@ -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);
diff --git a/src/BeSimple/SoapCommon/WsSecurityKey.php b/src/BeSimple/SoapCommon/WsSecurityKey.php
index 432e654..d6e03e6 100644
--- a/src/BeSimple/SoapCommon/WsSecurityKey.php
+++ b/src/BeSimple/SoapCommon/WsSecurityKey.php
@@ -113,4 +113,4 @@ class WsSecurityKey
     {
         return null !== $this->publicKey;
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapServer/SoapRequest.php b/src/BeSimple/SoapServer/SoapRequest.php
index 7fae123..8850db0 100644
--- a/src/BeSimple/SoapServer/SoapRequest.php
+++ b/src/BeSimple/SoapServer/SoapRequest.php
@@ -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']}";
         }
diff --git a/src/BeSimple/SoapServer/SoapServer.php b/src/BeSimple/SoapServer/SoapServer.php
index 9b1deed..efad1f6 100644
--- a/src/BeSimple/SoapServer/SoapServer.php
+++ b/src/BeSimple/SoapServer/SoapServer.php
@@ -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);
                 },
             );
diff --git a/src/BeSimple/SoapServer/SoapServerBuilder.php b/src/BeSimple/SoapServer/SoapServerBuilder.php
index 365c812..2426cb2 100644
--- a/src/BeSimple/SoapServer/SoapServerBuilder.php
+++ b/src/BeSimple/SoapServer/SoapServerBuilder.php
@@ -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);
@@ -197,4 +197,4 @@ class SoapServerBuilder extends AbstractSoapBuilder
             throw new \InvalidArgumentException('The handler has to be configured!');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BeSimple/SoapServer/XmlMimeFilter.php b/src/BeSimple/SoapServer/XmlMimeFilter.php
index 5c41c4f..2a2f39b 100644
--- a/src/BeSimple/SoapServer/XmlMimeFilter.php
+++ b/src/BeSimple/SoapServer/XmlMimeFilter.php
@@ -65,6 +65,5 @@ class XmlMimeFilter implements SoapResponseFilter
                 }
             }
         }
-
     }
 }