Merge branch 'Trainmaster-patch-1' into develop

Forward port zendframework/zendframework#6228
zendframework · Aug 6, 2014 · fe14f39 · fe14f39
8 parents d2a67fc + 26177b0 + 2beabf9 + de855cb + 82571c3 + e366253 + d26cf74 + 122fff3
commit fe14f39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php
@@ -248,15 +248,15 @@ protected function prepareParameters(Mail\Message $message)
 
         $sender = $message->getSender();
         if ($sender instanceof AddressInterface) {
-            $parameters .= ' -f ' . $sender->getEmail();
+            $parameters .= ' -f' . $sender->getEmail();
             return $parameters;
         }
 
         $from = $message->getFrom();
         if (count($from)) {
             $from->rewind();
             $sender      = $from->current();
-            $parameters .= ' -f ' . $sender->getEmail();
+            $parameters .= ' -f' . $sender->getEmail();
             return $parameters;
         }
 

diff --git a/test/Transport/SendmailTest.php b/test/Transport/SendmailTest.php
@@ -85,7 +85,7 @@ public function testReceivesMailArtifactsOnUnixSystems()
         $this->assertContains("From: zf-devteam@zend.com,\n Matthew <matthew@zend.com>\n", $this->additional_headers);
         $this->assertContains("X-Foo-Bar: Matthew\n", $this->additional_headers);
         $this->assertContains("Sender: Ralph Schindler <ralph.schindler@zend.com>\n", $this->additional_headers);
-        $this->assertEquals('-R hdrs -f ralph.schindler@zend.com', $this->additional_parameters);
+        $this->assertEquals('-R hdrs -fralph.schindler@zend.com', $this->additional_parameters);
     }
 
     public function testReceivesMailArtifactsOnWindowsSystems()