TASK: attempt to make travis and styleCI happy again

.travis_composer_json.json

@@ -25,8 +25,8 @@
 
       "neos/demo": "@dev",
 
-      "neos/neos-ui": "dev-event-sourced-patch as dev-master",
-      "neos/neos-ui-compiled": "dev-master as dev-event-sourced-patch",
+      "neos/neos-ui": "dev-master",
+      "neos/neos-ui-compiled": "dev-master",
 
       "neos/party": "@dev",
       "neos/seo": "@dev",

Neos.EventSourcedContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePrivilege.php

@@ -14,7 +14,6 @@
 use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\ChangeNodeAggregateName;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\ChangeNodeAggregateType;
-use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\CreateNodeVariant;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\DisableNodeAggregate;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\EnableNodeAggregate;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\MoveNodeAggregate;

Neos.EventSourcedContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePropertyPrivilege.php

@@ -15,11 +15,8 @@
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\ChangeNodeAggregateType;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\DisableNodeAggregate;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\EnableNodeAggregate;
-use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\MoveNodeAggregate;
-use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\RemoveNodeAggregate;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\SetNodeProperties;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAggregate\Command\SetNodeReferences;
-use Neos\EventSourcedNeosAdjustments\Domain\Model\NodeInterface;
 
 /**
  * A privilege to restrict editing of node properties.

Neos.EventSourcedContentRepository/Classes/Domain/Projection/Changes/ChangeProjector.php

@@ -148,8 +148,7 @@ protected function markAsChanged(
         ContentStreamIdentifier $contentStreamIdentifier,
         NodeAggregateIdentifier $nodeAggregateIdentifier,
         OriginDimensionSpacePoint $originDimensionSpacePoint
-    ): void
-    {
+    ): void {
         $this->transactional(function () use ($contentStreamIdentifier, $nodeAggregateIdentifier, $originDimensionSpacePoint) {
             $workspace = $this->workspaceFinder->findOneByCurrentContentStreamIdentifier($contentStreamIdentifier);
             if ($workspace instanceof Workspace && $workspace->getBaseWorkspaceName() === null) {
@@ -179,8 +178,7 @@ protected function markAsMoved(
         ContentStreamIdentifier $contentStreamIdentifier,
         NodeAggregateIdentifier $nodeAggregateIdentifier,
         OriginDimensionSpacePoint $originDimensionSpacePoint
-    ): void
-    {
+    ): void {
         $this->transactional(function () use ($contentStreamIdentifier, $nodeAggregateIdentifier, $originDimensionSpacePoint) {
             $workspace = $this->workspaceFinder->findOneByCurrentContentStreamIdentifier($contentStreamIdentifier);
             if ($workspace instanceof Workspace && $workspace->getBaseWorkspaceName() === null) {
@@ -209,8 +207,7 @@ protected function getChange(
         ContentStreamIdentifier $contentStreamIdentifier,
         NodeAggregateIdentifier $nodeAggregateIdentifier,
         OriginDimensionSpacePoint $originDimensionSpacePoint
-    ): ?Change
-    {
+    ): ?Change {
         $changeRow = $this->getDatabaseConnection()->executeQuery(
             'SELECT n.* FROM neos_contentrepository_projection_change n
 WHERE n.contentStreamIdentifier = :contentStreamIdentifier

Neos.EventSourcedNeosAdjustments/Classes/Eel/FlowQueryOperations/NeosUiDefaultNodesOperation.php

@@ -11,23 +11,15 @@
  * source code.
  */
 
-use Neos\ContentRepository\Domain\ContentSubgraph\NodePath;
-use Neos\ContentRepository\Domain\NodeAggregate\NodeAggregateIdentifier;
 use Neos\ContentRepository\Domain\NodeType\NodeTypeConstraintFactory;
-use Neos\ContentRepository\Domain\NodeType\NodeTypeName;
 use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface;
-use Neos\ContentRepository\Domain\Projection\Content\TraversableNodes;
 use Neos\ContentRepository\Exception\NodeException;
