Storage\Maildir fixes + enable unit tests

src/Header/IdentificationField.php

@@ -108,7 +108,7 @@ public function getEncoding()
      */
     public function toString()
     {
-        return sprintf('%s: %s', $this->fieldName, $this->getFieldValue());
+        return sprintf('%s: %s', $this->getFieldName(), $this->getFieldValue());
     }
 
     /**

src/Storage/Folder/Maildir.php

@@ -97,7 +97,7 @@ protected function buildFolderTree()
                 continue;
             }
 
-            if ($this->_isMaildir($this->rootdir . $entry)) {
+            if ($this->isMaildir($this->rootdir . $entry)) {
                 $dirs[] = $entry;
             }
         }
@@ -187,7 +187,7 @@ public function selectFolder($globalName)
         $folder = $this->getFolders($this->currentFolder);
 
         try {
-            $this->_openMaildir($this->rootdir . '.' . $folder->getGlobalName());
+            $this->openMaildir($this->rootdir . '.' . $folder->getGlobalName());
         } catch (Exception\ExceptionInterface $e) {
             // check what went wrong
             if (! $folder->isSelectable()) {

src/Storage/Maildir.php

@@ -133,7 +133,7 @@ public function getSize($id = null)
     public function getMessage($id)
     {
         // TODO that's ugly, would be better to let the message class decide
-        if ($this->messageClass === Message\File::class
+        if (\trim($this->messageClass, '\\') === Message\File::class
             || is_subclass_of($this->messageClass, Message\File::class)
         ) {
             return new $this->messageClass([

test/AddressListTest.php

@@ -40,7 +40,7 @@ public function testIsEmptyByDefault()
 
     public function testAddingEmailsIncreasesCount()
     {
-        $this->list->add('test@example.com');
+        $this->list->addFromString('test@example.com');
         $this->assertEquals(1, count($this->list));
     }
 
@@ -65,6 +65,18 @@ public function testGetReturnsFalseWhenEmailNotFound()
         $this->assertFalse($this->list->get('foo@example.com'));
     }
 
+    public function testThrowExceptionOnInvalidInputAdd()
+    {
+        $this->expectException('Laminas\Mail\Exception\InvalidArgumentException');
+        $this->list->add(null);
+    }
+
+    public function testThrowExceptionOnInvalidInputAddMany()
+    {
+        $this->expectException('Laminas\Mail\Exception\InvalidArgumentException');
+        $this->list->addMany([null]);
+    }
+
     public function testGetReturnsAddressObjectWhenEmailFound()
     {
         $this->list->add('test@example.com');

test/ConfigProviderTest.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-mail for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-mail/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-mail/blob/master/LICENSE.md New BSD License
+ */
+
+namespace LaminasTest\Mail;
+
+use Laminas\Mail\ConfigProvider;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @group      Laminas_Mail
+ * @covers \Laminas\Mail\ConfigProvider<extended>
+ */
+class ConfigProviderTest extends TestCase
+{
+    public function testInvoke()
+    {
+        $configProvider = new ConfigProvider();
+        $config = $configProvider();
+        $this->assertEquals(['dependencies'], \array_keys($config));
+    }
+}

test/Header/ContentTransferEncodingTest.php

