diff --git a/library/Zend/Acl/Acl.php b/library/Zend/Acl/Acl.php index 06d57ee1a44..85af27275af 100644 --- a/library/Zend/Acl/Acl.php +++ b/library/Zend/Acl/Acl.php @@ -1,21 +1,11 @@ url . ' ' . $this->description . self::LINE_FEED; return $output; } diff --git a/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php b/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php index 7ca8130fd79..9b040180d60 100644 --- a/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php +++ b/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php @@ -1,22 +1,11 @@ getName() . ' ]' . PHP_EOL; } -} \ No newline at end of file +} diff --git a/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php index 60275353396..66aa01d4094 100644 --- a/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php +++ b/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php @@ -1,21 +1,11 @@ tableGateway->adapter = $this->masterAdapter; } -} \ No newline at end of file +} diff --git a/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php b/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php index b03ddafdaed..7e4de0cdf18 100644 --- a/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php +++ b/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php @@ -1,4 +1,12 @@ 'hearts', /* black heart suit */ 9830 => 'diams', /* black diamond suit */ ); -} \ No newline at end of file +} diff --git a/library/Zend/Escaper/Exception/ExceptionInterface.php b/library/Zend/Escaper/Exception/ExceptionInterface.php index f1a3bb97641..65a818e0880 100644 --- a/library/Zend/Escaper/Exception/ExceptionInterface.php +++ b/library/Zend/Escaper/Exception/ExceptionInterface.php @@ -1,21 +1,11 @@ 'Zend\Mail\Header\Subject', 'to' => 'Zend\Mail\Header\To', ); -} \ No newline at end of file +} diff --git a/library/Zend/Mail/Header/HeaderWrap.php b/library/Zend/Mail/Header/HeaderWrap.php index 7c2dfee947e..1b2d0b79f46 100644 --- a/library/Zend/Mail/Header/HeaderWrap.php +++ b/library/Zend/Mail/Header/HeaderWrap.php @@ -1,22 +1,11 @@ getController()->getRequest()->getQuery()->get($param, $default); } -} \ No newline at end of file +} diff --git a/library/Zend/Mvc/Controller/Plugin/PluginInterface.php b/library/Zend/Mvc/Controller/Plugin/PluginInterface.php index a87f878bd29..bdca72d8a40 100644 --- a/library/Zend/Mvc/Controller/Plugin/PluginInterface.php +++ b/library/Zend/Mvc/Controller/Plugin/PluginInterface.php @@ -1,22 +1,11 @@ get('Y-m-d\TH:i:s.000\Z'); //DATE_ISO8601 is not compatible with S3 } -} \ No newline at end of file +} diff --git a/library/Zend/Service/Amazon/Accessories.php b/library/Zend/Service/Amazon/Accessories.php index 510a6c9a27c..a3d4edc8a09 100644 --- a/library/Zend/Service/Amazon/Accessories.php +++ b/library/Zend/Service/Amazon/Accessories.php @@ -1,22 +1,11 @@ height = (int)$image->getAttribute('height'); $this->width = (int)$image->getAttribute('width'); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/Flickr/Result.php b/library/Zend/Service/Flickr/Result.php index 0491b2c2574..d99dc491952 100644 --- a/library/Zend/Service/Flickr/Result.php +++ b/library/Zend/Service/Flickr/Result.php @@ -1,22 +1,11 @@ $k = $v; } } -} \ No newline at end of file +} diff --git a/library/Zend/Service/Flickr/ResultSet.php b/library/Zend/Service/Flickr/ResultSet.php index b816f28324d..c97daee3cf0 100644 --- a/library/Zend/Service/Flickr/ResultSet.php +++ b/library/Zend/Service/Flickr/ResultSet.php @@ -1,22 +1,11 @@ results && $this->currentIndex < $this->results->length; } -} \ No newline at end of file +} diff --git a/library/Zend/Service/GoGrid/AbstractGoGrid.php b/library/Zend/Service/GoGrid/AbstractGoGrid.php index 83ccfd9d356..8ac1e466f3a 100644 --- a/library/Zend/Service/GoGrid/AbstractGoGrid.php +++ b/library/Zend/Service/GoGrid/AbstractGoGrid.php @@ -1,22 +1,11 @@ setCharacters('0123456789'); $this->setChecksum('identcode'); } -} \ No newline at end of file +} diff --git a/library/Zend/Validator/Barcode/Intelligentmail.php b/library/Zend/Validator/Barcode/Intelligentmail.php index a9e5d5d27c5..6dd31f001a7 100644 --- a/library/Zend/Validator/Barcode/Intelligentmail.php +++ b/library/Zend/Validator/Barcode/Intelligentmail.php @@ -1,21 +1,11 @@ '/^[\x{002d}0-9a-zäåæéöøü]{1,63}$/iu', diff --git a/library/Zend/Validator/Hostname/Cn.php b/library/Zend/Validator/Hostname/Cn.php index dfcb120b227..efb14b12615 100644 --- a/library/Zend/Validator/Hostname/Cn.php +++ b/library/Zend/Validator/Hostname/Cn.php @@ -1,21 +1,11 @@ '/^[\x{002d}0-9a-z\x{3447}\x{3473}\x{359E}\x{360E}\x{361A}\x{3918}\x{396E}\x{39CF}\x{39D0}' . diff --git a/library/Zend/Validator/Hostname/Com.php b/library/Zend/Validator/Hostname/Com.php index 00d563b88ae..8fe41e0164e 100644 --- a/library/Zend/Validator/Hostname/Com.php +++ b/library/Zend/Validator/Hostname/Com.php @@ -1,21 +1,11 @@ '/^[\x{002d}0-9\x{0400}-\x{052f}]{1,63}$/iu', diff --git a/library/Zend/Validator/Hostname/Jp.php b/library/Zend/Validator/Hostname/Jp.php index 653348b2034..50a4856dbce 100644 --- a/library/Zend/Validator/Hostname/Jp.php +++ b/library/Zend/Validator/Hostname/Jp.php @@ -1,21 +1,11 @@ '/^[\x{002d}0-9a-z\x{3005}-\x{3007}\x{3041}-\x{3093}\x{309D}\x{309E}' . diff --git a/library/Zend/Validator/Identical.php b/library/Zend/Validator/Identical.php index fa4ff93b001..20afe737ae5 100644 --- a/library/Zend/Validator/Identical.php +++ b/library/Zend/Validator/Identical.php @@ -1,21 +1,11 @@ isValid($value); } -} \ No newline at end of file +} diff --git a/library/Zend/Validator/ValidatorInterface.php b/library/Zend/Validator/ValidatorInterface.php index 1636f671556..3179e6a7377 100644 --- a/library/Zend/Validator/ValidatorInterface.php +++ b/library/Zend/Validator/ValidatorInterface.php @@ -1,21 +1,11 @@ array('SampleClass.php'), - 'class' => array( - 'flags' => ClassGenerator::FLAG_ABSTRACT, - 'name' => 'SampleClass', - 'extendedClass' => 'ExtendedClassName', - 'implementedInterfaces' => array('Iterator', 'Traversable') - ) - )); + 'requiredFiles' => array('SampleClass.php'), + 'class' => array( + 'flags' => ClassGenerator::FLAG_ABSTRACT, + 'name' => 'SampleClass', + 'extendedClass' => 'ExtendedClassName', + 'implementedInterfaces' => array('Iterator', 'Traversable') + ) + )); $expectedOutput = << array( - 'name' => 'SampleClass' - ) - )); + 'class' => array( + 'name' => 'SampleClass' + ) + )); file_put_contents($tempFile, $codeGenFile->generate()); diff --git a/tests/Zend/Code/Generator/MethodGeneratorTest.php b/tests/Zend/Code/Generator/MethodGeneratorTest.php index 285d9782242..88b2f50bcd4 100644 --- a/tests/Zend/Code/Generator/MethodGeneratorTest.php +++ b/tests/Zend/Code/Generator/MethodGeneratorTest.php @@ -1,22 +1,11 @@ assertEquals('string', $tag->getReturnType()); $this->assertEquals('I\'m test method', $tag->getDescription()); } -} \ No newline at end of file +} diff --git a/tests/Zend/Code/Reflection/DocBlock/Tag/PropertyTagTest.php b/tests/Zend/Code/Reflection/DocBlock/Tag/PropertyTagTest.php index 40cd915214a..1634594599b 100644 --- a/tests/Zend/Code/Reflection/DocBlock/Tag/PropertyTagTest.php +++ b/tests/Zend/Code/Reflection/DocBlock/Tag/PropertyTagTest.php @@ -1,22 +1,11 @@ assertEquals('string', $tag->getType()); $this->assertEquals('I\'m test property', $tag->getDescription()); } -} \ No newline at end of file +} diff --git a/tests/Zend/Code/Reflection/DocBlockReflectionTest.php b/tests/Zend/Code/Reflection/DocBlockReflectionTest.php index 357c0e54db6..f12fd88f83d 100644 --- a/tests/Zend/Code/Reflection/DocBlockReflectionTest.php +++ b/tests/Zend/Code/Reflection/DocBlockReflectionTest.php @@ -1,22 +1,11 @@ assertSame($sql, $table->getSql()); } -} \ No newline at end of file +} diff --git a/tests/Zend/DebugTest.php b/tests/Zend/DebugTest.php index 8d74667457c..1711a782799 100644 --- a/tests/Zend/DebugTest.php +++ b/tests/Zend/DebugTest.php @@ -1,22 +1,11 @@ <?php /** - * BSD LICENSE + * Zend Framework (http://framework.zend.com/) * - * Copyright (c) 2009, norm2782 - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of norm2782 nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * @link http://github.com/zendframework/zf2 for the canonical source repository + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @package Zend_Feed */ /** diff --git a/tests/Zend/Feed/Reader/Entry/_files/Common/atom_noencodingdefined.xml b/tests/Zend/Feed/Reader/Entry/_files/Common/atom_noencodingdefined.xml index 3e31cbaffb2..69dcd46b78e 100644 --- a/tests/Zend/Feed/Reader/Entry/_files/Common/atom_noencodingdefined.xml +++ b/tests/Zend/Feed/Reader/Entry/_files/Common/atom_noencodingdefined.xml @@ -424,32 +424,12 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Entry/_files/Common/rss.xml b/tests/Zend/Feed/Reader/Entry/_files/Common/rss.xml
index 3d1fdfae24f..75f0e70c896 100644
--- a/tests/Zend/Feed/Reader/Entry/_files/Common/rss.xml
+++ b/tests/Zend/Feed/Reader/Entry/_files/Common/rss.xml
@@ -403,32 +403,12 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php b/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php
index 916f6248f92..aea52b04a1d 100644
--- a/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php
+++ b/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php
@@ -1,22 +1,11 @@
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Feed/_files/Common/atom_noencodingdefined.xml b/tests/Zend/Feed/Reader/Feed/_files/Common/atom_noencodingdefined.xml
index 3e31cbaffb2..69dcd46b78e 100644
--- a/tests/Zend/Feed/Reader/Feed/_files/Common/atom_noencodingdefined.xml
+++ b/tests/Zend/Feed/Reader/Feed/_files/Common/atom_noencodingdefined.xml
@@ -424,32 +424,12 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Feed/_files/Common/atom_rewrittenbydom.xml b/tests/Zend/Feed/Reader/Feed/_files/Common/atom_rewrittenbydom.xml
index fd9da5f015e..378e71b4980 100644
--- a/tests/Zend/Feed/Reader/Feed/_files/Common/atom_rewrittenbydom.xml
+++ b/tests/Zend/Feed/Reader/Feed/_files/Common/atom_rewrittenbydom.xml
@@ -420,32 +420,12 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Feed/_files/Common/rss.xml b/tests/Zend/Feed/Reader/Feed/_files/Common/rss.xml
index 3d1fdfae24f..75f0e70c896 100644
--- a/tests/Zend/Feed/Reader/Feed/_files/Common/rss.xml
+++ b/tests/Zend/Feed/Reader/Feed/_files/Common/rss.xml
@@ -403,32 +403,12 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php b/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php
index 5d0efd50296..39d62cb2e83 100644
--- a/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php
+++ b/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php
@@ -1,22 +1,11 @@
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/Integration/_files/wordpress-rss2-dc-atom.xml b/tests/Zend/Feed/Reader/Integration/_files/wordpress-rss2-dc-atom.xml
index 3d1fdfae24f..75f0e70c896 100644
--- a/tests/Zend/Feed/Reader/Integration/_files/wordpress-rss2-dc-atom.xml
+++ b/tests/Zend/Feed/Reader/Integration/_files/wordpress-rss2-dc-atom.xml
@@ -403,32 +403,12 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
 
 <?php
 /**
- * BSD LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * Copyright (c) 2009, norm2782
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of norm2782 nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY norm2782 ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL norm2782 BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Feed
  */
 
 /**
diff --git a/tests/Zend/Feed/Reader/ReaderTest.php b/tests/Zend/Feed/Reader/ReaderTest.php
index 4237d1e422c..b364e806f52 100644
--- a/tests/Zend/Feed/Reader/ReaderTest.php
+++ b/tests/Zend/Feed/Reader/ReaderTest.php
@@ -1,22 +1,11 @@
 orderByDate();
         $this->assertEquals(1230000000, $writer->getEntry(1)->getDateCreated()->getTimestamp());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php b/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php
index abc9f26d1ad..0edff20a608 100644
--- a/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php
+++ b/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php
@@ -1,22 +1,11 @@
 setPublicKey(array('private' => __DIR__ . '/../_files/publickey.pem'));
         $this->assertSame($filter, $r);
-        
+
         $this->setExpectedException('\Zend\Filter\Exception\InvalidArgumentException', 'not valid');
         $filter->setPublicKey(123);
 
@@ -161,7 +150,7 @@ public function testSetPublicKey()
     public function testSetPrivateKey()
     {
         $filter = new OpensslEncryption();
-        
+
         $filter->setPrivateKey(array('public' => __DIR__ . '/../_files/privatekey.pem'));
         $test = $filter->getPrivateKey();
         $this->assertEquals(array(
@@ -181,8 +170,8 @@ public function testSetPrivateKey()
 d/fxzPfuO/bLpADozTAnYT9Hu3wPrQVLeAfCp0ojqH7DYg==
 -----END RSA PRIVATE KEY-----
 '), $test);
-            
-            
+
+
         $this->setExpectedException('\Zend\Filter\Exception\InvalidArgumentException', 'not valid');
         $filter->setPrivateKey(123);
 
@@ -233,7 +222,7 @@ public function testInvalidDecryption()
     public function testEncryptionWithoutPublicKey()
     {
         $filter = new OpensslEncryption();
-        
+
         $this->setExpectedException('\Zend\Filter\Exception\RuntimeException', 'without public key');
         $filter->encrypt('unknown');
     }
@@ -314,4 +303,4 @@ public function testEncryptionWithDecryptionAndCompressionWithPackagedKeys()
         $input = $filter->decrypt($output);
         $this->assertEquals('teststring', trim($input));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/Zend/Filter/EncryptTest.php b/tests/Zend/Filter/EncryptTest.php
index 9bcd049bd79..d714b551833 100644
--- a/tests/Zend/Filter/EncryptTest.php
+++ b/tests/Zend/Filter/EncryptTest.php
@@ -1,22 +1,11 @@
  'Nachricht 1',
     'Message 8' => 'Nachricht 8'
-);
\ No newline at end of file
+);
diff --git a/tests/Zend/I18n/Translator/_files/testarray/translation-en_US.php b/tests/Zend/I18n/Translator/_files/testarray/translation-en_US.php
index a9de25914c2..70d9e406e23 100644
--- a/tests/Zend/I18n/Translator/_files/testarray/translation-en_US.php
+++ b/tests/Zend/I18n/Translator/_files/testarray/translation-en_US.php
@@ -1,22 +1,11 @@
 assertAttributeEquals($validator->getOption('messageTemplates'),
                                      'messageTemplates', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/I18n/View/Helper/CurrencyFormatTest.php b/tests/Zend/I18n/View/Helper/CurrencyFormatTest.php
index 23a1927aac0..164dc2fd7bf 100644
--- a/tests/Zend/I18n/View/Helper/CurrencyFormatTest.php
+++ b/tests/Zend/I18n/View/Helper/CurrencyFormatTest.php
@@ -1,22 +1,11 @@
 assertNotNull($jsonArray, "JSON decode result is NULL");
         $this->assertSame('A', $jsonArray['response']['message_type']['defaults']['close_rules']['after_responses']);
     }
-    
+
     /**
      * XML document provider for ZF-11385 tests
      * @return array
@@ -607,7 +594,7 @@ public static function providerNestingDepthIsHandledProperly()
 			D
 		
 	
-	0.0790269374847	
+	0.0790269374847
 
 EOT;
         return array(array($xmlStringContents));
diff --git a/tests/Zend/Json/Server/CacheTest.php b/tests/Zend/Json/Server/CacheTest.php
index 44428578f9b..423f5f84fed 100644
--- a/tests/Zend/Json/Server/CacheTest.php
+++ b/tests/Zend/Json/Server/CacheTest.php
@@ -1,22 +1,11 @@
 rcpt;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Mail/TestAsset/StringSerializableObject.php b/tests/Zend/Mail/TestAsset/StringSerializableObject.php
index 532d2002425..35c9fde9746 100644
--- a/tests/Zend/Mail/TestAsset/StringSerializableObject.php
+++ b/tests/Zend/Mail/TestAsset/StringSerializableObject.php
@@ -1,4 +1,12 @@
 adapter->baseConvert($dec, 10, 62));
 
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Math/BigInteger/Adapter/GmpTest.php b/tests/Zend/Math/BigInteger/Adapter/GmpTest.php
index 05a70a4dee3..210abeb39d6 100644
--- a/tests/Zend/Math/BigInteger/Adapter/GmpTest.php
+++ b/tests/Zend/Math/BigInteger/Adapter/GmpTest.php
@@ -1,22 +1,11 @@
 assertEquals('1234567890', $y);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Math/BigInteger/BigIntegerTest.php b/tests/Zend/Math/BigInteger/BigIntegerTest.php
index 15bd3f9314b..97a81bee4a8 100644
--- a/tests/Zend/Math/BigInteger/BigIntegerTest.php
+++ b/tests/Zend/Math/BigInteger/BigIntegerTest.php
@@ -1,22 +1,11 @@
 action8Passed = true; }
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
- * @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 testFSMClass extends Lucene\AbstractFSM
 {
diff --git a/tests/Zend/Search/Lucene/AnalysisTest.php b/tests/Zend/Search/Lucene/AnalysisTest.php
index 604fb231acd..9c70e4e04ad 100644
--- a/tests/Zend/Search/Lucene/AnalysisTest.php
+++ b/tests/Zend/Search/Lucene/AnalysisTest.php
@@ -1,22 +1,11 @@
 filesPath/$name.response");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Service/Flickr/OnlineTest.php b/tests/Zend/Service/Flickr/OnlineTest.php
index ff8b19d5420..5fc32a3ad0b 100644
--- a/tests/Zend/Service/Flickr/OnlineTest.php
+++ b/tests/Zend/Service/Flickr/OnlineTest.php
@@ -1,22 +1,11 @@
 assertEquals(0, $this->flickr->tagSearch('zendflickrtesttagnoresults')->totalResults());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Service/Flickr/TestAsset/FlickrProtectedMethodProxy.php b/tests/Zend/Service/Flickr/TestAsset/FlickrProtectedMethodProxy.php
index dbe0a4c7f07..cd0dc4b420a 100644
--- a/tests/Zend/Service/Flickr/TestAsset/FlickrProtectedMethodProxy.php
+++ b/tests/Zend/Service/Flickr/TestAsset/FlickrProtectedMethodProxy.php
@@ -1,22 +1,11 @@
 assertTrue($exceptionRaised);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Service/WindowsAzure/TableStorageTest.php b/tests/Zend/Service/WindowsAzure/TableStorageTest.php
index 2b927618929..739088ad901 100644
--- a/tests/Zend/Service/WindowsAzure/TableStorageTest.php
+++ b/tests/Zend/Service/WindowsAzure/TableStorageTest.php
@@ -5,7 +5,7 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Service_WindowsAzure
+ * @package   Zend_Service
  */
 
 namespace ZendTest\Service\WindowsAzure;
