Merge branch 'hotfix/3342'

Close zendframework/zendframework#3342
zendframework · Jan 7, 2013 · 48a3b96 · 48a3b96
commit 48a3b96
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -52,7 +52,7 @@ class AutoDiscover
     protected $class;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $strategy;
 

diff --git a/src/Client.php b/src/Client.php
@@ -407,7 +407,7 @@ public function getEncoding()
      * Check for valid URN
      *
      * @param  string $urn
-     * @return boolean
+     * @return bool
      * @throws Exception\ExceptionInterface on invalid URN
      */
     public function validateUrn($urn)
@@ -825,7 +825,7 @@ public function getSoapFeatures()
     /**
      * Set the SOAP WSDL Caching Options
      *
-     * @param string|int|boolean|null $caching
+     * @param string|int|bool|null $caching
      * @return Client
      */
     public function setWSDLCache($caching)
@@ -1026,7 +1026,7 @@ protected function _preProcessResult($result)
      * Add SOAP input header
      *
      * @param SoapHeader $header
-     * @param boolean $permanent
+     * @param  bool $permanent
      * @return Client
      */
     public function addSoapInputHeader(SoapHeader $header, $permanent = false)

diff --git a/src/Server.php b/src/Server.php
@@ -111,7 +111,7 @@ class Server implements \Zend\Server\Server
     /**
      * Flag: whether or not {@link handle()} should return a response instead
      * of automatically emitting it.
-     * @var boolean
+     * @var bool
      */
     protected $returnResponse = false;
 
@@ -453,7 +453,7 @@ public function getSoapFeatures()
     /**
      * Set the SOAP WSDL Caching Options
      *
-     * @param string|int|boolean $options
+     * @param string|int|bool $options
      * @return Server
      */
     public function setWSDLCache($options)
@@ -701,7 +701,7 @@ public function getLastRequest()
      *
      * The response is always available via {@link getResponse()}.
      *
-     * @param boolean $flag
+     * @param  bool $flag
      * @return Server
      */
     public function setReturnResponse($flag = true)
@@ -713,7 +713,7 @@ public function setReturnResponse($flag = true)
     /**
      * Retrieve return response flag
      *
-     * @return boolean
+     * @return bool
      */
     public function getReturnResponse()
     {
@@ -847,7 +847,7 @@ public function handle($request = null)
     /**
      * Method initializes the error context that the SOAPServer environment will run in.
      *
-     * @return boolean display_errors original value
+     * @return bool display_errors original value
      */
     protected function _initializeSoapErrorContext()
     {
@@ -873,7 +873,7 @@ public function registerFaultException($class)
      * Deregister a fault exception from the fault exception stack
      *
      * @param  string $class
-     * @return boolean
+     * @return bool
      */
     public function deregisterFaultException($class)
     {

diff --git a/src/Wsdl.php b/src/Wsdl.php
@@ -339,7 +339,7 @@ public function addBindingOperation($binding, $name, $input = false, $output = f
      * @param object $binding A binding XML_Tree_Node returned by {@link function addBinding}
      * @param string $style binding style, possible values are "rpc" (the default) and "document"
      * @param string $transport Transport method (defaults to HTTP)
-     * @return boolean
+     * @return bool
      */
     public function addSoapBinding($binding, $style = 'document', $transport = 'http://schemas.xmlsoap.org/soap/http')
     {
@@ -357,7 +357,7 @@ public function addSoapBinding($binding, $style = 'document', $transport = 'http
      *
      * @param object $operation An operation XML_Tree_Node returned by {@link function addBindingOperation}
      * @param string $soap_action SOAP Action
-     * @return boolean
+     * @return bool
      */
     public function addSoapOperation($binding, $soap_action)
     {
@@ -514,7 +514,7 @@ public function toDomDocument()
     /**
      * Echo the WSDL as XML
      *
-     * @return boolean
+     * @return bool
      */
     public function dump($filename = false)
     {

diff --git a/test/TestAsset/commontypes.php b/test/TestAsset/commontypes.php
@@ -199,7 +199,7 @@ class AutoDiscoverTestClass2
     /**
      *
      * @param \ZendTest\Soap\TestAsset\AutoDiscoverTestClass1 $test
-     * @return boolean
+     * @return bool
      */
     public function add(AutoDiscoverTestClass1 $test)
     {
@@ -277,7 +277,7 @@ class ComplexTest
 class ComplexObjectStructure
 {
     /**
-     * @var boolean
+     * @var bool
      */
     public $boolean = true;
 

diff --git a/test/_files/commontypes.php b/test/_files/commontypes.php
@@ -197,7 +197,7 @@ class Zend_Soap_AutoDiscoverTestClass2
     /**
      *
      * @param Zend_Soap_AutoDiscoverTestClass1 $test
-     * @return boolean
+     * @return bool
      */
     public function add(Zend_Soap_AutoDiscoverTestClass1 $test)
     {
@@ -275,7 +275,7 @@ class Zend_Soap_Wsdl_ComplexTest
 class Zend_Soap_Wsdl_ComplexObjectStructure
 {
     /**
-     * @var boolean
+     * @var bool
      */
     public $boolean = true;