@@ -68,6 +68,7 @@ public function testContentTransferEncodingGetFieldValueReturnsProperValue($enco
         $contentTransferEncodingHeader = new ContentTransferEncoding();
         $contentTransferEncodingHeader->setTransferEncoding($encoding);
         $this->assertEquals($encoding, $contentTransferEncodingHeader->getFieldValue());
+        $this->assertEquals($encoding, $contentTransferEncodingHeader->getTransferEncoding());
     }
 
     /**
@@ -147,4 +148,18 @@ public function testSetTransferEncodingRaisesExceptionForInvalidValues()
         $this->expectExceptionMessage('expects');
         $header->setTransferEncoding("8bit\r\n 7bit");
     }
+
+    public function testFromStringRaisesExceptionOnInvalidHeader()
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        ContentTransferEncoding::fromString('Foo: bar');
+    }
+
+    public function testEncodingAccessors()
+    {
+        $header = new ContentTransferEncoding('today');
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('ASCII', $header->getEncoding());
+    }
 }

test/Header/ContentTypeTest.php

@@ -187,4 +187,34 @@ public function invalidHeaderLinesProvider()
         ];
         // @codingStandardsIgnoreEnd
     }
+
+    public function testFromStringRaisesExceptionOnInvalidHeader()
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        ContentType::fromString('Foo: bar');
+    }
+
+    public function testEncodingAccessors()
+    {
+        $header = new ContentType('today');
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('UTF-8', $header->getEncoding());
+    }
+
+    public function testSetTypeThrowsOnInvalidValue()
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        $header = new ContentType();
+        $header->setType('invalid');
+    }
+
+    public function testGetRemoveParameter()
+    {
+        $header = ContentType::fromString('content-type: text/plain; level=top');
+        $this->assertEquals('top', $header->getParameter('level'));
+        $this->assertEquals(true, $header->removeParameter('level'));
+        $this->assertEquals(false, $header->removeParameter('level'));
+        $this->assertEquals(null, $header->getParameter('level'));
+    }
 }

test/Header/DateTest.php

@@ -44,4 +44,24 @@ public function testPreventsCRLFInjectionViaConstructor()
         $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
         $address = new Header\Date("This\ris\r\na\nCRLF Attack");
     }
+
+    public function testFromStringRaisesExceptionOnInvalidHeader()
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        Header\Date::fromString('Foo: bar');
+    }
+
+    public function testEncodingAccessors()
+    {
+        $header = new Header\Date('today');
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('ASCII', $header->getEncoding());
+    }
+
+    public function testToString()
+    {
+        $header = new Header\Date('today');
+        $this->assertEquals('Date: today', $header->toString());
+    }
 }

test/Header/GenericHeaderTest.php

@@ -16,22 +16,30 @@
  */
 class GenericHeaderTest extends TestCase
 {
+    public function invalidHeaderLines()
+    {
+        return [
+            ['Content-Type' . chr(32) . ': text/html; charset = "iso-8859-1"' . "\nThis is a test"],
+            ['Content-Type: text/html; charset = "iso-8859-1"' . "\nThis is a test"],
+            ['Missing colon'],
+        ];
+    }
     /**
+     * @dataProvider invalidHeaderLines
      * @group ZF2015-04
      */
-    public function testSplitHeaderLineRaisesExceptionOnInvalidHeader()
+    public function testSplitHeaderLineRaisesExceptionOnInvalidHeader($line)
     {
         $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
-        GenericHeader::splitHeaderLine(
-            'Content-Type' . chr(32) . ': text/html; charset = "iso-8859-1"' . "\nThis is a test"
-        );
+        GenericHeader::splitHeaderLine($line);
     }
 
     public function fieldNames()
     {
         return [
             'append-chr-13'  => ["Subject" . chr(13)],
             'append-chr-127' => ["Subject" . chr(127)],
+            'non-string' => [null],
         ];
     }
 
@@ -148,4 +156,12 @@ public function testAllowZeroInHeaderValueInConstructor()
         $this->assertEquals(0, $header->getFieldValue());
         $this->assertEquals('Foo: 0', $header->toString());
     }
+
+    public function testEncodingAccessors()
+    {
+        $header = new GenericHeader('Foo');
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('UTF-8', $header->getEncoding());
+    }
 }

test/Header/HeaderNameTest.php

@@ -38,6 +38,7 @@ public function getFilterNames()
      */
     public function testFilterName($name, $expected)
     {
+        HeaderName::assertValid($expected);
         $this->assertEquals($expected, HeaderName::filter($name));
     }
 

test/Header/IdentificationFieldTest.php

@@ -42,6 +42,15 @@ public function reversibleStringHeadersProvider()
         ];
     }
 
