From 66db43af15d1d71daf191a265ddeb80cfe22003b Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 9 Jul 2012 16:19:42 +0200 Subject: [PATCH 1/8] [CS][Library] Set File Header http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards#CodingStandards-Files The following script replaces the content between PHP open tag and namespace declaration. for COMPONENT in $(ls -d *) do for FILE in $(find $COMPONENT -name "*.php") do BLOCK="\/\*\*\n \* Zend Framework \(http:\/\/framework\.zend\.com\/\)\n \*\n \* \@link http:\/\/github\.com\/zendframework\/zf2 for the canonical source repository\n \* \@copyright Copyright \(c\) 2005-2012 Zend Technologies USA Inc\. \(http:\/\/www\.zend\.com\)\n \* \@license http:\/\/framework\.zend\.com\/license\/new-bsd New BSD License\n \* \@package Zend_$COMPONENT\n \*\/" perl -0777 -i -pe "s/(<\?php(\s*.*)*\nn)/ Date: Mon, 9 Jul 2012 16:34:21 +0200 Subject: [PATCH 2/8] [CS][test] Remove @copyright & @license for fl in $(find . -name "*.php"); do mv $fl $fl.old; sed '/@copyright/d' $fl.old > $fl; rm -f $fl.old; done; for fl in $(find . -name "*.php"); do mv $fl $fl.old; sed '/@license/d' $fl.old > $fl; rm -f $fl.old; done; --- test/AutoDiscover/OnlineTest.php | 4 --- test/AutoDiscoverTest.php | 4 --- test/ClientTest.php | 4 --- test/Server/DocumentLiteralWrapperTest.php | 2 -- test/ServerTest.php | 4 --- test/TestAsset/MyCalculatorService.php | 2 -- test/TestAsset/commontypes.php | 28 ------------------- test/TestAsset/fulltests/server1.php | 8 ------ test/TestAsset/fulltests/server2.php | 6 ---- test/Wsdl/ArrayOfTypeComplexStrategyTest.php | 4 --- test/Wsdl/ArrayOfTypeSequenceStrategyTest.php | 4 --- test/Wsdl/CompositeStrategyTest.php | 4 --- test/Wsdl/DefaultComplexTypeTest.php | 4 --- test/WsdlTest.php | 4 --- test/_files/commontypes.php | 28 ------------------- test/_files/fulltests/server1.php | 8 ------ test/_files/fulltests/server2.php | 6 ---- 17 files changed, 124 deletions(-) diff --git a/test/AutoDiscover/OnlineTest.php b/test/AutoDiscover/OnlineTest.php index d347d4d9..5a0b24cf 100644 --- a/test/AutoDiscover/OnlineTest.php +++ b/test/AutoDiscover/OnlineTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\AutoDiscover; @@ -28,8 +26,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap */ class OnlineTest extends \PHPUnit_Framework_TestCase diff --git a/test/AutoDiscoverTest.php b/test/AutoDiscoverTest.php index 2b0ab878..b39c4269 100644 --- a/test/AutoDiscoverTest.php +++ b/test/AutoDiscoverTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap; @@ -35,8 +33,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap */ class AutoDiscoverTest extends \PHPUnit_Framework_TestCase diff --git a/test/ClientTest.php b/test/ClientTest.php index f59bab55..32d2b05c 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap; @@ -30,8 +28,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap */ class ClientTest extends \PHPUnit_Framework_TestCase diff --git a/test/Server/DocumentLiteralWrapperTest.php b/test/Server/DocumentLiteralWrapperTest.php index ae9c4e08..f40ca9a6 100644 --- a/test/Server/DocumentLiteralWrapperTest.php +++ b/test/Server/DocumentLiteralWrapperTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\Server; diff --git a/test/ServerTest.php b/test/ServerTest.php index ff76530a..57d10b56 100644 --- a/test/ServerTest.php +++ b/test/ServerTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap; @@ -32,8 +30,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap * @group Zend_Soap_Server */ diff --git a/test/TestAsset/MyCalculatorService.php b/test/TestAsset/MyCalculatorService.php index 853b0109..26b70139 100644 --- a/test/TestAsset/MyCalculatorService.php +++ b/test/TestAsset/MyCalculatorService.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\TestAsset; diff --git a/test/TestAsset/commontypes.php b/test/TestAsset/commontypes.php index 334c5a8b..e6bb6349 100644 --- a/test/TestAsset/commontypes.php +++ b/test/TestAsset/commontypes.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\TestAsset; @@ -119,8 +117,6 @@ function TestFunc9($foo, $bar) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class TestFixingMultiplePrototypes { @@ -142,8 +138,6 @@ function testFunc($a=100, $b=200, $d=300) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Test { /** @@ -207,8 +201,6 @@ class AutoDiscoverTestClass1 * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class AutoDiscoverTestClass2 { @@ -246,8 +238,6 @@ public function addMultiple($test) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexTypeB { @@ -265,8 +255,6 @@ class ComplexTypeB * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexTypeA { @@ -280,8 +268,6 @@ class ComplexTypeA * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexTest { @@ -295,8 +281,6 @@ class ComplexTest * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexObjectStructure { @@ -325,8 +309,6 @@ class ComplexObjectStructure * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexObjectWithObjectStructure { @@ -340,8 +322,6 @@ class ComplexObjectWithObjectStructure * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class MyService { @@ -370,8 +350,6 @@ public function baz($baz) { * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class MyServiceSequence { @@ -407,8 +385,6 @@ public function bazNested($baz) { * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class MyResponse { @@ -422,8 +398,6 @@ class MyResponse * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Recursion { @@ -450,8 +424,6 @@ function OneWay($message) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class NoReturnType { diff --git a/test/TestAsset/fulltests/server1.php b/test/TestAsset/fulltests/server1.php index 4df21920..271e4e50 100644 --- a/test/TestAsset/fulltests/server1.php +++ b/test/TestAsset/fulltests/server1.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\TestAsset\fulltests; @@ -25,8 +23,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Server1 { @@ -58,8 +54,6 @@ public function request($request) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexTypeB { @@ -77,8 +71,6 @@ class ComplexTypeB * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexTypeA { diff --git a/test/TestAsset/fulltests/server2.php b/test/TestAsset/fulltests/server2.php index 95ce1f32..7a1c732b 100644 --- a/test/TestAsset/fulltests/server2.php +++ b/test/TestAsset/fulltests/server2.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\TestAsset\fulltests; @@ -25,8 +23,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class ComplexTypeB { @@ -44,8 +40,6 @@ class ComplexTypeB * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Server2 { diff --git a/test/Wsdl/ArrayOfTypeComplexStrategyTest.php b/test/Wsdl/ArrayOfTypeComplexStrategyTest.php index 13e09826..887449fc 100644 --- a/test/Wsdl/ArrayOfTypeComplexStrategyTest.php +++ b/test/Wsdl/ArrayOfTypeComplexStrategyTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\Wsdl; @@ -30,8 +28,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap * @group Zend_Soap_Wsdl */ diff --git a/test/Wsdl/ArrayOfTypeSequenceStrategyTest.php b/test/Wsdl/ArrayOfTypeSequenceStrategyTest.php index 17bd6e82..2798f2bf 100644 --- a/test/Wsdl/ArrayOfTypeSequenceStrategyTest.php +++ b/test/Wsdl/ArrayOfTypeSequenceStrategyTest.php @@ -14,8 +14,6 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\Wsdl; @@ -26,8 +24,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap * @group Zend_Soap_Wsdl */ diff --git a/test/Wsdl/CompositeStrategyTest.php b/test/Wsdl/CompositeStrategyTest.php index 31b8a6af..628bfba9 100644 --- a/test/Wsdl/CompositeStrategyTest.php +++ b/test/Wsdl/CompositeStrategyTest.php @@ -14,8 +14,6 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\Wsdl; @@ -39,8 +37,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap * @group Zend_Soap_Wsdl */ diff --git a/test/Wsdl/DefaultComplexTypeTest.php b/test/Wsdl/DefaultComplexTypeTest.php index 76dd87bd..e2ca9378 100644 --- a/test/Wsdl/DefaultComplexTypeTest.php +++ b/test/Wsdl/DefaultComplexTypeTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap\Wsdl; @@ -28,8 +26,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap * @group Zend_Soap_Wsdl */ diff --git a/test/WsdlTest.php b/test/WsdlTest.php index f17c8b1a..2926bdbf 100644 --- a/test/WsdlTest.php +++ b/test/WsdlTest.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ namespace ZendTest\Soap; @@ -29,8 +27,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @group Zend_Soap * @group Zend_Soap_Wsdl */ diff --git a/test/_files/commontypes.php b/test/_files/commontypes.php index b0fe768f..9852869b 100644 --- a/test/_files/commontypes.php +++ b/test/_files/commontypes.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: commontypes.php 21858 2010-04-15 19:58:12Z beberlei $ */ @@ -118,8 +116,6 @@ function Zend_Soap_AutoDiscover_TestFunc9($foo, $bar) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_TestFixingMultiplePrototypes { @@ -141,8 +137,6 @@ function testFunc($a=100, $b=200, $d=300) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_Test { /** @@ -206,8 +200,6 @@ class Zend_Soap_AutoDiscoverTestClass1 * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscoverTestClass2 { @@ -245,8 +237,6 @@ public function addMultiple($test) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexTypeB { @@ -264,8 +254,6 @@ class Zend_Soap_Wsdl_ComplexTypeB * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexTypeA { @@ -279,8 +267,6 @@ class Zend_Soap_Wsdl_ComplexTypeA * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexTest { @@ -294,8 +280,6 @@ class Zend_Soap_Wsdl_ComplexTest * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexObjectStructure { @@ -324,8 +308,6 @@ class Zend_Soap_Wsdl_ComplexObjectStructure * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexObjectWithObjectStructure { @@ -339,8 +321,6 @@ class Zend_Soap_Wsdl_ComplexObjectWithObjectStructure * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_MyService { @@ -369,8 +349,6 @@ public function baz($baz) { * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_MyServiceSequence { @@ -406,8 +384,6 @@ public function bazNested($baz) { * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_MyResponse { @@ -421,8 +397,6 @@ class Zend_Soap_AutoDiscover_MyResponse * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_Recursion { @@ -449,8 +423,6 @@ function Zend_Soap_AutoDiscover_OneWay($message) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_AutoDiscover_NoReturnType { diff --git a/test/_files/fulltests/server1.php b/test/_files/fulltests/server1.php index a028f766..c2ab7a85 100644 --- a/test/_files/fulltests/server1.php +++ b/test/_files/fulltests/server1.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: server1.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -28,8 +26,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Service_Server1 { @@ -61,8 +57,6 @@ public function request($request) * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexTypeB { @@ -80,8 +74,6 @@ class Zend_Soap_Wsdl_ComplexTypeB * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexTypeA { diff --git a/test/_files/fulltests/server2.php b/test/_files/fulltests/server2.php index 28f32204..062c63fb 100644 --- a/test/_files/fulltests/server2.php +++ b/test/_files/fulltests/server2.php @@ -15,8 +15,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: server2.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -28,8 +26,6 @@ * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_ComplexTypeB { @@ -47,8 +43,6 @@ class Zend_Soap_Wsdl_ComplexTypeB * @category Zend * @package Zend_Soap * @subpackage UnitTests - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Service_Server2 { From 7ecccf412205434665b59a2048279c68ed8fcc55 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 9 Jul 2012 16:41:27 +0200 Subject: [PATCH 3/8] [CS][Tests] Set File Header http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards#CodingStandards-Files The following script replaces the content between PHP open tag and namespace declaration. for COMPONENT in $(ls -d *) do for FILE in $(find $COMPONENT -name "*.php") do BLOCK="\/\*\*\n \* Zend Framework \(http:\/\/framework\.zend\.com\/\)\n \*\n \* \@link http:\/\/github\.com\/zendframework\/zf2 for the canonical source repository\n \* \@copyright Copyright \(c\) 2005-2012 Zend Technologies USA Inc\. \(http:\/\/www\.zend\.com\)\n \* \@license http:\/\/framework\.zend\.com\/license\/new-bsd New BSD License\n \* \@package Zend_$COMPONENT\n \*\/" perl -0777 -i -pe "s/(<\?php(\s*.*)*\nn)/ Date: Mon, 9 Jul 2012 16:47:31 +0200 Subject: [PATCH 4/8] [CS][Tests] Set File Header http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards#CodingStandards-Files The following script replaces the content of the first comment in the file (useful for files without namespace declaration) for COMPONENT in $(ls -d *) do for FILE in $(find $COMPONENT -name "*.php") do BLOCK="\/\*\*\n \* Zend Framework \(http:\/\/framework\.zend\.com\/\)\n \*\n \* \@link http:\/\/github\.com\/zendframework\/zf2 for the canonical source repository\n \* \@copyright Copyright \(c\) 2005-2012 Zend Technologies USA Inc\. \(http:\/\/www\.zend\.com\)\n \* \@license http:\/\/framework\.zend\.com\/license\/new-bsd New BSD License\n \* \@package Zend_$COMPONENT\n \*\/" perl -0777 -i -pe "s/(\/\*\*(\s*\*.*)*\/)/$BLOCK/" $FILE done done --- test/_files/commontypes.php | 20 +++++--------------- test/_files/fulltests/server1.php | 20 +++++--------------- test/_files/fulltests/server2.php | 20 +++++--------------- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/test/_files/commontypes.php b/test/_files/commontypes.php index 9852869b..d221e4fa 100644 --- a/test/_files/commontypes.php +++ b/test/_files/commontypes.php @@ -1,21 +1,11 @@ Date: Mon, 9 Jul 2012 16:46:59 -0500 Subject: [PATCH 5/8] [zen-49] Correct import statements across framework - Ran a script that would create multiple import statements out of multi-line import statements, and which would sort all import statements in alphabetic order. Script is at https://gist.github.com/3079222 and was run by dropping into the library/Zend folder and typing (in zsh) "for file in **/*.php;do php /path/to/replace-uses.php $file; done" --- src/AutoDiscover.php | 18 +++++++++--------- .../DiscoveryStrategyInterface.php | 6 +++--- .../DiscoveryStrategy/ReflectionDiscovery.php | 6 +++--- src/Client.php | 2 +- src/Client/DotNet.php | 4 ++-- src/Client/Local.php | 4 ++-- src/Server.php | 8 ++++---- src/Server/DocumentLiteralWrapper.php | 8 ++++---- src/Wsdl.php | 8 ++++---- src/Wsdl/ComplexTypeStrategy/Composite.php | 6 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php index 84ff38e8..230d74e1 100644 --- a/src/AutoDiscover.php +++ b/src/AutoDiscover.php @@ -10,15 +10,15 @@ namespace Zend\Soap; -use Zend\Uri, - Zend\Soap\Wsdl, - Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy, - Zend\Server\Reflection\AbstractFunction, - Zend\Server\Reflection, - Zend\Server\Reflection\Prototype, - Zend\Server\Reflection\ReflectionParameter, - Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery, - Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy; +use Zend\Server\Reflection; +use Zend\Server\Reflection\AbstractFunction; +use Zend\Server\Reflection\Prototype; +use Zend\Server\Reflection\ReflectionParameter; +use Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy; +use Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery; +use Zend\Soap\Wsdl; +use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy; +use Zend\Uri; /** * \Zend\Soap\AutoDiscover diff --git a/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php index 9c5e84c5..e02ff7f8 100644 --- a/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php +++ b/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php @@ -10,9 +10,9 @@ namespace Zend\Soap\AutoDiscover\DiscoveryStrategy; -use Zend\Server\Reflection\AbstractFunction, - Zend\Server\Reflection\Prototype, - Zend\Server\Reflection\ReflectionParameter; +use Zend\Server\Reflection\AbstractFunction; +use Zend\Server\Reflection\Prototype; +use Zend\Server\Reflection\ReflectionParameter; /** * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL. diff --git a/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php index ff97f74c..bc025d2b 100644 --- a/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php +++ b/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php @@ -10,9 +10,9 @@ namespace Zend\Soap\AutoDiscover\DiscoveryStrategy; -use Zend\Server\Reflection\AbstractFunction, - Zend\Server\Reflection\Prototype, - Zend\Server\Reflection\ReflectionParameter; +use Zend\Server\Reflection\AbstractFunction; +use Zend\Server\Reflection\Prototype; +use Zend\Server\Reflection\ReflectionParameter; /** * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL. diff --git a/src/Client.php b/src/Client.php index a912a07b..47856030 100644 --- a/src/Client.php +++ b/src/Client.php @@ -11,8 +11,8 @@ namespace Zend\Soap; use Traversable; -use Zend\Stdlib\ArrayUtils; use Zend\Server\Client as ServerClient; +use Zend\Stdlib\ArrayUtils; /** * \Zend\Soap\Client\Client diff --git a/src/Client/DotNet.php b/src/Client/DotNet.php index 1bb485be..855ab102 100644 --- a/src/Client/DotNet.php +++ b/src/Client/DotNet.php @@ -10,8 +10,8 @@ namespace Zend\Soap\Client; -use Zend\Soap\Client as SOAPClient, - Zend\Soap\Exception; +use Zend\Soap\Client as SOAPClient; +use Zend\Soap\Exception; /** * .NET SOAP client diff --git a/src/Client/Local.php b/src/Client/Local.php index e481f51c..6d90484f 100644 --- a/src/Client/Local.php +++ b/src/Client/Local.php @@ -10,8 +10,8 @@ namespace Zend\Soap\Client; -use Zend\Soap\Client as SOAPClient, - Zend\Soap\Server as SOAPServer; +use Zend\Soap\Client as SOAPClient; +use Zend\Soap\Server as SOAPServer; /** * \Zend\Soap\Client\Local diff --git a/src/Server.php b/src/Server.php index 56b44e52..2103efce 100644 --- a/src/Server.php +++ b/src/Server.php @@ -10,12 +10,12 @@ namespace Zend\Soap; +use DOMDocument; +use DOMNode; +use SimpleXMLElement; +use stdClass; use Traversable; use Zend\Stdlib\ArrayUtils; -use DOMDocument, - DOMNode, - SimpleXMLElement, - stdClass; /** * Zend_Soap_Server diff --git a/src/Server/DocumentLiteralWrapper.php b/src/Server/DocumentLiteralWrapper.php index 7017b509..646f7bc9 100644 --- a/src/Server/DocumentLiteralWrapper.php +++ b/src/Server/DocumentLiteralWrapper.php @@ -10,10 +10,10 @@ namespace Zend\Soap\Server; -use ReflectionClass, - ReflectionObject, - Zend\Soap\Exception\UnexpectedValueException, - Zend\Soap\Exception\BadMethodCallException; +use ReflectionClass; +use ReflectionObject; +use Zend\Soap\Exception\BadMethodCallException; +use Zend\Soap\Exception\UnexpectedValueException; /** * Wraps WSDL Document/Literal Style service objects to hide SOAP request diff --git a/src/Wsdl.php b/src/Wsdl.php index ea4b790a..f604cf2c 100644 --- a/src/Wsdl.php +++ b/src/Wsdl.php @@ -10,10 +10,10 @@ namespace Zend\Soap; -use DOMDocument, - DOMElement, - Zend\Uri\Uri, - Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy; +use DOMDocument; +use DOMElement; +use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy; +use Zend\Uri\Uri; /** * \Zend\Soap\Wsdl diff --git a/src/Wsdl/ComplexTypeStrategy/Composite.php b/src/Wsdl/ComplexTypeStrategy/Composite.php index 9a70225f..9cd20820 100644 --- a/src/Wsdl/ComplexTypeStrategy/Composite.php +++ b/src/Wsdl/ComplexTypeStrategy/Composite.php @@ -10,9 +10,9 @@ namespace Zend\Soap\Wsdl\ComplexTypeStrategy; -use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy, - Zend\Soap\Exception, - Zend\Soap\Wsdl; +use Zend\Soap\Exception; +use Zend\Soap\Wsdl; +use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy; /** * Zend_Soap_Wsdl_Strategy_Composite From d99480318326438345dc92121ace6a3e020c90b0 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Wed, 11 Jul 2012 22:11:34 +0200 Subject: [PATCH 6/8] Remove global prefix in use statements --- test/Wsdl/ArrayOfTypeComplexStrategyTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Wsdl/ArrayOfTypeComplexStrategyTest.php b/test/Wsdl/ArrayOfTypeComplexStrategyTest.php index dfb154cd..00298010 100644 --- a/test/Wsdl/ArrayOfTypeComplexStrategyTest.php +++ b/test/Wsdl/ArrayOfTypeComplexStrategyTest.php @@ -13,7 +13,7 @@ require_once __DIR__."/../TestAsset/commontypes.php"; use Zend\Soap\Wsdl; -use \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex; +use Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex; /** * @category Zend From fafc8ae83f5352c901b249b9bbd282e8d63b9da2 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Wed, 11 Jul 2012 22:20:59 +0200 Subject: [PATCH 7/8] Add blank lines around the use block --- test/AutoDiscover/OnlineTest.php | 1 + test/WsdlTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/test/AutoDiscover/OnlineTest.php b/test/AutoDiscover/OnlineTest.php index c8922f7d..2765f936 100644 --- a/test/AutoDiscover/OnlineTest.php +++ b/test/AutoDiscover/OnlineTest.php @@ -9,6 +9,7 @@ */ namespace ZendTest\Soap\AutoDiscover; + require_once __DIR__ . '/../TestAsset/commontypes.php'; use Zend\Soap\Client; diff --git a/test/WsdlTest.php b/test/WsdlTest.php index ce4a61de..cc8febef 100644 --- a/test/WsdlTest.php +++ b/test/WsdlTest.php @@ -9,6 +9,7 @@ */ namespace ZendTest\Soap; + use Zend\Soap\Wsdl; use Zend\Soap\Wsdl\ComplexTypeStrategy; From 88de986b1db72b4e57974b12401f0501c94dab61 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Thu, 12 Jul 2012 21:11:36 +0200 Subject: [PATCH 8/8] [PSR-2] fixers=braces,elseif,short_tag,php_closing_tag,trailing_spaces,linefeed Applied php-cs-fixer --fixers=braces,elseif,short_tag,php_closing_tag,trailing_spaces,linefeed --- src/AutoDiscover.php | 2 +- .../ArrayOfTypeSequence.php | 2 +- test/ServerTest.php | 36 ++++++++-------- test/TestAsset/MyCalculatorService.php | 2 +- test/TestAsset/WsdlTestClass.php | 3 +- test/TestAsset/commontypes.php | 42 ++++++++++++------- test/_files/commontypes.php | 24 +++++++---- 7 files changed, 67 insertions(+), 44 deletions(-) diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php index 230d74e1..aa0faeed 100644 --- a/src/AutoDiscover.php +++ b/src/AutoDiscover.php @@ -471,7 +471,7 @@ 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 if ($prototype->getReturnType() != "void") { + } elseif ($prototype->getReturnType() != "void") { // RPC style: add the return value as a typed part $args['return'] = array('type' => $wsdl->getType($this->_discoveryStrategy->getFunctionReturnType($function, $prototype))); } diff --git a/src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php b/src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php index b869a23d..2e2e8084 100644 --- a/src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php +++ b/src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php @@ -43,7 +43,7 @@ public function addComplexType($type) } return $complexType; - } else if (($soapType = $this->scanRegisteredTypes($type)) !== null) { + } elseif (($soapType = $this->scanRegisteredTypes($type)) !== null) { // Existing complex type return $soapType; } else { diff --git a/test/ServerTest.php b/test/ServerTest.php index 269b6c16..5bf2cbc4 100644 --- a/test/ServerTest.php +++ b/test/ServerTest.php @@ -124,7 +124,7 @@ public function testSoapVersion() $this->assertEquals(SOAP_1_2, $server->getSoapVersion()); $server->setSoapVersion(SOAP_1_1); $this->assertEquals(SOAP_1_1, $server->getSoapVersion()); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid soap version specified'); $server->setSoapVersion('bogus'); } @@ -134,7 +134,7 @@ public function testValidateUrn() $server = new Server(); $this->assertTrue($server->validateUrn('http://framework.zend.com/')); $this->assertTrue($server->validateUrn('urn:soapHandler/GetOpt')); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid URN'); $server->validateUrn('bogosity'); } @@ -146,7 +146,7 @@ public function testSetActor() $this->assertNull($server->getActor()); $server->setActor('http://framework.zend.com/'); $this->assertEquals('http://framework.zend.com/', $server->getActor()); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid URN'); $server->setActor('bogus'); } @@ -167,7 +167,7 @@ public function testSetUri() $this->assertNull($server->getUri()); $server->setUri('http://framework.zend.com/'); $this->assertEquals('http://framework.zend.com/', $server->getUri()); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid URN'); $server->setUri('bogus'); } @@ -192,19 +192,19 @@ public function testSetClassmap() $server->setClassmap($classmap); $this->assertTrue($classmap == $server->getClassmap()); } - + public function testSetClassmapThrowsExceptionOnBogusStringParameter() { $server = new Server(); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Classmap must be an array'); $server->setClassmap('bogus'); } - + public function testSetClassmapThrowsExceptionOnBogusArrayParameter() { $server = new Server(); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid class in class map'); $server->setClassmap(array('soapTypeName', 'bogusClassName')); } @@ -228,7 +228,7 @@ public function testSetWsdl() $this->assertNull($server->getWSDL()); $server->setWSDL(__DIR__.'/_files/wsdl_example.wsdl'); $this->assertEquals(__DIR__.'/_files/wsdl_example.wsdl', $server->getWSDL()); - + //$this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'foo'); $server->setWSDL(__DIR__.'/_files/bogus.wsdl'); } @@ -264,7 +264,7 @@ public function testAddFunction() public function testAddBogusFunctionAsInteger() { $server = new Server(); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid function specified'); $server->addFunction(126); } @@ -280,7 +280,7 @@ public function testAddBogusFunctionsAsString() public function testAddBogusFunctionsAsArray() { $server = new Server(); - + $functions = array('\ZendTest\Soap\TestAsset\TestFunc5', 'bogus_function', '\ZendTest\Soap\TestAsset\TestFunc6'); @@ -324,7 +324,7 @@ public function testSetClassTwiceThrowsException() { $server = new Server(); $server->setClass('\ZendTest\Soap\TestAsset\ServerTestClass'); - + $this->setExpectedException( 'Zend\Soap\Exception\InvalidArgumentException', 'A class has already been registered with this soap server instance' @@ -368,37 +368,37 @@ public function testSetObject() $r = $server->setObject(new TestAsset\ServerTestClass()); $this->assertSame($server, $r); } - + /** * @group ZF-4366 */ public function testSetObjectThrowsExceptionWithBadInput1() { $server = new Server(); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid object argument (integer)'); $server->setObject(465); } - + /** * @group ZF-4366 */ public function testSetObjectThrowsExceptionWithBadInput2() { $server = new Server(); - + $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Invalid object argument (integer)'); $int = 1; $server->setObject($int); } - + /** * @group ZF-4366 */ public function testSetObjectThrowsExceptionWithBadInput3() { $server = new Server(); - + //$this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'foo'); $server->setObject(new TestAsset\ServerTestClass()); } diff --git a/test/TestAsset/MyCalculatorService.php b/test/TestAsset/MyCalculatorService.php index 574c92aa..a095be63 100644 --- a/test/TestAsset/MyCalculatorService.php +++ b/test/TestAsset/MyCalculatorService.php @@ -11,7 +11,7 @@ namespace ZendTest\Soap\TestAsset; /** - * MyCalculatorService + * MyCalculatorService * * Class used in DocumentLiteralWrapperTest */ diff --git a/test/TestAsset/WsdlTestClass.php b/test/TestAsset/WsdlTestClass.php index 0312eda0..2553a9a1 100644 --- a/test/TestAsset/WsdlTestClass.php +++ b/test/TestAsset/WsdlTestClass.php @@ -13,7 +13,8 @@ /** * Test Class */ -class WsdlTestClass { +class WsdlTestClass +{ /** * @var integer */ diff --git a/test/TestAsset/commontypes.php b/test/TestAsset/commontypes.php index 0b68a766..1edf85f1 100644 --- a/test/TestAsset/commontypes.php +++ b/test/TestAsset/commontypes.php @@ -130,7 +130,8 @@ function testFunc($a=100, $b=200, $d=300) * @package Zend_Soap * @subpackage UnitTests */ -class Test { +class Test +{ /** * Test Function 1 * @@ -320,20 +321,23 @@ class MyService * @param string $foo * @return \ZendTest\Soap\TestAsset\MyResponse[] */ - public function foo($foo) { + public function foo($foo) + { } /** * @param string $bar * @return \ZendTest\Soap\TestAsset\MyResponse[] */ - public function bar($bar) { + public function bar($bar) + { } /** * @param string $baz * @return \ZendTest\Soap\TestAsset\MyResponse[] */ - public function baz($baz) { + public function baz($baz) + { } } @@ -348,27 +352,31 @@ class MyServiceSequence * @param string $foo * @return string[] */ - public function foo($foo) { + public function foo($foo) + { } /** * @param string $bar * @return string[] */ - public function bar($bar) { + public function bar($bar) + { } /** * @param string $baz * @return string[] */ - public function baz($baz) { + public function baz($baz) + { } /** * @param string $baz * @return string[][][] */ - public function bazNested($baz) { + public function bazNested($baz) + { } } @@ -430,7 +438,8 @@ public function pushOneWay($message) /* Client test classes */ /** Test Class */ -class TestClass { +class TestClass +{ /** * Test Function 1 * @@ -476,7 +485,8 @@ static function testFunc4() } /** Test class 2 */ -class TestData1 { +class TestData1 +{ /** * Property1 * @@ -493,7 +503,8 @@ class TestData1 { } /** Test class 2 */ -class TestData2 { +class TestData2 +{ /** * Property1 * @@ -509,7 +520,8 @@ class TestData2 { public $property2; } -class MockSoapServer { +class MockSoapServer +{ public $handle = null; public function handle() { @@ -518,9 +530,11 @@ public function handle() public function __call($name, $args) {} } -class MockServer extends \Zend\Soap\Server { +class MockServer extends \Zend\Soap\Server +{ public $mockSoapServer = null; - protected function _getSoap() { + protected function _getSoap() + { $this->mockSoapServer = new MockSoapServer(); return $this->mockSoapServer; } diff --git a/test/_files/commontypes.php b/test/_files/commontypes.php index d221e4fa..5ef3c806 100644 --- a/test/_files/commontypes.php +++ b/test/_files/commontypes.php @@ -128,7 +128,8 @@ function testFunc($a=100, $b=200, $d=300) * @package Zend_Soap * @subpackage UnitTests */ -class Zend_Soap_AutoDiscover_Test { +class Zend_Soap_AutoDiscover_Test +{ /** * Test Function 1 * @@ -318,20 +319,23 @@ class Zend_Soap_AutoDiscover_MyService * @param string $foo * @return Zend_Soap_AutoDiscover_MyResponse[] */ - public function foo($foo) { + public function foo($foo) + { } /** * @param string $bar * @return Zend_Soap_AutoDiscover_MyResponse[] */ - public function bar($bar) { + public function bar($bar) + { } /** * @param string $baz * @return Zend_Soap_AutoDiscover_MyResponse[] */ - public function baz($baz) { + public function baz($baz) + { } } @@ -346,27 +350,31 @@ class Zend_Soap_AutoDiscover_MyServiceSequence * @param string $foo * @return string[] */ - public function foo($foo) { + public function foo($foo) + { } /** * @param string $bar * @return string[] */ - public function bar($bar) { + public function bar($bar) + { } /** * @param string $baz * @return string[] */ - public function baz($baz) { + public function baz($baz) + { } /** * @param string $baz * @return string[][][] */ - public function bazNested($baz) { + public function bazNested($baz) + { } }