Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit f2d3686

Browse files
committed
Merge pull request #1 from zendframework/master
Update
2 parents d4887a0 + 5575e3e commit f2d3686

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
- memcached
2222

2323
before_script:
24+
- phpenv config-rm xdebug.ini || return 0
2425
- if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer self-update; fi
2526
- if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer install --no-interaction --prefer-source --dev; fi
2627

library/Zend/Service/LiveDocx.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ class Zend_Service_LiveDocx
125125
* {/code}
126126
*
127127
* @param array|Zend_Config $options
128-
* @return void
129128
* @throws Zend_Service_LiveDocx_Exception
130129
* @since LiveDocx 1.0
131130
*/
@@ -221,9 +220,6 @@ public function setSoapClient(Zend_Soap_Client $soapClient)
221220
/**
222221
* Log in to LiveDocx service
223222
*
224-
* @param string $username
225-
* @param string $password
226-
*
227223
* @throws Zend_Service_LiveDocx_Exception
228224
* @return boolean
229225
* @since LiveDocx 1.2
@@ -304,6 +300,7 @@ public function isLoggedIn()
304300
/**
305301
* Set username
306302
*
303+
* @param string $username
307304
* @return Zend_Service_LiveDocx
308305
* @since LiveDocx 1.0
309306
*/
@@ -316,6 +313,7 @@ public function setUsername($username)
316313
/**
317314
* Set password
318315
*
316+
* @param string $password
319317
* @return Zend_Service_LiveDocx
320318
* @since LiveDocx 1.0
321319
*/
@@ -328,6 +326,7 @@ public function setPassword($password)
328326
/**
329327
* Set WSDL of LiveDocx web service
330328
*
329+
* @param string $wsdl
331330
* @return Zend_Service_LiveDocx
332331
* @since LiveDocx 1.0
333332
*/
@@ -370,7 +369,7 @@ public function getPassword()
370369
/**
371370
* Return WSDL of LiveDocx web service
372371
*
373-
* @return Zend_Service_LiveDocx
372+
* @return string
374373
* @since LiveDocx 1.0
375374
*/
376375
public function getWsdl()

0 commit comments

Comments
 (0)