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

Commit

Permalink
Bring milestones/exceptions up-to-date with zf2/master
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@weierophinney
weierophinney committed Oct 30, 2010
8 parents c6443c0 + 0a9c731 + 2fdcee4 + 147c99e + d77655e + a6925eb + 81c945c + 4682ed8 commit 9fceeb6
Show file tree
Hide file tree
Showing 49 changed files with 0 additions and 49 deletions.
1 change: 0 additions & 1 deletion src/Barcode.php
View file
Expand Up @@ -16,7 +16,6 @@
* @package Zend_Barcode
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/BarcodeObject.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/BarcodeRenderer.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Renderer
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Exception.php
View file
Expand Up @@ -16,7 +16,6 @@
* @package Zend_Barcode
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/AbstractObject.php
View file
Expand Up @@ -18,7 +18,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Code25.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Code25interleaved.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Code39.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Ean13.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Ean2.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Ean5.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Ean8.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Error.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Exception.php
View file
Expand Up @@ -16,7 +16,6 @@
* @package Zend_Barcode
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Identcode.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Itf14.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Leitcode.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Planet.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Postnet.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Royalmail.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Upca.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Object/Upce.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Object
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Renderer/AbstractRenderer.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Renderer
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Renderer/Exception.php
View file
Expand Up @@ -16,7 +16,6 @@
* @package Zend_Barcode
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Renderer/Image.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Renderer
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Renderer/Pdf.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Renderer
* @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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion src/Renderer/Svg.php
View file
Expand Up @@ -17,7 +17,6 @@
* @subpackage Renderer
* @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: Image.php 20366 2010-01-18 03:56:52Z ralph $
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/FactoryTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Code25Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Code25interleavedTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Code39Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Ean13Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Ean2Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Ean5Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Ean8Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/ErrorTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/IdentcodeTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/Itf14Test.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/LeitcodeTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/PlanetTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/PostnetTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/RoyalmailTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/TestCommon.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/UpcaTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Object/UpceTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Renderer/ImageTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Renderer/PdfTest.php
View file
Expand Up @@ -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$
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Renderer/SvgTest.php
View file
Expand Up @@ -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: SvgTest.php 20096 2010-01-06 02:05:09Z bkarwin $
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Renderer/TestCommon.php
View file
Expand Up @@ -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$
*/

/**
Expand Down

0 comments on commit 9fceeb6

Please sign in to comment.