!!!FEATURE: Add virtual object configurations for framework loggers

Neos.Flow/Classes/Command/DoctrineCommandController.php

@@ -57,6 +57,7 @@ class DoctrineCommandController extends CommandController
     protected $throwableStorage;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/Http/Component/SecurityEntryPointComponent.php

@@ -26,7 +26,7 @@ class SecurityEntryPointComponent implements ComponentInterface
     protected $securityContext;
 
     /**
-     * @Flow\Inject
+     * @Flow\Inject(name="Neos.Flow:SecurityLogger")
      * @var LoggerInterface
      */
     protected $securityLogger;

Neos.Flow/Classes/Http/ContentStream.php

@@ -34,7 +34,7 @@ class ContentStream implements StreamInterface
     protected $stream;
 
     /**
-     * @Flow\Inject
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/I18n/Xliff/Model/FileAdapter.php

@@ -33,12 +33,11 @@
 class FileAdapter
 {
     /**
-     * @Flow\Inject
+     * @Flow\Inject(name="Neos.Flow:I18nLogger")
      * @var LoggerInterface
      */
     protected $i18nLogger;
 
-
     /**
      * @var array
      */

Neos.Flow/Classes/I18n/Xliff/Service/XliffReader.php

@@ -23,12 +23,11 @@
 class XliffReader
 {
     /**
-     * @Flow\Inject
+     * @Flow\Inject(name="Neos.Flow:I18nLogger")
      * @var LoggerInterface
      */
     protected $i18nLogger;
 
-
     /**
      * @param string $sourcePath
      * @param callable $iterator

Neos.Flow/Classes/Mvc/Routing/Router.php

@@ -33,6 +33,7 @@
 class Router implements RouterInterface
 {
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/Mvc/Routing/RouterCachingService.php

@@ -52,6 +52,7 @@ class RouterCachingService
 
     /**
      * @var LoggerInterface
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      */
     protected $logger;
 

Neos.Flow/Classes/Persistence/Doctrine/PersistenceManager.php

@@ -36,6 +36,7 @@
 class PersistenceManager extends AbstractPersistenceManager
 {
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/Persistence/Doctrine/Query.php

@@ -35,6 +35,7 @@ class Query implements QueryInterface
     protected $entityClassName;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/ResourceManagement/Publishing/MessageCollector.php

@@ -40,6 +40,7 @@ class MessageCollector
     protected $messages;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/ResourceManagement/ResourceManager.php

@@ -47,6 +47,7 @@ class ResourceManager
     protected $objectManager;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/ResourceManagement/ResourceTypeConverter.php

@@ -113,6 +113,7 @@ class ResourceTypeConverter extends AbstractTypeConverter
     protected $persistenceManager;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/ResourceManagement/Target/FileSystemTarget.php

@@ -89,6 +89,7 @@ class FileSystemTarget implements TargetInterface
     protected $resourceRepository;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/Security/Aspect/LoggingAspect.php

@@ -15,10 +15,10 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\JoinPointInterface;
-use Neos\Flow\Log\PsrSecurityLoggerInterface;
 use Neos\Flow\Security\Authentication\AuthenticationManagerInterface;
 use Neos\Flow\Security\Authentication\TokenInterface;
 use Neos\Flow\Security\Exception\NoTokensAuthenticatedException;
+use Psr\Log\LoggerInterface;
 
 /**
  * An aspect which centralizes the logging of security relevant actions.
@@ -29,8 +29,8 @@
 class LoggingAspect
 {
     /**
-     * @var PsrSecurityLoggerInterface
-     * @Flow\Inject
+     * @Flow\Inject(name="Neos.Flow:SecurityLogger")
+     * @var LoggerInterface
      */
     protected $securityLogger;
 

Neos.Flow/Classes/Security/Context.php

@@ -13,7 +13,6 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Cache\CacheAwareInterface;
-use Neos\Flow\Log\PsrSecurityLoggerInterface;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\Security\Authentication\Token\SessionlessTokenInterface;
@@ -24,6 +23,7 @@
 use Neos\Flow\Session\SessionManagerInterface;
 use Neos\Flow\Utility\Algorithms;
 use Neos\Utility\TypeHandling;
+use Psr\Log\LoggerInterface;
 
 /**
  * This is the default implementation of a security context, which holds current
@@ -171,8 +171,8 @@ class Context
     protected $sessionManager;
 
     /**
-     * @Flow\Inject
-     * @var PsrSecurityLoggerInterface
+     * @Flow\Inject(name="Neos.Flow:SecurityLogger")
+     * @var LoggerInterface
      */
     protected $securityLogger;
 

Neos.Flow/Classes/Security/RequestPattern/CsrfProtection.php

@@ -61,6 +61,7 @@ class CsrfProtection implements RequestPatternInterface
     protected $policyService;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/Session/Aspect/LoggingAspect.php

@@ -25,6 +25,7 @@
 class LoggingAspect
 {
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;

Neos.Flow/Classes/Session/Session.php

@@ -55,6 +55,7 @@ class Session implements CookieEnabledInterface
     protected $objectManager;
 
     /**
+     * @Flow\Inject(name="Neos.Flow:SystemLogger")
      * @var LoggerInterface
      */
     protected $logger;