-use Neos\Eel\FlowQuery\FizzleParser;
 use Neos\Eel\FlowQuery\FlowQuery;
-use Neos\Eel\FlowQuery\FlowQueryException;
-use Neos\Eel\FlowQuery\Operations\AbstractOperation;
 use Neos\EventSourcedContentRepository\Domain\Context\ContentSubgraph\SubtreeInterface;
 use Neos\EventSourcedContentRepository\Domain\Context\Parameters\VisibilityConstraints;
 use Neos\EventSourcedContentRepository\Domain\Projection\Content\ContentGraphInterface;
 use Neos\EventSourcedContentRepository\Domain\Projection\Content\ContentSubgraphInterface;
 use Neos\EventSourcedContentRepository\Domain\Projection\Content\TraversableNode;
-use Neos\EventSourcedContentRepository\Domain\Context\NodeAddress\NodeAddress;
 use Neos\Flow\Annotations as Flow;
 
 class NeosUiDefaultNodesOperation extends \Neos\Neos\Ui\FlowQueryOperations\NeosUiDefaultNodesOperation

Neos.EventSourcedNeosAdjustments/Classes/Eel/FlowQueryOperations/PropertyOperation.php

@@ -11,7 +11,6 @@
  * source code.
  */
 
-use Neos\ContentRepository\Domain\Projection\Content\NodeInterface;
 use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Eel\FlowQuery\FlowQueryException;

Neos.EventSourcedNeosAdjustments/Classes/Fluid/ViewHelpers/Link/NodeViewHelper.php

@@ -14,7 +14,6 @@
 
 use Neos\ContentRepository\Domain\NodeAggregate\NodeAggregateIdentifier;
 use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface;
-use Neos\EventSourcedContentRepository\Domain\Projection\Content\ContentSubgraphInterface;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAddress\NodeAddressFactory;
 use Neos\EventSourcedNeosAdjustments\Domain\Context\Content\NodeSiteResolvingService;
 use Neos\Flow\Annotations as Flow;

Neos.EventSourcedNeosAdjustments/Classes/Fluid/ViewHelpers/Uri/NodeViewHelper.php

@@ -14,7 +14,6 @@
 
 use Neos\ContentRepository\Domain\NodeAggregate\NodeAggregateIdentifier;
 use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface;
-use Neos\EventSourcedContentRepository\Domain\Projection\Content\ContentSubgraphInterface;
 use Neos\EventSourcedContentRepository\Domain\Context\NodeAddress\NodeAddressFactory;
 use Neos\EventSourcedNeosAdjustments\Domain\Context\Content\NodeSiteResolvingService;
 use Neos\Flow\Annotations as Flow;
@@ -141,7 +140,8 @@ public function initializeArguments()
      *
      * @throws \Neos\Flow\Mvc\Routing\Exception\MissingActionNameException
      */
-    public function render() {
+    public function render()
+    {
         $node = $this->arguments['node'];
         $uri = null;
         $nodeAddress = null;

Neos.EventSourcedNeosAdjustments/Classes/NodeImportFromLegacyCR/Service/ContentRepositoryExportService.php

@@ -283,8 +283,7 @@ protected function exportNodeOrNodeAggregate(
         array $propertyReferences,
         NodePath $nodePath,
         bool $isHidden
-    )
-    {
+    ) {
         echo $nodePath . "\n";
 
         try {

Neos.EventSourcedNeosAdjustments/Classes/WorkspaceModule/WorkspaceUserService.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 namespace Neos\EventSourcedNeosAdjustments\WorkspaceModule;
+
 /*
  * This file is part of the Neos.Neos package.
  *
@@ -126,5 +127,4 @@ public function currentUserCanTransferOwnershipOfWorkspace(Workspace $workspace)
         // ownership back to themselves.
         return $this->privilegeManager->isPrivilegeTargetGranted('Neos.Neos:Backend.Module.Management.Workspaces.ManageInternalWorkspaces');
     }
-
 }