WIP: Adjust to PHP8.2 and Neos 9

Author: Bernhard Schmitt

Classes/Application/EnumProvider.php

@@ -8,9 +8,9 @@
 
 namespace PackageFactory\AtomicFusion\PresentationObjects\Application;
 
-use Neos\ContentRepository\Domain\Model\NodeInterface;
-use Neos\ContentRepository\Domain\Model\NodeType;
-use Neos\ContentRepository\NodeTypePostprocessor\NodeTypePostprocessorInterface;
+use Neos\ContentRepository\Core\NodeType\NodeType;
+use Neos\ContentRepository\Core\NodeType\NodeTypePostprocessorInterface;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\I18n\Translator;
 use Neos\Neos\Service\DataSource\AbstractDataSource;
@@ -20,23 +20,19 @@
 
 final class EnumProvider extends AbstractDataSource implements ProtectedContextAwareInterface, NodeTypePostprocessorInterface
 {
-    /**
-     * @Flow\Inject(lazy=false)
-     * @var Translator
-     */
-    protected $translator;
+    #[Flow\Inject]
+    protected Translator $translator;
 
     /**
      * @var string
      */
     protected static $identifier = 'packagefactory-atomicfusion-presentationobjects-enumcases';
 
     /**
-     * @param NodeInterface|null $node
      * @param array<string|int,string> $arguments
      * @return array<string|int,array<string,string>>
      */
-    public function getData(NodeInterface $node = null, array $arguments = []): array
+    public function getData(Node $node = null, array $arguments = []): array
     {
         if (!array_key_exists('enumName', $arguments) || !is_string($arguments['enumName'])) {
             throw new \InvalidArgumentException('Argument "enumName" must be provided.', 1625297174);
@@ -55,11 +51,10 @@ public function getData(NodeInterface $node = null, array $arguments = []): arra
     }
 
     /**
-     * @param NodeType $nodeType
      * @param array<mixed> $configuration
      * @param array<mixed> $options
      */
-    public function process(NodeType $nodeType, array &$configuration, array $options)
+    public function process(NodeType $nodeType, array &$configuration, array $options): void
     {
         if (!array_key_exists('enumName', $options) || !is_string($options['enumName'])) {
             throw new \InvalidArgumentException('Option "enumName" must be provided.', 1625298032);

Classes/Command/ComponentCommandController.php

@@ -23,25 +23,19 @@
  */
 class ComponentCommandController extends CommandController
 {
-    /**
-     * @Flow\Inject
-     * @var PackageResolver
-     */
-    protected $packageResolver;
+    #[Flow\Inject]
+    protected PackageResolver $packageResolver;
 
-    /**
-     * @Flow\InjectConfiguration(path="componentGeneration.colocate")
-     * @var bool
-     */
-    protected $colocate;
+    #[Flow\InjectConfiguration(path: 'componentGeneration.colocate')]
+    protected bool $colocate;
 
     #[Flow\Inject]
     protected FactoryRendererInterface $factoryRenderer;
 
     /**
      * Create a new PresentationObject component and factory
      *
-     * This command will create an <b>interface</b>, a <b>value object</b> and a
+     * This command will create a <b>value object</b> and a
      * <b>factory</b> under in the chosen component namespace. It'll also register
      * the factory for later use in Fusion.
      *
@@ -64,7 +58,6 @@ class ComponentCommandController extends CommandController
      * @param string $name The name of the new component
      * @param bool $listable If set, an additional list type will be generated
      * @param bool $yes If set, no confirmation is going to be required for overwriting files
-     * @return void
      * @throws \Neos\Utility\Exception\FilesException
      */
     public function kickStartCommand(string $name, bool $listable = false, bool $yes = false): void
@@ -87,22 +80,16 @@ public function kickStartCommand(string $name, bool $listable = false, bool $yes
     }
 
     /**
-     * Create a new pseudo-enum value object
-     *
-     * This command will create a <b>value object</b> for a pseudo-enum under in the
-     * chosen component namespace and under the provided name. It'll also create a
-     * co-located <b>exception</b> class that will be used when validation for the
-     * pseudo-enum fails.
+     * Create a new enum
      *
-     * Additionally, a <b>datasource</b> for use in SelectBoxEditors will be created
-     * in the Application namespace of your chosen package.
+     * This command will create an enum under in the
+     * chosen component namespace and under the provided name.
      *
      * @param string $componentName The name of the component the new pseudo-enum belongs to
      * @param string $name The name of the new pseudo-enum
      * @param string $type The type of the new pseudo-enum (must be one of: "string", "int")
      * @param array|string[] $values A comma-separated colon list of names:values for the new pseudo-enum, e.g. a,b,c , a:1,b:2,c:3 or a:1.2,b:2.4,c:3.6
      * @param bool $yes If set, no confirmation is going to be required for overwriting files
-     * @return void
      */
     public function kickStartEnumCommand(string $componentName, string $name, string $type, array $values = [], bool $yes = false): void
     {

Classes/Domain/Component/Component.php

@@ -11,11 +11,11 @@
 use Neos\Flow\Annotations as Flow;
 
 #[Flow\Proxy(false)]
-final class Component
+final readonly class Component
 {
     public function __construct(
-        public readonly ComponentName $name,
-        public readonly Props $props
+        public ComponentName $name,
+        public Props $props
     ) {
     }
 

Classes/Domain/Component/ComponentGenerator.php

@@ -18,21 +18,16 @@
  * The component generator domain service
  */
 #[Flow\Proxy(false)]
-final class ComponentGenerator
+final readonly class ComponentGenerator
 {
     public function __construct(
-        private readonly FileWriterInterface $fileWriter,
-        private readonly FactoryRendererInterface $factoryRenderer
+        private FileWriterInterface $fileWriter,
+        private FactoryRendererInterface $factoryRenderer
     ) {
     }
 
     /**
-     * @param ComponentName $componentName
      * @param array|string[] $serializedProps
-     * @param string $packagePath
-     * @param bool $colocate
-     * @param bool $listable
-     * @return void
      * @throws \Neos\Utility\Exception\FilesException
      */
     public function generateComponent(
@@ -58,11 +53,6 @@ public function generateComponent(
         $this->registerFactory($packagePath, $componentName);
     }
 
-    /**
-     * @param string $packagePath
-     * @param ComponentName $componentName
-     * @return void
-     */
     private function registerFactory(string $packagePath, ComponentName $componentName): void
     {
         $configurationPath = $packagePath . 'Configuration/';

Classes/Domain/Component/ComponentName.php

@@ -14,12 +14,12 @@
 use PackageFactory\AtomicFusion\PresentationObjects\Domain\PackageKey;
 
 #[Flow\Proxy(false)]
-final class ComponentName
+final readonly class ComponentName
 {
     public function __construct(
-        public readonly PackageKey $packageKey,
-        public readonly FusionNamespace $fusionNamespace,
-        public readonly string $name
+        public PackageKey $packageKey,
+        public FusionNamespace $fusionNamespace,
+        public string $name
     ) {
     }
 

Classes/Domain/Component/PluralName.php

@@ -10,9 +10,7 @@
 
 use Neos\Flow\Annotations as Flow;
 
-/**
- * @Flow\Proxy(false)
- */
+#[Flow\Proxy(false)]
 final class PluralName
 {
     public static function forName(string $name): string

Classes/Domain/Component/PropType/BoolPropType.php

@@ -10,17 +10,12 @@
 
 use Neos\Flow\Annotations as Flow;
 
-/**
- * @Flow\Proxy(false)
- */
-final class BoolPropType implements PropTypeInterface
+#[Flow\Proxy(false)]
+final readonly class BoolPropType implements PropTypeInterface
 {
-    private bool $nullable;
-
     public function __construct(
-        bool $nullable
+        private bool $nullable
     ) {
-        $this->nullable = $nullable;
     }
 
     public function isNullable(): bool

Classes/Domain/Component/PropType/ComponentArrayPropType.php

@@ -12,17 +12,12 @@
 use PackageFactory\AtomicFusion\PresentationObjects\Domain\Component\ComponentName;
 use PackageFactory\AtomicFusion\PresentationObjects\Domain\Component\PluralName;
 
-/**
- * @Flow\Proxy(false)
- */
-final class ComponentArrayPropType implements PropTypeInterface
+#[Flow\Proxy(false)]
+final readonly class ComponentArrayPropType implements PropTypeInterface
 {
-    private ComponentName $componentName;
-
     public function __construct(
-        ComponentName $componentName
+        private ComponentName $componentName
     ) {
-        $this->componentName = $componentName;
     }
 
     public function isNullable(): bool

Classes/Domain/Component/PropType/ComponentPropType.php

@@ -12,21 +12,13 @@
 use PackageFactory\AtomicFusion\PresentationObjects\Domain\Component\ComponentName;
 use PackageFactory\AtomicFusion\PresentationObjects\Domain\Component\Props;
 
-/**
- * @Flow\Proxy(false)
- */
-final class ComponentPropType implements PropTypeInterface
+#[Flow\Proxy(false)]
+final readonly class ComponentPropType implements PropTypeInterface
 {
-    private ComponentName $componentName;
-
-    private bool $nullable;
-
     public function __construct(
-        ComponentName $componentName,
-        bool $nullable
+        private ComponentName $componentName,
+        private bool $nullable
     ) {
-        $this->componentName = $componentName;
-        $this->nullable = $nullable;
     }
 
     public function isNullable(): bool

Classes/Domain/Component/PropType/EnumPropType.php

@@ -11,11 +11,11 @@
 use Neos\Flow\Annotations as Flow;
 
 #[Flow\Proxy(false)]
-final class EnumPropType implements PropTypeInterface
+final readonly class EnumPropType implements PropTypeInterface
 {
     public function __construct(
         /** @var class-string<\BackedEnum> */
-        public readonly string $className,
+        public string $className,
         private bool $nullable
     ) {
     }