diff --git a/tests/Zend/Service/WindowsAzure/TestAsset/Entity.php b/tests/Zend/Service/WindowsAzure/TestAsset/Entity.php
index 701c00aaccf..5c4af03dc5b 100644
--- a/tests/Zend/Service/WindowsAzure/TestAsset/Entity.php
+++ b/tests/Zend/Service/WindowsAzure/TestAsset/Entity.php
@@ -1,22 +1,11 @@
 fooBarBaz = $value;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Stdlib/TestAsset/ClassMethodsCamelCaseMissing.php b/tests/Zend/Stdlib/TestAsset/ClassMethodsCamelCaseMissing.php
index 03ffb4ee410..11851e46116 100644
--- a/tests/Zend/Stdlib/TestAsset/ClassMethodsCamelCaseMissing.php
+++ b/tests/Zend/Stdlib/TestAsset/ClassMethodsCamelCaseMissing.php
@@ -1,4 +1,12 @@
 foo_bar_baz = $value;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Stdlib/TestAsset/Reflection.php b/tests/Zend/Stdlib/TestAsset/Reflection.php
index 9d23e285b7d..97ddc1b12d9 100644
--- a/tests/Zend/Stdlib/TestAsset/Reflection.php
+++ b/tests/Zend/Stdlib/TestAsset/Reflection.php
@@ -1,4 +1,12 @@
 fooBarBaz;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Stdlib/TestAsset/TestOptions.php b/tests/Zend/Stdlib/TestAsset/TestOptions.php
