Merge branch 'cs/zendframework/zendframework#6872-php-cs-fixer-automa…

…ted-fixes' Close zendframework/zendframework#6872 Forward port zendframework/zendframework#6872
zendframework · Nov 14, 2014 · 8f46a80 · 8f46a80
commit 8f46a80
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 63 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -365,7 +365,6 @@ public function addFunction($function)
                     'Argument to Zend\Soap\AutoDiscover::addFunction should be a valid function name.'
                 );
             }
-
         } else {
             throw new Exception\InvalidArgumentException(
                 'Argument to Zend\Soap\AutoDiscover::addFunction should be string or array of strings.'
@@ -483,7 +482,6 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
 
             // Add the wrapper element part, which must be named 'parameters'
             $args['parameters'] = array('element' => $wsdl->addElement($element));
-
         } else {
             // RPC style: add each parameter as a typed part
             foreach ($prototype->getParameters() as $param) {
@@ -516,7 +514,6 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
 
                 // Add the wrapper element part, which must be named 'parameters'
                 $args['parameters'] = array('element' => $wsdl->addElement($element));
-
             } elseif ($prototype->getReturnType() != "void") {
                 // RPC style: add the return value as a typed part
                 $args['return'] = array(

diff --git a/src/Client/Common.php b/src/Client/Common.php
@@ -15,7 +15,7 @@
 
 class Common extends SoapClient
 {
-    /**
+        /**
      * doRequest() pre-processing method
      *
      * @var callable
@@ -58,4 +58,4 @@ public function __doRequest($request, $location, $action, $version, $oneWay = nu
     }
 }
 
-} // end if (extension_loaded('soap')
+}
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -15,4 +15,5 @@
  * Exception thrown when unrecognized method is called via overloading
  */
 class BadMethodCallException extends SPLBadMethodCallException implements ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -13,4 +13,5 @@
  * Common Exception interface
  */
 interface ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -15,4 +15,5 @@
  * Exception thrown when SOAP PHP extension is not loaded
  */
 class ExtensionNotLoadedException extends RuntimeException
-{}
+{
+}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -15,4 +15,5 @@
  * Exception thrown when one or more method arguments are invalid
  */
 class InvalidArgumentException extends SPLInvalidArgumentException implements ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -15,4 +15,5 @@
  * Exception thrown when there is an error during program execution
  */
 class RuntimeException extends SPLRuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -15,4 +15,5 @@
  * Exception thrown when provided arguments are invalid
  */
 class UnexpectedValueException extends SPLUnexpectedValueException implements ExceptionInterface
-{}
+{
+}
diff --git a/src/Server.php b/src/Server.php
@@ -557,13 +557,10 @@ public function addFunction($function, $namespace = '')
                     throw new Exception\InvalidArgumentException('One or more invalid functions specified in array');
                 }
             }
-
         } elseif (is_string($function) && function_exists($function)) {
             $this->functions[] = $function;
-
         } elseif ($function == SOAP_FUNCTIONS_ALL) {
             $this->functions = SOAP_FUNCTIONS_ALL;
-
         } else {
             throw new Exception\InvalidArgumentException('Invalid function specified');
         }
@@ -730,13 +727,10 @@ protected function _setRequest($request)
 
         if ($request instanceof DOMDocument) {
             $xml = $request->saveXML();
-
         } elseif ($request instanceof DOMNode) {
             $xml = $request->ownerDocument->saveXML();
-
         } elseif ($request instanceof SimpleXMLElement) {
             $xml = $request->asXML();
-
         } elseif (is_object($request) || is_string($request)) {
             if (is_object($request)) {
                 $xml = $request->__toString();
@@ -982,7 +976,6 @@ public function registerFaultException($class)
             foreach ($class as $row) {
                 $this->registerFaultException($row);
             }
-
         } elseif (is_string($class) && class_exists($class) && (is_subclass_of($class, 'Exception') || 'Exception' === $class)) {
             $ref = new ReflectionClass($class);
 

diff --git a/src/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php b/src/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
@@ -50,7 +50,6 @@ public function getContext()
      */
     public function scanRegisteredTypes($phpType)
     {
-
         if (array_key_exists($phpType, $this->getContext()->getTypes())) {
             $soapTypes = $this->getContext()->getTypes();
             return $soapTypes[$phpType];

diff --git a/src/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/src/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -55,7 +55,6 @@ public function addComplexType($type)
 
         foreach ($class->getProperties() as $property) {
             if ($property->isPublic() && preg_match_all('/@var\s+([^\s]+)/m', $property->getDocComment(), $matches)) {
-
                 /**
                  * @todo check if 'xsd:element' must be used here (it may not be
                  * compatible with using 'complexType' node for describing other

diff --git a/test/AutoDiscoverTest.php b/test/AutoDiscoverTest.php
@@ -25,7 +25,6 @@
  */
 class AutoDiscoverTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @var AutoDiscover
      */
@@ -219,7 +218,6 @@ public function testAutoDiscoverConstructorWsdlClassException()
      */
     public function testSetServiceName($newName, $shouldBeValid)
     {
-
         if ($shouldBeValid == false) {
             $this->setExpectedException('InvalidArgumentException');
         }
@@ -289,7 +287,6 @@ public function testGetUriException()
 
     public function testClassMap()
     {
-
         $classMap = array(
             'TestClass' => 'test_class'
         );
@@ -1197,7 +1194,6 @@ public function testChangeWsdlUriInConstructor($uri, $expectedUri)
 
     public function testSetNonStringNonZendUriUriThrowsException()
     {
-
         $server = new AutoDiscover();
 
         $this->setExpectedException(
@@ -1258,8 +1254,7 @@ public function dataProviderValidUris()
      *
      */
     public function testUsingClassWithMethodsWithMultipleDefaultParameterValues(
-    )
-    {
+    ) {
         $this->server->setClass(
             '\ZendTest\Soap\TestAsset\TestFixingMultiplePrototypes'
         );
@@ -1324,8 +1319,7 @@ public function testComplexTypesThatAreUsedMultipleTimesAreRecoginzedOnce()
      * @group ZF-5604
      */
     public function testReturnSameArrayOfObjectsResponseOnDifferentMethodsWhenArrayComplex(
-    )
-    {
+    ) {
         $this->server->setComplexTypeStrategy(
             new \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex
         );
@@ -1349,8 +1343,7 @@ public function testReturnSameArrayOfObjectsResponseOnDifferentMethodsWhenArrayC
      * @group ZF-5430
      */
     public function testReturnSameArrayOfObjectsResponseOnDifferentMethodsWhenArraySequence(
-    )
-    {
+    ) {
         $this->server->setComplexTypeStrategy(
             new \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeSequence
         );
@@ -1473,7 +1466,6 @@ public function testHandle()
      */
     public function assertSpecificNodeNumberInXPath($n, $xpath, $msg = null)
     {
-
         $nodes = $this->xpath->query($xpath);
         if (!($nodes instanceof \DOMNodeList)) {
             $this->fail('Nodes not found. Invalid XPath expression ?');
@@ -1485,7 +1477,6 @@ public function assertSpecificNodeNumberInXPath($n, $xpath, $msg = null)
 
     public function assertAttributesOfNodes($attributes, $nodeList)
     {
-
         $c = count($attributes);
 
         $keys = array_keys($attributes);

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -24,7 +24,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         if (!extension_loaded('soap')) {
-           $this->markTestSkipped('SOAP Extension is not loaded');
+            $this->markTestSkipped('SOAP Extension is not loaded');
         }
     }
 

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -25,7 +25,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         if (!extension_loaded('soap')) {
-           $this->markTestSkipped('SOAP Extension is not loaded');
+            $this->markTestSkipped('SOAP Extension is not loaded');
         }
     }
 
@@ -690,7 +690,6 @@ public function testDeregisterFaultException($exception)
      */
     public function testIsRegisteredAsFaultException($exception)
     {
-
         $server = new Server();
         $server->registerFaultException($exception);
 

diff --git a/test/Wsdl/ArrayOfTypeComplexStrategyTest.php b/test/Wsdl/ArrayOfTypeComplexStrategyTest.php
@@ -21,7 +21,6 @@
  */
 class ArrayOfTypeComplexStrategyTest extends WsdlTestHelper
 {
-
     public function setUp()
     {
         $this->strategy = new ArrayOfTypeComplex();

diff --git a/test/Wsdl/ArrayOfTypeSequenceStrategyTest.php b/test/Wsdl/ArrayOfTypeSequenceStrategyTest.php
@@ -83,7 +83,6 @@ public function testNestedTypesDefinitions($stringDefinition, $definedTypeName,
         $this->assertEquals('tns:'.$definedTypeName, $return);
 
         foreach ($nestedTypeNames as $nestedTypeName => $typeName) {
-
             $nodes = $this->xpath->query('//wsdl:types/xsd:schema/xsd:complexType[@name="'.$nestedTypeName.'"]');
             $this->assertEquals(1, $nodes->length, 'Invalid first level of nested element definition');
 
@@ -221,25 +220,24 @@ public function testAddComplexTypeArrayOfObject()
             'ArrayOfComplexTypeB'       =>      'ComplexTypeB',
             'ArrayOfComplexTypeA'       =>      'ComplexTypeA'
                 ) as $arrayTypeName => $typeName) {
-
-                    $nodes = $this->xpath->query(
+            $nodes = $this->xpath->query(
                         '//wsdl:types/xsd:schema/xsd:complexType[@name="'.$arrayTypeName.'"]'
                     );
-                    $this->assertEquals(1, $nodes->length, 'Missing complex type definition.');
+            $this->assertEquals(1, $nodes->length, 'Missing complex type definition.');
 
-                    $nodes = $this->xpath->query('xsd:sequence/xsd:element', $nodes->item(0));
-                    $this->assertEquals(1, $nodes->length, 'Missing complex type element declaration');
+            $nodes = $this->xpath->query('xsd:sequence/xsd:element', $nodes->item(0));
+            $this->assertEquals(1, $nodes->length, 'Missing complex type element declaration');
 
-                    $this->assertEquals('item',                 $nodes->item(0)->getAttribute('name'),
+            $this->assertEquals('item',                 $nodes->item(0)->getAttribute('name'),
                         'Wrong complex type element name attribute'
                     );
-                    $this->assertEquals('tns:'.$typeName,       $nodes->item(0)->getAttribute('type'),
+            $this->assertEquals('tns:'.$typeName,       $nodes->item(0)->getAttribute('type'),
                         'Wrong complex type type attribute value'
                     );
-                    $this->assertEquals('0',                    $nodes->item(0)->getAttribute('minOccurs'),
+            $this->assertEquals('0',                    $nodes->item(0)->getAttribute('minOccurs'),
                         'Wrong complex type minOccurs attribute value'
                     );
-                    $this->assertEquals('unbounded',            $nodes->item(0)->getAttribute('maxOccurs'),
+            $this->assertEquals('unbounded',            $nodes->item(0)->getAttribute('maxOccurs'),
                         'Wrong complex type maxOccurs attribute value'
                     );
         }

diff --git a/test/Wsdl/CompositeStrategyTest.php b/test/Wsdl/CompositeStrategyTest.php
@@ -23,7 +23,6 @@
  */
 class CompositeStrategyTest extends WsdlTestHelper
 {
-
     public function setUp()
     {
         // override parent setup because it is needed only in one method

diff --git a/test/WsdlTest.php b/test/WsdlTest.php
@@ -20,7 +20,6 @@
  **/
 class WsdlTest extends WsdlTestHelper
 {
-
     public function testConstructor()
     {
         $this->assertEquals(Wsdl::WSDL_NS_URI,              $this->dom->lookupNamespaceUri(null));
@@ -71,7 +70,6 @@ public function testSetUriWithZendUriChangesDomDocumentWsdlStructureTnsAndTarget
 
         $this->assertEquals($expectedUri, $this->dom->lookupNamespaceUri('tns'));
         $this->assertEquals($expectedUri, $this->dom->documentElement->getAttribute('targetNamespace'));
-
     }
 
     /**
@@ -88,7 +86,6 @@ public function testObjectConstructionWithDifferentURI($uri, $expectedUri)
 
         $this->assertEquals($expectedUri, $dom->lookupNamespaceUri('tns'));
         $this->assertEquals($expectedUri, $dom->documentElement->getAttribute('targetNamespace'));
-
     }
 
     /**
@@ -141,7 +138,6 @@ public function testAddMessage($parameters)
             $part = $this->xpath->query('wsdl:part[@name="'.$parameterName.'"]', $messageNodes->item(0));
             $this->assertEquals($parameterType, $part->item(0)->getAttribute('type'));
         }
-
     }
 
     /**
@@ -173,7 +169,6 @@ public function testAddComplexMessage($parameters)
             $this->assertEquals($parameterDefinition['type'], $part->item(0)->getAttribute('type'));
             $this->assertEquals($parameterDefinition['name'], $part->item(0)->getAttribute('name'));
         }
-
     }
 
     /**
@@ -274,7 +269,6 @@ public function testAddBinding()
 
         $this->assertEquals('MyServiceBinding',     $bindingNodes->item(0)->getAttribute('name'));
         $this->assertEquals('myPortType',           $bindingNodes->item(0)->getAttribute('type'));
-
     }
 
     /**
@@ -339,7 +333,6 @@ public function testAddBindingOperation($operationName,
             '//wsdl:output/soap:body'   => $outputArray,
             '//wsdl:fault'              => $faultArray
                  ) as $query => $ar) {
-
             if (!empty($ar)) {
                 $nodes = $this->xpath->query($query);
 
@@ -355,7 +348,6 @@ public function testAddBindingOperation($operationName,
 
     public function dataProviderForAddBindingOperation()
     {
-
         $enc = 'http://schemas.xmlsoap.org/soap/encoding/';
 
         return array(
@@ -455,7 +447,6 @@ public function dataProviderForAddService()
      */
     public function testAddBindingOperationWithAmpersandInUrl($actualUrl, $expectedUrl)
     {
-
         $this->wsdl->addPortType('myPortType');
         $binding = $this->wsdl->addBinding('MyServiceBinding', 'myPortType');
 
@@ -535,7 +526,6 @@ public function testAddDocumentation()
         $nodes = $this->wsdl->toDomDocument()->childNodes;
         $this->assertEquals(1, $nodes->length);
         $this->assertEquals($doc, $nodes->item(0)->nodeValue);
-
     }
 
     public function testAddDocumentationToSomeElmenet()
@@ -566,7 +556,6 @@ public function testAddDocumentationToSetInsertsBefore()
 
         $nodes = $this->xpath->query('//wsdl:message[@name="myMessage"]/*[1]');
         $this->assertEquals('documentation', $nodes->item(0)->nodeName);
-
     }
 
     public function testDumpToFile()
@@ -796,7 +785,6 @@ public function testMultipleSequenceDefinitionsOfSameTypeWillBeRecognizedOnceByS
 
         $nodes = $this->xpath->query('//wsdl:types/xsd:schema/xsd:complexType[@name="ArrayOfInt"]');
         $this->assertEquals(1, $nodes->length,  "ArrayOfInt should appear only once.");
-
     }
 
     public function testClassMap()
@@ -845,6 +833,4 @@ public function testAddElement()
 
         $this->assertEquals(count($element['sequence']), $n);
     }
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,5 @@ @@
      * Exception thrown when unrecognized method is called via overloading
      */
     class BadMethodCallException extends SPLBadMethodCallException implements ExceptionInterface
-    {}
+    {
+    }