restore php 5.3 language level

Conflicts: test/AddressTest.php
zendframework · Jul 13, 2017 · 0fead56 · 0fead56
1 parent e5eb4ea
commit 0fead56
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/test/AddressTest.php b/test/AddressTest.php
@@ -64,4 +64,23 @@ public function invalidSenderDataProvider()
             array("foo@bar", "\r\nevilBody"),
         );
     }
+
+    /**
+     * @dataProvider validSenderDataProvider
+     * @param string $email
+     * @param null|string $name
+     */
+    public function testSetAddressValidAddressObject($email, $name)
+    {
+        $address = new Address($email, $name);
+        $this->assertInstanceOf('\Zend\Mail\Address', $address);
+    }
+
+    public function validSenderDataProvider()
+    {
+        return array(
+            // Description => [sender address, sender name],
+            'german IDN' => array('öäü@ä-umlaut.de', null),
+        );
+    }
 }
diff --git a/test/Transport/SendmailTest.php b/test/Transport/SendmailTest.php
@@ -138,7 +138,7 @@ public function testCodeInjectionInFromHeader()
         $message->addTo('hacker@localhost', 'Name of recipient');
         $message->setSubject('TestSubject');
 
-        $this->setExpectedException(RuntimeException::class);
+        $this->setExpectedException('Zend\Mail\Transport\Exception\RuntimeException');
         $this->transport->send($message);
     }