Merge branch 'master' into 2.0

Author: nezaniel

.editorconfig

@@ -14,7 +14,7 @@ indent_size = 2
 [{package.json,.babelrc,.eslintrc,.stylelintrc}]
 indent_size = 2
 
-[*.{css,js,ts}]
+[*.{css,js,ts,neon}]
 indent_style = tab
 
 [Makefile]
@@ -24,4 +24,4 @@ indent_style = tab
 indent_style = tab
 
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.github/workflows/qa.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   coding-standard:
@@ -51,16 +51,11 @@ jobs:
         run: |
           composer install
 
-      - name: Run phpstan on Tests/
+      - name: Run phpstan
         run: |
           bin/phpstan analyse \
-            --autoload-file Build/BuildEssentials/PhpUnit/UnitTestBootstrap.php \
             --level 8 \
-            Tests/Unit
-
-      - name: Run phpstan on Classes/
-        run: |
-          bin/phpstan analyse --level 8 Classes
+            Tests/Unit Classes
 
   unit-tests:
     runs-on: ubuntu-20.04

Classes/Command/ComponentCommandController.php

@@ -8,24 +8,28 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
 use PackageFactory\AtomicFusion\PresentationObjects\Domain\Component\ComponentGenerator;
-use PackageFactory\AtomicFusion\PresentationObjects\Domain\Value\ValueGenerator;
+use PackageFactory\AtomicFusion\PresentationObjects\Domain\Component\ComponentName;
+use PackageFactory\AtomicFusion\PresentationObjects\Domain\Enum\EnumGenerator;
+use PackageFactory\AtomicFusion\PresentationObjects\Domain\PackageKey;
+use PackageFactory\AtomicFusion\PresentationObjects\Domain\PackageResolver;
+use PackageFactory\AtomicFusion\PresentationObjects\Infrastructure\DefensiveConfirmationFileWriter;
 
 /**
- * The command controller for kickstarting PresentationObject components
+ * The command controller for kick-starting PresentationObject components
  */
 class ComponentCommandController extends CommandController
 {
     /**
      * @Flow\Inject
-     * @var ComponentGenerator
+     * @var PackageResolver
      */
-    protected $componentGenerator;
+    protected $packageResolver;
 
     /**
-     * @Flow\Inject
-     * @var ValueGenerator
+     * @Flow\InjectConfiguration(path="componentGeneration.colocate")
+     * @var bool
      */
-    protected $valueGenerator;
+    protected $colocate;
 
     /**
      * Create a new PresentationObject component and factory
@@ -41,20 +45,35 @@ class ComponentCommandController extends CommandController
      * The following values are allowed for types:
      *
      * * string, int, float, bool
+     * * slot
      * * Value class names created with <u>component:kickstartvalue</u> in the same
      *   component namespace
      * * Component class names created with <u>component:kickstart</u> in the same
      *   package
      * * ImageSource
      * * Uri
+     * * array<...> with any of the above as an argument
      *
      * @param string $name The name of the new component
-     * @param null|string $packageKey Package key of an optional target package, if not set the configured default package or the first available site package will be used
+     * @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, ?string $packageKey = null): void
+    public function kickStartCommand(string $name, bool $listable = false, bool $yes = false): void
     {
-        $this->componentGenerator->generateComponent($name, $this->request->getExceedingArguments(), $packageKey);
+        $componentGenerator = new ComponentGenerator(
+            new DefensiveConfirmationFileWriter($this->output, $yes)
+        );
+        $package = $this->packageResolver->resolvePackage();
+
+        $componentGenerator->generateComponent(
+            ComponentName::fromInput($name, PackageKey::fromPackage($package)),
+            $this->request->getExceedingArguments(),
+            $package->getPackagePath(),
+            $this->colocate,
+            $listable
+        );
     }
 
     /**
@@ -71,12 +90,25 @@ public function kickStartCommand(string $name, ?string $packageKey = null): void
      * @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 list of values for the new pseudo-enum
-     * @param null|string $packageKey Package key of an optional target package, if not set the configured default package or the first available site package will be used
+     * @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 kickStartValueCommand(string $componentName, string $name, string $type, array $values = [], ?string $packageKey = null): void
+    public function kickStartEnumCommand(string $componentName, string $name, string $type, array $values = [], bool $yes = false): void
     {
-        $this->valueGenerator->generateValue($componentName, $name, $type, $values, $packageKey);
+        $enumGenerator = new EnumGenerator(
+            new \DateTimeImmutable(),
+            new DefensiveConfirmationFileWriter($this->output, $yes)
+        );
+        $package = $this->packageResolver->resolvePackage();
+
+        $enumGenerator->generateEnum(
+            ComponentName::fromInput($componentName, PackageKey::fromPackage($package)),
+            $name,
+            $type,
+            $values,
+            $package->getPackagePath(),
+            $this->colocate
+        );
     }
 }

Classes/Domain/AbstractImmutableArrayObject.php

@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+namespace PackageFactory\AtomicFusion\PresentationObjects\Domain;
+
+/*
+ * This file is part of the PackageFactory.AtomicFusion.PresentationObjects package
+ */
+
+/**
+ * The abstract class for immutable array objects
+ * @template K of int|string
+ * @template V
+ * @extends \ArrayObject<K,V>
+ */
+abstract class AbstractImmutableArrayObject extends \ArrayObject
+{
+    /**
+     * @param K $key
+     * @param V $value
+     * @return void
+     */
+    public function offsetSet($key, $value): void
+    {
+        throw new \BadMethodCallException(get_class() . ' are immutable.', 1616240304);
+    }
+
+    /**
+     * @param K $key
+     * @return void
+     */
+    public function offsetUnset($key): void
+    {
+        throw new \BadMethodCallException(get_class() . ' are immutable.', 1616240304);
+    }
+
+    /**
+     * @param V $value
+     * @return void
+     */
+    public function append($value): void
+    {
+        throw new \BadMethodCallException(get_class() . ' are immutable.', 1616240304);
+    }
+
+    /**
+     * @param array<K,V> $array
+     * @return array<K,V>
+     */
+    public function exchangeArray($array): array
+    {
+        throw new \BadMethodCallException(get_class() . ' are immutable.', 1616240304);
+    }
+}

Classes/Domain/Component/AbstractComponentArray.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+namespace PackageFactory\AtomicFusion\PresentationObjects\Domain\Component;
+
+/*
+ * This file is part of the PackageFactory.AtomicFusion.PresentationObjects package
+ */
+
+use PackageFactory\AtomicFusion\PresentationObjects\Domain\AbstractImmutableArrayObject;
+use PackageFactory\AtomicFusion\PresentationObjects\Fusion\ComponentPresentationObjectInterface;
+
+/**
+ * The abstract class for component array objects
+ * @extends AbstractImmutableArrayObject<int,ComponentPresentationObjectInterface>
+ */
+abstract class AbstractComponentArray extends AbstractImmutableArrayObject
+{
+}