FEATURE: flow query directy field access without get 0

Neos.Eel/Classes/FlowQuery/FlowQuery.php

@@ -14,6 +14,8 @@
 use Neos\Eel\Exception;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
+use Neos\Utility\Exception\PropertyNotAccessibleException;
+use Neos\Utility\ObjectAccess;
 
 /**
  * FlowQuery is jQuery for PHP, a selector and traversal engine for object sets.
@@ -179,6 +181,19 @@ public function __call($operationName, array $arguments)
         }
     }
 
+    public function __get($name): mixed
+    {
+        $value = $this->__call('get', [0]);
+        if (is_array($value) || is_object($value)) {
+            try {
+                return ObjectAccess::getProperty($value, $name);
+            } catch (PropertyNotAccessibleException $exception) {
+                return null;
+            }
+        }
+        return null;
+    }
+
     /**
      * Implementation of the countable() interface, which is mapped to the "count" operation.
      *

Neos.Eel/Tests/Unit/FlowQuery/FlowQueryTest.php

@@ -41,6 +41,20 @@ public function constructWithFlowQueryIsIdempotent()
         self::assertEquals($flowQuery->getContext(), $wrappedQuery->getContext());
     }
 
+    /**
+     * @test
+     */
+    public function accessPropertiesDirectly()
+    {
+        $myObject = new \stdClass();
+        $myObject->stringProperty = 'abc';
+        $myObject2 = new \stdClass();
+        $myObject2->stringProperty = 'def';
+
+        $query = $this->createFlowQuery([$myObject, $myObject2]);
+        self::assertSame('abc', $query->stringProperty);
+    }
+
     /**
      * @test
      */

Neos.Utility.ObjectHandling/Classes/ObjectAccess.php

@@ -143,6 +143,10 @@ protected static function getPropertyInternal($subject, string $propertyName, bo
             return null;
         }
 
+        if (method_exists($subject, '__get')) {
+            return $subject->__get($propertyName);
+        }
+
         $cacheIdentifier = $className . '|' . $propertyName;
         self::initializePropertyGetterCache($cacheIdentifier, $subject, $propertyName);
 

Neos.Utility.ObjectHandling/Tests/Unit/Fixture/DummyClassWithCall.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Utility\ObjectHandling\Tests\Unit\Fixture;
+
+class DummyClassWithCall
+{
+    public function __call($name, $arguments)
+    {
+        return sprintf('__call %s %s', $name, json_encode($arguments));
+    }
+}

Neos.Utility.ObjectHandling/Tests/Unit/Fixture/DummyClassWithCallAndGet.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Utility\ObjectHandling\Tests\Unit\Fixture;
+
+class DummyClassWithCallAndGet
+{
+    public function __call($name, $arguments)
+    {
+        throw new \RuntimeException('should not be invoked');
+    }
+
+    public function __get($name)
+    {
+        return sprintf('__get %s', $name);
+    }
+}

Neos.Utility.ObjectHandling/Tests/Unit/ObjectAccessTest.php

@@ -14,13 +14,17 @@
 use Neos\Utility\Exception\PropertyNotAccessibleException;
 use Neos\Utility\ObjectAccess;
 use Neos\Utility\ObjectHandling\Tests\Unit\Fixture\ArrayAccessClass;
+use Neos\Utility\ObjectHandling\Tests\Unit\Fixture\DummyClassWithCall;
+use Neos\Utility\ObjectHandling\Tests\Unit\Fixture\DummyClassWithCallAndGet;
 use Neos\Utility\ObjectHandling\Tests\Unit\Fixture\DummyClassWithGettersAndSetters;
 use Neos\Utility\ObjectHandling\Tests\Unit\Fixture\ProxiedClassWithPrivateProperty;
 use Neos\Utility\ObjectHandling\Tests\Unit\Fixture\Model\EntityWithDoctrineProxy;
 use Neos\Utility\TypeHandling;
 
 require_once('Fixture/DummyClassWithGettersAndSetters.php');
 require_once('Fixture/ArrayAccessClass.php');
+require_once('Fixture/DummyClassWithCallAndGet.php');
+require_once('Fixture/DummyClassWithCall.php');
 require_once('Fixture/Model/EntityWithDoctrineProxy.php');
 require_once('Fixture/ProxiedClassWithPrivateProperty.php');
 
@@ -274,6 +278,26 @@ public function getPropertyDoesNotTryArrayAccessOnSplObjectStorageSubject()
         ObjectAccess::getProperty($splObjectStorage, 'something');
     }
 
+    /**
+     * @test
+     */
+    public function getPropertyInvokesMagicGetMethodIfExistent()
+    {
+        $dummyClassWithCallAndGet = new DummyClassWithCallAndGet();
+        $actualResult = ObjectAccess::getProperty($dummyClassWithCallAndGet, 'key');
+        self::assertEquals('__get key', $actualResult);
+    }
+
+    /**
+     * @test
+     */
+    public function getPropertyInvokesMagicCallMethod()
+    {
+        $classWithCall = new DummyClassWithCall();
+        $actualResult = ObjectAccess::getProperty($classWithCall, 'key');
+        self::assertEquals('__call getKey []', $actualResult);
+    }
+
     /**
      * @test
      */
@@ -560,7 +584,7 @@ public function getPropertyUsingDirectAccessWorksOnPrivatePropertyOfProxyParent(
     public function setPropertyUsingDirectAccessWorksOnPrivatePropertyOfProxyParent()
     {
         $proxyObject = new ProxiedClassWithPrivateProperty();
- 
+
         ObjectAccess::setProperty($proxyObject, 'property', 'changed', true);
         self::assertEquals('changed', $proxyObject->getProperty());
     }