Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · 06d397d · 06d397d
5 parents f3d5365 + 88de986 + b1c3dd1 + fb38487 + 7bfe758
commit 06d397d
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 55 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -956,7 +956,7 @@ public function _doRequest(Client\Common $client, $request, $location, $action,
     {
         // Perform request as is
         if ($one_way === null) {
-        	return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
+            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
         }
         return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version, $one_way);
     }

diff --git a/src/Client/Common.php b/src/Client/Common.php
@@ -33,7 +33,7 @@ class Common extends \SoapClient
      * @param string $wsdl
      * @param array $options
      */
-    function __construct($doRequestCallback, $wsdl, $options)
+    public function __construct($doRequestCallback, $wsdl, $options)
     {
         $this->_doRequestCallback = $doRequestCallback;
 
@@ -51,7 +51,7 @@ function __construct($doRequestCallback, $wsdl, $options)
      * @param int    $one_way
      * @return mixed
      */
-    function __doRequest($request, $location, $action, $version, $one_way = null)
+    public function __doRequest($request, $location, $action, $version, $one_way = null)
     {
         if ($one_way === null) {
             return call_user_func($this->_doRequestCallback, $this, $request, $location, $action, $version);

diff --git a/src/Client/Local.php b/src/Client/Local.php
@@ -41,7 +41,7 @@ class Local extends SOAPClient
      * @param string $wsdl
      * @param array $options
      */
-    function __construct(SOAPServer $server, $wsdl, $options = null)
+    public function __construct(SOAPServer $server, $wsdl, $options = null)
     {
         $this->_server = $server;
 

diff --git a/...Exception/ExceptionNotLoadedException.php → ...Exception/ExtensionNotLoadedException.php b/...Exception/ExceptionNotLoadedException.php → ...Exception/ExtensionNotLoadedException.php
diff --git a/test/AutoDiscoverTest.php b/test/AutoDiscoverTest.php
@@ -64,7 +64,7 @@ protected function assertValidWSDL(\DOMDocument $dom)
         unlink($file);
     }
 
-    function testSetClass()
+    public function testSetClass()
     {
         $scriptUri = 'http://localhost/my_script.php';
 
@@ -147,7 +147,7 @@ function testSetClass()
         $this->assertValidWSDL($dom);
     }
 
-    function testSetClassWithDifferentStyles()
+    public function testSetClassWithDifferentStyles()
     {
         $scriptUri = 'http://localhost/my_script.php';
 
@@ -301,7 +301,7 @@ function testSetClassWithDifferentStyles()
     /**
      * @group ZF-5072
      */
-    function testSetClassWithResponseReturnPartCompabilityMode()
+    public function testSetClassWithResponseReturnPartCompabilityMode()
     {
         $scriptUri = 'http://localhost/my_script.php';
 
@@ -318,7 +318,7 @@ function testSetClassWithResponseReturnPartCompabilityMode()
         unlink(__DIR__.'/TestAsset/setclass.wsdl');
     }
 
-    function testAddFunctionSimple()
+    public function testAddFunctionSimple()
     {
         $scriptUri = 'http://localhost/my_script.php';
 
@@ -355,7 +355,7 @@ function testAddFunctionSimple()
         $this->assertValidWSDL($dom);
     }
 
-    function testAddFunctionSimpleWithDifferentStyle()
+    public function testAddFunctionSimpleWithDifferentStyle()
     {
         $scriptUri = 'http://localhost/my_script.php';
 
@@ -401,7 +401,7 @@ function testAddFunctionSimpleWithDifferentStyle()
     /**
      * @group ZF-5072
      */
-    function testAddFunctionSimpleInReturnNameCompabilityMode()
+    public function testAddFunctionSimpleInReturnNameCompabilityMode()
     {
         $scriptUri = 'http://localhost/my_script.php';
 
@@ -418,7 +418,7 @@ function testAddFunctionSimpleInReturnNameCompabilityMode()
         $this->assertValidWSDL($dom);
     }
 
-    function testAddFunctionMultiple()
+    public function testAddFunctionMultiple()
     {
         $scriptUri = 'http://localhost/my_script.php';
 

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -326,8 +326,8 @@ public function testSetClassTwiceThrowsException()
         $server->setClass('\ZendTest\Soap\TestAsset\ServerTestClass');
 
         $this->setExpectedException(
-        	'Zend\Soap\Exception\InvalidArgumentException',
-        	'A class has already been registered with this soap server instance'
+            'Zend\Soap\Exception\InvalidArgumentException',
+            'A class has already been registered with this soap server instance'
             );
         $server->setClass('\ZendTest\Soap\TestAsset\ServerTestClass');
     }

diff --git a/test/TestAsset/commontypes.php b/test/TestAsset/commontypes.php
@@ -119,7 +119,7 @@ class TestFixingMultiplePrototypes
      * @param integer $d
      * @return integer
      */
-    function testFunc($a=100, $b=200, $d=300)
+    public function testFunc($a=100, $b=200, $d=300)
     {
 
     }
@@ -137,7 +137,7 @@ class Test
      *
      * @return string
      */
-    function testFunc1()
+    public function testFunc1()
     {
         return "Hello World";
     }
@@ -148,7 +148,7 @@ function testFunc1()
      * @param string $who Some Arg
      * @return string
      */
-    function testFunc2($who)
+    public function testFunc2($who)
     {
         return "Hello $who!";
     }
@@ -160,7 +160,7 @@ function testFunc2($who)
      * @param int $when Some
      * @return string
      */
-    function testFunc3($who, $when)
+    public function testFunc3($who, $when)
     {
         return "Hello $who, How are you $when";
     }
@@ -170,7 +170,7 @@ function testFunc3($who, $when)
      *
      * @return string
      */
-    static function testFunc4()
+    public static function testFunc4()
     {
         return "I'm Static!";
     }
@@ -445,7 +445,7 @@ class TestClass
      *
      * @return string
      */
-    function testFunc1()
+    public function testFunc1()
     {
         return "Hello World";
     }
@@ -456,7 +456,7 @@ function testFunc1()
      * @param string $who Some Arg
      * @return string
      */
-    function testFunc2($who)
+    public function testFunc2($who)
     {
         return "Hello $who!";
     }
@@ -468,7 +468,7 @@ function testFunc2($who)
      * @param int $when Some
      * @return string
      */
-    function testFunc3($who, $when)
+    public function testFunc3($who, $when)
     {
         return "Hello $who, How are you $when";
     }
@@ -478,7 +478,7 @@ function testFunc3($who, $when)
      *
      * @return string
      */
-    static function testFunc4()
+    public static function testFunc4()
     {
         return "I'm Static!";
     }
@@ -549,7 +549,7 @@ class ServerTestClass
      *
      * @return string
      */
-    function testFunc1()
+    public function testFunc1()
     {
         return "Hello World";
     }
@@ -560,7 +560,7 @@ function testFunc1()
      * @param string $who Some Arg
      * @return string
      */
-    function testFunc2($who)
+    public function testFunc2($who)
     {
         return "Hello $who!";
     }
@@ -572,7 +572,7 @@ function testFunc2($who)
      * @param int $when Some
      * @return string
      */
-    function testFunc3($who, $when)
+    public function testFunc3($who, $when)
     {
         return "Hello $who, How are you $when";
     }
@@ -582,7 +582,7 @@ function testFunc3($who, $when)
      *
      * @return string
      */
-    static function testFunc4()
+    public static function testFunc4()
     {
         return "I'm Static!";
     }
@@ -592,7 +592,7 @@ static function testFunc4()
      *
      * @return void
      */
-    function testFunc5()
+    public function testFunc5()
     {
         trigger_error("Test Message", E_USER_ERROR);
     }
@@ -617,13 +617,13 @@ class TestLocalSoapClient extends \SoapClient
      * @param string $wsdl
      * @param array $options
      */
-    function __construct(\Zend\Soap\Server $server, $wsdl, $options)
+    public function __construct(\Zend\Soap\Server $server, $wsdl, $options)
     {
         $this->server = $server;
         parent::__construct($wsdl, $options);
     }
 
-    function __doRequest($request, $location, $action, $version, $one_way = 0)
+    public function __doRequest($request, $location, $action, $version, $one_way = 0)
     {
         ob_start();
         $this->server->handle($request);