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

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
112 parents 12f1dca + 7b89f79 + 943d58e + c40b665 + 42ba32c + 1730b26 + 932edde + dc9b974 + 1a05b42 + 01cbd6f + fe46ab5 + 9442908 + 7a5a1b8 + 5e96208 + ac5855b + 3d91eec + b6038ed + 4ead487 + 314f415 + 0b54361 + d7353a4 + 31b63d7 + ec487e1 + ce398bb + 5b4137d + 8353126 + 1e8c7b8 + a5fd1c1 + 485628f + 4f2f689 + a44cce0 + 4a5aec0 + c931a3d + dbb4a85 + 61b2b6a + 66509ee + 7e24d5d + 01cfc3b + c0e12d0 + 5071c77 + f4c654e + 803ce88 + 11b33de + b45194c + a993356 + b58900f + 6f28391 + 80ebd20 + e572be4 + 2ce0c75 + 99c1db1 + 75447c2 + 4e63318 + 7f1db80 + 536bdd5 + 92c20ae + 67690dc + 75fad5c + 94f88dc + 9379d5a + 5f8209d + 1506bd8 + 0422a6e + 990f5f1 + 4798483 + a33ceb1 + 3787c5a + be1f78e + 944eef9 + aa16b4a + 24e6305 + f8d98c4 + 61cfbb8 + 96d0551 + acc2a46 + f70a8c2 + f70afcc + 493858c + eeacea8 + cecc8e5 + 59d9085 + 4c9c2fc + 50e8d8a + 7563fb1 + 6b50c1b + 914c8bd + e1d5120 + 8f7913e + 85b6a8e + 7cb373f + d917e2a + e375cf4 + f9b74b8 + 25e480d + aeffc49 + 3f8e166 + 99084c3 + aead0e9 + 02447d8 + 21c18f9 + 8860d1d + 431f220 + 67ec1da + d33b5ba + 011e4c8 + d728180 + 028a1ef + 0b023c0 + 98db888 + 8dd2f16 + 817fb7c + 9aaf514 commit 16acbbd
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 43 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
4 changes: 0 additions & 4 deletions src/Container/AbstractContainer.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_Memory
*/

namespace Zend\Memory\Container;

/**
* Memory value container
*
* @category Zend
* @package Zend_Memory
*/
abstract class AbstractContainer implements ContainerInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Container/AccessController.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_Memory
*/

namespace Zend\Memory\Container;
Expand All @@ -21,9 +20,6 @@
* out of scope or unset operation.
*
* Class also provides Zend\Memory\Container interface and works as proxy for such cases.
*
* @category Zend
* @package Zend_Memory
*/
class AccessController implements ContainerInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Container/ContainerInterface.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_Memory
*/

namespace Zend\Memory\Container;

/**
* Memory value container interface
*
* @category Zend
* @package Zend_Memory
*/
interface ContainerInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Container/Locked.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_Memory
*/

namespace Zend\Memory\Container;
Expand All @@ -14,9 +13,6 @@
* Memory value container
*
* Locked (always stored in memory).
*
* @category Zend
* @package Zend_Memory
*/
class Locked extends AbstractContainer
{
Expand Down
4 changes: 0 additions & 4 deletions src/Container/Movable.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_Memory
*/

namespace Zend\Memory\Container;
Expand All @@ -17,9 +16,6 @@
* Memory value container
*
* Movable (may be swapped with specified backend and unloaded).
*
* @category Zend
* @package Zend_Memory
*/
class Movable extends AbstractContainer
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
* @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_Memory
*/

namespace Zend\Memory\Exception;

/**
* @category Zend
* @package Zend_Memory
*/
interface ExceptionInterface
{}
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.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_Memory
*/

namespace Zend\Memory\Exception;

/**
* Exception for Zend_Memory component.
*
* @category Zend
* @package Zend_Memory
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/RuntimeException.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_Memory
*/

namespace Zend\Memory\Exception;

/**
* Exception for Zend_Memory component.
*
* @category Zend
* @package Zend_Memory
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/MemoryManager.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_Memory
*/

namespace Zend\Memory;
Expand All @@ -19,9 +18,6 @@
*
* This class encapsulates memory menagement operations, when PHP works
* in limited memory mode.
*
* @category Zend
* @package Zend_Memory
*/
class MemoryManager
{
Expand Down
4 changes: 0 additions & 4 deletions src/Value.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_Memory
*/

namespace Zend\Memory;
Expand All @@ -18,9 +17,6 @@
*
* It's an OO string wrapper.
* Used to intercept string updates.
*
* @category Zend
* @package Zend_Memory
*/
class Value implements ArrayAccess, Countable
{
Expand Down

0 comments on commit 16acbbd

Please sign in to comment.