Merge branch 'feature/7263'

Adds PHP 7 support.

Close zendframework/zendframework#7366
Fixes zendframework/zendframework#7270
Fixes zendframework/zendframework#7263

src/Storage/Mbox.php

@@ -231,7 +231,7 @@ protected function isMboxFile($file, $fileIsString = true)
 
         $result = false;
 
-        $line = fgets($file);
+        $line = fgets($file) ?: '';
         if (strpos($line, 'From ') === 0) {
             $result = true;
         }

src/Transport/Factory.php

@@ -19,7 +19,9 @@ abstract class Factory
      */
     protected static $classMap = array(
         'file'      => 'Zend\Mail\Transport\File',
-        'null'      => 'Zend\Mail\Transport\Null',
+        'inmemory'  => 'Zend\Mail\Transport\InMemory',
+        'memory'    => 'Zend\Mail\Transport\InMemory',
+        'null'      => 'Zend\Mail\Transport\InMemory',
         'sendmail'  => 'Zend\Mail\Transport\Sendmail',
         'smtp'      => 'Zend\Mail\Transport\Smtp',
     );
@@ -64,7 +66,8 @@ public static function create($spec = array())
 
         if (! $transport instanceof TransportInterface) {
             throw new Exception\DomainException(sprintf(
-                '%s expects the "type" attribute to resolve to a valid Zend\Mail\Transport\TransportInterface instance; received "%s"',
+                '%s expects the "type" attribute to resolve to a valid'
+                . ' Zend\Mail\Transport\TransportInterface instance; received "%s"',
                 __METHOD__,
                 $type
             ));

src/Transport/InMemory.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mail\Transport;
+
+use Zend\Mail\Message;
+
+/**
+ * InMemory transport
+ *
+ * This transport will just store the message in memory.  It is helpful
+ * when unit testing, or to prevent sending email when in development or
+ * testing.
+ */
+class InMemory implements TransportInterface
+{
+    /**
+     * @var Message
+     */
+    protected $lastMessage;
+
+    /**
+     * Takes the last message and saves it for testing.
+     *
+     * @param Message $message
+     */
+    public function send(Message $message)
+    {
+        $this->lastMessage = $message;
+    }
+
+    /**
+     * Get the last message sent.
+     *
+     * @return Message
+     */
+    public function getLastMessage()
+    {
+        return $this->lastMessage;
+    }
+}

src/Transport/Null.php

@@ -9,38 +9,27 @@
 
 namespace Zend\Mail\Transport;
 
-use Zend\Mail\Message;
-
 /**
- * File transport
+ * Stub class for backwards compatibility.
+ *
+ * Since PHP 7 adds "null" as a reserved keyword, we can no longer have a class
+ * named that and retain PHP 7 compatibility. The original class has been
+ * renamed to "InMemory", and this class is now an extension of it. It raises an
+ * E_USER_DEPRECATED to warn users to migrate.
  *
- * The null transport will just store the message in memory.  It is helpful
- * when unit testing.
+ * @deprecated
  */
-class Null implements TransportInterface
+class Null extends InMemory
 {
-    /**
-     * @var Message
-     */
-    protected $lastMessage;
-
-    /**
-     * Takes the last message and Saves it for testing
-     *
-     * @param Message $message
-     */
-    public function send(Message $message)
-    {
-        $this->lastMessage = $message;
-    }
-
-    /**
-     * Get the last message sent
-     *
-     * @return Message
-     */
-    public function getLastMessage()
+    public function __construct()
     {
-        return $this->lastMessage;
+        trigger_error(
+            sprintf(
+                'The class %s has been deprecated; please use %s\\InMemory',
+                __CLASS__,
+                __NAMESPACE__
+            ),
+            E_USER_DEPRECATED
+        );
     }
 }

test/Transport/FactoryTest.php

@@ -47,21 +47,32 @@ public function testDefaultTypeIsSendmail()
      */
     public function testCanCreateClassUsingTypeKey($type)
     {
+        set_error_handler(function ($code, $message) {
+            // skip deprecation notices
+            return;
+        }, E_USER_DEPRECATED);
         $transport = Factory::create(array(
             'type' => $type,
         ));
+        restore_error_handler();
 
         $this->assertInstanceOf($type, $transport);
     }
 
     public function typeProvider()
     {
-        return array(
+        $types = array(
             array('Zend\Mail\Transport\File'),
-            array('Zend\Mail\Transport\Null'),
+            array('Zend\Mail\Transport\InMemory'),
             array('Zend\Mail\Transport\Sendmail'),
             array('Zend\Mail\Transport\Smtp'),
         );
+
+        if (version_compare(PHP_VERSION, '7.0', '<')) {
+            $types[] = array('Zend\Mail\Transport\Null');
+        }
+
+        return $types;
     }
 
     /**
@@ -82,12 +93,15 @@ public function typeAliasProvider()
     {
         return array(
             array('file', 'Zend\Mail\Transport\File'),
-            array('null', 'Zend\Mail\Transport\Null'),
+            array('null', 'Zend\Mail\Transport\InMemory'),
+            array('memory', 'Zend\Mail\Transport\InMemory'),
+            array('inmemory', 'Zend\Mail\Transport\InMemory'),
+            array('InMemory', 'Zend\Mail\Transport\InMemory'),
             array('sendmail', 'Zend\Mail\Transport\Sendmail'),
             array('smtp', 'Zend\Mail\Transport\Smtp'),
             array('File', 'Zend\Mail\Transport\File'),
-            array('Null', 'Zend\Mail\Transport\Null'),
-            array('NULL', 'Zend\Mail\Transport\Null'),
+            array('Null', 'Zend\Mail\Transport\InMemory'),
+            array('NULL', 'Zend\Mail\Transport\InMemory'),
             array('Sendmail', 'Zend\Mail\Transport\Sendmail'),
             array('SendMail', 'Zend\Mail\Transport\Sendmail'),
             array('Smtp', 'Zend\Mail\Transport\Smtp'),
@@ -106,7 +120,7 @@ public function testCanUseTraversableAsSpec()
 
         $transport = Factory::create($spec);
 
-        $this->assertInstanceOf('Zend\Mail\Transport\Null', $transport);
+        $this->assertInstanceOf('Zend\Mail\Transport\InMemory', $transport);
     }
 
     /**

test/Transport/InMemoryTest.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Mail\Transport;
+
+use Zend\Mail\Message;
+use Zend\Mail\Transport\InMemory;
+
+/**
+ * @group      Zend_Mail
+ */
+class InMemoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function getMessage()
+    {
+        $message = new Message();
+        $message->addTo('zf-devteam@zend.com', 'ZF DevTeam')
+                ->addCc('matthew@zend.com')
+                ->addBcc('zf-crteam@lists.zend.com', 'CR-Team, ZF Project')
+                ->addFrom(array(
+                    'zf-devteam@zend.com',
+                    'Matthew' => 'matthew@zend.com',
+                ))
+                ->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
+                ->setSubject('Testing Zend\Mail\Transport\Sendmail')
+                ->setBody('This is only a test.');
+        $message->getHeaders()->addHeaders(array(
+            'X-Foo-Bar' => 'Matthew',
+        ));
+        return $message;
+    }
+
+    public function testReceivesMailArtifacts()
+    {
+        $message = $this->getMessage();
+        $transport = new InMemory();
+
+        $transport->send($message);
+
+        $this->assertSame($message, $transport->getLastMessage());
+    }
+}

test/Transport/NullTest.php

@@ -9,40 +9,23 @@
 
 namespace ZendTest\Mail\Transport;
 
-use Zend\Mail\Message;
-use Zend\Mail\Transport\Null;
+use Zend\Mail\Transport\Null as NullTransport;
 
 /**
  * @group      Zend_Mail
  */
 class NullTest extends \PHPUnit_Framework_TestCase
 {
-    public function getMessage()
+    public function setUp()
     {
-        $message = new Message();
-        $message->addTo('zf-devteam@zend.com', 'ZF DevTeam')
-                ->addCc('matthew@zend.com')
-                ->addBcc('zf-crteam@lists.zend.com', 'CR-Team, ZF Project')
-                ->addFrom(array(
-                    'zf-devteam@zend.com',
-                    'Matthew' => 'matthew@zend.com',
-                ))
-                ->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
-                ->setSubject('Testing Zend\Mail\Transport\Sendmail')
-                ->setBody('This is only a test.');
-        $message->getHeaders()->addHeaders(array(
-            'X-Foo-Bar' => 'Matthew',
-        ));
-        return $message;
+        if (version_compare(PHP_VERSION, '7.0', '>=')) {
+            $this->markTestSkipped('Cannot test Null transport under PHP 7; reserved keyword');
+        }
     }
 
-    public function testReceivesMailArtifacts()
+    public function testRaisesNoticeOnInstantiation()
     {
-        $message = $this->getMessage();
-        $transport = new Null();
-
-        $transport->send($message);
-
-        $this->assertSame($message, $transport->getLastMessage());
+        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated');
+        new NullTransport();
     }
 }