Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- Nothing.
- [#98](https://github.com/laminas/laminas-mail/pull/98) removes `Laminas\Mail\Transport\Null`, as it is unusable with the new minimum supported PHP version (7.1). Users should use `Laminas\Mail\Transport\InMemory` instead. As this has been the default when requesting a "null" transport from `Laminas\Mail\Transport\Factory` for the past several minor releases, end-users should be unaffected. However, **users are encouraged to specify "inmemory" instead of "null" when requiring a no-op transport.**

### Fixed

Expand Down
34 changes: 0 additions & 34 deletions src/Transport/Null.php

This file was deleted.

9 changes: 2 additions & 7 deletions test/Transport/FactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

use Laminas\Mail\Transport\Factory;
use Laminas\Mail\Transport\InMemory;
use Laminas\Mail\Transport\Null as NullTransport;
use Laminas\Mail\Transport\Sendmail;
use Laminas\Stdlib\ArrayObject;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -77,10 +76,6 @@ public function typeProvider()
[Smtp::class],
];

if (version_compare(PHP_VERSION, '7.0', '<')) {
$types[] = [NullTransport::class];
}

return $types;
}

Expand All @@ -102,13 +97,13 @@ public function typeAliasProvider()
{
return [
['file', File::class],
['null', InMemory::class],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can actually keep these references to keep BC for end-users.

['memory', InMemory::class],
['inmemory', InMemory::class],
['InMemory', InMemory::class],
['sendmail', Sendmail::class],
['smtp', Smtp::class],
['File', File::class],
['null', InMemory::class],
['Null', InMemory::class],
['NULL', InMemory::class],
['Sendmail', Sendmail::class],
Expand All @@ -124,7 +119,7 @@ public function typeAliasProvider()
public function testCanUseTraversableAsSpec()
{
$spec = new ArrayObject([
'type' => 'null'
'type' => 'inMemory',
]);

$transport = Factory::create($spec);
Expand Down
31 changes: 0 additions & 31 deletions test/Transport/NullTest.php

This file was deleted.