!!! TASK: Remove leftovers from magic underscore access for internal node properties

Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php

@@ -19,7 +19,6 @@
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
-use Neos\Utility\ObjectAccess;
 
 /**
  * This filter implementation contains specific behavior for use on ContentRepository
@@ -122,14 +121,7 @@ protected function matchesIdentifierFilter($element, $identifier)
      */
     protected function getPropertyPath($element, $propertyPath)
     {
-        if ($propertyPath === '_identifier') {
-            // TODO: deprecated (Neos <9 case)
-            return $element->aggregateId->value;
-        } elseif ($propertyPath[0] === '_') {
-            return ObjectAccess::getPropertyPath($element, substr($propertyPath, 1));
-        } else {
-            return $element->getProperty($propertyPath);
-        }
+        return $element->getProperty($propertyPath);
     }
 
     /**

Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php

@@ -24,12 +24,9 @@
 use Neos\Eel\FlowQuery\Operations\AbstractOperation;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
-use Neos\Utility\ObjectAccess;
 
 /**
- * Used to access properties of a ContentRepository Node. If the property mame is
- * prefixed with _, internal node properties like start time, end time,
- * hidden are accessed.
+ * Used to access properties of a ContentRepository Node.
  */
 class PropertyOperation extends AbstractOperation
 {
@@ -84,7 +81,7 @@ public function canEvaluate($context): bool
     public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
     {
         if (empty($arguments[0])) {
-            throw new FlowQueryException('property() does not support returning all attributes yet', 1332492263);
+            throw new FlowQueryException(static::$shortName . '() does not allow returning all properties.', 1332492263);
         }
         /** @var array<int,mixed> $context */
         $context = $flowQuery->getContext();
@@ -96,22 +93,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
 
         /* @var $element Node */
         $element = $context[0];
-        if ($propertyName === '_path') {
-            $subgraph = $this->contentRepositoryRegistry->subgraphForNode($element);
-            $ancestors = $subgraph->findAncestorNodes(
-                $element->aggregateId,
-                FindAncestorNodesFilter::create()
-            )->reverse();
-
-            return AbsoluteNodePath::fromLeafNodeAndAncestors($element, $ancestors)->serializeToString();
-        }
-        if ($propertyName === '_identifier') {
-            // TODO: deprecated (Neos <9 case)
-            return $element->aggregateId->value;
-        }
-
-        if ($propertyName[0] === '_') {
-            return ObjectAccess::getPropertyPath($element, substr($propertyName, 1));
+        if ($element->hasProperty($propertyName)) {
+            return $element->getProperty($propertyName);
         }
 
         $contentRepository = $this->contentRepositoryRegistry->get($element->contentRepositoryId);
@@ -136,6 +119,6 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
             return $references;
         }
 
-        return $element->getProperty($propertyName);
+        return null;
     }
 }

Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php → Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SortOperation.php

