Bring milestones/exceptions up-to-date with zf2/master

Merge branch 'zf2/master' into milestones/exceptions Conflicts: library/Zend/Amf/Parser/TypeLoader.php library/Zend/Amf/Server.php library/Zend/Application/AbstractBootstrap.php library/Zend/File/Transfer/Adapter/AbstractAdapter.php library/Zend/Filter/Inflector.php library/Zend/Filter/InputFilter.php library/Zend/Filter/StaticFilter.php library/Zend/Form/Element.php library/Zend/Form/Element/File.php library/Zend/InfoCard/XML/Security/Transform/Exception.php library/Zend/Navigation/Page/Mvc.php library/Zend/Paginator/Paginator.php library/Zend/Search/Lucene/Document/Exception.php library/Zend/Serializer/Adapter/Amf0.php library/Zend/Serializer/Adapter/Amf3.php library/Zend/Serializer/Exception.php library/Zend/Serializer/Serializer.php library/Zend/Service/Amazon/Ec2/AbstractService.php library/Zend/Tag/Cloud.php library/Zend/Tag/Cloud/Decorator/Exception.php library/Zend/Tag/Cloud/Decorator/HtmlTag.php library/Zend/Test/PHPUnit/ControllerTestCase.php library/Zend/Validator/StaticValidator.php library/Zend/Wildfire/Protocol/Exception.php library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php tests/Zend/Application/AbstractBootstrapTest.php tests/Zend/Filter/InputTest.php tests/Zend/Filter/StaticFilterTest.php tests/Zend/Form/ElementTest.php tests/Zend/Form/FormTest.php tests/Zend/Paginator/PaginatorTest.php tests/Zend/Serializer/SerializerTest.php tests/Zend/Tag/Cloud/CloudTest.php tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php tests/Zend/Translate/Adapter/XmlTmTest.php
zendframework · Oct 30, 2010 · 58956c7 · 58956c7
10 parents 7624c04 + cfbc839 + 49e4d7c + ff81391 + 21cca29 + f0671be + 7c4ff71 + 98d530a + 8d88cc5 + 00e3a5a
commit 58956c7
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 8 deletions.
diff --git a/src/Css2Xpath.php b/src/Css2Xpath.php
@@ -30,7 +30,6 @@
  * @subpackage Query
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class Css2Xpath
 {

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Dom
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -16,7 +16,6 @@
  * @package    Zend_Dom
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/NodeList.php b/src/NodeList.php
@@ -32,7 +32,6 @@
  * @subpackage Query
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class NodeList implements \Iterator,\Countable
 {

diff --git a/src/Query.php b/src/Query.php
@@ -16,7 +16,6 @@
  * @package    Zend_Dom
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/Css2XpathTest.php b/test/Css2XpathTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/NodeListTest.php b/test/NodeListTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/QueryTest.php b/test/QueryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**