From ac128f9ff525e154cbafd1fbffe4366254f32dc5 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Thu, 15 Dec 2022 21:36:49 +0100 Subject: [PATCH 1/2] Callables of the form [$obj, "ClassName::Method"] are deprecated. --- lib/classes/Swift/Attachment.php | 2 +- lib/classes/Swift/EmbeddedFile.php | 2 +- lib/classes/Swift/FailoverTransport.php | 2 +- lib/classes/Swift/LoadBalancedTransport.php | 2 +- lib/classes/Swift/Message.php | 2 +- lib/classes/Swift/MimePart.php | 2 +- lib/classes/Swift/NullTransport.php | 2 +- lib/classes/Swift/SendmailTransport.php | 2 +- lib/classes/Swift/SmtpTransport.php | 2 +- lib/classes/Swift/SpoolTransport.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/classes/Swift/Attachment.php b/lib/classes/Swift/Attachment.php index 7a1420f79..b7df37515 100644 --- a/lib/classes/Swift/Attachment.php +++ b/lib/classes/Swift/Attachment.php @@ -27,7 +27,7 @@ class Swift_Attachment extends Swift_Mime_Attachment public function __construct($data = null, $filename = null, $contentType = null) { \call_user_func_array( - [$this, 'Swift_Mime_Attachment::__construct'], + 'Swift_Mime_Attachment::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('mime.attachment') ); diff --git a/lib/classes/Swift/EmbeddedFile.php b/lib/classes/Swift/EmbeddedFile.php index 30fc68ab0..b4d79d72e 100644 --- a/lib/classes/Swift/EmbeddedFile.php +++ b/lib/classes/Swift/EmbeddedFile.php @@ -27,7 +27,7 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile public function __construct($data = null, $filename = null, $contentType = null) { \call_user_func_array( - [$this, 'Swift_Mime_EmbeddedFile::__construct'], + 'Swift_Mime_EmbeddedFile::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('mime.embeddedfile') ); diff --git a/lib/classes/Swift/FailoverTransport.php b/lib/classes/Swift/FailoverTransport.php index af0be9179..7ecb1d392 100644 --- a/lib/classes/Swift/FailoverTransport.php +++ b/lib/classes/Swift/FailoverTransport.php @@ -23,7 +23,7 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport public function __construct($transports = []) { \call_user_func_array( - [$this, 'Swift_Transport_FailoverTransport::__construct'], + 'Swift_Transport_FailoverTransport::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('transport.failover') ); diff --git a/lib/classes/Swift/LoadBalancedTransport.php b/lib/classes/Swift/LoadBalancedTransport.php index 244b5f602..2a87f1ad1 100644 --- a/lib/classes/Swift/LoadBalancedTransport.php +++ b/lib/classes/Swift/LoadBalancedTransport.php @@ -23,7 +23,7 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport public function __construct($transports = []) { \call_user_func_array( - [$this, 'Swift_Transport_LoadBalancedTransport::__construct'], + 'Swift_Transport_LoadBalancedTransport::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('transport.loadbalanced') ); diff --git a/lib/classes/Swift/Message.php b/lib/classes/Swift/Message.php index 5c5834e23..f8e4bb14c 100644 --- a/lib/classes/Swift/Message.php +++ b/lib/classes/Swift/Message.php @@ -43,7 +43,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage public function __construct($subject = null, $body = null, $contentType = null, $charset = null) { \call_user_func_array( - [$this, 'Swift_Mime_SimpleMessage::__construct'], + 'Swift_Mime_SimpleMessage::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('mime.message') ); diff --git a/lib/classes/Swift/MimePart.php b/lib/classes/Swift/MimePart.php index ea97619ad..865b0ea6a 100644 --- a/lib/classes/Swift/MimePart.php +++ b/lib/classes/Swift/MimePart.php @@ -27,7 +27,7 @@ class Swift_MimePart extends Swift_Mime_MimePart public function __construct($body = null, $contentType = null, $charset = null) { \call_user_func_array( - [$this, 'Swift_Mime_MimePart::__construct'], + 'Swift_Mime_MimePart::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('mime.part') ); diff --git a/lib/classes/Swift/NullTransport.php b/lib/classes/Swift/NullTransport.php index e44b7af98..2e73d5a5a 100644 --- a/lib/classes/Swift/NullTransport.php +++ b/lib/classes/Swift/NullTransport.php @@ -18,7 +18,7 @@ class Swift_NullTransport extends Swift_Transport_NullTransport public function __construct() { \call_user_func_array( - [$this, 'Swift_Transport_NullTransport::__construct'], + 'Swift_Transport_NullTransport::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('transport.null') ); diff --git a/lib/classes/Swift/SendmailTransport.php b/lib/classes/Swift/SendmailTransport.php index 3c756436c..bb1559fc2 100644 --- a/lib/classes/Swift/SendmailTransport.php +++ b/lib/classes/Swift/SendmailTransport.php @@ -23,7 +23,7 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport public function __construct($command = '/usr/sbin/sendmail -bs') { \call_user_func_array( - [$this, 'Swift_Transport_SendmailTransport::__construct'], + 'Swift_Transport_SendmailTransport::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('transport.sendmail') ); diff --git a/lib/classes/Swift/SmtpTransport.php b/lib/classes/Swift/SmtpTransport.php index 56b62323a..9a5846ceb 100644 --- a/lib/classes/Swift/SmtpTransport.php +++ b/lib/classes/Swift/SmtpTransport.php @@ -33,7 +33,7 @@ class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport public function __construct($host = 'localhost', $port = 25, $encryption = null) { \call_user_func_array( - [$this, 'Swift_Transport_EsmtpTransport::__construct'], + 'Swift_Transport_EsmtpTransport::__construct', Swift_DependencyContainer::getInstance() ->createDependenciesFor('transport.smtp') ); diff --git a/lib/classes/Swift/SpoolTransport.php b/lib/classes/Swift/SpoolTransport.php index c08e0fb17..503feb46a 100644 --- a/lib/classes/Swift/SpoolTransport.php +++ b/lib/classes/Swift/SpoolTransport.php @@ -26,7 +26,7 @@ public function __construct(Swift_Spool $spool) $arguments[] = $spool; \call_user_func_array( - [$this, 'Swift_Transport_SpoolTransport::__construct'], + 'Swift_Transport_SpoolTransport::__construct', $arguments ); } From 4a969e81f8ef7c912ffcb15df21a8c0da8da8bb3 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Thu, 8 Feb 2024 17:07:06 +0100 Subject: [PATCH 2/2] Added 8.2 to tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 71e16d3b6..bf0d33ea4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: true matrix: - php: ['7.4', '8.1'] + php: ['7.4', '8.1', '8.2'] name: PHP ${{ matrix.php }}