Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_eventFix

.travis/run-tests.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+travisdir=$(dirname $(readlink /proc/$$/fd/255))
+testdir="$travisdir/../tests"
+testedcomponents=(`cat "$travisdir/tested-components"`)
+result=0
+
+for tested in "${testedcomponents[@]}"
+    do
+        echo "$tested:"
+        phpunit -c $testdir/phpunit.xml $testdir/$tested
+        let "result = $result || $?"
+done
+
+exit $result

.travis/skipped-components

@@ -0,0 +1,9 @@
+Zend/Amf
+Zend/Barcode
+Zend/Date
+Zend/Feed
+Zend/Queue
+Zend/Service
+Zend/Test
+Zend/Translator
+Zend/Wildfire

.travis/tested-components

@@ -0,0 +1,58 @@
+Zend/Acl
+Zend/Authentication
+Zend/Cache
+Zend/Captcha
+Zend/Cloud
+Zend/Code
+Zend/Config
+Zend/Console
+Zend/Crypt
+Zend/Currency
+Zend/Db
+Zend/Di
+Zend/Docbook
+Zend/Dojo
+Zend/Dom
+Zend/EventManager
+Zend/Feed/Reader
+Zend/Feed/Writer
+Zend/File
+Zend/Filter
+Zend/Form
+Zend/GData
+Zend/Http
+Zend/InfoCard
+Zend/Json
+Zend/Ldap
+Zend/Loader
+Zend/Locale
+Zend/Log
+Zend/Mail
+Zend/Markup
+Zend/Measure
+Zend/Memory
+Zend/Mime
+Zend/Module
+Zend/Mvc
+Zend/Navigation
+Zend/OAuth
+Zend/OpenId
+Zend/Paginator
+Zend/Pdf
+Zend/ProgressBar
+Zend/RegistryTest.php
+Zend/Rest
+Zend/Search
+Zend/Serializer
+Zend/Server
+Zend/Session
+Zend/Soap
+Zend/Stdlib
+Zend/Tag
+Zend/Text
+Zend/TimeSync
+Zend/Uri
+Zend/Validator
+Zend/VersionTest.php
+Zend/View
+Zend/XmlRpc

src/ClassFileLocator.php

@@ -1,4 +1,22 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_File
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 
 namespace Zend\File;
 
@@ -11,9 +29,11 @@
 
 /**
  * Locate files containing PHP classes, interfaces, or abstracts
- * 
+ *
+ * @category   Zend
  * @package    Zend_File
- * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
+ * @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 ClassFileLocator extends FilterIterator
 {
@@ -23,8 +43,7 @@ class ClassFileLocator extends FilterIterator
      * Expects either a directory, or a DirectoryIterator (or its recursive variant) 
      * instance.
      * 
-     * @param  string|DirectoryIterator $dirOrIterator 
-     * @return void
+     * @param  string|DirectoryIterator $dirOrIterator
      */
     public function __construct($dirOrIterator = '.')
     {