bug swiftmailer#458 Fix Swift_ByteStream_FileByteStream::read to match to the specification. (realityking)

This PR was merged into the 5.1-dev branch.

Discussion
----------

Fix Swift_ByteStream_FileByteStream::read to match to the specification.

Issue discovered in swiftmailer#418

An explanation for the PHP behavior can be found here: http://us1.php.net/manual/en/function.feof.php#67261

Commits
-------

f497b2e Fix Swift_ByteStream_FileByteStream::read to match to the specification.

Author: fabpot

lib/classes/Swift/ByteStream/FileByteStream.php

@@ -77,7 +77,7 @@ public function getPath()
      *
      * @param integer $length
      *
-     * @return string
+     * @return string|boolean
      *
      * @throws Swift_IoException
      */
@@ -93,13 +93,21 @@ public function read($length)
                 ini_set('magic_quotes_runtime', 1);
             }
             $this->_offset = ftell($fp);
+            
+            // If we read one byte after reaching the end of the file
+            // feof() will return false and an empty string is returned
+            if ($bytes === '' && feof($fp)) {
+            	$this->_resetReadHandle();
+            	
+            	return false;
+            }
 
             return $bytes;
-        } else {
-            $this->_resetReadHandle();
-
-            return false;
         }
+
+        $this->_resetReadHandle();
+
+        return false;
     }
 
     /**