From d76cdbed13cd8772bed40d327b2894715f966c7b Mon Sep 17 00:00:00 2001 From: Niels de Blaauw Date: Wed, 13 Mar 2019 11:44:08 +0100 Subject: Fixes #33, fixes a couple of return type issues --- .../Postman-Configuration/PostmanConfigurationController.php | 4 ++-- Postman/Postman-Configuration/PostmanSmtpDiscovery.php | 4 ++-- Postman/Postman-Connectivity-Test/Postman-PortTest.php | 4 ++-- .../Postman-Mail/PostmanGmailApiModuleZendMailTransport.php | 4 ++-- Postman/Postman-Mail/PostmanTransportRegistry.php | 4 ++-- Postman/PostmanUtils.php | 10 +++++----- Postman/PostmanWpMailBinder.php | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Postman/Postman-Configuration/PostmanConfigurationController.php b/Postman/Postman-Configuration/PostmanConfigurationController.php index 612ec27..fa8f06d 100644 --- a/Postman/Postman-Configuration/PostmanConfigurationController.php +++ b/Postman/Postman-Configuration/PostmanConfigurationController.php @@ -758,11 +758,11 @@ class PostmanManageConfigurationAjaxHandler extends PostmanAbstractAjaxHandler { /** * - * @param PostmanSocket $socket + * @param PostmanWizardSocket $socket * @param mixed $userSocketOverride * @param mixed $userAuthOverride * @param mixed $originalSmtpServer - * @return Ambigous + * @return mixed */ private function getWin( PostmanWizardSocket $socket, $userSocketOverride, $userAuthOverride, $originalSmtpServer ) { static $recommendationPriority = - 1; diff --git a/Postman/Postman-Configuration/PostmanSmtpDiscovery.php b/Postman/Postman-Configuration/PostmanSmtpDiscovery.php index 90777d5..44da3bb 100644 --- a/Postman/Postman-Configuration/PostmanSmtpDiscovery.php +++ b/Postman/Postman-Configuration/PostmanSmtpDiscovery.php @@ -137,8 +137,8 @@ if (! class_exists ( 'PostmanSmtpDiscovery' )) { } /** * - * @param mixed $email - * @return Ambigous + * @param mixed $email + * @return string|bool */ private function validateEmail($email) { return PostmanUtils::validateEmail ( $email ); diff --git a/Postman/Postman-Connectivity-Test/Postman-PortTest.php b/Postman/Postman-Connectivity-Test/Postman-PortTest.php index d92b743..91d18f1 100644 --- a/Postman/Postman-Connectivity-Test/Postman-PortTest.php +++ b/Postman/Postman-Connectivity-Test/Postman-PortTest.php @@ -50,8 +50,8 @@ class PostmanPortTest { /** * Wrap the regDomain/getRegisteredDomain function * - * @param mixed $domain - * @return mixed|Ambigous + * @param mixed $domain + * @return mixed */ private function getRegisteredDomain($hostname) { $registeredDomain = getRegisteredDomain ( $hostname ); diff --git a/Postman/Postman-Mail/PostmanGmailApiModuleZendMailTransport.php b/Postman/Postman-Mail/PostmanGmailApiModuleZendMailTransport.php index 3cb05c9..544d5fb 100644 --- a/Postman/Postman-Mail/PostmanGmailApiModuleZendMailTransport.php +++ b/Postman/Postman-Mail/PostmanGmailApiModuleZendMailTransport.php @@ -112,7 +112,7 @@ if (! class_exists ( 'PostmanGmailApiModuleZendMailTransport' )) { * * @param string $host * OPTIONAL (Default: 127.0.0.1) - * @param array|null $config + * @param array $config * OPTIONAL (Default: null) * @return void * @@ -165,7 +165,7 @@ if (! class_exists ( 'PostmanGmailApiModuleZendMailTransport' )) { /** * Gets the connection protocol instance * - * @return Postman_Zend_Mail_Protocol|null + * @return Postman_Zend_Mail_Protocol_Abstract|null */ public function getConnection() { return $this->_connection; diff --git a/Postman/Postman-Mail/PostmanTransportRegistry.php b/Postman/Postman-Mail/PostmanTransportRegistry.php index 17b8eb6..5af2493 100644 --- a/Postman/Postman-Mail/PostmanTransportRegistry.php +++ b/Postman/Postman-Mail/PostmanTransportRegistry.php @@ -71,7 +71,7 @@ class PostmanTransportRegistry { /** * Retrieve the transport Postman is currently configured with. * - * @return PostmanDummyTransport|PostmanModuleTransport + * @return PostmanModuleTransport * @deprecated */ public function getCurrentTransport() { @@ -105,7 +105,7 @@ class PostmanTransportRegistry { /** * Retrieve the transport Postman is currently configured with. * - * @return PostmanDummyTransport|PostmanModuleTransport + * @return PostmanModuleTransport */ public function getSelectedTransport() { $selectedTransport = PostmanOptions::getInstance()->getTransportType(); diff --git a/Postman/PostmanUtils.php b/Postman/PostmanUtils.php index 226e6a9..5b42270 100644 --- a/Postman/PostmanUtils.php +++ b/Postman/PostmanUtils.php @@ -100,7 +100,7 @@ class PostmanUtils { * Detect if the host is NOT a domain name * * @param mixed $ipAddress - * @return number + * @return bool */ public static function isHostAddressNotADomainName( $host ) { // IPv4 / IPv6 test from http://stackoverflow.com/a/17871737/4368109 @@ -117,7 +117,7 @@ class PostmanUtils { * * @param mixed $url * @param mixed $args - * @return the HTML body + * @return string the HTML body */ static function remotePostGetBodyOnly( $url, $parameters, array $headers = array() ) { $response = PostmanUtils::remotePost( $url, $parameters, $headers ); @@ -132,7 +132,7 @@ class PostmanUtils { * * @param mixed $url * @param mixed $args - * @return the HTTP response + * @return array|WP_Error the HTTP response */ static function remotePost( $url, $parameters = array(), array $headers = array() ) { $args = array( @@ -325,7 +325,7 @@ class PostmanUtils { * Validate an e-mail address * * @param mixed $email - * @return number + * @return string|bool */ static function validateEmail( $email ) { if ( PostmanOptions::getInstance()->isEmailValidationDisabled() ) { @@ -364,7 +364,7 @@ class PostmanUtils { /** * - * @return Ambigous + * @return string|mixed */ static function postmanGetServerName() { if ( ! empty( $_SERVER ['SERVER_NAME'] ) ) { diff --git a/Postman/PostmanWpMailBinder.php b/Postman/PostmanWpMailBinder.php index b0be8f4..dc5ea28 100644 --- a/Postman/PostmanWpMailBinder.php +++ b/Postman/PostmanWpMailBinder.php @@ -26,7 +26,7 @@ if (! class_exists ( 'PostmanWpMailBinder' )) { /** * Return the Singleton instance * - * @return Ambigous + * @return PostmanWpMailBinder */ public static function getInstance() { static $inst = null; -- cgit v1.2.3