Merge pull request #18 from neos/task/adjust-logger-for-flow-6

TASK: Adjust logger calls for Flow 6.0
neos · Sep 4, 2019 · 91162e2 · 91162e2
2 parents 429520a + 1be659d
commit 91162e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Classes/Transport/LoggingTransport.php b/Classes/Transport/LoggingTransport.php
@@ -15,7 +15,9 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\SwiftMailer\TransportInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * A logging swift transport for functional tests and development. It stores and logs sent messages.
@@ -31,9 +33,9 @@ class LoggingTransport implements TransportInterface
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Log\SystemLoggerInterface
+     * @var LoggerInterface
      */
-    protected $systemLogger;
+    protected $logger;
 
     /**
      * The logging transport is always started
@@ -75,9 +77,9 @@ public function send(\Swift_Mime_SimpleMessage $message, &$failedRecipients = nu
     {
         self::$deliveredMessages[] = $message;
 
-        $this->systemLogger->log('Sent email to ' . $this->buildStringFromEmailAndNameArray($message->getTo()), LOG_DEBUG, [
-            'message' => $message->toString()
-        ]);
+        $this->logger->debug('Sent email to ' . $this->buildStringFromEmailAndNameArray($message->getTo()),
+            array_merge(LogEnvironment::fromMethodName(__METHOD__), ['message' => $message->toString()])
+        );
 
         return count((array)$message->getTo()) + count((array)$message->getCc()) + count((array)$message->getBcc());
     }

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "MIT"
     ],
     "require": {
-        "neos/flow": "^4.0 || ^5.0 || dev-master",
+        "neos/flow": "^5.2 || ^6.0 || dev-master",
         "swiftmailer/swiftmailer": "^6.0"
     },
     "autoload": {