Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/docblock-simplification' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 21, 2013
130 parents b8939bd + 1c82c93 + 1b48124 + 6a22f1e + f66fb69 + 65e3dc5 + 893db4e + 1f95227 + 37eba61 + a8a134d + 2a58e81 + c687156 + ff43991 + bad6a8b + aba47b0 + 955d97a + 2b78fdc + 0094c19 + 4985e6d + d904244 + 52367d8 + dce778a + 2305c94 + 052b9a4 + ef11064 + 4efb47c + b3dcf28 + 778fbea + cdde9b4 + 6ade9b9 + 435888b + 2ad89a8 + e232251 + 5932189 + d0360d2 + 52242e5 + 3804b57 + 1cecc58 + 4a4065c + f9b61b5 + 0a07b63 + 0e321e0 + 95ceb90 + 4380d08 + ec9c36c + 4de92b2 + b6eb950 + fca746d + ff69119 + 5351804 + 3617ea6 + 24c8a1f + 0aa6c03 + b24267c + beadb3c + 51c4ced + d92ccc9 + eb1f131 + f383de1 + abc631a + 666ec86 + e22a167 + bb8b8f6 + b55f760 + f23a913 + 9ba9f17 + d01f94f + 9c4e0cc + 63c4a7e + 9eedf95 + 980bffb + 03cf7b3 + 8bbf35d + aff3454 + 1c6567c + a102513 + 90b7795 + 286539e + 7f08291 + 417d368 + ae0f13d + 7894420 + 8ff1b30 + 55ca16f + 0c6cb6c + 7010e32 + 745a36a + f021693 + cd91ba2 + 5586879 + 1cd9259 + b611b41 + e07e054 + 7657d67 + 52b6014 + 00211c2 + 0d594de + f919c63 + 7e217f4 + 3e0da00 + 3723e41 + facd3ee + 4d8294f + 3cdb12a + f09df31 + 34e6a86 + 4e1b451 + 2d3566a + ef9466a + 3c172af + 2260c5e + dd964bc + f325c01 + 3cd4478 + dc3a58e + cf0af6f + 6e93d7b + 6b3eedb + ce63e39 + 1bd656e + cc16778 + 720b563 + b63de1e + 770056f + 88022d1 + 039e86a + b27a1fe + 56e7a3b + 9e9a6cb + b32c347 commit 82f2194
Show file tree
Hide file tree
Showing 25 changed files with 0 additions and 104 deletions.
4 changes: 0 additions & 4 deletions src/AbstractManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session;
Expand All @@ -19,9 +18,6 @@
* Base ManagerInterface implementation
*
* Defines common constructor logic and getters for Storage and Configuration
*
* @category Zend
* @package Zend_Session
*/
abstract class AbstractManager implements Manager
{
Expand Down
4 changes: 0 additions & 4 deletions src/Config/ConfigInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Config;

/**
* Standard session configuration
*
* @category Zend
* @package Zend_Session
*/
interface ConfigInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Config/SessionConfig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Config;
Expand All @@ -14,10 +13,6 @@

/**
* Session configuration proxying to session INI options
*
* @category Zend
* @package Zend_Session
* @subpackage Configuration
*/
class SessionConfig extends StandardConfig
{
Expand Down
5 changes: 0 additions & 5 deletions src/Config/StandardConfig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Config;
Expand All @@ -17,10 +16,6 @@

/**
* Standard session configuration
*
* @category Zend
* @package Zend_Session
* @subpackage Configuration
*/
class StandardConfig implements ConfigInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Container.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session;
Expand All @@ -22,9 +21,6 @@
* may have their own expiries, or even expiries per key in the container.
* Additionally, expiries may be absolute TTLs or measured in "hops", which
* are based on how many times the key or container were accessed.
*
* @category Zend
* @package Zend_Session
*/
class Container extends ArrayObject
{
Expand Down
1 change: 0 additions & 1 deletion src/Exception/BadMethodCallException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Exception;
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Exception;

/**
* Zend_Session_Exception
*
* @category Zend
* @package Zend_Session
*/
interface ExceptionInterface
{}
1 change: 0 additions & 1 deletion src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Exception;
Expand Down
1 change: 0 additions & 1 deletion src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Exception;
Expand Down
4 changes: 0 additions & 4 deletions src/ManagerInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session;
Expand All @@ -17,9 +16,6 @@

/**
* Session manager interface
*
* @category Zend
* @package Zend_Session
*/
interface ManagerInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/SaveHandler/Cache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\SaveHandler;
Expand All @@ -15,10 +14,6 @@

/**
* Cache session save handler
*
* @category Zend
* @package Zend_Session
* @subpackage SaveHandler
*/
class Cache implements SaveHandlerInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/SaveHandler/DbTableGateway.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\SaveHandler;
Expand All @@ -14,10 +13,6 @@

/**
* DB Table Gateway session save handler
*
* @category Zend
* @package Zend_Session
* @subpackage SaveHandler
*/
class DbTableGateway implements SaveHandlerInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/SaveHandler/DbTableGatewayOptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\SaveHandler;
Expand All @@ -15,10 +14,6 @@

/**
* DbTableGateway Save Handler Options
*
* @category Zend
* @package Zend_Session
* @subpackage SaveHandler
*/
class DbTableGatewayOptions extends AbstractOptions
{
Expand Down
5 changes: 0 additions & 5 deletions src/SaveHandler/MongoDB.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\SaveHandler;
Expand All @@ -17,10 +16,6 @@

/**
* MongoDB session save handler
*
* @category Zend
* @package Zend_Session
* @subpackage SaveHandler
*/
class MongoDB implements SaveHandlerInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/SaveHandler/MongoDBOptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\SaveHandler;
Expand All @@ -16,10 +15,6 @@

/**
* MongoDB session save handler Options
*
* @category Zend
* @package Zend_Session
* @subpackage SaveHandler
*/
class MongoDBOptions extends AbstractOptions
{
Expand Down
3 changes: 0 additions & 3 deletions src/SaveHandler/SaveHandlerInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\SaveHandler;

/**
* SaveHandler Interface
*
* @category Zend
* @package Zend_Session
* @see http://php.net/session_set_save_handler
*/
interface SaveHandlerInterface
Expand Down
4 changes: 0 additions & 4 deletions src/SessionManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session;
Expand All @@ -14,9 +13,6 @@

/**
* Session ManagerInterface implementation utilizing ext/session
*
* @category Zend
* @package Zend_Session
*/
class SessionManager extends AbstractManager
{
Expand Down
5 changes: 0 additions & 5 deletions src/Storage/ArrayStorage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Storage;
Expand All @@ -18,10 +17,6 @@
*
* Defines an ArrayObject interface for accessing session storage, with options
* for setting metadata, locking, and marking as isImmutable.
*
* @category Zend
* @package Zend_Session
* @subpackage Storage
*/
class ArrayStorage extends ArrayObject implements StorageInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Storage/SessionArrayStorage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Storage;
Expand All @@ -20,10 +19,6 @@
*
* Replaces the $_SESSION superglobal with an ArrayObject that allows for
* property access, metadata storage, locking, and immutability.
*
* @category Zend
* @package Zend_Session
* @subpackage Storage
*/
class SessionArrayStorage implements IteratorAggregate, StorageInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Storage/SessionStorage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Storage;
Expand All @@ -17,10 +16,6 @@
*
* Replaces the $_SESSION superglobal with an ArrayObject that allows for
* property access, metadata storage, locking, and immutability.
*
* @category Zend
* @package Zend_Session
* @subpackage Storage
*/
class SessionStorage extends ArrayStorage
{
Expand Down
4 changes: 0 additions & 4 deletions src/Storage/StorageInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Storage;
Expand All @@ -20,9 +19,6 @@
*
* Defines the minimum requirements for handling userland, in-script session
* storage (e.g., the $_SESSION superglobal array).
*
* @category Zend
* @package Zend_Session
*/
interface StorageInterface extends Traversable, ArrayAccess, Serializable, Countable
{
Expand Down
6 changes: 0 additions & 6 deletions src/Validator/HttpUserAgent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Validator;

/**
* @category Zend
* @package Zend_Session
* @subpackage Validator
*/
class HttpUserAgent implements ValidatorInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Validator/RemoteAddr.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Session
*/

namespace Zend\Session\Validator;

use Zend\Http\PhpEnvironment\RemoteAddress;
use Zend\Session\Validator\ValidatorInterface as SessionValidator;

/**
* @category Zend
* @package Zend_Session
* @subpackage Validator
*/
class RemoteAddr implements SessionValidator
{
/**
Expand Down
Loading

0 comments on commit 82f2194

Please sign in to comment.