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

Author: sgehrig

src/ClassFileLocator.php

@@ -34,7 +34,7 @@ public function __construct($dirOrIterator = '.')
                 throw new Exception\InvalidArgumentException('Expected a valid directory name');
             }
 
-            $dirOrIterator = new RecursiveDirectoryIterator($dirOrIterator);
+            $dirOrIterator = new RecursiveDirectoryIterator($dirOrIterator, RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
         }
         if (!$dirOrIterator instanceof DirectoryIterator) {
             throw new Exception\InvalidArgumentException('Expected a DirectoryIterator');

src/Transfer/Adapter/AbstractAdapter.php

@@ -375,7 +375,7 @@ public function addPrefixPaths(array $spec)
      * @param  boolean      $breakChainOnFailure If the validation chain should stop an failure
      * @param  string|array $options             Options to set for the validator
      * @param  string|array $files               Files to limit this validator to
-     * @return Zend_File_Transfer_Adapter
+     * @return \Zend\File\Transfer\Adapter\AbstractAdapter
      */
     public function addValidator($validator, $breakChainOnFailure = false, $options = null, $files = null)
     {
@@ -1093,7 +1093,7 @@ public function setTranslator($translator = null)
     {
         if (null === $translator) {
             $this->_translator = null;
-        } elseif ($translator instanceof \Zend\Translator\Adapter\Adapter) {
+        } elseif ($translator instanceof \Zend\Translator\Adapter\AbstractAdapter) {
             $this->_translator = $translator;
         } elseif ($translator instanceof \Zend\Translator\Translator) {
             $this->_translator = $translator->getAdapter();

src/Transfer/Adapter/Http.php

@@ -139,7 +139,8 @@ public function isValid($files = null)
                 'name'  => $files,
                 'error' => 1));
             $validator = $this->_validators['Zend\Validator\File\Upload'];
-            $validator->setFiles($temp)
+            $validator->setTranslator($this->getTranslator())
+                      ->setFiles($temp)
                       ->isValid($files, null);
             $this->_messages += $validator->getMessages();
             return false;