Merge pull request #28 from PackageFactory/fix/v3-php-and-neos-version-constraints

BUGFIX: Ensure compatibility with PHP 8.1 and Neos 8

Author: nezaniel

Classes/Domain/Enum/EnumGenerator.php

@@ -20,7 +20,7 @@ final class EnumGenerator
 
     private FileWriterInterface $fileWriter;
 
-    public function __construct(?\DateTimeImmutable $now = null, FileWriterInterface $fileWriter)
+    public function __construct(?\DateTimeImmutable $now, FileWriterInterface $fileWriter)
     {
         $this->now = $now ?? new \DateTimeImmutable();
         $this->fileWriter = $fileWriter;

Tests/Unit/Fusion/PresentationObjectComponentImplementationTest.php

@@ -62,6 +62,9 @@ public function prepareProperlyMergesPropsToStubbedPresentationObjectInPreviewMo
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(true);
@@ -94,6 +97,9 @@ public function prepareWritesPresentationObjectToContextWhenNotInPreviewMode():
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(false);
@@ -158,6 +164,9 @@ public function evaluateThrowsExceptionWhenNotInPreviewModeAndWithoutGivenPresen
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(false);
@@ -188,6 +197,9 @@ public function evaluateThrowsExceptionWhenNotInPreviewModeAndWithoutDeclaredPre
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(false);
@@ -221,6 +233,9 @@ public function evaluateThrowsExceptionWhenNotInPreviewModeAndWithoutExistingPre
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(false);
@@ -254,6 +269,9 @@ public function evaluateThrowsExceptionWhenNotInPreviewModeAndWithPresentationOb
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(false);
@@ -287,6 +305,9 @@ public function evaluateThrowsExceptionWhenNotInPreviewModeAndWithPresentationOb
         $runtime
             ->getCurrentContext()
             ->willReturn([]);
+        $runtime
+            ->evaluate('test/__meta/sortProperties', $subject)
+            ->willReturn(true);
         $runtime
             ->evaluate('test/' . PresentationObjectComponentImplementation::PREVIEW_MODE, $subject)
             ->willReturn(false);

composer.json

@@ -11,8 +11,8 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ~8.0.0",
-        "neos/neos": "^5.0 || ^7.0 || dev-master",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "neos/neos": "^5.0 || ^7.0 || ^8.0 || dev-master",
         "sitegeist/kaleidoscope": "^5.0 || ^6.0 || dev-master"
     },
     "require-dev": {