Revert "Bump min version to 7.2"

This reverts commit d02b28f.

.gitignore

@@ -1,5 +1,6 @@
 /.php_cs.cache
 /.phpunit
+/.phpunit.result.cache
 /build/*
 /composer.lock
 /phpunit.xml

.travis.yml

@@ -11,12 +11,18 @@ before_script:
 
 script: ./vendor/bin/simple-phpunit
 
+env:
+    global:
+        - SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1
+
 matrix:
     include:
+        - php: 7.0
+        - php: 7.1
         - php: 7.2
         - php: 7.3
         - php: 7.4
-        - php: nightly #php 8
+        - php: 8.0
     fast_finish: true
 
 cache:

CHANGES

@@ -1,10 +1,10 @@
 Changelog
 =========
 
-6.3.0 (2020-XX-XX)
+6.2.4 (2020-XX-XX)
 ------------------
 
- * Bump min PHP version to 7.2.5
+ * Code cleanups
 
 6.2.3 (2019-11-12)
 ------------------

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.0.0",
         "egulias/email-validator": "^2.0",
         "symfony/polyfill-iconv": "^1.0",
         "symfony/polyfill-mbstring": "^1.0",
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.3-dev"
+            "dev-master": "6.2-dev"
         }
     }
 }

doc/introduction.rst

@@ -6,7 +6,7 @@ Swift Mailer is a component based library for sending e-mails from PHP applicati
 System Requirements
 -------------------
 
-Swift Mailer requires PHP 7.2 or higher (``proc_*`` functions must be
+Swift Mailer requires PHP 7.0 or higher (``proc_*`` functions must be
 available).
 
 Swift Mailer does not work when used with function overloading as implemented

lib/classes/Swift.php

@@ -15,7 +15,7 @@
  */
 abstract class Swift
 {
-    const VERSION = '6.3.0';
+    const VERSION = '6.2.4';
 
     public static $initialized = false;
     public static $inits = [];

lib/classes/Swift/Events/SimpleEventDispatcher.php

@@ -127,7 +127,7 @@ private function prepareBubbleQueue(Swift_Events_EventObject $evt)
                 $bubbleQueue[] = $listener;
             }
         }
-        
+
         return $bubbleQueue;
     }
 

tests/SwiftMailerSmokeTestCase.php

