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 · 239f3d3 · 239f3d3
9 parents d106f99 + 85a1daf + 6cfcb06 + 1bd47d3 + 83975c8 + cf20e25 + 926bdec + dd03435 + f92f0a5
commit 239f3d3
Show file tree

Hide file tree

Showing 32 changed files with 0 additions and 32 deletions.
diff --git a/src/AbstractServer.php b/src/AbstractServer.php
@@ -38,7 +38,6 @@
  * @package    Zend_Server
  * @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$
  */
 abstract class AbstractServer implements Server
 {

diff --git a/src/Cache.php b/src/Cache.php
@@ -16,7 +16,6 @@
  * @package    Zend_Server
  * @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/Definition.php b/src/Definition.php
@@ -16,7 +16,6 @@
  * @package    Zend_Server
  * @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.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Server
  * @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/Method/Callback.php b/src/Method/Callback.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Method
  * @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/Method/Definition.php b/src/Method/Definition.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Method
  * @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/Method/Parameter.php b/src/Method/Parameter.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Method
  * @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/Method/Prototype.php b/src/Method/Prototype.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Method
  * @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/Reflection/AbstractFunction.php b/src/Reflection/AbstractFunction.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/Exception.php b/src/Reflection/Exception.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/Node.php b/src/Reflection/Node.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/Prototype.php b/src/Reflection/Prototype.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/Reflection.php b/src/Reflection/Reflection.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/ReflectionFunction.php b/src/Reflection/ReflectionFunction.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/ReflectionMethod.php b/src/Reflection/ReflectionMethod.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/ReflectionParameter.php b/src/Reflection/ReflectionParameter.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Reflection/ReflectionReturnValue.php b/src/Reflection/ReflectionReturnValue.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Server_Reflection
  * @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/Server.php b/src/Server.php
@@ -16,7 +16,6 @@
  * @package    Zend_Server
  * @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/DefinitionTest.php b/test/DefinitionTest.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/Method/CallbackTest.php b/test/Method/CallbackTest.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/Method/DefinitionTest.php b/test/Method/DefinitionTest.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/Method/ParameterTest.php b/test/Method/ParameterTest.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/Method/PrototypeTest.php b/test/Method/PrototypeTest.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/Reflection/NodeTest.php b/test/Reflection/NodeTest.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/Reflection/PrototypeTest.php b/test/Reflection/PrototypeTest.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/Reflection/ReflectionClassTest.php b/test/Reflection/ReflectionClassTest.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/Reflection/ReflectionFunctionTest.php b/test/Reflection/ReflectionFunctionTest.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/Reflection/ReflectionMethodTest.php b/test/Reflection/ReflectionMethodTest.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/Reflection/ReflectionParameterTest.php b/test/Reflection/ReflectionParameterTest.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/Reflection/ReflectionReturnValueTest.php b/test/Reflection/ReflectionReturnValueTest.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/ReflectionTest.php b/test/ReflectionTest.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$
  */
 
 /**