index 650e52a419e..51a6024c5a0 100644
--- a/tests/Zend/Stdlib/TestAsset/TestOptions.php
+++ b/tests/Zend/Stdlib/TestAsset/TestOptions.php
@@ -1,4 +1,12 @@
 assertAttributeEquals($validator->getOption('messageTemplates'),
                                      'messageTemplates', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/HostnameTest.php b/tests/Zend/Validator/HostnameTest.php
index ad262cf400f..cb10c4f96bb 100644
--- a/tests/Zend/Validator/HostnameTest.php
+++ b/tests/Zend/Validator/HostnameTest.php
@@ -1,22 +1,11 @@
 assertAttributeEquals($validator->getOption('messageTemplates'),
                                      'messageTemplates', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/IpTest.php b/tests/Zend/Validator/IpTest.php
index 1cc2f3fac71..c1f71b3305d 100644
--- a/tests/Zend/Validator/IpTest.php
+++ b/tests/Zend/Validator/IpTest.php
@@ -1,22 +1,11 @@
 assertAttributeEquals($validator->getOption('messageTemplates'),
                                      'messageTemplates', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/IsbnTest.php b/tests/Zend/Validator/IsbnTest.php
index 1e1f1a48237..284795c3dd8 100644
--- a/tests/Zend/Validator/IsbnTest.php
+++ b/tests/Zend/Validator/IsbnTest.php
@@ -1,21 +1,11 @@
 assertAttributeEquals($validator->getOption('messageTemplates'),
                                      'messageTemplates', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/LessThanTest.php b/tests/Zend/Validator/LessThanTest.php
index 9b5bfdc3ee0..b9a796f75dc 100644
--- a/tests/Zend/Validator/LessThanTest.php
+++ b/tests/Zend/Validator/LessThanTest.php
@@ -1,22 +1,11 @@
 assertAttributeEquals($validator->getOption('messageVariables'),
                                      'messageVariables', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/Sitemap/ChangefreqTest.php b/tests/Zend/Validator/Sitemap/ChangefreqTest.php
index 2f08a13da51..914503cdcf0 100644
--- a/tests/Zend/Validator/Sitemap/ChangefreqTest.php
+++ b/tests/Zend/Validator/Sitemap/ChangefreqTest.php
@@ -1,22 +1,11 @@
 assertAttributeEquals($validator->getOption('messageVariables'),
                                      'messageVariables', $validator);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/TestAsset/ArrayTranslator.php b/tests/Zend/Validator/TestAsset/ArrayTranslator.php
index d1a93c40a84..333d0daaf01 100644
--- a/tests/Zend/Validator/TestAsset/ArrayTranslator.php
+++ b/tests/Zend/Validator/TestAsset/ArrayTranslator.php
@@ -1,4 +1,12 @@
 error(self::FOO_MESSAGE);
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Zend/Validator/TestAsset/SessionManager.php b/tests/Zend/Validator/TestAsset/SessionManager.php
index d0a1e600121..37130d65504 100644
--- a/tests/Zend/Validator/TestAsset/SessionManager.php
+++ b/tests/Zend/Validator/TestAsset/SessionManager.php
@@ -1,22 +1,11 @@