Merge pull request #52 from gerhard-boden/apply-core-migrations

TASK: Apply core migrations

Author: daniellienert

Classes/Flowpack/ElasticSearch/Annotations/Indexable.php renamed to Classes/Annotations/Indexable.php

@@ -15,17 +15,17 @@
 use Flowpack\ElasticSearch\Domain\Model\Client;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Flowpack\ElasticSearch\Indexer\Object\ObjectIndexer;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Error\Error;
-use TYPO3\Flow\Error\Result as ErrorResult;
-use TYPO3\Flow\Exception;
+use Neos\Flow\Annotations as Flow;
+use Neos\Error\Messages\Error;
+use Neos\Error\Messages\Result as ErrorResult;
+use Neos\Flow\Exception;
 
 /**
  * Provides CLI features for index handling
  *
  * @Flow\Scope("singleton")
  */
-class IndexCommandController extends \TYPO3\Flow\Cli\CommandController
+class IndexCommandController extends \Neos\Flow\Cli\CommandController
 {
     /**
      * @Flow\Inject
@@ -41,7 +41,7 @@ class IndexCommandController extends \TYPO3\Flow\Cli\CommandController
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var \Neos\Flow\Persistence\PersistenceManagerInterface
      */
     protected $persistenceManager;
 
@@ -251,7 +251,7 @@ public function statusCommand($object = null, $conductUpdate = false, $clientNam
         if ($result->hasErrors()) {
             $this->outputLine();
             $this->outputLine('The following errors occurred:');
-            /** @var $error \TYPO3\Flow\Error\Error */
+            /** @var $error \Neos\Error\Messages\Error */
             foreach ($result->getFlattenedErrors() as $className => $errors) {
                 foreach ($errors as $error) {
                     $this->outputLine();

Classes/Flowpack/ElasticSearch/Annotations/Mapping.php renamed to Classes/Annotations/Mapping.php

@@ -12,14 +12,14 @@
  */
 
 use Flowpack\ElasticSearch\Mapping\MappingCollection;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Provides CLI features for mapping handling
  *
  * @Flow\Scope("singleton")
  */
-class MappingCommandController extends \TYPO3\Flow\Cli\CommandController
+class MappingCommandController extends \Neos\Flow\Cli\CommandController
 {
     /**
      * @Flow\Inject
@@ -66,8 +66,8 @@ public function showStatusCommand($clientName = null)
                 $propertiesSet = $mappingSet['properties'];
                 $this->outputFormatted('type %s:', array($this->markupDiffValue(isset($entityMappingCollection[$indexName][$typeName]) ? $typeName : null, isset($backendMappingCollection[$indexName][$typeName]) ? $typeName : null)), 4);
                 foreach ($propertiesSet as $propertyName => $properties) {
-                    $entityProperties = \TYPO3\Flow\Utility\Arrays::getValueByPath($entityMappingCollection, array($indexName, $typeName, 'properties', $propertyName));
-                    $backendProperties = \TYPO3\Flow\Utility\Arrays::getValueByPath($backendMappingCollection, array($indexName, $typeName, 'properties', $propertyName));
+                    $entityProperties = \Neos\Utility\Arrays::getValueByPath($entityMappingCollection, array($indexName, $typeName, 'properties', $propertyName));
+                    $backendProperties = \Neos\Utility\Arrays::getValueByPath($backendMappingCollection, array($indexName, $typeName, 'properties', $propertyName));
 
                     $this->outputFormatted('property %s:', array($this->markupDiffValue($entityProperties ? $propertyName : null, $backendProperties ? $propertyName : null)), 8);
                     foreach ($properties as $key => $value) {

Classes/Flowpack/ElasticSearch/Annotations/Transform.php renamed to Classes/Annotations/Transform.php

@@ -11,7 +11,7 @@
  * source code.
  */
 
-use TYPO3\Flow\Error\Result;
+use Neos\Error\Messages\Result;
 
 /**
  * Signals a mismatch between the

Classes/Flowpack/ElasticSearch/Command/IndexCommandController.php renamed to Classes/Command/IndexCommandController.php

@@ -11,7 +11,7 @@
  * source code.
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Client factory
@@ -73,7 +73,7 @@ protected function buildClientConfigurations(array $clientsSettings)
                 $setterMethodName = 'set' . ucfirst($settingKey);
                 try {
                     call_user_func(array($configuration, $setterMethodName), $settingValue);
-                } catch (\TYPO3\Flow\Error\Exception $exception) {
+                } catch (\Neos\Flow\Error\Exception $exception) {
                     $exceptionMessage = 'Setting key "' . $settingKey . '" as client configuration value is not allowed. Refer to the Settings.yaml.example for the supported keys.';
                     throw new \Flowpack\ElasticSearch\Exception($exceptionMessage, 1338886877, $exception);
                 }

Classes/Flowpack/ElasticSearch/Command/MappingCommandController.php renamed to Classes/Command/MappingCommandController.php

@@ -13,9 +13,9 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Flowpack\ElasticSearch\Domain\Model;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Error\Error;
-use TYPO3\Flow\Error\Result as ErrorResult;
+use Neos\Flow\Annotations as Flow;
+use Neos\Error\Messages\Error;
+use Neos\Error\Messages\Result as ErrorResult;
 
 /**
  * Reconstitute a Document from the ElasticSearch index.

Classes/Flowpack/ElasticSearch/Domain/Exception/DocumentPropertiesMismatchException.php renamed to Classes/Domain/Exception/DocumentPropertiesMismatchException.php

@@ -11,7 +11,7 @@
  * source code.
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * An abstract document type. Implement your own or use the GenericType provided with this package.

Classes/Flowpack/ElasticSearch/Domain/Factory/ClientFactory.php renamed to Classes/Domain/Factory/ClientFactory.php

@@ -11,7 +11,7 @@
  * source code.
  */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * A Client representation