TASK: Fix problems originated by the upmerge

Author: daniellienert

Classes/Driver/AbstractNodeTypeMappingBuilder.php

@@ -11,9 +11,9 @@
  * source code.
  */
 
+use Neos\Error\Messages\Result;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException;
-use Neos\Flow\Error;
 use Neos\Flow\Configuration\ConfigurationManager;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
@@ -44,6 +44,11 @@ abstract class AbstractNodeTypeMappingBuilder implements NodeTypeMappingBuilderI
      */
     protected $configurationManager;
 
+    /**
+     * @var Result
+     */
+    protected $lastMappingErrors;
+
     /**
      * Called by the Flow object framework after creating the object and resolving all dependencies.
      *
@@ -69,7 +74,9 @@ public static function convertNodeTypeNameToMappingName($nodeTypeName)
         return str_replace('.', '-', $nodeTypeName);
     }
 
-
+    /**
+     * @return Result
+     */
     public function getLastMappingErrors()
     {
         return $this->lastMappingErrors;

Classes/Driver/Version1/Mapping/NodeTypeMappingBuilder.php

@@ -18,8 +18,11 @@
 use Neos\ContentRepository\Domain\Model\NodeType;
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 use Neos\Error\Messages\Result;
+use Neos\Error\Messages\Warning;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  * NodeTypeMappingBuilder for Elasticsearch version 1.x
@@ -41,11 +44,6 @@ class NodeTypeMappingBuilder extends AbstractNodeTypeMappingBuilder
      */
     protected $nodeTypeManager;
 
-    /**
-     * @var Result
-     */
-    protected $lastMappingErrors;
-
     /**
      * @Flow\Inject
      * @var ConfigurationManager
@@ -56,11 +54,12 @@ class NodeTypeMappingBuilder extends AbstractNodeTypeMappingBuilder
      * Called by the Flow object framework after creating the object and resolving all dependencies.
      *
      * @param integer $cause Creation cause
+     * @throws InvalidConfigurationTypeException
      */
     public function initializeObject($cause)
     {
-        if ($cause === \Neos\Flow\ObjectManagement\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
-            $settings = $this->configurationManager->getConfiguration(\Neos\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.ContentRepository.Search');
+        if ($cause === ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
+            $settings = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.ContentRepository.Search');
             $this->defaultConfigurationPerType = $settings['defaultConfigurationPerType'];
         }
     }
@@ -126,7 +125,7 @@ public function buildMappingInformation(Index $index)
                         $mapping->setPropertyByPath($propertyName, $this->defaultConfigurationPerType[$propertyConfiguration['type']]['elasticSearchMapping']);
                     }
                 } else {
-                    $this->lastMappingErrors->addWarning(new \Neos\Error\Messages\Warning('Node Type "' . $nodeTypeName . '" - property "' . $propertyName . '": No ElasticSearch Mapping found.'));
+                    $this->lastMappingErrors->addWarning(new Warning('Node Type "' . $nodeTypeName . '" - property "' . $propertyName . '": No ElasticSearch Mapping found.'));
                 }
             }
 
@@ -135,12 +134,4 @@ public function buildMappingInformation(Index $index)
 
         return $mappings;
     }
-
-    /**
-     * @return Result
-     */
-    public function getLastMappingErrors()
-    {
-        return $this->lastMappingErrors;
-    }
 }