@@ -7,7 +7,7 @@
  */
 class SwiftMailerSmokeTestCase extends SwiftMailerTestCase
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         if (!\defined('SWIFT_SMOKE_TRANSPORT_TYPE')) {
             $this->markTestSkipped(

tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php

@@ -4,13 +4,13 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit\Framework\T
 {
     private $_testFile;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->testFile = sys_get_temp_dir().'/swift-test-file'.__CLASS__;
         file_put_contents($this->testFile, 'abcdefghijklm');
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         unlink($this->testFile);
     }

tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php

@@ -5,7 +5,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
     private $factory;
     private $prefix = 'Swift_CharacterReader_';
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
     }

tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php

@@ -5,7 +5,7 @@ class Swift_Encoder_Base64EncoderAcceptanceTest extends \PHPUnit\Framework\TestC
     private $samplesDir;
     private $encoder;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
         $this->encoder = new Swift_Encoder_Base64Encoder();

tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php

@@ -5,7 +5,7 @@ class Swift_Encoder_QpEncoderAcceptanceTest extends \PHPUnit\Framework\TestCase
     private $samplesDir;
     private $factory;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
         $this->factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();

tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php

@@ -5,7 +5,7 @@ class Swift_Encoder_Rfc2231EncoderAcceptanceTest extends \PHPUnit\Framework\Test
     private $samplesDir;
     private $factory;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
         $this->factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();

tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php

@@ -6,7 +6,7 @@ class Swift_KeyCache_ArrayKeyCacheAcceptanceTest extends \PHPUnit\Framework\Test
     private $key1 = 'key1';
     private $key2 = 'key2';
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->cache = new Swift_KeyCache_ArrayKeyCache(
             new Swift_KeyCache_SimpleKeyCacheInputStream()

tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php

@@ -6,7 +6,7 @@ class Swift_KeyCache_DiskKeyCacheAcceptanceTest extends \PHPUnit\Framework\TestC
     private $key1;
     private $key2;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->key1 = uniqid(microtime(true), true);
         $this->key2 = uniqid(microtime(true), true);

tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php

@@ -9,7 +9,7 @@ class Swift_Mime_AttachmentAcceptanceTest extends \PHPUnit\Framework\TestCase
     private $headers;
     private $emailValidator;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->cache = new Swift_KeyCache_ArrayKeyCache(
             new Swift_KeyCache_SimpleKeyCacheInputStream()

tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php

@@ -5,7 +5,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoderAcceptanceTest extends \PHPU
     private $samplesDir;
     private $encoder;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
         $this->encoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();

tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php

@@ -9,7 +9,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PH
      */
     protected $encoder;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
         $this->encoder = new Swift_Mime_ContentEncoder_NativeQpContentEncoder();

tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php

@@ -5,7 +5,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUn
     private $samplesDir;
     private $encoder;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
         $this->encoder = new Swift_Mime_ContentEncoder_PlainContentEncoder('8bit');

tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php

@@ -5,13 +5,13 @@ class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit\
     private $samplesDir;
     private $factory;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
         $this->factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         Swift_Preferences::getInstance()->setQPDotEscape(false);
     }

tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php

@@ -9,7 +9,7 @@ class Swift_Mime_EmbeddedFileAcceptanceTest extends \PHPUnit\Framework\TestCase
     private $headers;
     private $emailValidator;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->cache = new Swift_KeyCache_ArrayKeyCache(
             new Swift_KeyCache_SimpleKeyCacheInputStream()

tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php

@@ -4,7 +4,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoderAcceptanceTest extends \PHPUni
 {
     private $encoder;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->encoder = new Swift_Mime_HeaderEncoder_Base64HeaderEncoder();
     }

tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php

@@ -9,7 +9,7 @@ class Swift_Mime_MimePartAcceptanceTest extends \PHPUnit\Framework\TestCase
     private $headers;
     private $emailValidator;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->cache = new Swift_KeyCache_ArrayKeyCache(
             new Swift_KeyCache_SimpleKeyCacheInputStream()

tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php

@@ -2,7 +2,7 @@
 
 class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         Swift_Preferences::getInstance()->setCharset(null); //TODO: Test with the charset defined
     }

tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php

@@ -6,7 +6,7 @@ abstract class Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest e
 
     abstract protected function initializeBuffer();
 
-    protected function setUp(): void
+    protected function setUp()
     {
         if (true == getenv('TRAVIS')) {
             $this->markTestSkipped(

tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php

@@ -4,7 +4,7 @@
 
 class Swift_Transport_StreamBuffer_BasicSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         if (!\defined('SWIFT_SMTP_HOST')) {
             $this->markTestSkipped(

tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php

@@ -4,7 +4,7 @@
 
 class Swift_Transport_StreamBuffer_ProcessAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         if (!\defined('SWIFT_SENDMAIL_PATH')) {
             $this->markTestSkipped(

tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php

@@ -6,7 +6,7 @@ class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit\Framework\
     protected $server;
     protected $randomHighPort;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         if (!\defined('SWIFT_SMTP_HOST')) {
             $this->markTestSkipped(
@@ -56,7 +56,7 @@ public function testTimeoutException()
         $this->assertMatchesRegularExpression('/Connection to .* Timed Out/', $e->getMessage());
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         if ($this->server) {
             stream_socket_shutdown($this->server, STREAM_SHUT_RDWR);

tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php

@@ -4,7 +4,7 @@
 
 class Swift_Transport_StreamBuffer_SslSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         $streams = stream_get_transports();
         if (!\in_array('ssl', $streams)) {

tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php

@@ -4,7 +4,7 @@
 
 class Swift_Transport_StreamBuffer_TlsSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         $streams = stream_get_transports();
         if (!\in_array('tls', $streams)) {

tests/bug/Swift/Bug118Test.php

@@ -4,7 +4,7 @@ class Swift_Bug118Test extends \PHPUnit\Framework\TestCase
 {
     private $message;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->message = new Swift_Message();
     }

tests/bug/Swift/Bug206Test.php

@@ -6,7 +6,7 @@ class Swift_Bug206Test extends \PHPUnit\Framework\TestCase
 {
     private $factory;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
         $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(

tests/bug/Swift/Bug34Test.php

@@ -2,7 +2,7 @@
 
 class Swift_Bug34Test extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         Swift_Preferences::getInstance()->setCharset('utf-8');
     }

tests/bug/Swift/Bug35Test.php

@@ -2,7 +2,7 @@
 
 class Swift_Bug35Test extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         Swift_Preferences::getInstance()->setCharset('utf-8');
     }

tests/bug/Swift/Bug38Test.php

@@ -6,7 +6,7 @@ class Swift_Bug38Test extends \PHPUnit\Framework\TestCase
     private $attFileName;
     private $attFileType;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->attFileName = 'data.txt';
         $this->attFileType = 'text/plain';

tests/bug/Swift/Bug51Test.php

@@ -5,7 +5,7 @@ class Swift_Bug51Test extends \SwiftMailerTestCase
     private $attachmentFile;
     private $outputFile;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->attachmentFile = sys_get_temp_dir().'/attach.rand.bin';
         file_put_contents($this->attachmentFile, '');
@@ -14,7 +14,7 @@ protected function setUp(): void
         file_put_contents($this->outputFile, '');
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         unlink($this->attachmentFile);
         unlink($this->outputFile);

tests/bug/Swift/Bug71Test.php

@@ -4,7 +4,7 @@ class Swift_Bug71Test extends \PHPUnit\Framework\TestCase
 {
     private $message;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->message = new Swift_Message('test');
     }