Merge pull request #20 from punktDe/update-neos-30

TASK: Update the package to Neos 3.0
ttreeagency · Jul 11, 2017 · 5126c1e · 5126c1e
2 parents ca0722b + 2c0bc77
commit 5126c1e
Show file tree

Hide file tree

Showing 33 changed files with 170 additions and 94 deletions.
diff --git a/...ositoryImporter/Aspect/EventLogAspect.php → Classes/Aspect/EventLogAspect.php b/...ositoryImporter/Aspect/EventLogAspect.php → Classes/Aspect/EventLogAspect.php
@@ -7,12 +7,12 @@
 
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
 use Ttree\ContentRepositoryImporter\Importer\ImporterInterface;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\AOP\JoinPointInterface;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Persistence\PersistenceManagerInterface;
-use TYPO3\Flow\Utility\Arrays;
-use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Aop\JoinPointInterface;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Utility\Arrays;
+use Neos\ContentRepository\Domain\Repository\NodeDataRepository;
 
 /**
  * Aspect to automatically handle EventLog in Importer object

diff --git a/...orter/Command/ImportCommandController.php → Classes/Command/ImportCommandController.php b/...orter/Command/ImportCommandController.php → Classes/Command/ImportCommandController.php
@@ -11,14 +11,14 @@
 use Ttree\ContentRepositoryImporter\Domain\Service\ImportService;
 use Ttree\ContentRepositoryImporter\Exception\ImportAlreadyExecutedException;
 use Ttree\ContentRepositoryImporter\Importer\AbstractImporter;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Cli\CommandController;
-use TYPO3\Flow\Core\Booting\Scripts;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Object\ObjectManagerInterface;
-use TYPO3\Flow\Utility\Arrays;
-use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Cli\CommandController;
+use Neos\Flow\Core\Booting\Scripts;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Utility\Arrays;
+use Neos\Neos\EventLog\Domain\Service\EventEmittingService;
 
 /**
  * Import Command Controller
@@ -40,7 +40,7 @@ class ImportCommandController extends CommandController
     protected $eventLogRepository;
 
     /**
-     * @Flow\InjectConfiguration(package="TYPO3.Flow")
+     * @Flow\InjectConfiguration(package="Neos.Flow")
      * @var array
      */
     protected $flowSettings;
@@ -273,7 +273,7 @@ public function flushEventLogCommand()
      *
      * @param array $presetSettings
      * @param string $preset
