Merge pull request #38 from sitegeist/task/adjustmentsForNeos7

TASK: Adjust for Neos 7

Author: mficzel

Classes/Command/TaxonomyCommandController.php

@@ -8,8 +8,7 @@
 use Neos\ContentRepository\Domain\Service\ImportExport\NodeImportService;
 use Neos\ContentRepository\Domain\Repository\NodeDataRepository;
 use Neos\Eel\FlowQuery\FlowQuery;
-use Neos\Flow\Persistence\Generic\PersistenceManager;
-use Neos\Flow\ResourceManagement\PersistentResource;
+use Neos\Flow\Persistence\PersistenceManagerInterface;
 use Sitegeist\Taxonomy\Service\DimensionService;
 use Sitegeist\Taxonomy\Service\TaxonomyService;
 
@@ -56,7 +55,7 @@ class TaxonomyCommandController extends CommandController
     protected $dimensionService;
 
     /**
-     * @var PersistenceManager
+     * @var PersistenceManagerInterface
      * @Flow\Inject
      */
     protected $persistenceManager;

Classes/Hooks/ContentRepositoryHooks.php

@@ -1,12 +1,10 @@
 <?php
 namespace Sitegeist\Taxonomy\Hooks;
 
-use Neos\Error\Messages\Message;
 use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Sitegeist\Taxonomy\Service\TaxonomyService;
 use Sitegeist\Taxonomy\Service\DimensionService;
-use Psr\Log\LoggerInterface;
 
 /**
  * Class ContentRepositoryHooks
@@ -16,12 +14,6 @@
 class ContentRepositoryHooks
 {
 
-    /**
-     * @var LoggerInterface
-     * @Flow\Inject
-     */
-    protected $logger;
-
     /**
      * @var TaxonomyService
      * @Flow\Inject
@@ -46,8 +38,6 @@ class ContentRepositoryHooks
      */
     public function nodeAdded(NodeInterface $node)
     {
-        $this->logger->info(sprintf("CREATED NODE %S", $node->getContextPath()));
-
         if ($node->getNodeType()->isOfType($this->taxonomyService->getRootNodeType()) ||
             $node->getNodeType()->isOfType($this->taxonomyService->getVocabularyNodeType()) ||
             $node->getNodeType()->isOfType($this->taxonomyService->getTaxonomyNodeType())) {
@@ -66,8 +56,6 @@ public function nodeAdded(NodeInterface $node)
      */
     public function nodeRemoved(NodeInterface $node)
     {
-        $this->logger->info(sprintf("CREATED NODE %S", $node->getContextPath()));
-
         if ($node->getNodeType()->isOfType($this->taxonomyService->getRootNodeType()) ||
             $node->getNodeType()->isOfType($this->taxonomyService->getVocabularyNodeType()) ||
             $node->getNodeType()->isOfType($this->taxonomyService->getTaxonomyNodeType())) {

Configuration/Settings.yaml

@@ -13,8 +13,8 @@ Sitegeist:
         ui:
           label: 'Taxonomy References'
           inspector:
+            editor: 'Sitegeist.Taxonomy:TaxonomyEditor'
             editorOptions:
-              nodeTypes: ['Sitegeist.Taxonomy:Taxonomy']
               startingPoint: '/taxonomies'
               placeholder: 'assign Taxonomies'
 
@@ -41,6 +41,18 @@ Neos:
           Sitegeist.Taxonomy:
             - 'Main'
             - 'NodeTypes/*'
+    nodeTypes:
+      presets:
+        properties:
+          taxonomyReferences:
+            type: references
+            ui:
+              label: 'Taxonomy References'
+              inspector:
+                editor: 'Sitegeist.Taxonomy:TaxonomyEditor'
+                editorOptions:
+                  startingPoint: '/taxonomies'
+                  placeholder: 'assign Taxonomies'
 
   Fusion:
     defaultContext:
@@ -59,4 +71,4 @@ Neos:
               'Sitegeist.Taxonomy:secondaryInspector':
                 pattern: ControllerObjectName
                 patternOptions:
-                  controllerObjectNamePattern: 'Sitegeist\Taxonomy\Controller\SecondaryInspectorController'
+                  controllerObjectNamePattern: 'Sitegeist\Taxonomy\Controller\SecondaryInspectorController'