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

…e_filesystem
zendframework · Jan 3, 2012 · 76e9a65 · 76e9a65
19 parents 0fb7a6e + b476244 + a566cb1 + 84a7972 + f6501d5 + 74b0454 + ea99bf1 + e2703e7 + 90db7ae + b2f5380 + d6ee2dd + 2dae9df + 15a2e1f + 00d7ef1 + 88e29ab + 04f5596 + d4b9187 + 83cb40e + 9666e65
commit 76e9a65
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 22 deletions.
diff --git a/src/AddressList.php b/src/AddressList.php
@@ -84,7 +84,7 @@ public function addMany(array $addresses)
             if (is_int($key) || is_numeric($key)) {
                 $this->add($value);
             } elseif (is_string($key)) {
-                $this->add($value, $key);
+                $this->add($key, $value);
             } else {
                 throw new Exception\RuntimeException(sprintf(
                     'Invalid key type in provided addresses array ("%s")',

diff --git a/src/Header/OrigDate.php → src/Header/Date.php b/src/Header/OrigDate.php → src/Header/Date.php
@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class OrigDate implements Header
+class Date implements Header
 {
     /**
      * @var string
@@ -49,16 +49,16 @@ class OrigDate implements Header
      * Factory: create header object from string
      * 
      * @param  string $headerLine 
-     * @return OrigDate
+     * @return Date
      * @throws Exception\InvalidArgumentException
      */
     public static function fromString($headerLine)
     {
         list($name, $value) = preg_split('#: #', $headerLine, 2);
 
         // check to ensure proper header type for this factory
-        if (strtolower($name) !== 'orig-date') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Orig-Date string');
+        if (strtolower($name) !== 'date') {
+            throw new Exception\InvalidArgumentException('Invalid header line for Date string');
         }
 
         $header = new static();
@@ -74,7 +74,7 @@ public static function fromString($headerLine)
      */
     public function getFieldName()
     {
-        return 'Orig-Date';
+        return 'Date';
     }
 
     /**
@@ -116,6 +116,6 @@ public function getEncoding()
      */
     public function toString()
     {
-        return 'Orig-Date: ' . $this->getFieldValue();
+        return 'Date: ' . $this->getFieldValue();
     }
 }
diff --git a/src/Headers.php b/src/Headers.php
@@ -134,7 +134,23 @@ public function getPluginClassLoader()
     {
         if ($this->pluginClassLoader === null) {
             $this->pluginClassLoader = new PluginClassLoader(array(
-                'contenttype'        => 'Zend\Mail\Header\ContentType',
+                'bcc'          => 'Zend\Mail\Header\Bcc',
+                'cc'           => 'Zend\Mail\Header\Cc',
+                'contenttype'  => 'Zend\Mail\Header\ContentType',
+                'content_type' => 'Zend\Mail\Header\ContentType',
+                'content-type' => 'Zend\Mail\Header\ContentType',
+                'date'         => 'Zend\Mail\Header\Date',
+                'from'         => 'Zend\Mail\Header\From',
+                'mimeversion'  => 'Zend\Mail\Header\MimeVersion',
+                'mime_version' => 'Zend\Mail\Header\MimeVersion',
+                'mime-version' => 'Zend\Mail\Header\MimeVersion',
+                'received'     => 'Zend\Mail\Header\Received',
+                'replyto'      => 'Zend\Mail\Header\ReplyTo',
+                'reply_to'     => 'Zend\Mail\Header\ReplyTo',
+                'reply-to'     => 'Zend\Mail\Header\ReplyTo',
+                'sender'       => 'Zend\Mail\Header\Sender',
+                'subject'      => 'Zend\Mail\Header\Subject',
+                'to'           => 'Zend\Mail\Header\To',
             ));
         }
         return $this->pluginClassLoader;

diff --git a/src/Message.php b/src/Message.php
@@ -118,7 +118,7 @@ public function headers()
     {
         if (null === $this->headers) {
             $this->setHeaders(new Headers());
-            $this->headers->addHeaderLine('Orig-Date', date('r'));
+            $this->headers->addHeaderLine('Date', date('r'));
         }
         return $this->headers;
     }

diff --git a/src/Transport/SmtpOptions.php b/src/Transport/SmtpOptions.php
@@ -134,12 +134,12 @@ public function getConnectionConfig()
     /**
      * Set connection configuration array
      * 
-     * @param  array $config 
+     * @param  array $connectionConfig 
      * @return SmtpOptions
      */
-    public function setConnectionConfig(array $config)
+    public function setConnectionConfig(array $connectionConfig)
     {
-        $this->connectionConfig = $config;
+        $this->connectionConfig = $connectionConfig;
         return $this;
     }
 

diff --git a/test/AddressListTest.php b/test/AddressListTest.php
@@ -98,7 +98,7 @@ public function testCanAddManyAddressesAtOnce()
     {
         $addresses = array(
             'zf-devteam@zend.com',
-            'ZF Contributors List' => 'zf-contributors@lists.zend.com',
+            'zf-contributors@lists.zend.com' => 'ZF Contributors List',
             new Address('fw-announce@lists.zend.com', 'ZF Announce List'),
         );
         $this->list->addMany($addresses);
@@ -112,7 +112,6 @@ public function testDoesNotStoreDuplicatesAndFirstWins()
     {
         $addresses = array(
             'zf-devteam@zend.com',
-            'ZF DevTeam' => 'zf-devteam@zend.com',
             new Address('zf-devteam@zend.com', 'ZF DevTeam'),
         );
         $this->list->addMany($addresses);

diff --git a/test/HeadersTest.php b/test/HeadersTest.php
@@ -282,4 +282,40 @@ public function testCastingToStringReturnsAllMultiHeaderValues()
         $expected = implode("\r\n", $expected) . "\r\n";
         $this->assertEquals($expected, $string);
     }
+
+    public static function expectedHeaders()
+    {
+        return array(
+            array('bcc', 'Zend\Mail\Header\Bcc'),
+            array('cc', 'Zend\Mail\Header\Cc'),
+            array('contenttype', 'Zend\Mail\Header\ContentType'),
+            array('content_type', 'Zend\Mail\Header\ContentType'),
+            array('content-type', 'Zend\Mail\Header\ContentType'),
+            array('from', 'Zend\Mail\Header\From'),
+            array('mimeversion', 'Zend\Mail\Header\MimeVersion'),
+            array('mime_version', 'Zend\Mail\Header\MimeVersion'),
+            array('mime-version', 'Zend\Mail\Header\MimeVersion'),
+            array('origdate', 'Zend\Mail\Header\OrigDate'),
+            array('orig_date', 'Zend\Mail\Header\OrigDate'),
+            array('orig-date', 'Zend\Mail\Header\OrigDate'),
+            array('received', 'Zend\Mail\Header\Received'),
+            array('replyto', 'Zend\Mail\Header\ReplyTo'),
+            array('reply_to', 'Zend\Mail\Header\ReplyTo'),
+            array('reply-to', 'Zend\Mail\Header\ReplyTo'),
+            array('sender', 'Zend\Mail\Header\Sender'),
+            array('subject', 'Zend\Mail\Header\Subject'),
+            array('to', 'Zend\Mail\Header\To'),
+        );
+    }
+
+    /**
+     * @dataProvider expectedHeaders
+     */
+    public function testDefaultPluginLoaderIsSeededWithHeaders($plugin, $class)
+    {
+        $headers = new Headers();
+        $loader  = $headers->getPluginClassLoader();
+        $test    = $loader->load($plugin);
+        $this->assertEquals($class, $test);
+    }
 }
diff --git a/test/MessageTest.php b/test/MessageTest.php
@@ -57,8 +57,8 @@ public function testSetsOrigDateHeaderByDefault()
     {
         $headers = $this->message->headers();
         $this->assertInstanceOf('Zend\Mail\Headers', $headers);
-        $this->assertTrue($headers->has('orig-date'));
-        $header  = $headers->get('orig-date');
+        $this->assertTrue($headers->has('date'));
+        $header  = $headers->get('date');
         $date    = date('r');
         $date    = substr($date, 0, 16);
         $test    = $header->getFieldValue();
@@ -230,7 +230,7 @@ public function testCanAddManyFromAddressesUsingArray()
     {
         $addresses = array(
             'zf-devteam@zend.com',
-            'ZF Contributors List' => 'zf-contributors@lists.zend.com',
+            'zf-contributors@lists.zend.com' => 'ZF Contributors List',
             new Address('fw-announce@lists.zend.com', 'ZF Announce List'),
         );
         $this->message->addFrom($addresses);
@@ -294,7 +294,7 @@ public function testCanAddManyCcAddressesUsingArray()
     {
         $addresses = array(
             'zf-devteam@zend.com',
-            'ZF Contributors List' => 'zf-contributors@lists.zend.com',
+            'zf-contributors@lists.zend.com' => 'ZF Contributors List',
             new Address('fw-announce@lists.zend.com', 'ZF Announce List'),
         );
         $this->message->addCc($addresses);
@@ -358,7 +358,7 @@ public function testCanAddManyBccAddressesUsingArray()
     {
         $addresses = array(
             'zf-devteam@zend.com',
-            'ZF Contributors List' => 'zf-contributors@lists.zend.com',
+            'zf-contributors@lists.zend.com' => 'ZF Contributors List',
             new Address('fw-announce@lists.zend.com', 'ZF Announce List'),
         );
         $this->message->addBcc($addresses);
@@ -422,7 +422,7 @@ public function testCanAddManyReplyToAddressesUsingArray()
     {
         $addresses = array(
             'zf-devteam@zend.com',
-            'ZF Contributors List' => 'zf-contributors@lists.zend.com',
+            'zf-contributors@lists.zend.com' => 'ZF Contributors List',
             new Address('fw-announce@lists.zend.com', 'ZF Announce List'),
         );
         $this->message->addReplyTo($addresses);

diff --git a/test/Transport/SendmailTest.php b/test/Transport/SendmailTest.php
@@ -74,7 +74,7 @@ public function getMessage()
                 ->addBcc('zf-crteam@lists.zend.com', 'CR-Team, ZF Project')
                 ->addFrom(array(
                     'zf-devteam@zend.com',
-                    'Matthew' => 'matthew@zend.com',
+                    'matthew@zend.com' => 'Matthew',
                 ))
                 ->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
                 ->setSubject('Testing Zend\Mail\Transport\Sendmail')

diff --git a/test/Transport/SmtpTest.php b/test/Transport/SmtpTest.php
@@ -56,7 +56,7 @@ public function getMessage()
                 ->addBcc('zf-crteam@lists.zend.com', 'CR-Team, ZF Project')
                 ->addFrom(array(
                     'zf-devteam@zend.com',
-                    'Matthew' => 'matthew@zend.com',
+                    'matthew@zend.com' => 'Matthew',
                 ))
                 ->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
                 ->setSubject('Testing Zend\Mail\Transport\Sendmail')