-     * @throws \TYPO3\Flow\Mvc\Exception\StopActionException
+     * @throws \Neos\Flow\Mvc\Exception\StopActionException
      */
     protected function checkForPartsSettingsOrQuit(array $presetSettings, $preset)
     {

diff --git a/...ter/DataProvider/AbstractDataProvider.php → ...ses/DataProvider/AbstractDataProvider.php b/...ter/DataProvider/AbstractDataProvider.php → ...ses/DataProvider/AbstractDataProvider.php
@@ -6,8 +6,8 @@
  */
 
 use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SystemLoggerInterface;
 
 /**
  * Abstract Data Provider

diff --git a/...Provider/AbstractDatabaseDataProvider.php → ...Provider/AbstractDatabaseDataProvider.php b/...Provider/AbstractDatabaseDataProvider.php → ...Provider/AbstractDatabaseDataProvider.php
@@ -8,7 +8,7 @@
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Database based Data Provider

diff --git a/...Importer/DataProvider/CsvDataProvider.php → Classes/DataProvider/CsvDataProvider.php b/...Importer/DataProvider/CsvDataProvider.php → Classes/DataProvider/CsvDataProvider.php
@@ -7,8 +7,8 @@
 
 use Ttree\ContentRepositoryImporter\Exception\InvalidArgumentException;
 use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SystemLoggerInterface;
 
 /**
  * Csv Data Provider

diff --git a/...er/DataProvider/DataProviderInterface.php → ...es/DataProvider/DataProviderInterface.php b/...er/DataProvider/DataProviderInterface.php → ...es/DataProvider/DataProviderInterface.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Data Provider Interface

diff --git a/...tRepositoryImporter/DataType/DataType.php → Classes/DataType/DataType.php b/...tRepositoryImporter/DataType/DataType.php → Classes/DataType/DataType.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  * String Data Type

diff --git a/...ryImporter/DataType/DataTypeInterface.php → Classes/DataType/DataTypeInterface.php b/...ryImporter/DataType/DataTypeInterface.php → Classes/DataType/DataTypeInterface.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Data Type Interface

diff --git a/...ntentRepositoryImporter/DataType/Date.php → Classes/DataType/Date.php b/...ntentRepositoryImporter/DataType/Date.php → Classes/DataType/Date.php
@@ -5,7 +5,7 @@
  * This script belongs to the TYPO3 Flow package "Ttree.ContentRepositoryImporter". *
  *                                                                                  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Date Data Type

diff --git a/...oryImporter/DataType/ExternalResource.php → Classes/DataType/ExternalResource.php b/...oryImporter/DataType/ExternalResource.php → Classes/DataType/ExternalResource.php
@@ -6,12 +6,12 @@
  */
 
 use Gedmo\Uploadable\MimeType\MimeTypeGuesser;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Resource\ResourceManager;
-use TYPO3\Flow\Utility\Files;
-use TYPO3\Flow\Utility\MediaTypes;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\ResourceManagement\ResourceManager;
+use Neos\Utility\Files;
+use Neos\Utility\MediaTypes;
 
 /**
  * String Data Type
@@ -62,8 +62,8 @@ public function disableForceDownload()
     /**
      * @param string $value
      * @throws Exception
-     * @throws \TYPO3\Flow\Resource\Exception
-     * @throws \TYPO3\Flow\Utility\Exception
+     * @throws \Neos\Flow\ResourceManagement\Exception
+     * @throws \Neos\Flow\Utility\Exception
      */
     protected function initializeValue($value)
     {

diff --git a/...positoryImporter/DataType/HtmlContent.php → Classes/DataType/HtmlContent.php b/...positoryImporter/DataType/HtmlContent.php → Classes/DataType/HtmlContent.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Utility\Arrays;
+use Neos\Flow\Annotations as Flow;
+use Neos\Utility\Arrays;
 
 /**
  * String Data Type

diff --git a/...ntRepositoryImporter/DataType/Integer.php → Classes/DataType/Integer.php b/...ntRepositoryImporter/DataType/Integer.php → Classes/DataType/Integer.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * String Data Type

diff --git a/...ntentRepositoryImporter/DataType/Slug.php → Classes/DataType/Slug.php b/...ntentRepositoryImporter/DataType/Slug.php → Classes/DataType/Slug.php
@@ -6,7 +6,7 @@
  */
 
 use Cocur\Slugify\Slugify;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * String Data Type

diff --git a/...positoryImporter/DataType/StringValue.php → Classes/DataType/StringValue.php b/...positoryImporter/DataType/StringValue.php → Classes/DataType/StringValue.php
@@ -5,7 +5,7 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * String Data Type

diff --git a/...RepositoryImporter/Domain/Model/Event.php → Classes/Domain/Model/Event.php b/...RepositoryImporter/Domain/Model/Event.php → Classes/Domain/Model/Event.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Neos\EventLog\Domain\Model\NodeEvent;
+use Neos\Flow\Annotations as Flow;
+use Neos\Neos\EventLog\Domain\Model\NodeEvent;
 
 /**
  * A specific event used by the ContentRepositoryImporter

diff --git a/...epositoryImporter/Domain/Model/Import.php → Classes/Domain/Model/Import.php b/...epositoryImporter/Domain/Model/Import.php → Classes/Domain/Model/Import.php
@@ -6,11 +6,11 @@
  */
 
 use Doctrine\ORM\Mapping as ORM;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Object\ObjectManagerInterface;
-use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Neos\EventLog\Domain\Service\EventEmittingService;
 
 /**
  * @Flow\Entity
@@ -80,7 +80,7 @@ public function getExternalImportIdentifier()
      * @param array $data
      * @param Event $parentEvent
      * @return Event
-     * @throws \TYPO3\Neos\Exception
+     * @throws \Neos\Neos\Exception
      */
     public function addEvent($eventType, $externalIdentifier = null, array $data = null, Event $parentEvent = null)
     {

diff --git a/...ter/Domain/Model/PresetPartDefinition.php → ...ses/Domain/Model/PresetPartDefinition.php b/...ter/Domain/Model/PresetPartDefinition.php → ...ses/Domain/Model/PresetPartDefinition.php
@@ -6,7 +6,7 @@
  */
 
 use Ttree\ContentRepositoryImporter\Exception\InvalidArgumentException;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Preset Part Definition

diff --git a/...ryImporter/Domain/Model/RecordMapping.php → Classes/Domain/Model/RecordMapping.php b/...ryImporter/Domain/Model/RecordMapping.php → Classes/Domain/Model/RecordMapping.php
@@ -6,7 +6,7 @@
  */
 
 use Doctrine\ORM\Mapping as ORM;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/...ter/Domain/Repository/EventRepository.php → ...ses/Domain/Repository/EventRepository.php b/...ter/Domain/Repository/EventRepository.php → ...ses/Domain/Repository/EventRepository.php
@@ -5,12 +5,12 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * @Flow\Scope("singleton")
  */
-class EventRepository extends \TYPO3\Neos\EventLog\Domain\Repository\EventRepository
+class EventRepository extends \Neos\Neos\EventLog\Domain\Repository\EventRepository
 {
     /**
      * Remove all events without checking foreign keys. Needed for clearing the table during tests.

diff --git a/...er/Domain/Repository/ImportRepository.php → ...es/Domain/Repository/ImportRepository.php b/...er/Domain/Repository/ImportRepository.php → ...es/Domain/Repository/ImportRepository.php
@@ -6,8 +6,8 @@
  */
 
 use Doctrine\Common\Persistence\ObjectManager;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Persistence\Repository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Persistence\Repository;
 
 /**
  * @Flow\Scope("singleton")

diff --git a/...in/Repository/RecordMappingRepository.php → ...in/Repository/RecordMappingRepository.php b/...in/Repository/RecordMappingRepository.php → ...in/Repository/RecordMappingRepository.php
@@ -7,8 +7,8 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Persistence\Repository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Persistence\Repository;
 
 /**
  * @Flow\Scope("singleton")

diff --git a/...Importer/Domain/Service/ImportService.php → Classes/Domain/Service/ImportService.php b/...Importer/Domain/Service/ImportService.php → Classes/Domain/Service/ImportService.php
@@ -12,9 +12,9 @@
 use Ttree\ContentRepositoryImporter\Domain\Repository\ImportRepository;
 use Ttree\ContentRepositoryImporter\Domain\Repository\RecordMappingRepository;
 use Ttree\ContentRepositoryImporter\Exception\ImportAlreadyExecutedException;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
-use TYPO3\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
+use Neos\Flow\Persistence\PersistenceManagerInterface;
 
 /**
  * @Flow\Scope("singleton")
@@ -67,7 +67,7 @@ public function resume($identifier)
      * @param string $externalImportIdentifier
      * @param boolean $force
      * @throws Exception
-     * @throws \TYPO3\Flow\Persistence\Exception\IllegalObjectTypeException
+     * @throws \Neos\Flow\Persistence\Exception\IllegalObjectTypeException
      */
     public function start($externalImportIdentifier = null, $force = false)
     {

diff --git a/...eption/ImportAlreadyExecutedException.php → ...eption/ImportAlreadyExecutedException.php b/...eption/ImportAlreadyExecutedException.php → ...eption/ImportAlreadyExecutedException.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
 
 /**
  * Import Already Executed Exception

diff --git a/...er/Exception/InvalidArgumentException.php → ...es/Exception/InvalidArgumentException.php b/...er/Exception/InvalidArgumentException.php → ...es/Exception/InvalidArgumentException.php
@@ -5,8 +5,8 @@
  * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter".
  */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Exception;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Exception;
 
 /**
  * Invalid Argument Exception

diff --git a/...Importer/AbstractCommandBasedImporter.php → ...Importer/AbstractCommandBasedImporter.php b/...Importer/AbstractCommandBasedImporter.php → ...Importer/AbstractCommandBasedImporter.php
@@ -6,8 +6,8 @@
  */
 
 use Ttree\ContentRepositoryImporter\DataType\Slug;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\TYPO3CR\Domain\Model\NodeTemplate;
+use Neos\Flow\Annotations as Flow;
+use Neos\ContentRepository\Domain\Model\NodeTemplate;
 
 /**
  * A base importer for data providers which deliver data as commands (create, delete, update, ...) instead of plain