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

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quoc Vu committed May 9, 2013
160 parents 5cdfa08 + 4925e55 + fb107e5 + 98634df + 8d23ab7 + 19e17a6 + 98ac67f + 0a2d51c + 86db540 + efbb513 + 24c143c + 307427e + 4c7a822 + 25d3bd7 + 40bfe7f + 70ca2ff + 76fd684 + 82cff31 + 186a39c + 39a35fe + b0c8193 + 1a7e426 + 09ea754 + 8317963 + 950705c + bd78289 + 25f3e05 + 1c0577b + 6bcfccb + 0b2a1a9 + 7974490 + f3ba45e + 4357e80 + 7d43d02 + 421a0f4 + e7aa329 + 6d05bfe + f27c5e2 + 6cb3b21 + 1ecb5ed + b66b0e2 + 0b91e40 + 6bda391 + b932fa5 + a431b75 + 9ce83ec + a35dff6 + 60e4965 + 0f071e9 + 3fe17b4 + 196ca18 + 17cbc64 + 8f4a51f + 88ec12d + 31ab35e + 59c83c4 + d50da4c + 01af50b + 6a46af5 + 4308adc + 1c3d629 + 18a268d + 1987408 + abc72db + 175f7ab + 8a85704 + 7706019 + cc5d38c + fbaa5aa + 0555415 + 20ae04b + 0680687 + e65301c + 424e30a + d36a7f1 + 64bb794 + c74649b + b14bb6b + 4e73e4e + 0ee93d0 + e887bfd + f66ad20 + 66c5ff2 + f5b2841 + 717175b + 52c5e49 + 8f39d69 + 2003fce + 1ccb3fd + 315a9ac + 2b82c0f + 1565409 + fd7399e + cb27129 + 62ca6c9 + 7b73995 + 18f93e0 + 72fe59b + 9f5b116 + 28a04a3 + b56ee4d + 9287e61 + 1a420ec + 6a43cc1 + ad11b96 + cf95523 + 25ef603 + 33b5707 + 0f253b5 + 644d22a + f3cba00 + e470732 + ae8cd95 + a4f21b6 + f36ff90 + 5344247 + 894f762 + c00c005 + 69fb7fc + 57cb4a0 + e25b09c + 17a7c5c + c526cd4 + 518ca6f + 57fa76c + 853c28f + 520cebc + dc5f609 + ccf1c7e + 251b79e + 78fbb55 + fcc04e7 + 9bf2948 + 9561532 + b614ad3 + 954a3b1 + dacc257 + 07a262d + 59c02c3 + 7064caa + 6f75739 + 747b7ed + eb24d30 + 8ff8298 + 97c61d8 + da4af46 + 11c9caf + cc11df8 + cd54577 + 298afbb + 24c5cf6 + fa546ac + 5e4d7a6 + cddbfdf + 7e73be1 + ecda841 + dc32703 + 9bb6302 + fee2498 + f827502 commit 4b8d9e1
Show file tree
Hide file tree
Showing 43 changed files with 361 additions and 205 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
}
},
"autoload-dev": {
Expand Down
38 changes: 18 additions & 20 deletions src/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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_Config
*/

namespace Zend\Config;
Expand All @@ -21,23 +20,20 @@
*
* Implements Countable, Iterator and ArrayAccess
* to facilitate easy access to the data.
*
* @category Zend
* @package Zend_Config
*/
class Config implements Countable, Iterator, ArrayAccess
{
/**
* Whether modifications to configuration data are allowed.
*
* @var boolean
* @var bool
*/
protected $allowModifications;

/**
* Number of elements in configuration data.
*
* @var integer
* @var int
*/
protected $count;

Expand All @@ -52,7 +48,7 @@ class Config implements Countable, Iterator, ArrayAccess
* Used when unsetting values during iteration to ensure we do not skip
* the next element.
*
* @var boolean
* @var bool
*/
protected $skipNextIteration;

Expand All @@ -63,15 +59,15 @@ class Config implements Countable, Iterator, ArrayAccess
* on construction.
*
* @param array $array
* @param boolean $allowModifications
* @param bool $allowModifications
*/
public function __construct(array $array, $allowModifications = false)
{
$this->allowModifications = (boolean) $allowModifications;
$this->allowModifications = (bool) $allowModifications;

foreach ($array as $key => $value) {
if (is_array($value)) {
$this->data[$key] = new self($value, $this->allowModifications);
$this->data[$key] = new static($value, $this->allowModifications);
} else {
$this->data[$key] = $value;
}
Expand Down Expand Up @@ -123,7 +119,7 @@ public function __set($name, $value)
if ($this->allowModifications) {

if (is_array($value)) {
$value = new self($value, true);
$value = new static($value, true);
}

if (null === $name) {
Expand Down Expand Up @@ -185,7 +181,7 @@ public function toArray()
* isset() overloading
*
* @param string $name
* @return boolean
* @return bool
*/
public function __isset($name)
{
Expand Down Expand Up @@ -214,7 +210,7 @@ public function __unset($name)
* count(): defined by Countable interface.
*
* @see Countable::count()
* @return integer
* @return int
*/
public function count()
{
Expand Down Expand Up @@ -276,7 +272,7 @@ public function rewind()
* valid(): defined by Iterator interface.
*
* @see Iterator::valid()
* @return boolean
* @return bool
*/
public function valid()
{
Expand All @@ -288,7 +284,7 @@ public function valid()
*
* @see ArrayAccess::offsetExists()
* @param mixed $offset
* @return boolean
* @return bool
*/
public function offsetExists($offset)
{
Expand Down Expand Up @@ -343,7 +339,7 @@ public function offsetUnset($offset)
* @param Config $merge
* @return Config
*/
public function merge(self $merge)
public function merge(Config $merge)
{
/** @var Config $value */
foreach ($merge as $key => $value) {
Expand All @@ -354,17 +350,19 @@ public function merge(self $merge)
$this->data[$key]->merge($value);
} else {
if ($value instanceof self) {
$this->data[$key] = new self($value->toArray(), $this->allowModifications);
$this->data[$key] = new static($value->toArray(), $this->allowModifications);
} else {
$this->data[$key] = $value;
}
}
} else {
if ($value instanceof self) {
$this->data[$key] = new self($value->toArray(), $this->allowModifications);
$this->data[$key] = new static($value->toArray(), $this->allowModifications);
} else {
$this->data[$key] = $value;
}

$this->count++;
}
}

Expand Down Expand Up @@ -394,7 +392,7 @@ public function setReadOnly()
/**
* Returns whether this Config object is read only or not.
*
* @return boolean
* @return bool
*/
public function isReadOnly()
{
Expand Down
8 changes: 1 addition & 7 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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_Config
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Exception
*/
interface ExceptionInterface
{}
8 changes: 1 addition & 7 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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_Config
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Exception
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{}
8 changes: 1 addition & 7 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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_Config
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Exception
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
Loading

0 comments on commit 4b8d9e1

Please sign in to comment.