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

Commit

Permalink
Merge branch 'ZF2-257' of https://github.com/dbstephenson/zf2 into ho…
Browse files Browse the repository at this point in the history 
…tfix/zf2-257
  • Loading branch information
@weierophinney
weierophinney committed Apr 9, 2012
56 parents 86d63c0 + 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 + 6f6b0e9 commit 25f3e05
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -23,11 +23,11 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException
extends \InvalidArgumentException
implements \Zend\Config\Exception
{
}
}
4 changes: 2 additions & 2 deletions src/Exception/RuntimeException.php
View file
Expand Up @@ -23,11 +23,11 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RuntimeException
extends \RuntimeException
implements \Zend\Config\Exception
{
}
}
2 changes: 1 addition & 1 deletion src/Factory.php
View file
Expand Up @@ -27,7 +27,7 @@
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Factory
Expand Down
2 changes: 1 addition & 1 deletion src/Processor.php
View file
Expand Up @@ -23,7 +23,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Processor
Expand Down
2 changes: 1 addition & 1 deletion src/Processor/Constant.php
View file
Expand Up @@ -30,7 +30,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Constant extends Token implements Processor
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Filter.php
View file
Expand Up @@ -30,7 +30,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Filter implements Processor
Expand Down Expand Up @@ -103,4 +103,4 @@ public function processValue($value)
{
return $this->filter->filter($value);
}
}
}
2 changes: 1 addition & 1 deletion src/Processor/Queue.php
View file
Expand Up @@ -28,7 +28,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Queue extends PriorityQueue implements Processor
Expand Down
4 changes: 2 additions & 2 deletions src/Processor/Token.php
View file
Expand Up @@ -29,7 +29,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Token implements Processor
Expand Down Expand Up @@ -247,4 +247,4 @@ public function processValue($value)
$values = array_values($this->map);
return str_replace($keys, $values, $value);
}
}
}
2 changes: 1 addition & 1 deletion src/Processor/Translator.php
View file
Expand Up @@ -31,7 +31,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Translator implements Processor
Expand Down
2 changes: 1 addition & 1 deletion src/Reader.php
View file
Expand Up @@ -23,7 +23,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Reader
Expand Down
2 changes: 1 addition & 1 deletion src/Reader/Ini.php
View file
Expand Up @@ -30,7 +30,7 @@
* @category Zend
* @package Zend_Config
* @subpackage Reader
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Ini implements Reader
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Json.php
View file
Expand Up @@ -31,7 +31,7 @@
* @category Zend
* @package Zend_Config
* @subpackage Reader
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Json implements Reader
Expand Down Expand Up @@ -110,4 +110,4 @@ protected function process(array $data) {
}
return $data;
}
}
}
2 changes: 1 addition & 1 deletion src/Reader/Xml.php
View file
Expand Up @@ -31,7 +31,7 @@
* @category Zend
* @package Zend_Config
* @subpackage Reader
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Xml implements Reader
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Yaml.php
View file
Expand Up @@ -30,7 +30,7 @@
* @category Zend
* @package Zend_Config
* @subpackage Reader
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Yaml implements Reader
Expand Down Expand Up @@ -157,4 +157,4 @@ protected function process(array $data) {
}
return $data;
}
}
}
2 changes: 1 addition & 1 deletion src/Writer.php
View file
Expand Up @@ -23,7 +23,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Writer
Expand Down
2 changes: 1 addition & 1 deletion test/FactoryTest.php
View file
Expand Up @@ -27,7 +27,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
2 changes: 1 addition & 1 deletion test/ProcessorTest.php
View file
Expand Up @@ -37,7 +37,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Reader/AbstractReaderTestCase.php
View file
Expand Up @@ -29,7 +29,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Reader/IniTest.php
View file
Expand Up @@ -27,7 +27,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Reader/JsonTest.php
View file
Expand Up @@ -27,7 +27,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
4 changes: 2 additions & 2 deletions test/Reader/XmlTest.php
View file
Expand Up @@ -27,7 +27,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down Expand Up @@ -86,4 +86,4 @@ public function testInvalidString()
$this->setExpectedException('Zend\Config\Exception\RuntimeException');
$arrayXml = $this->reader->fromString($xml);
}
}
}
2 changes: 1 addition & 1 deletion test/Reader/YamlTest.php
View file
Expand Up @@ -27,7 +27,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Writer/AbstractWriterTestCase.php
View file
Expand Up @@ -28,7 +28,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Writer/PhpArrayTest.php
View file
Expand Up @@ -29,7 +29,7 @@
* @category Zend
* @package Zend_Config
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Config
*/
Expand Down

0 comments on commit 25f3e05

Please sign in to comment.