+    public function invalidIds()
+    {
+        return [
+            [References::class, ["1234@local.machine.example\r\n"]],
+            [References::class, ["1234@local.machine.example", "3456@example.net\r\n"]],
+            [InReplyTo::class, ["3456@example.net\r\n"]],
+        ];
+    }
+
     /**
      * @dataProvider stringHeadersProvider
      * @param string $className
@@ -68,4 +77,44 @@ public function testSerializationToString($className, $headerString, $ids)
         $header->setIds($ids);
         $this->assertEquals($headerString, $header->toString());
     }
+
+    /**
+     * @dataProvider stringHeadersProvider
+     * @param string $className
+     * @param string $headerString
+     * @param string[] $ids
+     */
+    public function testEncodingAccessors($className, $headerString, $ids)
+    {
+        /** @var IdentificationField $header */
+        $header = $className::fromString($headerString);
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('ASCII', $header->getEncoding());
+    }
+
+    /**
+     * @dataProvider invalidIds
+     * @param string $className
+     * @param string[] $ids
+     */
+    public function testSetIdsThrowsOnInvalidInput($className, $ids)
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        /** @var IdentificationField $header */
+        $header = new $className();
+        $header->setIds($ids);
+    }
+
+    /**
+     * @dataProvider invalidIds
+     * @param string $className
+     * @param string[] $ids
+     */
+    public function testFromStringRaisesExceptionOnInvalidHeader($className, $ids)
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        /** @var IdentificationField $header */
+        $header = $className::fromString('Foo: bar');
+    }
 }

test/Header/MessageIdTest.php

@@ -25,6 +25,8 @@ public function testSettingManually()
 
         $expected = sprintf('<%s>', $id);
         $this->assertEquals($expected, $messageid->getFieldValue());
+        $this->assertEquals($expected, $messageid->getId());
+        $this->assertEquals("Message-ID: $expected", $messageid->toString());
     }
 
     public function testAutoGeneration()
@@ -35,6 +37,15 @@ public function testAutoGeneration()
         $this->assertContains('@', $messageid->getFieldValue());
     }
 
+    public function testAutoGenerationWithServerVars()
+    {
+        $_SERVER['REMOTE_ADDR'] = '172.16.0.1';
+        $_SERVER['SERVER_NAME'] = 'server-name.test';
+        $messageid = new Header\MessageId();
+        $messageid->setId();
+
+        $this->assertContains('@', $messageid->getFieldValue());
+    }
 
     public function headerLines()
     {
@@ -77,4 +88,18 @@ public function testInvalidIdentifierRaisesException($id)
         $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
         $header->setId($id);
     }
+
+    public function testFromStringRaisesExceptionOnInvalidHeader()
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        Header\MessageId::fromString('Foo: bar');
+    }
+
+    public function testEncodingAccessors()
+    {
+        $header = new Header\MessageId();
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('ASCII', $header->getEncoding());
+    }
 }

test/Header/MimeVersionTest.php

@@ -29,6 +29,7 @@ public function testDefaultVersion()
     {
         $mime = new Header\MimeVersion();
         $this->assertEquals('1.0', $mime->getVersion());
+        $this->assertEquals('MIME-Version: 1.0', $mime->toString());
     }
 
     public function headerLines()
@@ -71,4 +72,18 @@ public function testRaisesExceptionOnInvalidVersionFromSetVersion($value)
         $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
         $header->setVersion($value);
     }
+
+    public function testFromStringRaisesExceptionOnInvalidHeader()
+    {
+        $this->expectException('Laminas\Mail\Header\Exception\InvalidArgumentException');
+        Header\MimeVersion::fromString('Foo: bar');
+    }
+
+    public function testEncodingAccessors()
+    {
+        $header = new Header\MimeVersion('1.0');
+        $this->assertEquals('ASCII', $header->getEncoding());
+        $header->setEncoding('UTF-8');
+        $this->assertEquals('ASCII', $header->getEncoding());
+    }
 }