Merge pull request #1 from akleineb/patch-1

Add neos/flow 6

Author: johannessteu

Classes/EventListener/AppliedEventsLogRepository.php

@@ -11,7 +11,7 @@
  * source code.
  */
 
-use Doctrine\Common\Persistence\ObjectManager as EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Neos\Flow\Annotations as Flow;
 
 /**
@@ -31,7 +31,7 @@ class AppliedEventsLogRepository
 {
     /**
      * @Flow\Inject
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     protected $entityManager;
 

Classes/EventStore/Storage/Doctrine/Factory/ConnectionFactory.php

@@ -11,12 +11,12 @@
  * source code.
  */
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Types\Type;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Utility\Arrays;
 
 /**
@@ -32,7 +32,7 @@ class ConnectionFactory
      * slot is invoked. Without this an exception 'Unknown column type "flow_json_array" requested' might be thrown
      *
      * @Flow\Inject(lazy=false)
-     * @var ObjectManager
+     * @var ObjectManagerInterface
      */
     protected $doctrineObjectManager;
 

Classes/ProcessManager/State/StateRepository.php

@@ -13,7 +13,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\SystemLoggerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * A repository specialized on Process States
@@ -24,7 +24,7 @@ final class StateRepository
 {
     /**
      * @Flow\Inject
-     * @var SystemLoggerInterface
+     * @var LoggerInterface
      */
     protected $systemLogger;
 

Classes/Projection/Doctrine/DoctrineProjectionPersistenceManager.php

@@ -15,8 +15,8 @@
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\UnitOfWork;
 use Neos\EventSourcing\Exception;
-use Neos\Flow\Log\SystemLoggerInterface;
 use Neos\Flow\Annotations as Flow;
+use Psr\Log\LoggerInterface;
 
 /**
  * A persistence manager for Doctrine-based projectors
@@ -29,7 +29,7 @@ class DoctrineProjectionPersistenceManager
 
     /**
      * @Flow\Inject
-     * @var SystemLoggerInterface
+     * @var LoggerInterface
      */
     protected $systemLogger;
 

composer.json

@@ -4,7 +4,7 @@
     "description": "Lean and opinionated way to integrate Event Sourcing and CQRS pattern in your Flow framework package",
     "require": {
         "php": ">=7.0",
-        "neos/flow": "~4.0 || ~5.0 || dev-master"
+        "neos/flow": "~4.0 || ~5.0 || ~6.0 || dev-master"
     },
     "suggest": {
         "php-uuid": "For fast generation of UUIDs used in the persistence."