From: Gunnar Wrobel Date: Wed, 28 Oct 2009 21:58:43 +0000 (+0100) Subject: phpdoc, CS X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=60dc4ba165106be8d7f94208d5007798b81b0e2d;p=horde.git phpdoc, CS --- diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php index c0e2c62b1..1ebe6f5c2 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php @@ -106,11 +106,11 @@ class Horde_Kolab_Session_Base implements Horde_Kolab_Session /** * Constructor. * - * @param string $user The session will be setup for the user - * with this ID. - * @param Horde_Kolab_Server $server The connection to the Kolab user - * database. - * @param array $params Kolab configuration settings. + * @param string $user_id The session will be setup for the user + * with this ID. + * @param Horde_Kolab_Server $server The connection to the Kolab user + * database. + * @param array $params Kolab configuration settings. */ public function __construct( $user_id, diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory.php index 5a8df0363..3dca47c3a 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory.php @@ -71,7 +71,11 @@ interface Horde_Kolab_Session_Factory /** * Validate the given session. * - * @param string $user The session will be validated for this user ID. + * Validate the given session. + * + * @param Horde_Kolab_Session $session The session to validate. + * @param string $user The session will be validated for + * this user ID. * * @return boolean True if the given session is valid. */ @@ -90,8 +94,7 @@ interface Horde_Kolab_Session_Factory * Returns either a reference to a session handler with data retrieved from * the session or a new session handler. * - * @param string $user The session will be setup for the user - * with this ID. + * @param string $user The session will be setup for the user with this ID. * * @return Horde_Kolab_Session The concrete Kolab session reference. */ diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Anonymous.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Anonymous.php index 109e914b3..9f8be47b9 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Anonymous.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Anonymous.php @@ -110,6 +110,9 @@ implements Horde_Kolab_Session_Factory /** * Return the session validation driver. * + * @param Horde_Kolab_Session $session The session to validate. + * @param Horde_Kolab_Session_Auth $auth The auth handler. + * * @return Horde_Kolab_Session_Valid The driver for validating sessions. */ public function getSessionValidator( @@ -122,7 +125,9 @@ implements Horde_Kolab_Session_Factory /** * Validate the given session. * - * @param string $user The session will be validated for this user ID. + * @param Horde_Kolab_Session $session The session to validate. + * @param string $user The session will be validated for + * this user ID. * * @return boolean True if thxe given session is valid. */ @@ -153,8 +158,7 @@ implements Horde_Kolab_Session_Factory * Returns either a reference to a session handler with data retrieved from * the session or a new session handler. * - * @param string $user The session will be setup for the user - * with this ID. + * @param string $user The session will be setup for the user with this ID. * * @return Horde_Kolab_Session The concrete Kolab session reference. */ diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Base.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Base.php index b9f9ea8fc..309357e10 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Base.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Base.php @@ -33,6 +33,9 @@ implements Horde_Kolab_Session_Factory /** * Return the session validation driver. * + * @param Horde_Kolab_Session $session The session to validate. + * @param Horde_Kolab_Session_Auth $auth The auth handler. + * * @return Horde_Kolab_Session_Valid The driver for validating sessions. */ public function getSessionValidator( diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Configuration.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Configuration.php index 382f337e9..00e1825eb 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Configuration.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Configuration.php @@ -76,7 +76,8 @@ implements Horde_Kolab_Session_Factory } if (isset($config['session']['anonymous']['user']) - && isset($config['session']['anonymous']['pass'])) { + && isset($config['session']['anonymous']['pass']) + ) { $factory = new Horde_Kolab_Session_Factory_Anonymous( $factory, $config['session']['anonymous']['user'], @@ -130,6 +131,9 @@ implements Horde_Kolab_Session_Factory /** * Return the session validation driver. * + * @param Horde_Kolab_Session $session The session to validate. + * @param Horde_Kolab_Session_Auth $auth The auth handler. + * * @return Horde_Kolab_Session_Valid The driver for validating sessions. */ public function getSessionValidator( @@ -142,7 +146,9 @@ implements Horde_Kolab_Session_Factory /** * Validate the given session. * - * @param string $user The session will be validated for this user ID. + * @param Horde_Kolab_Session $session The session to validate. + * @param string $user The session will be validated for + * this user ID. * * @return boolean True if the given session is valid. */ @@ -167,8 +173,7 @@ implements Horde_Kolab_Session_Factory * Returns either a reference to a session handler with data retrieved from * the session or a new session handler. * - * @param string $user The session will be setup for the user - * with this ID. + * @param string $user The session will be setup for the user with this ID. * * @return Horde_Kolab_Session The concrete Kolab session reference. */ diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Injector.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Injector.php index 161919de9..927ba2459 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Injector.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Injector.php @@ -128,7 +128,7 @@ extends Horde_Kolab_Session_Factory_Base * definition. This should usually be done by an external setup method * before constructing the session injcetion factory. * - * @parm Horde_Injector + * @param Horde_Injector $injector The injector to seed with the mock configuration. * * @return NULL */ diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Logged.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Logged.php index e69087bb2..513d92eb9 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Logged.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Logged.php @@ -97,6 +97,9 @@ implements Horde_Kolab_Session_Factory /** * Return the session validation driver. * + * @param Horde_Kolab_Session $session The session to validate. + * @param Horde_Kolab_Session_Auth $auth The auth handler. + * * @return Horde_Kolab_Session_Valid The driver for validating sessions. */ public function getSessionValidator( @@ -111,7 +114,9 @@ implements Horde_Kolab_Session_Factory /** * Validate the given session. * - * @param string $user The session will be validated for this user ID. + * @param Horde_Kolab_Session $session The session to validate. + * @param string $user The session will be validated for + * this user ID. * * @return boolean True if thxe given session is valid. */ @@ -138,8 +143,7 @@ implements Horde_Kolab_Session_Factory * Returns either a reference to a session handler with data retrieved from * the session or a new session handler. * - * @param string $user The session will be setup for the user - * with this ID. + * @param string $user The session will be setup for the user with this ID. * * @return Horde_Kolab_Session The concrete Kolab session reference. */ diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Logged.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Logged.php index a21b88af6..bb0f70380 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Logged.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Logged.php @@ -71,7 +71,8 @@ class Horde_Kolab_Session_Valid_Logged implements Horde_Kolab_Session_Valid if ($result === false) { $this->_logger->info( sprintf( - "Invalid Kolab session for current user \"%s\", requested user \"%s\" and stored user \"%s\".", + "Invalid Kolab session for current user \"%s\", requested" + . " user \"%s\" and stored user \"%s\".", $this->_valid->getAuth()->getCurrentUser(), $user, $this->_valid->getSession()->getMail() diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/BaseTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/BaseTest.php index e7c81a16b..823f0c23c 100644 --- a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/BaseTest.php +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/BaseTest.php @@ -196,7 +196,8 @@ class Horde_Kolab_Session_Class_BaseTest extends Horde_Kolab_Session_SessionTest '_imap_server', '_freebusy_server', '_storage_params', - ), $session->__sleep()); + ), $session->__sleep() + ); } public function testMethodGetidHasResultStringTheIdOfTheUserUserUsedForConnecting()