@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Eel\FlowQueryOperations;
+namespace Neos\ContentRepository\NodeAccess\FlowQueryOperations;
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\Eel\FlowQuery\FlowQuery;
@@ -46,9 +46,7 @@ public function canEvaluate($context)
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * First argument is the node property to sort by. Works with internal arguments (_xyz) as well.
+     * First argument is the node property to sort by. To sort by time _creationDateTime, _lastModificationDateTime or _lastPublicationDateTime can be used.
      * Second argument is the sort direction (ASC or DESC).
      * Third optional argument are the sort options (see https://www.php.net/manual/en/function.sort):
      *  - 'SORT_REGULAR'
@@ -113,15 +111,12 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
 
         // Determine the property value to sort by
         foreach ($nodes as $node) {
-            if ($sortProperty[0] === '_') {
-                $propertyValue = \Neos\Utility\ObjectAccess::getPropertyPath($node, substr($sortProperty, 1));
-            } else {
-                $propertyValue = $node->getProperty($sortProperty);
-            }
-
-            if ($propertyValue instanceof \DateTime) {
-                $propertyValue = $propertyValue->getTimestamp();
-            }
+            $propertyValue = match($sortProperty) {
+                '_creationDateTime' => $node->timestamps->created->getTimestamp(),
+                '_lastModificationDateTime' => $node->timestamps->lastModified?->getTimestamp(),
+                '_lastPublicationDateTime' => $node->timestamps->originalLastModified?->getTimestamp(),
+                default => $node->getProperty($sortProperty)
+            };
 
             $sortSequence[$node->aggregateId->value] = $propertyValue;
             $nodesByIdentifier[$node->aggregateId->value] = $node;

Neos.Neos/Classes/Fusion/Helper/NodeHelper.php

@@ -14,6 +14,7 @@
 
 namespace Neos\Neos\Fusion\Helper;
 
+use Neos\ContentRepository\Core\Feature\SubtreeTagging\Dto\SubtreeTag;
 use Neos\ContentRepository\Core\NodeType\NodeType;
 use Neos\ContentRepository\Core\Projection\ContentGraph\AbsoluteNodePath;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
@@ -162,6 +163,11 @@ public function subgraphForNode(Node $node): ContentSubgraphInterface
         return $this->contentRepositoryRegistry->subgraphForNode($node);
     }
 
+    public function isDisabled(Node $node): bool
+    {
+        return $node->tags->contain(SubtreeTag::disabled());
+    }
+
     /**
      * @param string $methodName
      * @return boolean

Neos.Neos/Tests/Behavior/Features/Fusion/FlowQuery.feature

@@ -395,6 +395,32 @@ Feature: Tests for the "Neos.ContentRepository" Flow Query methods.
     nothingToRemove: a1a4,a1a4,a1a4
     """
 
+  Scenario: Sort
+    When I execute the following Fusion code:
+    """fusion
+    test = Neos.Fusion:DataStructure {
+      @context {
+        a1a1 = ${q(site).find('#a1a1').get(0)}
+        a1a2 = ${q(site).find('#a1a2').get(0)}
+        a1a3 = ${q(site).find('#a1a3').get(0)}
+        a1a4 = ${q(site).find('#a1a4').get(0)}
+      }
+      unsorted = ${q([a1a3, a1a4, a1a1, a1a2]).get()}
+      sortByTitleAsc = ${q([a1a3, a1a4, a1a1, a1a2]).sort("title", "ASC").get()}
+      sortByUriDesc = ${q([a1a3, a1a4, a1a1, a1a2]).sort("uriPathSegment", "DESC").get()}
+      # todo find out how to test time related logic
+      sortByDateAsc = ${q([a1a1]).sort("_creationDateTime", "ASC").get()}
+      @process.render = Neos.Neos:Test.RenderNodesDataStructure
+    }
+    """
+    Then I expect the following Fusion rendering result:
+    """
+    unsorted: a1a3,a1a4,a1a1,a1a2
+    sortByTitleAsc: a1a1,a1a2,a1a3,a1a4
+    sortByUriDesc: a1a4,a1a3,a1a2,a1a1
+    sortByDateAsc: a1a1
+    """
+
   Scenario: Node accessors (final Node access operations)
     When the Fusion context node is "a1"
     When I execute the following Fusion code:

Neos.Neos/Tests/Unit/FlowQueryOperations/SortOperationTest.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Tests\Unit\FlowQueryOperations;
+
+use Neos\ContentRepository\NodeAccess\FlowQueryOperations\SortOperation;
+use Neos\Eel\FlowQuery\FlowQueryException;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * SortOperation test
+ */
+class SortOperationTest extends TestCase
+{
+    /**
+     * @test+
+     */
+    public function callWithoutArgumentsCausesException()
+    {
+        $this->expectException(FlowQueryException::class);
+        $flowQuery = new \Neos\Eel\FlowQuery\FlowQuery([]);
+        $operation = new SortOperation();
+        $operation->evaluate($flowQuery, []);
+    }
+
+    /**
+     * @test
+     */
+    public function invalidSortDirectionCausesException()
+    {
+        $this->expectException(FlowQueryException::class);
+        $flowQuery = new \Neos\Eel\FlowQuery\FlowQuery([]);
+        $operation = new SortOperation();
+        $operation->evaluate($flowQuery, ['title', 'FOO']);
+    }
+
+    /**
+     * @test
+     */
+    public function invalidSortOptionCausesException()
+    {
+        $this->expectException(FlowQueryException::class);
+        $flowQuery = new \Neos\Eel\FlowQuery\FlowQuery([]);
+        $operation = new SortOperation();
+        $operation->evaluate($flowQuery, ['title', 'ASC', 'SORT_BAR']);
+    }
+}