summaryrefslogtreecommitdiff
path: root/vendor/swiftmailer
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/swiftmailer')
-rw-r--r--vendor/swiftmailer/swiftmailer/.gitignore6
-rw-r--r--vendor/swiftmailer/swiftmailer/.php_cs.dist15
-rw-r--r--vendor/swiftmailer/swiftmailer/.travis.yml8
-rw-r--r--vendor/swiftmailer/swiftmailer/CHANGES30
-rw-r--r--vendor/swiftmailer/swiftmailer/VERSION2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php32
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php18
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php6
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php10
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php8
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php6
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php10
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php31
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php5
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php10
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php19
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php60
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php31
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php10
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php6
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php18
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php9
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php17
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php18
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/lib/preferences.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance.conf.php.default7
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php46
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php30
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php14
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php6
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug118Test.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug38Test.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug51Test.php19
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug71Test.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug76Test.php19
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/fixtures/MimeEntityFixture.php8
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php7
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php12
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php1
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php42
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php16
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php14
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php6
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php78
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php1
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php2
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php4
-rw-r--r--vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php2
148 files changed, 457 insertions, 518 deletions
diff --git a/vendor/swiftmailer/swiftmailer/.gitignore b/vendor/swiftmailer/swiftmailer/.gitignore
index 9a23ffe6..20d389a1 100644
--- a/vendor/swiftmailer/swiftmailer/.gitignore
+++ b/vendor/swiftmailer/swiftmailer/.gitignore
@@ -1,4 +1,8 @@
+/.php_cs.cache
+/.phpunit
+/build/*
+/composer.lock
+/phpunit.xml
/tests/acceptance.conf.php
/tests/smoke.conf.php
-/build/*
/vendor/
diff --git a/vendor/swiftmailer/swiftmailer/.php_cs.dist b/vendor/swiftmailer/swiftmailer/.php_cs.dist
new file mode 100644
index 00000000..f18d65d4
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/.php_cs.dist
@@ -0,0 +1,15 @@
+<?php
+
+return PhpCsFixer\Config::create()
+ ->setRules(array(
+ '@Symfony' => true,
+ '@Symfony:risky' => true,
+ 'array_syntax' => array('syntax' => 'long'),
+ 'no_unreachable_default_argument_value' => false,
+ 'braces' => array('allow_single_line_closure' => true),
+ 'heredoc_to_nowdoc' => false,
+ 'phpdoc_annotation_without_dot' => false,
+ ))
+ ->setRiskyAllowed(true)
+ ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
+;
diff --git a/vendor/swiftmailer/swiftmailer/.travis.yml b/vendor/swiftmailer/swiftmailer/.travis.yml
index 0adf8d54..fc24d05e 100644
--- a/vendor/swiftmailer/swiftmailer/.travis.yml
+++ b/vendor/swiftmailer/swiftmailer/.travis.yml
@@ -11,8 +11,7 @@ before_script:
- gem install mailcatcher
- mailcatcher --smtp-port 4456
-script:
- - phpunit --verbose
+script: ./vendor/bin/simple-phpunit
matrix:
include:
@@ -21,7 +20,12 @@ matrix:
- php: 5.5
- php: 5.6
- php: 7.0
+ - php: 7.1
- php: hhvm
allow_failures:
- php: hhvm
fast_finish: true
+
+cache:
+ directories:
+ - .phpunit
diff --git a/vendor/swiftmailer/swiftmailer/CHANGES b/vendor/swiftmailer/swiftmailer/CHANGES
index 282e89e1..e5b605bd 100644
--- a/vendor/swiftmailer/swiftmailer/CHANGES
+++ b/vendor/swiftmailer/swiftmailer/CHANGES
@@ -1,10 +1,36 @@
Changelog
=========
-5.4.5 (2016-XX-XX)
+5.4.8 (2017-05-01)
------------------
- * fixed CVE-2016-10033 and CVE-2016-10045
+ * fixed encoding inheritance in addPart()
+ * fixed sorting MIME children when their types are equal
+
+5.4.7 (2017-04-20)
+------------------
+
+ * fixed NTLMAuthenticator clobbering bcmath scale
+
+5.4.6 (2017-02-13)
+------------------
+
+ * removed exceptions thrown in destructors as they lead to fatal errors
+ * switched to use sha256 by default in DKIM as per the RFC
+ * fixed an 'Undefined variable: pipes' PHP notice
+ * fixed long To headers when using the mail transport
+ * fixed NTLMAuthenticator when no domain is passed with the username
+ * prevented fatal error during unserialization of a message
+ * fixed a PHP warning when sending a message that has a length of a multiple of 8192
+
+5.4.5 (2016-12-29)
+------------------
+
+ * SECURITY FIX: fixed CVE-2016-10074 by disallowing potentially unsafe shell characters
+
+ Prior to 5.4.5, the mail transport (Swift_Transport_MailTransport) was vulnerable to passing
+ arbitrary shell arguments if the "From", "ReturnPath" or "Sender" header came
+ from a non-trusted source, potentially allowing Remote Code Execution
* deprecated the mail transport
5.4.4 (2016-11-23)
diff --git a/vendor/swiftmailer/swiftmailer/VERSION b/vendor/swiftmailer/swiftmailer/VERSION
index e130e22a..6434642b 100644
--- a/vendor/swiftmailer/swiftmailer/VERSION
+++ b/vendor/swiftmailer/swiftmailer/VERSION
@@ -1 +1 @@
-Swift-5.4.5-DEV
+Swift-5.4.8
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
index 3d5e854a..4267adbc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
@@ -48,8 +48,8 @@ interface Swift_CharacterReader
* A value of zero means this is already a valid character.
* A value of -1 means this cannot possibly be a valid character.
*
- * @param integer[] $bytes
- * @param int $size
+ * @param int[] $bytes
+ * @param int $size
*
* @return int
*/
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 7379bda2..22746bd8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -19,22 +19,22 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
/** Pre-computed for optimization */
private static $length_map = array(
// N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x0N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x1N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x2N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x3N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x4N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x5N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x6N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x7N
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0x8N
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0x9N
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0xAN
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0xBN
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xCN
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xDN
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, // 0xEN
- 4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0, // 0xFN
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x3N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x4N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x5N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x6N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x7N
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x8N
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x9N
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xAN
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xBN
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
+ 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
);
private static $s_length_map = array(
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index d695a6e1..7213a40d 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -155,7 +155,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
*
* @param int $length
*
- * @return integer[]
+ * @return int[]
*/
public function readBytes($length)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
index 8c1074a3..befec9ac 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -48,7 +48,7 @@ class Swift_DependencyContainer
/**
* Returns a singleton of the DependencyContainer.
*
- * @return Swift_DependencyContainer
+ * @return self
*/
public static function getInstance()
{
@@ -143,7 +143,7 @@ class Swift_DependencyContainer
*
* @param string $itemName
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function register($itemName)
{
@@ -160,7 +160,7 @@ class Swift_DependencyContainer
*
* @param mixed $value
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function asValue($value)
{
@@ -176,7 +176,7 @@ class Swift_DependencyContainer
*
* @param string $lookup
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function asAliasOf($lookup)
{
@@ -198,7 +198,7 @@ class Swift_DependencyContainer
*
* @param string $className
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function asNewInstanceOf($className)
{
@@ -216,7 +216,7 @@ class Swift_DependencyContainer
*
* @param string $className
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function asSharedInstanceOf($className)
{
@@ -236,7 +236,7 @@ class Swift_DependencyContainer
*
* @param array $lookups
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function withDependencies(array $lookups)
{
@@ -257,7 +257,7 @@ class Swift_DependencyContainer
*
* @param mixed $value
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function addConstructorValue($value)
{
@@ -278,7 +278,7 @@ class Swift_DependencyContainer
*
* @param string $lookup
*
- * @return Swift_DependencyContainer
+ * @return $this
*/
public function addConstructorLookup($lookup)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index 8a81fe39..edec10c5 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -235,8 +235,8 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
/**
* Encode the given byte array into a verbatim QP form.
*
- * @param integer[] $bytes
- * @param int $size
+ * @param int[] $bytes
+ * @param int $size
*
* @return string
*/
@@ -262,7 +262,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
*
* @param int $size number of bytes to read
*
- * @return integer[]
+ * @return int[]
*/
protected function _nextSequence($size = 4)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
index 253977b6..24587870 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
@@ -55,8 +55,6 @@ class Swift_Encoding
return self::_lookup('mime.base64contentencoder');
}
- // -- Private Static Methods
-
private static function _lookup($key)
{
return Swift_DependencyContainer::getInstance()->lookup($key);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 7dc381d9..674e6b5e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -25,7 +25,7 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
/**
* An array of codes which a successful response will contain.
*
- * @var integer[]
+ * @var int[]
*/
private $_successCodes = array();
@@ -56,7 +56,7 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
/**
* Get the numeric response codes which indicate success for this command.
*
- * @return integer[]
+ * @return int[]
*/
public function getSuccessCodes()
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
index 53f277da..9951c597 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -36,7 +36,7 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
*
* @param Swift_Transport[] $transports
*
- * @return Swift_FailoverTransport
+ * @return self
*/
public static function newInstance($transports = array())
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
index 25f5f1b6..4213ee27 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
@@ -36,7 +36,7 @@ class Swift_Image extends Swift_EmbeddedFile
* @param string $filename
* @param string $contentType
*
- * @return Swift_Image
+ * @return self
*/
public static function newInstance($data = null, $filename = null, $contentType = null)
{
@@ -48,14 +48,10 @@ class Swift_Image extends Swift_EmbeddedFile
*
* @param string $path
*
- * @return Swift_Image
+ * @return self
*/
public static function fromPath($path)
{
- $image = self::newInstance()->setFile(
- new Swift_ByteStream_FileByteStream($path)
- );
-
- return $image;
+ return self::newInstance()->setFile(new Swift_ByteStream_FileByteStream($path));
}
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
index fdba9df5..e151b8a9 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -36,7 +36,7 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
*
* @param array $transports
*
- * @return Swift_LoadBalancedTransport
+ * @return self
*/
public static function newInstance($transports = array())
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
index 994df3ec..18556989 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
@@ -38,7 +38,7 @@ class Swift_MailTransport extends Swift_Transport_MailTransport
*
* @param string $extraParams To be passed to mail()
*
- * @return Swift_MailTransport
+ * @return self
*/
public static function newInstance($extraParams = '-f%s')
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
index 64115462..8314fe8f 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
@@ -33,7 +33,7 @@ class Swift_Mailer
*
* @param Swift_Transport $transport
*
- * @return Swift_Mailer
+ * @return self
*/
public static function newInstance(Swift_Transport $transport)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
index a6bb6593..242cbf31 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -86,9 +86,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
*/
public function addPart($body, $contentType = null, $charset = null)
{
- return $this->attach(Swift_MimePart::newInstance(
- $body, $contentType, $charset
- ));
+ return $this->attach(Swift_MimePart::newInstance($body, $contentType, $charset)->setEncoder($this->getEncoder()));
}
/**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index 46a5e8da..d5ba14b9 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -64,7 +64,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
*
* @param string $disposition
*
- * @return Swift_Mime_Attachment
+ * @return $this
*/
public function setDisposition($disposition)
{
@@ -90,7 +90,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
*
* @param string $filename
*
- * @return Swift_Mime_Attachment
+ * @return $this
*/
public function setFilename($filename)
{
@@ -115,7 +115,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
*
* @param int $size
*
- * @return Swift_Mime_Attachment
+ * @return $this
*/
public function setSize($size)
{
@@ -130,7 +130,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
* @param Swift_FileStream $file
* @param string $contentType optional
*
- * @return Swift_Mime_Attachment
+ * @return $this
*/
public function setFile(Swift_FileStream $file, $contentType = null)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
index 7390d2c8..1768709e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
@@ -138,7 +138,7 @@ interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver
/**
* Create a new instance of this HeaderSet.
*
- * @return Swift_Mime_HeaderSet
+ * @return self
*/
public function newInstance();
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index fbd9258a..3a6d7b39 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -219,8 +219,6 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
return $this->toString();
}
- // -- Points of extension
-
/**
* Set the name of this Header field.
*
@@ -449,7 +447,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
*/
protected function toTokens($string = null)
{
- if (is_null($string)) {
+ if (null === $string) {
$string = $this->getFieldBody();
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 4fd66742..4075cbfa 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -95,7 +95,7 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
*/
public function setTimestamp($timestamp)
{
- if (!is_null($timestamp)) {
+ if (null !== $timestamp) {
$timestamp = (int) $timestamp;
}
$this->clearCachedValueIf($this->_timestamp != $timestamp);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index e54b1c66..e4567fc8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -231,15 +231,13 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
public function getFieldBody()
{
// Compute the string value of the header only if needed
- if (is_null($this->getCachedValue())) {
+ if (null === $this->getCachedValue()) {
$this->setCachedValue($this->createMailboxListString($this->_mailboxes));
}
return $this->getCachedValue();
}
- // -- Points of extension
-
/**
* Normalizes a user-input list of mailboxes into consistent key=>value pairs.
*
@@ -323,7 +321,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
foreach ($mailboxes as $email => $name) {
$mailboxStr = $email;
- if (!is_null($name)) {
+ if (null !== $name) {
$nameStr = $this->createDisplayNameString($name, empty($strings));
$mailboxStr = $nameStr.' <'.$mailboxStr.'>';
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index c506daec..c1777d33 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -131,7 +131,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
{
$body = parent::getFieldBody();
foreach ($this->_params as $name => $value) {
- if (!is_null($value)) {
+ if (null !== $value) {
// Add the parameter
$body .= '; '.$this->_createParameter($name, $value);
}
@@ -156,7 +156,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
// Try creating any parameters
foreach ($this->_params as $name => $value) {
- if (!is_null($value)) {
+ if (null !== $value) {
// Add the semi-colon separator
$tokens[count($tokens) - 1] .= ';';
$tokens = array_merge($tokens, $this->generateTokenLines(
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index 2fffc7b4..4a814b12 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -80,7 +80,7 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
*/
public function setAddress($address)
{
- if (is_null($address)) {
+ if (null === $address) {
$this->_address = null;
} elseif ('' == $address) {
$this->_address = '';
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index 50fadfb7..4564fef6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -40,7 +40,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
{
parent::__construct($headers, $encoder, $cache, $grammar);
$this->setContentType('text/plain');
- if (!is_null($charset)) {
+ if (null !== $charset) {
$this->setCharset($charset);
}
}
@@ -53,7 +53,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
* @param string $contentType optional
* @param string $charset optional
*
- * @return Swift_Mime_MimePart
+ * @return $this
*/
public function setBody($body, $contentType = null, $charset = null)
{
@@ -82,7 +82,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
*
* @param string $charset
*
- * @return Swift_Mime_MimePart
+ * @return $this
*/
public function setCharset($charset)
{
@@ -111,7 +111,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
*
* @param string $format
*
- * @return Swift_Mime_MimePart
+ * @return $this
*/
public function setFormat($format)
{
@@ -136,7 +136,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
*
* @param bool $delsp
*
- * @return Swift_Mime_MimePart
+ * @return $this
*/
public function setDelSp($delsp = true)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index e2d0e874..a06ce724 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -266,7 +266,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
/**
* Create a new instance of this HeaderSet.
*
- * @return Swift_Mime_HeaderSet
+ * @return self
*/
public function newInstance()
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index f169584d..a13f1b23 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -786,30 +786,33 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
// Sort in order of preference, if there is one
if ($shouldSort) {
- usort($this->_immediateChildren, array($this, '_childSortAlgorithm'));
- }
- }
+ // Group the messages by order of preference
+ $sorted = array();
+ foreach ($this->_immediateChildren as $child) {
+ $type = $child->getContentType();
+ $level = array_key_exists($type, $this->_alternativePartOrder) ? $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1;
- private function _childSortAlgorithm($a, $b)
- {
- $typePrefs = array();
- $types = array(strtolower($a->getContentType()), strtolower($b->getContentType()));
+ if (empty($sorted[$level])) {
+ $sorted[$level] = array();
+ }
- foreach ($types as $type) {
- $typePrefs[] = array_key_exists($type, $this->_alternativePartOrder) ? $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1;
- }
+ $sorted[$level][] = $child;
+ }
- return $typePrefs[0] >= $typePrefs[1] ? 1 : -1;
- }
+ ksort($sorted);
- // -- Destructor
+ $this->_immediateChildren = array_reduce($sorted, 'array_merge', array());
+ }
+ }
/**
* Empties it's own contents from the cache.
*/
public function __destruct()
{
- $this->_cache->clearAll($this->_cacheKey);
+ if ($this->_cache instanceof Swift_KeyCache) {
+ $this->_cache->clearAll($this->_cacheKey);
+ }
}
/**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
index 215f8db3..525b7ec8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
@@ -50,7 +50,7 @@ class Swift_MimePart extends Swift_Mime_MimePart
* @param string $contentType
* @param string $charset
*
- * @return Swift_Mime_MimePart
+ * @return self
*/
public static function newInstance($body = null, $contentType = null, $charset = null)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
index b38e1cf7..ddde335c 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -15,9 +15,6 @@
*/
class Swift_NullTransport extends Swift_Transport_NullTransport
{
- /**
- * Create a new NullTransport.
- */
public function __construct()
{
call_user_func_array(
@@ -30,7 +27,7 @@ class Swift_NullTransport extends Swift_Transport_NullTransport
/**
* Create a new NullTransport instance.
*
- * @return Swift_NullTransport
+ * @return self
*/
public static function newInstance()
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index 7552b67a..58344405 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -18,7 +18,7 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
/**
* The sender to impersonate.
*
- * @var String
+ * @var string
*/
private $_sender;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index e622cb37..5ff1d932 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,7 +16,7 @@
class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
{
/**
- * @var array
+ * @var Swift_Mime_Message[]
*/
private $messages;
@@ -28,7 +28,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
/**
* Get the message list.
*
- * @return array
+ * @return Swift_Mime_Message[]
*/
public function getMessages()
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index 18abb770..31461526 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -63,7 +63,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
* @param int $port
* @param string $crypto as "tls" or "ssl"
*
- * @return Swift_Plugins_PopBeforeSmtpPlugin
+ * @return self
*/
public static function newInstance($host, $port = 110, $crypto = null)
{
@@ -75,7 +75,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
*
* @param Swift_Plugins_Pop_Pop3Connection $connection
*
- * @return Swift_Plugins_PopBeforeSmtpPlugin
+ * @return $this
*/
public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
{
@@ -99,7 +99,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
*
* @param int $timeout
*
- * @return Swift_Plugins_PopBeforeSmtpPlugin
+ * @return $this
*/
public function setTimeout($timeout)
{
@@ -113,7 +113,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
*
* @param string $username
*
- * @return Swift_Plugins_PopBeforeSmtpPlugin
+ * @return $this
*/
public function setUsername($username)
{
@@ -127,7 +127,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
*
* @param string $password
*
- * @return Swift_Plugins_PopBeforeSmtpPlugin
+ * @return $this
*/
public function setPassword($password)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
index 503db84d..83cbddcd 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
@@ -26,7 +26,7 @@ class Swift_Preferences
/**
* Gets the instance of Preferences.
*
- * @return Swift_Preferences
+ * @return self
*/
public static function getInstance()
{
@@ -42,12 +42,11 @@ class Swift_Preferences
*
* @param string $charset
*
- * @return Swift_Preferences
+ * @return $this
*/
public function setCharset($charset)
{
- Swift_DependencyContainer::getInstance()
- ->register('properties.charset')->asValue($charset);
+ Swift_DependencyContainer::getInstance()->register('properties.charset')->asValue($charset);
return $this;
}
@@ -57,12 +56,11 @@ class Swift_Preferences
*
* @param string $dir
*
- * @return Swift_Preferences
+ * @return $this
*/
public function setTempDir($dir)
{
- Swift_DependencyContainer::getInstance()
- ->register('tempdir')->asValue($dir);
+ Swift_DependencyContainer::getInstance()->register('tempdir')->asValue($dir);
return $this;
}
@@ -72,12 +70,11 @@ class Swift_Preferences
*
* @param string $type
*
- * @return Swift_Preferences
+ * @return $this
*/
public function setCacheType($type)
{
- Swift_DependencyContainer::getInstance()
- ->register('cache')->asAliasOf(sprintf('cache.%s', $type));
+ Swift_DependencyContainer::getInstance()->register('cache')->asAliasOf(sprintf('cache.%s', $type));
return $this;
}
@@ -87,7 +84,7 @@ class Swift_Preferences
*
* @param bool $dotEscape
*
- * @return Swift_Preferences
+ * @return $this
*/
public function setQPDotEscape($dotEscape)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
index 974b24f2..47ae7a59 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -36,7 +36,7 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
*
* @param string $command
*
- * @return Swift_SendmailTransport
+ * @return self
*/
public static function newInstance($command = '/usr/sbin/sendmail -bs')
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
index 9ffcef39..8e66e18f 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
@@ -20,7 +20,7 @@ interface Swift_Signers_BodySigner extends Swift_Signer
*
* @param Swift_Message $message
*
- * @return Swift_Signers_BodySigner
+ * @return self
*/
public function signMessage(Swift_Message $message);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index 6ddd4f92..454e84b4 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -39,9 +39,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* Hash algorithm used.
*
+ * @see RFC6376 3.3: Signers MUST implement and SHOULD sign using rsa-sha256.
+ *
* @var string
*/
- protected $_hashAlgorithm = 'rsa-sha1';
+ protected $_hashAlgorithm = 'rsa-sha256';
/**
* Body canon method.
@@ -101,7 +103,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* When will the signature expires false means not embedded, if sigTimestamp is auto
- * Expiration is relative, otherwhise it's absolute.
+ * Expiration is relative, otherwise it's absolute.
*
* @var int
*/
@@ -123,7 +125,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
protected $_signedHeaders = array();
/**
- * If debugHeaders is set store debugDatas here.
+ * If debugHeaders is set store debugData here.
*
* @var string
*/
@@ -174,6 +176,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
$this->_domainName = $domainName;
$this->_signerIdentity = '@'.$domainName;
$this->_selector = $selector;
+
+ // keep fallback hash algorithm sha1 if php version is lower than 5.4.8
+ if (PHP_VERSION_ID < 50408) {
+ $this->_hashAlgorithm = 'rsa-sha1';
+ }
}
/**
@@ -183,7 +190,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
* @param string $domainName
* @param string $selector
*
- * @return Swift_Signers_DKIMSigner
+ * @return self
*/
public static function newInstance($privateKey, $domainName, $selector)
{
@@ -223,6 +230,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @return int
*/
+ // TODO fix return
public function write($bytes)
{
$this->_canonicalizeBody($bytes);
@@ -234,8 +242,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* For any bytes that are currently buffered inside the stream, force them
* off the buffer.
- *
- * @throws Swift_IoException
*/
public function commit()
{
@@ -276,8 +282,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
return;
}
}
-
- return;
}
/**
@@ -292,19 +296,28 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
}
/**
- * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1 defaults to rsa-sha256.
+ * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1.
*
- * @param string $hash
+ * @param string $hash 'rsa-sha1' or 'rsa-sha256'
*
- * @return Swift_Signers_DKIMSigner
+ * @throws Swift_SwiftException
+ *
+ * @return $this
*/
public function setHashAlgorithm($hash)
{
- // Unable to sign with rsa-sha256
- if ($hash == 'rsa-sha1') {
- $this->_hashAlgorithm = 'rsa-sha1';
- } else {
- $this->_hashAlgorithm = 'rsa-sha256';
+ switch ($hash) {
+ case 'rsa-sha1':
+ $this->_hashAlgorithm = 'rsa-sha1';
+ break;
+ case 'rsa-sha256':
+ $this->_hashAlgorithm = 'rsa-sha256';
+ if (!defined('OPENSSL_ALGO_SHA256')) {
+ throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
+ }
+ break;
+ default:
+ throw new Swift_SwiftException('Unable to set the hash algorithm, must be one of rsa-sha1 or rsa-sha256 (%s given).', $hash);
}
return $this;
@@ -315,7 +328,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @param string $canon
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setBodyCanon($canon)
{
@@ -333,7 +346,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @param string $canon
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setHeaderCanon($canon)
{
@@ -351,7 +364,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @param string $identity
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setSignerIdentity($identity)
{
@@ -365,7 +378,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @param mixed $len (bool or int)
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setBodySignedLen($len)
{
@@ -388,7 +401,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @param int $time A timestamp
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setSignatureTimestamp($time)
{
@@ -402,7 +415,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @param int $time A timestamp
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setSignatureExpiration($time)
{
@@ -583,7 +596,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* @deprecated This method is currently useless in this class but it must be
* kept for BC reasons due to its "protected" scope. This method
- * might be overriden by custom client code.
+ * might be overridden by custom client code.
*/
protected function _endOfHeaders()
{
@@ -678,6 +691,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
private function _getEncryptedHash()
{
$signature = '';
+
switch ($this->_hashAlgorithm) {
case 'rsa-sha1':
$algorithm = OPENSSL_ALGO_SHA1;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 786cee7b..0365363c 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -131,7 +131,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
* @param string $domainName
* @param string $selector
*
- * @return Swift_Signers_DomainKeySigner
+ * @return self
*/
public static function newInstance($privateKey, $domainName, $selector)
{
@@ -141,7 +141,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
/**
* Resets internal states.
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function reset()
{
@@ -169,8 +169,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @throws Swift_IoException
*
- * @return int
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function write($bytes)
{
@@ -188,7 +187,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @throws Swift_IoException
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function commit()
{
@@ -203,7 +202,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param Swift_InputByteStream $is
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function bind(Swift_InputByteStream $is)
{
@@ -221,7 +220,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param Swift_InputByteStream $is
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function unbind(Swift_InputByteStream $is)
{
@@ -230,7 +229,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
if ($stream === $is) {
unset($this->_bound[$k]);
- return;
+ break;
}
}
@@ -243,7 +242,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @throws Swift_IoException
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function flushBuffers()
{
@@ -257,7 +256,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param string $hash
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function setHashAlgorithm($hash)
{
@@ -271,7 +270,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param string $canon simple | nofws defaults to simple
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function setCanon($canon)
{
@@ -289,7 +288,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param string $identity
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function setSignerIdentity($identity)
{
@@ -303,7 +302,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param bool $debug
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function setDebugHeaders($debug)
{
@@ -346,7 +345,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param string $header_name
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function ignoreHeader($header_name)
{
@@ -360,7 +359,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param Swift_Mime_HeaderSet $headers
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function setHeaders(Swift_Mime_HeaderSet $headers)
{
@@ -392,7 +391,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*
* @param Swift_Mime_HeaderSet $headers
*
- * @return Swift_Signers_DomainKeySigner
+ * @return $this
*/
public function addSignature(Swift_Mime_HeaderSet $headers)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
index c75cb08a..ef8832fd 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
@@ -20,21 +20,21 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
*
* @param string $header_name
*
- * @return Swift_Signers_HeaderSigner
+ * @return self
*/
public function ignoreHeader($header_name);
/**
* Prepare the Signer to get a new Body.
*
- * @return Swift_Signers_HeaderSigner
+ * @return self
*/
public function startBody();
/**
* Give the signal that the body has finished streaming.
*
- * @return Swift_Signers_HeaderSigner
+ * @return self
*/
public function endBody();
@@ -43,7 +43,7 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
*
* @param Swift_Mime_SimpleHeaderSet $headers
*
- * @return Swift_Signers_HeaderSigner
+ * @return self
*/
public function setHeaders(Swift_Mime_HeaderSet $headers);
@@ -52,7 +52,7 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
*
* @param Swift_Mime_HeaderSet $headers
*
- * @return Swift_Signers_HeaderSigner
+ * @return self
*/
public function addSignature(Swift_Mime_HeaderSet $headers);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index 3a35ad55..8fdbaa43 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -133,7 +133,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
*
* @param int $time
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setSignatureTimestamp($time)
{
@@ -147,7 +147,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
*
* @param int $time
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setSignatureExpiration($time)
{
@@ -161,7 +161,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
*
* @param bool $debug
*
- * @return Swift_Signers_DKIMSigner
+ * @return $this
*/
public function setDebugHeaders($debug)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index b267099a..d13c02e4 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -74,7 +74,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
* @param string $certificate
* @param string $privateKey
*
- * @return Swift_Signers_SMimeSigner
+ * @return self
*/
public static function newInstance($certificate = null, $privateKey = null)
{
@@ -84,14 +84,14 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
/**
* Set the certificate location to use for signing.
*
- * @link http://www.php.net/manual/en/openssl.pkcs7.flags.php
+ * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
*
* @param string $certificate
* @param string|array $privateKey If the key needs an passphrase use array('file-location', 'passphrase') instead
* @param int $signOptions Bitwise operator options for openssl_pkcs7_sign()
* @param string $extraCerts A file containing intermediate certificates needed by the signing certificate
*
- * @return Swift_Signers_SMimeSigner
+ * @return $this
*/
public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null)
{
@@ -117,13 +117,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
/**
* Set the certificate location to use for encryption.
*
- * @link http://www.php.net/manual/en/openssl.pkcs7.flags.php
- * @link http://nl3.php.net/manual/en/openssl.ciphers.php
+ * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+ * @see http://nl3.php.net/manual/en/openssl.ciphers.php
*
* @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
* @param int $cipher
*
- * @return Swift_Signers_SMimeSigner
+ * @return $this
*/
public function setEncryptCertificate($recipientCerts, $cipher = null)
{
@@ -169,7 +169,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
*
* @param bool $signThenEncrypt
*
- * @return Swift_Signers_SMimeSigner
+ * @return $this
*/
public function setSignThenEncrypt($signThenEncrypt = true)
{
@@ -189,7 +189,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
/**
* Resets internal states.
*
- * @return Swift_Signers_SMimeSigner
+ * @return $this
*/
public function reset()
{
@@ -201,7 +201,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
*
* @param Swift_Message $message
*
- * @return Swift_Signers_SMimeSigner
+ * @return $this
*/
public function signMessage(Swift_Message $message)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
index 62516114..b97f01e7 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -49,7 +49,7 @@ class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
* @param int $port
* @param string $security
*
- * @return Swift_SmtpTransport
+ * @return self
*/
public static function newInstance($host = 'localhost', $port = 25, $security = null)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
index cf9bf78f..79c9b1f0 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -38,7 +38,7 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
*
* @param Swift_Spool $spool
*
- * @return Swift_SpoolTransport
+ * @return self
*/
public static function newInstance(Swift_Spool $spool)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index 0418750f..9412b1dc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -131,7 +131,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
// We try to find if the next byte is part of a search pattern
for ($j = 0; $j <= $this->_treeMaxLen; ++$j) {
// We have a new byte for a search pattern
- if (isset($buffer [$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
+ if (isset($buffer[$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
$search_pos = $search_pos[$buffer[$p]];
// We have a complete pattern, save, in case we don't find a better match later
if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
index d0db8b96..f64144af 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -42,6 +42,10 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
*/
public function shouldBuffer($buffer)
{
+ if ('' === $buffer) {
+ return false;
+ }
+
$endOfBuffer = substr($buffer, -1);
foreach ((array) $this->_search as $needle) {
if (false !== strpos($needle, $endOfBuffer)) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index f4d9967a..60233f96 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -57,7 +57,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
*
* @param string $domain
*
- * @return Swift_Transport_AbstractSmtpTransport
+ * @return $this
*/
public function setLocalDomain($domain)
{
@@ -396,7 +396,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
do {
$line = $this->_buffer->readLine($seq);
$response .= $line;
- } while (null !== $line && false !== $line && ' ' != $line{3});
+ } while (null !== $line && false !== $line && ' ' != $line[3]);
} catch (Swift_TransportException $e) {
$this->_throwException($e);
} catch (Swift_IoException $e) {
@@ -491,6 +491,9 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
*/
public function __destruct()
{
- $this->stop();
+ try {
+ $this->stop();
+ } catch (Exception $e) {
+ }
}
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index eb04acf0..83926585 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -296,9 +296,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
return explode('\\', $name);
}
- list($user, $domain) = explode('@', $name);
+ if (false !== strpos($name, '@')) {
+ list($user, $domain) = explode('@', $name);
- return array($domain, $user);
+ return array($domain, $user);
+ }
+
+ // no domain passed
+ return array('', $name);
}
/**
@@ -361,11 +366,9 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
protected function getCorrectTimestamp($time)
{
// Get our timestamp (tricky!)
- bcscale(0);
-
$time = number_format($time, 0, '.', ''); // save microtime to string
- $time = bcadd($time, '11644473600000'); // add epoch time
- $time = bcmul($time, 10000); // tenths of a microsecond.
+ $time = bcadd($time, '11644473600000', 0); // add epoch time
+ $time = bcmul($time, 10000, 0); // tenths of a microsecond.
$binary = $this->si2bin($time, 64); // create 64 bit binary string
$timestamp = '';
@@ -459,6 +462,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
}
/** HELPER FUNCTIONS */
+
/**
* Create our security buffer depending on length and offset.
*
@@ -561,6 +565,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
}
/** ENCRYPTION ALGORITHMS */
+
/**
* DES Encryption.
*
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 4106df41..156e2cf5 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -63,7 +63,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param string $host
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setHost($host)
{
@@ -87,7 +87,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param int $port
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setPort($port)
{
@@ -111,7 +111,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param int $timeout seconds
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setTimeout($timeout)
{
@@ -136,7 +136,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param string $encryption
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setEncryption($encryption)
{
@@ -167,7 +167,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param array $options
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setStreamOptions($options)
{
@@ -191,7 +191,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param string $source
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setSourceIp($source)
{
@@ -215,7 +215,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*
* @param Swift_Transport_EsmtpHandler[] $handlers
*
- * @return Swift_Transport_EsmtpTransport
+ * @return $this
*/
public function setExtensionHandlers(array $handlers)
{
@@ -270,8 +270,6 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
return parent::executeCommand($command, $codes, $failures);
}
- // -- Mixin invocation code
-
/** Mixin handling method for ESMTP handlers */
public function __call($method, $args)
{
@@ -281,7 +279,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
)) {
$return = call_user_func_array(array($handler, $method), $args);
// Allow fluid method calls
- if (is_null($return) && substr($method, 0, 3) == 'set') {
+ if (null === $return && substr($method, 0, 3) == 'set') {
return $this;
} else {
return $return;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
index 32a11efa..48ef4a70 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
@@ -77,7 +77,7 @@ class Swift_Transport_MailTransport implements Swift_Transport
*
* @param string $params
*
- * @return Swift_Transport_MailTransport
+ * @return $this
*/
public function setExtraParams($params)
{
@@ -164,11 +164,13 @@ class Swift_Transport_MailTransport implements Swift_Transport
$headers = str_replace("\r\n", PHP_EOL, $headers);
$subject = str_replace("\r\n", PHP_EOL, $subject);
$body = str_replace("\r\n", PHP_EOL, $body);
+ $to = str_replace("\r\n", PHP_EOL, $to);
} else {
// Windows, using SMTP
$headers = str_replace("\r\n.", "\r\n..", $headers);
$subject = str_replace("\r\n.", "\r\n..", $subject);
$body = str_replace("\r\n.", "\r\n..", $body);
+ $to = str_replace("\r\n.", "\r\n..", $to);
}
if ($this->_invoker->mail($to, $subject, $body, $headers, $this->_formatExtraParams($this->_extraParams, $reversePath))) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 34ac4ce3..6430d5f6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -64,7 +64,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
*
* @param string $command
*
- * @return Swift_Transport_SendmailTransport
+ * @return $this
*/
public function setCommand($command)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index 55a79924..e4b87f34 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -35,7 +35,7 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
*
* @param Swift_Spool $spool
*
- * @return Swift_Transport_SpoolTransport
+ * @return $this
*/
public function setSpool(Swift_Spool $spool)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index 5134ea48..9f2fff4b 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -84,7 +84,6 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
if ($this->_stream) {
stream_set_blocking($this->_stream, 1);
}
-
}
}
$this->_params[$param] = $value;
@@ -292,6 +291,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
1 => array('pipe', 'w'),
2 => array('pipe', 'w'),
);
+ $pipes = array();
$this->_stream = proc_open($command, $descriptorSpec, $pipes);
stream_set_blocking($pipes[2], 0);
if ($err = stream_get_contents($pipes[2])) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
index 56169c92..d575e4f2 100644
--- a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -117,7 +117,7 @@ Swift_DependencyContainer::getInstance()
// As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
// see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
->register('mime.qpcontentencoder')
- ->asAliasOf(version_compare(phpversion(), '5.4.7', '>=') ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
+ ->asAliasOf(PHP_VERSION_ID >= 50407 ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
;
unset($swift_mime_types);
diff --git a/vendor/swiftmailer/swiftmailer/lib/preferences.php b/vendor/swiftmailer/swiftmailer/lib/preferences.php
index e5195014..0b430e67 100644
--- a/vendor/swiftmailer/swiftmailer/lib/preferences.php
+++ b/vendor/swiftmailer/swiftmailer/lib/preferences.php
@@ -20,6 +20,6 @@ if (@is_writable($tmpDir = sys_get_temp_dir())) {
// this should only be done when Swiftmailer won't use the native QP content encoder
// see mime_deps.php
-if (version_compare(phpversion(), '5.4.7', '<')) {
+if (PHP_VERSION_ID < 50407) {
$preferences->setQPDotEscape(false);
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php b/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php
index 21d89e83..71c5713b 100644
--- a/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php
+++ b/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php
@@ -7,7 +7,7 @@
*/
class SwiftMailerSmokeTestCase extends SwiftMailerTestCase
{
- public function setUp()
+ protected function setUp()
{
if (!defined('SWIFT_SMOKE_TRANSPORT_TYPE')) {
$this->markTestSkipped(
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance.conf.php.default b/vendor/swiftmailer/swiftmailer/tests/acceptance.conf.php.default
index 68902d84..5717c98f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance.conf.php.default
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance.conf.php.default
@@ -12,13 +12,6 @@
You can fill out only the parts you know and leave the other bits.
*/
-
-/*
- Defines: The path to a writable directory (a temporary dir).
- Recommended: /tmp
- */
-define('SWIFT_TMP_DIR', '/tmp');
-
/*
Defines: The name and port of a SMTP server you can connect to.
Recommended: smtp.gmail.com:25
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
index 0b5bbef4..49ad20a8 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
@@ -2,24 +2,15 @@
class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_TestCase
{
- private $_tmpDir;
private $_testFile;
- public function setUp()
+ protected function setUp()
{
- if (!defined('SWIFT_TMP_DIR')) {
- $this->markTestSkipped(
- 'Cannot run test without a writable directory to use ('.
- 'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
- );
- }
-
- $this->_tmpDir = SWIFT_TMP_DIR;
- $this->_testFile = $this->_tmpDir.'/swift-test-file'.__CLASS__;
+ $this->_testFile = sys_get_temp_dir().'/swift-test-file'.__CLASS__;
file_put_contents($this->_testFile, 'abcdefghijklm');
}
- public function tearDown()
+ protected function tearDown()
{
unlink($this->_testFile);
}
@@ -50,18 +41,14 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_T
public function testFileCanBeWrittenTo()
{
- $file = $this->_createFileStream(
- $this->_testFile, true
- );
+ $file = $this->_createFileStream($this->_testFile, true);
$file->write('foobar');
$this->assertEquals('foobar', $file->read(8192));
}
public function testReadingFromThenWritingToFile()
{
- $file = $this->_createFileStream(
- $this->_testFile, true
- );
+ $file = $this->_createFileStream($this->_testFile, true);
$file->write('foobar');
$this->assertEquals('foobar', $file->read(8192));
$file->write('zipbutton');
@@ -70,9 +57,7 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_T
public function testWritingToFileWithCanonicalization()
{
- $file = $this->_createFileStream(
- $this->_testFile, true
- );
+ $file = $this->_createFileStream($this->_testFile, true);
$file->addFilter($this->_createFilter(array("\r\n", "\r"), "\n"), 'allToLF');
$file->write("foo\r\nbar\r");
$file->write("\nzip\r\ntest\r");
@@ -80,11 +65,18 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_T
$this->assertEquals("foo\nbar\nzip\ntest\n", file_get_contents($this->_testFile));
}
+ public function testWritingWithFulleMessageLengthOfAMultipleOf8192()
+ {
+ $file = $this->_createFileStream($this->_testFile, true);
+ $file->addFilter($this->_createFilter(array("\r\n", "\r"), "\n"), 'allToLF');
+ $file->write('');
+ $file->flushBuffers();
+ $this->assertEquals('', file_get_contents($this->_testFile));
+ }
+
public function testBindingOtherStreamsMirrorsWriteOperations()
{
- $file = $this->_createFileStream(
- $this->_testFile, true
- );
+ $file = $this->_createFileStream($this->_testFile, true);
$is1 = $this->_createMockInputStream();
$is2 = $this->_createMockInputStream();
@@ -129,9 +121,7 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_T
public function testUnbindingStreamPreventsFurtherWrites()
{
- $file = $this->_createFileStream(
- $this->_testFile, true
- );
+ $file = $this->_createFileStream($this->_testFile, true);
$is1 = $this->_createMockInputStream();
$is2 = $this->_createMockInputStream();
@@ -155,8 +145,6 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_T
$file->write('y');
}
- // -- Creation methods
-
private function _createFilter($search, $replace)
{
return new Swift_StreamFilters_StringReplacementFilter($search, $replace);
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
index 8ce4a182..c13e5704 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
@@ -5,7 +5,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
private $_factory;
private $_prefix = 'Swift_CharacterReader_';
- public function setUp()
+ protected function setUp()
{
$this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
}
@@ -14,7 +14,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('utf8', 'utf-8', 'UTF-8', 'UTF8') as $utf8) {
$reader = $this->_factory->getReaderFor($utf8);
- $this->assertInstanceof($this->_prefix.'Utf8Reader', $reader);
+ $this->assertInstanceOf($this->_prefix.'Utf8Reader', $reader);
}
}
@@ -32,7 +32,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
foreach ($charsets as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -49,7 +49,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
foreach ($charsets as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -74,7 +74,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
foreach ($charsets as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -83,7 +83,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('ansi', 'ANSI') as $ansi) {
$reader = $this->_factory->getReaderFor($ansi);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -92,7 +92,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('macintosh', 'MACINTOSH') as $mac) {
$reader = $this->_factory->getReaderFor($mac);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -109,7 +109,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
foreach ($charsets as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -118,7 +118,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('iscii', 'ISCII', 'viscii', 'VISCII') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -127,7 +127,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('mik', 'MIK') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -136,7 +136,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('cork', 'CORK', 't1', 'T1') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(1, $reader->getInitialByteSize());
}
}
@@ -145,7 +145,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('ucs-2', 'UCS-2', 'ucs2', 'UCS2') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(2, $reader->getInitialByteSize());
}
}
@@ -154,7 +154,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('utf-16', 'UTF-16', 'utf16', 'UTF16') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(2, $reader->getInitialByteSize());
}
}
@@ -163,7 +163,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('ucs-4', 'UCS-4', 'ucs4', 'UCS4') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(4, $reader->getInitialByteSize());
}
}
@@ -172,7 +172,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
{
foreach (array('utf-32', 'UTF-32', 'utf32', 'UTF32') as $charset) {
$reader = $this->_factory->getReaderFor($charset);
- $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+ $this->assertInstanceOf($this->_prefix.'GenericFixedWidthReader', $reader);
$this->assertEquals(4, $reader->getInitialByteSize());
}
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
index d8ba5264..bada5094 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
@@ -5,7 +5,7 @@ class Swift_Encoder_Base64EncoderAcceptanceTest extends \PHPUnit_Framework_TestC
private $_samplesDir;
private $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
$this->_encoder = new Swift_Encoder_Base64Encoder();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
index 1da3b837..442d9a94 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
@@ -5,7 +5,7 @@ class Swift_Encoder_QpEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
private $_samplesDir;
private $_factory;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
$this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
index 043ddf8c..bcb6b957 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
@@ -5,7 +5,7 @@ class Swift_Encoder_Rfc2231EncoderAcceptanceTest extends \PHPUnit_Framework_Test
private $_samplesDir;
private $_factory;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
$this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php
index 6b06e2ee..5fab14ce 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php
@@ -6,7 +6,7 @@ class Swift_KeyCache_ArrayKeyCacheAcceptanceTest extends \PHPUnit_Framework_Test
private $_key1 = 'key1';
private $_key2 = 'key2';
- public function setUp()
+ protected function setUp()
{
$this->_cache = new Swift_KeyCache_ArrayKeyCache(
new Swift_KeyCache_SimpleKeyCacheInputStream()
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php
index 392edde8..0e027c2d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php
@@ -6,21 +6,11 @@ class Swift_KeyCache_DiskKeyCacheAcceptanceTest extends \PHPUnit_Framework_TestC
private $_key1;
private $_key2;
- public function setUp()
+ protected function setUp()
{
- if (!defined('SWIFT_TMP_DIR')) {
- $this->markTestSkipped(
- 'Cannot run test without a writable directory to use ('.
- 'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
- );
- }
-
$this->_key1 = uniqid(microtime(true), true);
$this->_key2 = uniqid(microtime(true), true);
- $this->_cache = new Swift_KeyCache_DiskKeyCache(
- new Swift_KeyCache_SimpleKeyCacheInputStream(),
- SWIFT_TMP_DIR
- );
+ $this->_cache = new Swift_KeyCache_DiskKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream(), sys_get_temp_dir());
}
public function testStringDataCanBeSetAndFetched()
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
index 9372fbfd..5f4e9835 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
@@ -45,8 +45,6 @@ class Swift_MessageAcceptanceTest extends Swift_Mime_SimpleMessageAcceptanceTest
);
}
- // -- Private helpers
-
protected function _createMessage()
{
Swift_DependencyContainer::getInstance()
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php
index e925367e..7353d9d6 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php
@@ -7,7 +7,7 @@ class Swift_Mime_AttachmentAcceptanceTest extends \PHPUnit_Framework_TestCase
private $_grammar;
private $_headers;
- public function setUp()
+ protected function setUp()
{
$this->_cache = new Swift_KeyCache_ArrayKeyCache(
new Swift_KeyCache_SimpleKeyCacheInputStream()
@@ -109,8 +109,6 @@ class Swift_Mime_AttachmentAcceptanceTest extends \PHPUnit_Framework_TestCase
);
}
- // -- Private helpers
-
protected function _createAttachment()
{
$entity = new Swift_Mime_Attachment(
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
index 2a5c562b..a72f5ff4 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
@@ -5,7 +5,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoderAcceptanceTest extends \PHPU
private $_samplesDir;
private $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
$this->_encoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
index ecd7fcd1..0dfc4e22 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
@@ -9,7 +9,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PH
*/
protected $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
$this->_encoder = new Swift_Mime_ContentEncoder_NativeQpContentEncoder();
@@ -65,7 +65,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PH
}
/**
- * @expectedException RuntimeException
+ * @expectedException \RuntimeException
*/
public function testCharsetChangeNotImplemented()
{
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
index 1541b7ea..5eff4e2f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
@@ -5,7 +5,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUn
private $_samplesDir;
private $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
$this->_encoder = new Swift_Mime_ContentEncoder_PlainContentEncoder('8bit');
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
index 84f7e03b..a383b584 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
@@ -5,13 +5,13 @@ class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit_
private $_samplesDir;
private $_factory;
- public function setUp()
+ protected function setUp()
{
$this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
$this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
}
- public function tearDown()
+ protected function tearDown()
{
Swift_Preferences::getInstance()->setQPDotEscape(false);
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php
index 8a04df6b..0f7aa728 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php
@@ -7,7 +7,7 @@ class Swift_Mime_EmbeddedFileAcceptanceTest extends \PHPUnit_Framework_TestCase
private $_grammar;
private $_headers;
- public function setUp()
+ protected function setUp()
{
$this->_cache = new Swift_KeyCache_ArrayKeyCache(
new Swift_KeyCache_SimpleKeyCacheInputStream()
@@ -122,8 +122,6 @@ class Swift_Mime_EmbeddedFileAcceptanceTest extends \PHPUnit_Framework_TestCase
);
}
- // -- Private helpers
-
protected function _createEmbeddedFile()
{
$entity = new Swift_Mime_EmbeddedFile(
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php
index 304867a4..e3fad6de 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php
@@ -4,7 +4,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoderAcceptanceTest extends \PHPUni
{
private $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_encoder = new Swift_Mime_HeaderEncoder_Base64HeaderEncoder();
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
index 8232fe63..a7f6fc51 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
@@ -7,7 +7,7 @@ class Swift_Mime_MimePartAcceptanceTest extends \PHPUnit_Framework_TestCase
private $_grammar;
private $_headers;
- public function setUp()
+ protected function setUp()
{
$this->_cache = new Swift_KeyCache_ArrayKeyCache(
new Swift_KeyCache_SimpleKeyCacheInputStream()
@@ -113,8 +113,6 @@ class Swift_Mime_MimePartAcceptanceTest extends \PHPUnit_Framework_TestCase
);
}
- // -- Private helpers
-
protected function _createMimePart()
{
$entity = new Swift_Mime_MimePart(
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
index cd6d910d..912768ee 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
@@ -2,7 +2,7 @@
class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit_Framework_TestCase
{
- public function setUp()
+ protected function setUp()
{
Swift_Preferences::getInstance()->setCharset(null); //TODO: Test with the charset defined
}
@@ -1227,8 +1227,6 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit_Framework_TestCase
);
}
- // -- Private helpers
-
protected function _createMessage()
{
return new Swift_Message();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php
index dc0d0a1d..21abc131 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php
@@ -6,7 +6,7 @@ abstract class Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest e
abstract protected function _initializeBuffer();
- public function setUp()
+ protected function setUp()
{
if (true == getenv('TRAVIS')) {
$this->markTestSkipped(
@@ -124,8 +124,6 @@ abstract class Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest e
$this->_buffer->write('y');
}
- // -- Creation Methods
-
private function _createMockInputStream()
{
return $this->getMockBuilder('Swift_InputByteStream')->getMock();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
index 51c998c6..4c3c7d3a 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
@@ -4,7 +4,7 @@ require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
class Swift_Transport_StreamBuffer_BasicSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
{
- public function setUp()
+ protected function setUp()
{
if (!defined('SWIFT_SMTP_HOST')) {
$this->markTestSkipped(
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
index 0e2924eb..a37439d7 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
@@ -4,7 +4,7 @@ require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
class Swift_Transport_StreamBuffer_ProcessAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
{
- public function setUp()
+ protected function setUp()
{
if (!defined('SWIFT_SENDMAIL_PATH')) {
$this->markTestSkipped(
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
index d550f818..59362b01 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
@@ -8,7 +8,7 @@ class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit_Framework_
protected $_server;
- public function setUp()
+ protected function setUp()
{
if (!defined('SWIFT_SMTP_HOST')) {
$this->markTestSkipped(
@@ -54,11 +54,11 @@ class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit_Framework_
$line = $this->_buffer->readLine(0);
} catch (Exception $e) {
}
- $this->assertInstanceof('Swift_IoException', $e, 'IO Exception Not Thrown On Connection Timeout');
+ $this->assertInstanceOf('Swift_IoException', $e, 'IO Exception Not Thrown On Connection Timeout');
$this->assertRegExp('/Connection to .* Timed Out/', $e->getMessage());
}
- public function tearDown()
+ protected function tearDown()
{
if ($this->_server) {
stream_socket_shutdown($this->_server, STREAM_SHUT_RDWR);
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
index 2863f965..32e0fe84 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
@@ -4,7 +4,7 @@ require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
class Swift_Transport_StreamBuffer_SslSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
{
- public function setUp()
+ protected function setUp()
{
$streams = stream_get_transports();
if (!in_array('ssl', $streams)) {
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
index 6fc85057..1053a877 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
@@ -4,7 +4,7 @@ require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
class Swift_Transport_StreamBuffer_TlsSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
{
- public function setUp()
+ protected function setUp()
{
$streams = stream_get_transports();
if (!in_array('tls', $streams)) {
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug118Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug118Test.php
index bd10c716..40b5a772 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug118Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug118Test.php
@@ -4,7 +4,7 @@ class Swift_Bug118Test extends \PHPUnit_Framework_TestCase
{
private $_message;
- public function setUp()
+ protected function setUp()
{
$this->_message = new Swift_Message();
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php
index fdfa5302..7563f4d3 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php
@@ -4,7 +4,7 @@ class Swift_Bug206Test extends \PHPUnit_Framework_TestCase
{
private $_factory;
- public function setUp()
+ protected function setUp()
{
$factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
$headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php
index 9c76ceb3..768bf3d8 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php
@@ -2,7 +2,7 @@
class Swift_Bug34Test extends \PHPUnit_Framework_TestCase
{
- public function setUp()
+ protected function setUp()
{
Swift_Preferences::getInstance()->setCharset('utf-8');
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php
index e07ee8f0..98999f04 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php
@@ -2,7 +2,7 @@
class Swift_Bug35Test extends \PHPUnit_Framework_TestCase
{
- public function setUp()
+ protected function setUp()
{
Swift_Preferences::getInstance()->setCharset('utf-8');
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug38Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug38Test.php
index a8a9212c..9deae4f7 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug38Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug38Test.php
@@ -6,7 +6,7 @@ class Swift_Bug38Test extends \PHPUnit_Framework_TestCase
private $_attFileName;
private $_attFileType;
- public function setUp()
+ protected function setUp()
{
$this->_attFileName = 'data.txt';
$this->_attFileType = 'text/plain';
@@ -181,8 +181,6 @@ class Swift_Bug38Test extends \PHPUnit_Framework_TestCase
$this->assertPatternInStream($pattern, $streamB);
}
- // -- Helpers
-
public function assertPatternInStream($pattern, $stream, $message = '%s')
{
$string = '';
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug51Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug51Test.php
index b9c33b09..48074f0e 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug51Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug51Test.php
@@ -5,23 +5,16 @@ class Swift_Bug51Test extends \SwiftMailerTestCase
private $_attachmentFile;
private $_outputFile;
- public function setUp()
+ protected function setUp()
{
- if (!defined('SWIFT_TMP_DIR') || !is_writable(SWIFT_TMP_DIR)) {
- $this->markTestSkipped(
- 'Cannot run test without a writable directory to use ('.
- 'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
- );
- }
-
- $this->_attachmentFile = SWIFT_TMP_DIR.'/attach.rand.bin';
+ $this->_attachmentFile = sys_get_temp_dir().'/attach.rand.bin';
file_put_contents($this->_attachmentFile, '');
- $this->_outputFile = SWIFT_TMP_DIR.'/attach.out.bin';
+ $this->_outputFile = sys_get_temp_dir().'/attach.out.bin';
file_put_contents($this->_outputFile, '');
}
- public function tearDown()
+ protected function tearDown()
{
unlink($this->_attachmentFile);
unlink($this->_outputFile);
@@ -66,8 +59,6 @@ class Swift_Bug51Test extends \SwiftMailerTestCase
}
}
- // -- Custom Assertions
-
public function assertAttachmentFromSourceMatches($attachmentData, $source)
{
$encHeader = 'Content-Transfer-Encoding: base64';
@@ -88,8 +79,6 @@ class Swift_Bug51Test extends \SwiftMailerTestCase
$this->assertIdenticalBinary($attachmentData, base64_decode($attachmentBase64));
}
- // -- Creation Methods
-
private function _fillFileWithRandomBytes($byteCount, $file)
{
// I was going to use dd with if=/dev/random but this way seems more
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug71Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug71Test.php
index 4b804537..d58242fb 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug71Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug71Test.php
@@ -4,7 +4,7 @@ class Swift_Bug71Test extends \PHPUnit_Framework_TestCase
{
private $_message;
- public function setUp()
+ protected function setUp()
{
$this->_message = new Swift_Message('test');
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug76Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug76Test.php
index c2b12cb4..899083c0 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug76Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug76Test.php
@@ -6,25 +6,18 @@ class Swift_Bug76Test extends \PHPUnit_Framework_TestCase
private $_outputFile;
private $_encoder;
- public function setUp()
+ protected function setUp()
{
- if (!defined('SWIFT_TMP_DIR') || !is_writable(SWIFT_TMP_DIR)) {
- $this->markTestSkipped(
- 'Cannot run test without a writable directory to use ('.
- 'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
- );
- }
-
- $this->_inputFile = SWIFT_TMP_DIR.'/in.bin';
+ $this->_inputFile = sys_get_temp_dir().'/in.bin';
file_put_contents($this->_inputFile, '');
- $this->_outputFile = SWIFT_TMP_DIR.'/out.bin';
+ $this->_outputFile = sys_get_temp_dir().'/out.bin';
file_put_contents($this->_outputFile, '');
$this->_encoder = $this->_createEncoder();
}
- public function tearDown()
+ protected function tearDown()
{
unlink($this->_inputFile);
unlink($this->_outputFile);
@@ -44,8 +37,6 @@ class Swift_Bug76Test extends \PHPUnit_Framework_TestCase
);
}
- // -- Custom Assertions
-
public function assertMaxLineLength($length, $filePath, $message = '%s')
{
$lines = file($filePath);
@@ -54,8 +45,6 @@ class Swift_Bug76Test extends \PHPUnit_Framework_TestCase
}
}
- // -- Creation Methods
-
private function _fillFileWithRandomBytes($byteCount, $file)
{
// I was going to use dd with if=/dev/random but this way seems more
diff --git a/vendor/swiftmailer/swiftmailer/tests/fixtures/MimeEntityFixture.php b/vendor/swiftmailer/swiftmailer/tests/fixtures/MimeEntityFixture.php
index e2cf86a5..159c2ae1 100644
--- a/vendor/swiftmailer/swiftmailer/tests/fixtures/MimeEntityFixture.php
+++ b/vendor/swiftmailer/swiftmailer/tests/fixtures/MimeEntityFixture.php
@@ -32,27 +32,35 @@ class MimeEntityFixture implements Swift_Mime_MimeEntity
public function getId()
{
}
+
public function getHeaders()
{
}
+
public function getBody()
{
}
+
public function setBody($body, $contentType = null)
{
}
+
public function toByteStream(Swift_InputByteStream $is)
{
}
+
public function charsetChanged($charset)
{
}
+
public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
{
}
+
public function getChildren()
{
}
+
public function setChildren(array $children)
{
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
index c3b61c39..5a4ccde3 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
@@ -7,7 +7,7 @@ class Swift_Smoke_AttachmentSmokeTest extends SwiftMailerSmokeTestCase
{
private $_attFile;
- public function setUp()
+ protected function setUp()
{
parent::setup(); // For skip
$this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
index dca14341..3b13cc5d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
@@ -7,7 +7,7 @@ class Swift_Smoke_HtmlWithAttachmentSmokeTest extends SwiftMailerSmokeTestCase
{
private $_attFile;
- public function setUp()
+ protected function setUp()
{
$this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
index fafd7271..b9ebef52 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
@@ -7,7 +7,7 @@ class Swift_Smoke_InternationalSmokeTest extends SwiftMailerSmokeTestCase
{
private $_attFile;
- public function setUp()
+ protected function setUp()
{
parent::setup(); // For skip
$this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
index 2a50b190..60ebb661 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
@@ -194,8 +194,6 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit_Framework_TestCase
$bs->write('y');
}
- // -- Creation Methods
-
private function _createArrayStream($input)
{
return new Swift_ByteStream_ArrayByteStream($input);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
index 41f8f703..0d567360 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
@@ -18,7 +18,7 @@ class Swift_CharacterReader_UsAsciiReaderTest extends \PHPUnit_Framework_TestCas
private $_reader;
- public function setUp()
+ protected function setUp()
{
$this->_reader = new Swift_CharacterReader_UsAsciiReader();
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
index 34e9c91d..ec17eebe 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
@@ -4,7 +4,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit_Framework_TestCase
{
private $_reader;
- public function setUp()
+ protected function setUp()
{
$this->_reader = new Swift_CharacterReader_Utf8Reader();
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
index cbd412bd..977051e9 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
@@ -335,8 +335,6 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
$this->assertFalse($stream->read(1));
}
- // -- Creation methods
-
private function _getReader()
{
return $this->getMockery('Swift_CharacterReader');
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
index 70690e2d..ccd14f6f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
@@ -4,6 +4,7 @@ class One
{
public $arg1;
public $arg2;
+
public function __construct($arg1 = null, $arg2 = null)
{
$this->arg1 = $arg1;
@@ -15,7 +16,7 @@ class Swift_DependencyContainerTest extends \PHPUnit_Framework_TestCase
{
private $_container;
- public function setUp()
+ protected function setUp()
{
$this->_container = new Swift_DependencyContainer();
}
@@ -40,7 +41,7 @@ class Swift_DependencyContainerTest extends \PHPUnit_Framework_TestCase
public function testRegisterAndLookupNewInstance()
{
$this->_container->register('one')->asNewInstanceOf('One');
- $this->assertInstanceof('One', $this->_container->lookup('one'));
+ $this->assertInstanceOf('One', $this->_container->lookup('one'));
}
public function testHasReturnsTrueForRegisteredInstance()
@@ -60,7 +61,7 @@ class Swift_DependencyContainerTest extends \PHPUnit_Framework_TestCase
public function testRegisterAndLookupSharedInstance()
{
$this->_container->register('one')->asSharedInstanceOf('One');
- $this->assertInstanceof('One', $this->_container->lookup('one'));
+ $this->assertInstanceOf('One', $this->_container->lookup('one'));
}
public function testHasReturnsTrueForSharedInstance()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php
index 1e712fe5..b89eb9f5 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php
@@ -4,7 +4,7 @@ class Swift_Encoder_Base64EncoderTest extends \PHPUnit_Framework_TestCase
{
private $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_encoder = new Swift_Encoder_Base64Encoder();
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
index 0bf4d181..6740f22c 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
@@ -385,8 +385,6 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
);
}
- // -- Creation methods
-
private function _createCharStream()
{
return $this->getMockery('Swift_CharacterStream')->shouldIgnoreMissing();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
index 3849e09e..a78bc3a3 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
@@ -22,8 +22,6 @@ class Swift_Events_CommandEventTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($transport, $ref);
}
- // -- Creation Methods
-
private function _createEvent(Swift_Transport $source, $command, $successCodes = array())
{
return new Swift_Events_CommandEvent($source, $command, $successCodes);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php
index 62a91be5..0cfe3caa 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php
@@ -25,8 +25,6 @@ class Swift_Events_EventObjectTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($evt->bubbleCancelled());
}
- // -- Creation Methods
-
private function _createEvent($source)
{
return new Swift_Events_EventObject($source);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php
index 1028e8e9..6f611acb 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php
@@ -26,8 +26,6 @@ class Swift_Events_ResponseEventTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($transport, $ref);
}
- // -- Creation Methods
-
private function _createEvent(Swift_Transport $source, $response, $result)
{
return new Swift_Events_ResponseEvent($source, $response, $result);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
index 8a3fe92f..c4a6a7ef 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
@@ -79,8 +79,6 @@ class Swift_Events_SendEventTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array(), $evt->getFailedRecipients());
}
- // -- Creation Methods
-
private function _createEvent(Swift_Transport $source,
Swift_Mime_Message $message)
{
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
index fdc9c138..3f063ff7 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
@@ -4,7 +4,7 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
{
private $_dispatcher;
- public function setUp()
+ protected function setUp()
{
$this->_dispatcher = new Swift_Events_SimpleEventDispatcher();
}
@@ -14,7 +14,7 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
$transport = $this->getMockBuilder('Swift_Transport')->getMock();
$message = $this->getMockBuilder('Swift_Mime_Message')->getMock();
$evt = $this->_dispatcher->createSendEvent($transport, $message);
- $this->assertInstanceof('Swift_Events_SendEvent', $evt);
+ $this->assertInstanceOf('Swift_Events_SendEvent', $evt);
$this->assertSame($message, $evt->getMessage());
$this->assertSame($transport, $evt->getTransport());
}
@@ -23,7 +23,7 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
{
$buf = $this->getMockBuilder('Swift_Transport')->getMock();
$evt = $this->_dispatcher->createCommandEvent($buf, "FOO\r\n", array(250));
- $this->assertInstanceof('Swift_Events_CommandEvent', $evt);
+ $this->assertInstanceOf('Swift_Events_CommandEvent', $evt);
$this->assertSame($buf, $evt->getSource());
$this->assertEquals("FOO\r\n", $evt->getCommand());
$this->assertEquals(array(250), $evt->getSuccessCodes());
@@ -33,7 +33,7 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
{
$buf = $this->getMockBuilder('Swift_Transport')->getMock();
$evt = $this->_dispatcher->createResponseEvent($buf, "250 Ok\r\n", true);
- $this->assertInstanceof('Swift_Events_ResponseEvent', $evt);
+ $this->assertInstanceOf('Swift_Events_ResponseEvent', $evt);
$this->assertSame($buf, $evt->getSource());
$this->assertEquals("250 Ok\r\n", $evt->getResponse());
$this->assertTrue($evt->isValid());
@@ -43,7 +43,7 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
{
$transport = $this->getMockBuilder('Swift_Transport')->getMock();
$evt = $this->_dispatcher->createTransportChangeEvent($transport);
- $this->assertInstanceof('Swift_Events_TransportChangeEvent', $evt);
+ $this->assertInstanceOf('Swift_Events_TransportChangeEvent', $evt);
$this->assertSame($transport, $evt->getSource());
}
@@ -52,7 +52,7 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
$transport = $this->getMockBuilder('Swift_Transport')->getMock();
$ex = new Swift_TransportException('');
$evt = $this->_dispatcher->createTransportExceptionEvent($transport, $ex);
- $this->assertInstanceof('Swift_Events_TransportExceptionEvent', $evt);
+ $this->assertInstanceOf('Swift_Events_TransportExceptionEvent', $evt);
$this->assertSame($transport, $evt->getSource());
$this->assertSame($ex, $evt->getException());
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php
index 8d7b2376..a260ccb5 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php
@@ -18,8 +18,6 @@ class Swift_Events_TransportChangeEventTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($transport, $ref);
}
- // -- Creation Methods
-
private function _createEvent(Swift_Transport $source)
{
return new Swift_Events_TransportChangeEvent($source);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php
index 0324cdb8..731dfad5 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php
@@ -24,8 +24,6 @@ class Swift_Events_TransportExceptionEventTest extends \PHPUnit_Framework_TestCa
);
}
- // -- Creation Methods
-
private function _createEvent(Swift_Transport $transport, Swift_TransportException $ex)
{
return new Swift_Events_TransportExceptionEvent($transport, $ex);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php
index 634b7ad0..f2ed5dd6 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php
@@ -218,8 +218,6 @@ class Swift_KeyCache_ArrayKeyCacheTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($cache->hasKey($this->_key1, 'bar'));
}
- // -- Creation methods
-
private function _createCache($is)
{
return new Swift_KeyCache_ArrayKeyCache($is);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php
index 389264fb..74951a70 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php
@@ -123,8 +123,6 @@ class Swift_MailerTest extends \SwiftMailerTestCase
$mailer->registerPlugin($plugin);
}
- // -- Creation methods
-
private function _createPlugin()
{
return $this->getMockery('Swift_Events_EventListener')->shouldIgnoreMissing();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php
index 00039f10..35a568c6 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php
@@ -54,7 +54,6 @@ class Swift_MessageTest extends \PHPUnit_Framework_TestCase
$this->assertNotEquals($id_1, $id_2, 'Message Ids are the same');
}
- // -- Private helpers
protected function _recursiveObjectCloningCheck($obj1, $obj2, $obj1_clone)
{
$obj1_properties = (array) $obj1;
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
index ffe9cd8d..3efe6ec4 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
@@ -740,6 +740,46 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
);
}
+ public function testOrderingEqualContentTypesMaintainsOriginalOrdering()
+ {
+ $firstChild = new MimeEntityFixture(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+ "Content-Type: text/plain\r\n".
+ "\r\n".
+ 'PART 1',
+ 'text/plain'
+ );
+ $secondChild = new MimeEntityFixture(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+ "Content-Type: text/plain\r\n".
+ "\r\n".
+ 'PART 2',
+ 'text/plain'
+ );
+ $headers = $this->_createHeaderSet(array(), false);
+ $headers->shouldReceive('toString')
+ ->zeroOrMoreTimes()
+ ->andReturn("Content-Type: multipart/alternative; boundary=\"xxx\"\r\n");
+
+ $entity = $this->_createEntity($headers, $this->_createEncoder(),
+ $this->_createCache()
+ );
+ $entity->setBoundary('xxx');
+ $entity->setChildren(array($firstChild, $secondChild));
+
+ $this->assertEquals(
+ "Content-Type: multipart/alternative; boundary=\"xxx\"\r\n".
+ "\r\n\r\n--xxx\r\n".
+ "Content-Type: text/plain\r\n".
+ "\r\n".
+ 'PART 1'.
+ "\r\n\r\n--xxx\r\n".
+ "Content-Type: text/plain\r\n".
+ "\r\n".
+ 'PART 2'.
+ "\r\n\r\n--xxx--\r\n",
+ $entity->toString()
+ );
+ }
+
public function testUnsettingChildrenRestoresContentType()
{
$cType = $this->_createHeader('Content-Type', 'text/plain', array(), false);
@@ -948,8 +988,6 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
);
}
- // -- Private helpers
-
abstract protected function _createEntity($headers, $encoder, $cache);
protected function _createChild($level = null, $string = '', $stub = true)
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
index bd2499c0..2c1e581e 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
@@ -282,8 +282,6 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
);
}
- // -- Private helpers
-
protected function _createEntity($headers, $encoder, $cache)
{
return $this->_createAttachment($headers, $encoder, $cache);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php
index 0442af33..1571fce3 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php
@@ -4,7 +4,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoderTest extends \SwiftMailerTes
{
private $_encoder;
- public function setUp()
+ protected function setUp()
{
$this->_encoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
index b523a64c..ca44e11a 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
@@ -154,8 +154,6 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderTest extends \SwiftMailerTest
$this->assertEquals($expected, $collection->content);
}
- // -- Private helpers
-
private function _getEncoder($name, $canonical = false)
{
return new Swift_Mime_ContentEncoder_PlainContentEncoder($name, $canonical);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
index 81992891..7762bbe9 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
@@ -491,8 +491,6 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
);
}
- // -- Creation Methods
-
private function _createCharacterStream($stub = false)
{
return $this->getMockery('Swift_CharacterStream')->shouldIgnoreMissing();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
index f4c3ac89..3a1fc512 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
@@ -43,8 +43,6 @@ class Swift_Mime_EmbeddedFileTest extends Swift_Mime_AttachmentTest
);
}
- // -- Private helpers
-
protected function _createAttachment($headers, $encoder, $cache, $mimeTypes = array())
{
return $this->_createEmbeddedFile($headers, $encoder, $cache, $mimeTypes);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
index 54a792a6..b5a10fe4 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
@@ -209,8 +209,6 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
$this->assertEquals($output, $encoder->encodeString($input));
}
- // -- Creation Methods
-
private function _createEncoder($charStream)
{
return new Swift_Mime_HeaderEncoder_QpHeaderEncoder($charStream);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
index 0f3fe145..cd027cc8 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
@@ -371,8 +371,6 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
$this->assertEquals('utf-8', $header->getParameter('charset'));
}
- // -- Private helper
-
private function _getHeader($name, $encoder, $paramEncoder)
{
$header = new Swift_Mime_Headers_ParameterizedHeader($name, $encoder,
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
index 7e91134f..738ac685 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
@@ -218,8 +218,6 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
);
}
- // -- Private helpers
-
//abstract
protected function _createEntity($headers, $encoder, $cache)
{
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
index 4ee62963..6a87abfa 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
@@ -4,7 +4,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
{
private $_factory;
- public function setUp()
+ protected function setUp()
{
$this->_factory = $this->_createFactory();
}
@@ -12,7 +12,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
public function testMailboxHeaderIsCorrectType()
{
$header = $this->_factory->createMailboxHeader('X-Foo');
- $this->assertInstanceof('Swift_Mime_Headers_MailboxHeader', $header);
+ $this->assertInstanceOf('Swift_Mime_Headers_MailboxHeader', $header);
}
public function testMailboxHeaderHasCorrectName()
@@ -32,7 +32,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
public function testDateHeaderHasCorrectType()
{
$header = $this->_factory->createDateHeader('X-Date');
- $this->assertInstanceof('Swift_Mime_Headers_DateHeader', $header);
+ $this->assertInstanceOf('Swift_Mime_Headers_DateHeader', $header);
}
public function testDateHeaderHasCorrectName()
@@ -50,7 +50,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
public function testTextHeaderHasCorrectType()
{
$header = $this->_factory->createTextHeader('X-Foo');
- $this->assertInstanceof('Swift_Mime_Headers_UnstructuredHeader', $header);
+ $this->assertInstanceOf('Swift_Mime_Headers_UnstructuredHeader', $header);
}
public function testTextHeaderHasCorrectName()
@@ -68,7 +68,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
public function testParameterizedHeaderHasCorrectType()
{
$header = $this->_factory->createParameterizedHeader('X-Foo');
- $this->assertInstanceof('Swift_Mime_Headers_ParameterizedHeader', $header);
+ $this->assertInstanceOf('Swift_Mime_Headers_ParameterizedHeader', $header);
}
public function testParameterizedHeaderHasCorrectName()
@@ -94,7 +94,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
public function testIdHeaderHasCorrectType()
{
$header = $this->_factory->createIdHeader('X-ID');
- $this->assertInstanceof('Swift_Mime_Headers_IdentificationHeader', $header);
+ $this->assertInstanceOf('Swift_Mime_Headers_IdentificationHeader', $header);
}
public function testIdHeaderHasCorrectName()
@@ -112,7 +112,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
public function testPathHeaderHasCorrectType()
{
$header = $this->_factory->createPathHeader('X-Path');
- $this->assertInstanceof('Swift_Mime_Headers_PathHeader', $header);
+ $this->assertInstanceOf('Swift_Mime_Headers_PathHeader', $header);
}
public function testPathHeaderHasCorrectName()
@@ -143,8 +143,6 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
$factory->charsetChanged('utf-8');
}
- // -- Creation methods
-
private function _createFactory($encoder = null, $paramEncoder = null)
{
return new Swift_Mime_SimpleHeaderFactory(
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
index 9682f37e..bed1c137 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
@@ -500,7 +500,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit_Framework_TestCase
{
$set = $this->_createSet($this->_createFactory());
$instance = $set->newInstance();
- $this->assertInstanceof('Swift_Mime_HeaderSet', $instance);
+ $this->assertInstanceOf('Swift_Mime_HeaderSet', $instance);
}
public function testToStringJoinsHeadersTogether()
@@ -709,8 +709,6 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit_Framework_TestCase
$set->setCharset('utf-8');
}
- // -- Creation methods
-
private function _createSet($factory)
{
return new Swift_Mime_SimpleHeaderSet($factory);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
index 267d2764..e5d225cb 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
@@ -809,8 +809,6 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
);
}
- // -- Private helpers
-
//abstract
protected function _createEntity($headers, $encoder, $cache)
{
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
index b54d7f87..fa2a8d48 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
@@ -2,8 +2,6 @@
class Swift_Mime_SimpleMimeEntityTest extends Swift_Mime_AbstractMimeEntityTest
{
- // -- Private helpers
-
protected function _createEntity($headerFactory, $encoder, $cache)
{
return new Swift_Mime_SimpleMimeEntity($headerFactory, $encoder, $cache, new Swift_Mime_Grammar());
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php
index 8f014405..463e4ebb 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php
@@ -71,8 +71,6 @@ class Swift_Plugins_AntiFloodPluginTest extends \PHPUnit_Framework_TestCase
}
}
- // -- Creation Methods
-
private function _createTransport()
{
return $this->getMockBuilder('Swift_Transport')->getMock();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
index bb01a92c..869cfc80 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
@@ -6,7 +6,7 @@ class Swift_Plugins_BandwidthMonitorPluginTest extends \PHPUnit_Framework_TestCa
private $_bytes = 0;
- public function setUp()
+ protected function setUp()
{
$this->_monitor = new Swift_Plugins_BandwidthMonitorPlugin();
}
@@ -69,8 +69,6 @@ class Swift_Plugins_BandwidthMonitorPluginTest extends \PHPUnit_Framework_TestCa
$this->assertEquals(12, $this->_monitor->getBytesOut());
}
- // -- Creation Methods
-
private function _createSendEvent($message)
{
$evt = $this->getMockBuilder('Swift_Events_SendEvent')
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
index 7f4cdef1..8019dfbd 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
@@ -177,8 +177,6 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
$plugin->sendPerformed($evt);
}
- // -- Creation methods
-
private function _createMessage($headers, $to = array(), $from = null, $subject = null,
$body = null)
{
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php
index 15d7014b..bfe4cb70 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php
@@ -123,8 +123,6 @@ class Swift_Plugins_LoggerPluginTest extends \SwiftMailerTestCase
}
}
- // -- Creation Methods
-
private function _createLogger()
{
return $this->getMockBuilder('Swift_Plugins_Logger')->getMock();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php
index d7c55afc..cbd368f3 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php
@@ -69,8 +69,6 @@ class Swift_Plugins_PopBeforeSmtpPluginTest extends \PHPUnit_Framework_TestCase
$plugin->beforeTransportStarted($evt);
}
- // -- Creation Methods
-
private function _createTransport()
{
return $this->getMockBuilder('Swift_Transport')->getMock();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
index 4cc7e89f..bfd5669c 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
@@ -169,8 +169,6 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($message->getBcc(), array('fabien@example.com' => 'Fabien'));
}
- // -- Creation Methods
-
private function _createSendEvent(Swift_Mime_Message $message)
{
$evt = $this->getMockBuilder('Swift_Events_SendEvent')
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
index 81018830..5ba5d5cc 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
@@ -69,8 +69,6 @@ class Swift_Plugins_ReporterPluginTest extends \SwiftMailerTestCase
$plugin->sendPerformed($evt);
}
- // -- Creation Methods
-
private function _createMessage()
{
return $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
index 33dcc750..20aae571 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
@@ -5,7 +5,7 @@ class Swift_Plugins_Reporters_HitReporterTest extends \PHPUnit_Framework_TestCas
private $_hitReporter;
private $_message;
- public function setUp()
+ protected function setUp()
{
$this->_hitReporter = new Swift_Plugins_Reporters_HitReporter();
$this->_message = $this->getMockBuilder('Swift_Mime_Message')->getMock();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php
index a6c6a277..fb0bc975 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php
@@ -5,7 +5,7 @@ class Swift_Plugins_Reporters_HtmlReporterTest extends \PHPUnit_Framework_TestCa
private $_html;
private $_message;
- public function setUp()
+ protected function setUp()
{
$this->_html = new Swift_Plugins_Reporters_HtmlReporter();
$this->_message = $this->getMockBuilder('Swift_Mime_Message')->getMock();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php
index a50f14f9..309f5063 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php
@@ -66,8 +66,6 @@ class Swift_Plugins_ThrottlerPluginTest extends \SwiftMailerTestCase
}
}
- // -- Creation Methods
-
private function _createSleeper()
{
return $this->getMockery('Swift_Plugins_Sleeper');
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
index 13c1b4c1..5eda2232 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
@@ -2,12 +2,10 @@
class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
{
- public function setUp()
+ protected function setUp()
{
- if (version_compare(phpversion(), '5.4', '<') && !defined('OPENSSL_ALGO_SHA256')) {
- $this->markTestSkipped(
- 'skipping because of https://bugs.php.net/bug.php?id=61421'
- );
+ if (PHP_VERSION_ID < 50400 && !defined('OPENSSL_ALGO_SHA256')) {
+ $this->markTestSkipped('skipping because of https://bugs.php.net/bug.php?id=61421');
}
}
@@ -29,12 +27,13 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
$signer->addSignature($headers);
}
- // Default Signing
- public function testSigningDefaults()
+ // SHA1 Signing
+ public function testSigningSHA1()
{
$headerSet = $this->_createHeaderSet();
$messageContent = 'Hello World';
$signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+ $signer->setHashAlgorithm('rsa-sha1');
$signer->setSignatureTimestamp('1299879181');
$altered = $signer->getAlteredHeaders();
$this->assertEquals(array('DKIM-Signature'), $altered);
@@ -147,7 +146,6 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
$this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha256; bh=f+W+hu8dIhf2VAni89o8lF6WKTXi7nViA4RrMdpD5/U=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; c=simple/relaxed; t=1299879181; b=M5eomH/zamyzix9kOes+6YLzQZxuJdBP4x3nP9zF2N26eMLG2/cBKbnNyqiOTDhJdYfWPbLIa 1CWnjST0j5p4CpeOkGYuiE+M4TWEZwhRmRWootlPO3Ii6XpbBJKFk1o9zviS7OmXblUUE4aqb yRSIMDhtLdCK5GlaCneFLN7RQ=');
}
- // -- Creation Methods
private function _createHeaderSet()
{
$cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php
index 00e48c13..ce99bc63 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php
@@ -5,7 +5,7 @@
*/
class Swift_Signers_OpenDKIMSignerTest extends \SwiftMailerTestCase
{
- public function setUp()
+ protected function setUp()
{
if (!extension_loaded('opendkim')) {
$this->markTestSkipped(
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
index df745ef2..5069c1f5 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
@@ -9,7 +9,7 @@ class Swift_Signers_SMimeSignerTest extends \PHPUnit_Framework_TestCase
protected $samplesDir;
- public function setUp()
+ protected function setUp()
{
$this->replacementFactory = Swift_DependencyContainer::getInstance()
->lookup('transport.replacementfactory');
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
index e4d4f48d..c85bdc1e 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
@@ -122,8 +122,6 @@ class Swift_StreamFilters_ByteArrayReplacementFilterTest extends \PHPUnit_Framew
);
}
- // -- Creation methods
-
private function _createFilter($search, $replace)
{
return new Swift_StreamFilters_ByteArrayReplacementFilter($search, $replace);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php
index bd44f5c7..c14d5dc7 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php
@@ -5,7 +5,7 @@ class Swift_StreamFilters_StringReplacementFilterFactoryTest extends \PHPUnit_Fr
public function testInstancesOfStringReplacementFilterAreCreated()
{
$factory = $this->_createFactory();
- $this->assertInstanceof(
+ $this->assertInstanceOf(
'Swift_StreamFilters_StringReplacementFilter',
$factory->createFilter('a', 'b')
);
@@ -29,8 +29,6 @@ class Swift_StreamFilters_StringReplacementFilterFactoryTest extends \PHPUnit_Fr
);
}
- // -- Creation methods
-
private function _createFactory()
{
return new Swift_StreamFilters_StringReplacementFilterFactory();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
index 7a98a2f2..681e2352 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
@@ -46,7 +46,11 @@ class Swift_StreamFilters_StringReplacementFilterTest extends \PHPUnit_Framework
);
}
- // -- Creation methods
+ public function testShouldBufferReturnsFalseOnEmptyBuffer()
+ {
+ $filter = $this->_createFilter("\r\n", "\n");
+ $this->assertFalse($filter->shouldBuffer(''));
+ }
private function _createFilter($search, $replace)
{
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
index 121aaba0..81bda4f0 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
@@ -551,8 +551,6 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
$smtp->start();
}
- // -- Creation Methods
-
protected function _createEventDispatcher($stub = true)
{
return $this->getMockery('Swift_Events_EventDispatcher')->shouldIgnoreMissing();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
index f64b0716..aca03a92 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
@@ -4,7 +4,7 @@ class Swift_Transport_Esmtp_Auth_CramMd5AuthenticatorTest extends \SwiftMailerTe
{
private $_agent;
- public function setUp()
+ protected function setUp()
{
$this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
}
@@ -57,8 +57,6 @@ class Swift_Transport_Esmtp_Auth_CramMd5AuthenticatorTest extends \SwiftMailerTe
);
}
- // -- Private helpers
-
private function _getAuthenticator()
{
return new Swift_Transport_Esmtp_Auth_CramMd5Authenticator();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
index fc6e8069..13f0209a 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
@@ -4,7 +4,7 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticatorTest extends \SwiftMailerTest
{
private $_agent;
- public function setUp()
+ protected function setUp()
{
$this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
}
@@ -57,8 +57,6 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticatorTest extends \SwiftMailerTest
);
}
- // -- Private helpers
-
private function _getAuthenticator()
{
return new Swift_Transport_Esmtp_Auth_LoginAuthenticator();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
index 09ace834..911d2585 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
@@ -6,12 +6,10 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
private $_message2 = '4e544c4d53535000020000000c000c003000000035828980514246973ea892c10000000000000000460046003c00000054004500530054004e00540002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d0000000000';
private $_message3 = '4e544c4d5353500003000000180018006000000076007600780000000c000c0040000000080008004c0000000c000c0054000000000000009a0000000102000054004500530054004e00540074006500730074004d0045004d00420045005200bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000';
- public function setUp()
+ protected function setUp()
{
if (!function_exists('openssl_encrypt') || !function_exists('openssl_random_pseudo_bytes') || !function_exists('bcmul') || !function_exists('iconv')) {
- $this->markTestSkipped(
- 'One of the required functions is not available.'
- );
+ $this->markTestSkipped('One of the required functions is not available.');
}
}
@@ -26,9 +24,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
$message1 = $this->_invokePrivateMethod('createMessage1', $login);
- $this->assertEquals($this->_message1, bin2hex($message1),
- '%s: We send the smallest ntlm message which should never fail.'
- );
+ $this->assertEquals($this->_message1, bin2hex($message1), '%s: We send the smallest ntlm message which should never fail.');
}
public function testLMv1Generator()
@@ -40,9 +36,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
$lmv1Result = $this->_invokePrivateMethod('createLMPassword', $login, array($password, $this->hex2bin($challenge)));
- $this->assertEquals($lmv1, bin2hex($lmv1Result),
- '%s: The keys should be the same cause we use the same values to generate them.'
- );
+ $this->assertEquals($lmv1, bin2hex($lmv1Result), '%s: The keys should be the same cause we use the same values to generate them.');
}
public function testLMv2Generator()
@@ -56,9 +50,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
$lmv2Result = $this->_invokePrivateMethod('createLMv2Password', $login, array($password, $username, $domain, $this->hex2bin($challenge), $this->hex2bin('ffffff0011223344')));
- $this->assertEquals($lmv2, bin2hex($lmv2Result),
- '%s: The keys should be the same cause we use the same values to generate them.'
- );
+ $this->assertEquals($lmv2, bin2hex($lmv2Result), '%s: The keys should be the same cause we use the same values to generate them.');
}
public function testMessage3v1Generator()
@@ -73,9 +65,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
$message3 = $this->_invokePrivateMethod('createMessage3', $login, array($domain, $username, $workstation, $this->hex2bin($lmResponse), $this->hex2bin($ntlmResponse)));
- $this->assertEquals($message3T, bin2hex($message3),
- '%s: We send the same information as the example is created with so this should be the same'
- );
+ $this->assertEquals($message3T, bin2hex($message3), '%s: We send the same information as the example is created with so this should be the same');
}
public function testMessage3v2Generator()
@@ -89,9 +79,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
$message3 = $this->_invokePrivateMethod('createMessage3', $login, array($domain, $username, $workstation, $this->hex2bin($lmResponse), $this->hex2bin($ntlmResponse)));
- $this->assertEquals($this->_message3, bin2hex($message3),
- '%s: We send the same information as the example is created with so this should be the same'
- );
+ $this->assertEquals($this->_message3, bin2hex($message3), '%s: We send the same information as the example is created with so this should be the same');
}
public function testGetDomainAndUsername()
@@ -101,12 +89,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
- $this->assertEquals('DOMAIN', $domain,
- '%s: the fetched domain did not match'
- );
- $this->assertEquals('user', $user,
- '%s: the fetched user did not match'
- );
+ $this->assertEquals('DOMAIN', $domain, '%s: the fetched domain did not match');
+ $this->assertEquals('user', $user, '%s: the fetched user did not match');
}
public function testGetDomainAndUsernameWithExtension()
@@ -116,12 +100,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
- $this->assertEquals('domain.com', $domain,
- '%s: the fetched domain did not match'
- );
- $this->assertEquals('user', $user,
- '%s: the fetched user did not match'
- );
+ $this->assertEquals('domain.com', $domain, '%s: the fetched domain did not match');
+ $this->assertEquals('user', $user, '%s: the fetched user did not match');
}
public function testGetDomainAndUsernameWithAtSymbol()
@@ -131,12 +111,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
- $this->assertEquals('DOMAIN', $domain,
- '%s: the fetched domain did not match'
- );
- $this->assertEquals('user', $user,
- '%s: the fetched user did not match'
- );
+ $this->assertEquals('DOMAIN', $domain, '%s: the fetched domain did not match');
+ $this->assertEquals('user', $user, '%s: the fetched user did not match');
}
public function testGetDomainAndUsernameWithAtSymbolAndExtension()
@@ -146,12 +122,19 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$login = $this->_getAuthenticator();
list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
- $this->assertEquals('domain.com', $domain,
- '%s: the fetched domain did not match'
- );
- $this->assertEquals('user', $user,
- '%s: the fetched user did not match'
- );
+ $this->assertEquals('domain.com', $domain, '%s: the fetched domain did not match');
+ $this->assertEquals('user', $user, '%s: the fetched user did not match');
+ }
+
+ public function testGetDomainAndUsernameWithoutDomain()
+ {
+ $username = 'user';
+
+ $login = $this->_getAuthenticator();
+ list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
+
+ $this->assertEquals('', $domain, '%s: the fetched domain did not match');
+ $this->assertEquals('user', $user, '%s: the fetched user did not match');
}
public function testSuccessfulAuthentication()
@@ -174,9 +157,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
$this->_invokePrivateMethod('createMessage3', $ntlm, array($domain, $username, $this->hex2bin('4d0045004d00420045005200'), $this->hex2bin('bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9'), $this->hex2bin('caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000'))
))."\r\n", array(235));
- $this->assertTrue($ntlm->authenticate($agent, $username.'@'.$domain, $secret, $this->hex2bin('30fa7e3c677bc301'), $this->hex2bin('f5ce3d2401c8f6e9')),
- '%s: The buffer accepted all commands authentication should succeed'
- );
+ $this->assertTrue($ntlm->authenticate($agent, $username.'@'.$domain, $secret, $this->hex2bin('30fa7e3c677bc301'), $this->hex2bin('f5ce3d2401c8f6e9')), '%s: The buffer accepted all commands authentication should succeed');
}
public function testAuthenticationFailureSendRsetAndReturnFalse()
@@ -197,12 +178,9 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
->once()
->with("RSET\r\n", array(250));
- $this->assertFalse($ntlm->authenticate($agent, $username.'@'.$domain, $secret, $this->hex2bin('30fa7e3c677bc301'), $this->hex2bin('f5ce3d2401c8f6e9')),
- '%s: Authentication fails, so RSET should be sent'
- );
+ $this->assertFalse($ntlm->authenticate($agent, $username.'@'.$domain, $secret, $this->hex2bin('30fa7e3c677bc301'), $this->hex2bin('f5ce3d2401c8f6e9')), '%s: Authentication fails, so RSET should be sent');
}
- // -- Private helpers
private function _getAuthenticator()
{
return new Swift_Transport_Esmtp_Auth_NTLMAuthenticator();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
index 4fe9db80..73a90627 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
@@ -4,7 +4,7 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticatorTest extends \SwiftMailerTest
{
private $_agent;
- public function setUp()
+ protected function setUp()
{
$this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
}
@@ -60,8 +60,6 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticatorTest extends \SwiftMailerTest
);
}
- // -- Private helpers
-
private function _getAuthenticator()
{
return new Swift_Transport_Esmtp_Auth_PlainAuthenticator();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
index 64327d47..d52328a1 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
@@ -4,7 +4,7 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
{
private $_agent;
- public function setUp()
+ protected function setUp()
{
$this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
}
@@ -148,8 +148,6 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
$auth->afterEhlo($this->_agent);
}
- // -- Private helpers
-
private function _createHandler($authenticators)
{
return new Swift_Transport_Esmtp_AuthHandler($authenticators);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
index 8d6321f3..166e1605 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
@@ -5,6 +5,7 @@ require_once dirname(__DIR__).'/EsmtpTransportTest.php';
interface Swift_Transport_EsmtpHandlerMixin extends Swift_Transport_EsmtpHandler
{
public function setUsername($user);
+
public function setPassword($pass);
}
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
index 8d80f359..e56e37f4 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
@@ -503,8 +503,6 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
$transport->registerPlugin($plugin);
}
- // -- Private helpers
-
private function _getTransport(array $transports)
{
$transport = new Swift_Transport_FailoverTransport();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
index cc7297b1..f6bb8199 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
@@ -719,7 +719,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
public function varsAreReferences(&$ref1, &$ref2)
{
if (is_object($ref2)) {
- return ($ref1 === $ref2);
+ return $ref1 === $ref2;
}
if ($ref1 !== $ref2) {
return false;
@@ -734,8 +734,6 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
return $isRef;
}
- // -- Private helpers
-
private function _getTransport(array $transports)
{
$transport = new Swift_Transport_LoadBalancedTransport();
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
index 96e9943d..6672a3d1 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
@@ -421,7 +421,7 @@ class Swift_Transport_MailTransportTest extends \SwiftMailerTestCase
}
/**
- * @expectedException Swift_TransportException
+ * @expectedException \Swift_TransportException
* @expectedExceptionMessage Cannot send message without a recipient
*/
public function testExceptionWhenNoRecipients()
@@ -465,8 +465,6 @@ class Swift_Transport_MailTransportTest extends \SwiftMailerTestCase
$transport->send($message);
}
- // -- Creation Methods
-
private function _createTransport($invoker, $dispatcher)
{
return new Swift_Transport_MailTransport($invoker, $dispatcher);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
index 6108a954..5109b56b 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
@@ -26,8 +26,6 @@ class Swift_Transport_StreamBufferTest extends \PHPUnit_Framework_TestCase
$buffer->setWriteTranslations(array('x' => 'y', 'a' => 'b'));
}
- // -- Creation methods
-
private function _createBuffer($replacementFactory)
{
return new Swift_Transport_StreamBuffer($replacementFactory);