Merge pull request #13 from sandstorm/task/flow73

TASK: Flow 7 upgrade

Author: simstern

Classes/Sandstorm/GedmoTranslatableConnector/MappingDriverChainWithFlowAnnotationDriverAsDefault.php

@@ -9,7 +9,7 @@
  * of the License, or (at your option) any later version.                     *
  *                                                                            */
 
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Neos\Flow\Persistence\Doctrine\Mapping\Driver\FlowAnnotationDriver;
 
 /**
@@ -22,10 +22,10 @@ public function __construct(FlowAnnotationDriver $flowAnnotationDriver) {
 	}
 
 	/**
-	 * @param \Doctrine\Common\Persistence\ObjectManager $entityManager
+	 * @param \Doctrine\ORM\EntityManager $entityManager
 	 * @return void
 	 */
-	public function setEntityManager(\Doctrine\Common\Persistence\ObjectManager $entityManager) {
+	public function setEntityManager(\Doctrine\ORM\EntityManager $entityManager) {
 		$this->getDefaultDriver()->setEntityManager($entityManager);
 	}
-} 
+}

Classes/Sandstorm/GedmoTranslatableConnector/Package.php

@@ -33,7 +33,7 @@ public function boot(\Neos\Flow\Core\Bootstrap $bootstrap) {
 				$flowAnnotationDriver = $bootstrap->getObjectManager()->get('Neos\Flow\Persistence\Doctrine\Mapping\Driver\FlowAnnotationDriver');
 
 				$driverChain = new MappingDriverChainWithFlowAnnotationDriverAsDefault($flowAnnotationDriver);
-				$driverChain->addDriver(new AnnotationDriver(ObjectAccess::getProperty($flowAnnotationDriver, 'reader', TRUE), FLOW_PATH_PACKAGES . 'Libraries/gedmo/doctrine-extensions/lib/Gedmo/Translatable/Entity'), 'Gedmo');
+				$driverChain->addDriver(new AnnotationDriver(ObjectAccess::getProperty($flowAnnotationDriver, 'reader', TRUE), FLOW_PATH_PACKAGES . 'Libraries/gedmo/doctrine-extensions/src/Translatable/Entity'), 'Gedmo');
 				$bootstrap->getObjectManager()->setInstance('Neos\Flow\Persistence\Doctrine\Mapping\Driver\FlowAnnotationDriver', $driverChain);
 			}
 		});
@@ -53,4 +53,4 @@ public function boot(\Neos\Flow\Core\Bootstrap $bootstrap) {
 			}
 		});
 	}
-} 
+}

composer.json

@@ -3,12 +3,12 @@
     "type": "neos-package",
     "description": "Connector to make Gedmo Translatable work with Neos Flow",
     "require": {
-        "neos/flow": "*",
-        "gedmo/doctrine-extensions": "2.4.*"
+        "neos/flow": "^7.0",
+        "gedmo/doctrine-extensions": "^3.0"
     },
     "autoload": {
         "psr-0": {
             "Sandstorm\\GedmoTranslatableConnector": "Classes"
         }
     }
-}
+}