Просмотр исходного кода

Merge pull request #1 from zendframework/master

Update
Komarov Alexey 10 лет назад
Родитель
Сommit
f2d368632a
2 измененных файлов с 5 добавлено и 5 удалено
  1. 1 0
      .travis.yml
  2. 4 5
      library/Zend/Service/LiveDocx.php

+ 1 - 0
.travis.yml

@@ -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
   

+ 4 - 5
library/Zend/Service/LiveDocx.php

@@ -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
      */
@@ -221,9 +220,6 @@ class Zend_Service_LiveDocx
     /**
      * Log in to LiveDocx service
      *
-     * @param string $username
-     * @param string $password
-     *
      * @throws Zend_Service_LiveDocx_Exception
      * @return boolean
      * @since  LiveDocx 1.2
@@ -304,6 +300,7 @@ class Zend_Service_LiveDocx
     /**
      * Set username
      *
+     * @param string $username
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
      */
@@ -316,6 +313,7 @@ class Zend_Service_LiveDocx
     /**
      * Set password
      *
+     * @param string $password
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
      */
@@ -328,6 +326,7 @@ class Zend_Service_LiveDocx
     /**
      * Set WSDL of LiveDocx web service
      *
+     * @param string $wsdl
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
      */
@@ -370,7 +369,7 @@ class Zend_Service_LiveDocx
     /**
      * Return WSDL of LiveDocx web service
      *
-     * @return Zend_Service_LiveDocx
+     * @return string
      * @since  LiveDocx 1.0
      */
     public function getWsdl()