Skip to content
This repository has been archived by the owner on May 16, 2018. It is now read-only.

Commit

Permalink
Merge pull request #1 from zendframework/master
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
erdraug committed Oct 21, 2015
2 parents d4887a0 + 5575e3e commit f2d3686
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ services:
- memcached

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

Expand Down
9 changes: 4 additions & 5 deletions library/Zend/Service/LiveDocx.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class Zend_Service_LiveDocx
* {/code}
*
* @param array|Zend_Config $options
* @return void
* @throws Zend_Service_LiveDocx_Exception
* @since LiveDocx 1.0
*/
Expand Down Expand Up @@ -221,9 +220,6 @@ public function setSoapClient(Zend_Soap_Client $soapClient)
/**
* Log in to LiveDocx service
*
* @param string $username
* @param string $password
*
* @throws Zend_Service_LiveDocx_Exception
* @return boolean
* @since LiveDocx 1.2
Expand Down Expand Up @@ -304,6 +300,7 @@ public function isLoggedIn()
/**
* Set username
*
* @param string $username
* @return Zend_Service_LiveDocx
* @since LiveDocx 1.0
*/
Expand All @@ -316,6 +313,7 @@ public function setUsername($username)
/**
* Set password
*
* @param string $password
* @return Zend_Service_LiveDocx
* @since LiveDocx 1.0
*/
Expand All @@ -328,6 +326,7 @@ public function setPassword($password)
/**
* Set WSDL of LiveDocx web service
*
* @param string $wsdl
* @return Zend_Service_LiveDocx
* @since LiveDocx 1.0
*/
Expand Down Expand Up @@ -370,7 +369,7 @@ public function getPassword()
/**
* Return WSDL of LiveDocx web service
*
* @return Zend_Service_LiveDocx
* @return string
* @since LiveDocx 1.0
*/
public function getWsdl()
Expand Down

0 comments on commit f2d3686

Please sign in to comment.