Merge branch '9.0' into bugfix/review-workspace-changes

Neos.ContentRepositoryRegistry/Classes/Command/NodeMigrationCommandController.php

@@ -53,9 +53,9 @@ public function __construct(
      * @param boolean $force Confirm application of this migration, only needed if the given migration contains any warnings.
      * @return void
      * @throws StopCommandException
-     * @see neos.contentrepositoryregistry:nodemigration:migrate
+     * @see neos.contentrepositoryregistry:nodemigration:execute
      */
-    public function migrateCommand(string $version, string $workspace = 'live', bool $force = false, string $contentRepositoryIdentifier = 'default'): void
+    public function executeCommand(string $version, string $workspace = 'live', bool $force = false, string $contentRepositoryIdentifier = 'default'): void
     {
         $contentRepositoryId = ContentRepositoryId::fromString($contentRepositoryIdentifier);
 
@@ -66,7 +66,7 @@ public function migrateCommand(string $version, string $workspace = 'live', bool
             if ($migrationConfiguration->hasWarnings() && $force === false) {
                 $this->outputLine();
                 $this->outputLine('Migration has warnings.'
-                    . ' You need to confirm execution by adding the "--confirmation true" option to the command.');
+                    . ' You need to confirm execution by adding the "--force true" option to the command.');
                 $this->quit(1);
             }
 
@@ -94,9 +94,9 @@ public function migrateCommand(string $version, string $workspace = 'live', bool
      * @throws UnknownPackageException
      * @throws FilesException
      * @throws StopCommandException
-     * @see neos.contentrepositoryregistry:nodemigration:migrationcreate
+     * @see neos.contentrepositoryregistry:nodemigration:kickstart
      */
-    public function migrationCreateCommand(string $packageKey): void
+    public function kickstartCommand(string $packageKey): void
     {
        if (!$this->packageManager->isPackageAvailable($packageKey)) {
            $this->outputLine('Package "%s" is not available.', [$packageKey]);

Neos.ContentRepositoryRegistry/Classes/Migration/Configuration/YamlConfiguration.php

@@ -45,7 +45,6 @@ protected function registerAvailableVersions()
     {
         $this->availableVersions = [];
         foreach ($this->packageManager->getAvailablePackages() as $package) {
-            $this->registerVersionInDirectory($package, 'TYPO3CR');
             $this->registerVersionInDirectory($package, 'ContentRepository');
         }
         ksort($this->availableVersions);

Neos.Fusion.Afx/README.md

@@ -354,10 +354,10 @@ Neos.Fusion:Join {
 
 ## Examples
 
-### Rendering of Collections with `Neos.Fusion:Collection`
+### Rendering of Collections with `Neos.Fusion:Loop`
 
 For rendering of lists or menus a presentational-component usually will recieve arrays of
-preprocessed data as prop. To iterate over such an array the `Neos.Fusion:Collection`
+preprocessed data as prop. To iterate over such an array the `Neos.Fusion:Loop`
 can be used in afx.
 
 ```
@@ -368,11 +368,11 @@ prototype(Vendor.Site:IterationExample) < prototype(Neos.Fusion:Component) {
 
     renderer = afx`
         <ul @if.has={props.items ? true : false}>
-        <Neos.Fusion:Collection collection={props.items} itemName="item">
-            <li @path='itemRenderer'>
+        <Neos.Fusion:Loop items={props.items} itemName="item">
+            <li>
                 <Vendor.Site:LinkExample {...item} />
             </li>
-        </Neos.Fusion:Collection>
+        </Neos.Fusion:Loop>
         </ul>
     `
 }
@@ -389,11 +389,11 @@ prototype(PackageFactory.AtomicFusion.AFX:SliderExample) < prototype(Packagefact
   images = ${[]}
   renderer = afx`
      <div class="slider">
-        <Neos.Fusion:Collection collection={props.images} itemName="image" iterationName="iteration" @children="itemRenderer">
+        <Neos.Fusion:Loop items={props.images} itemName="image" iterationName="iteration">
             <Neos.Fusion:Augmenter class="slider__slide" data-index={iteration.index}>
                 <Vendor.Site:ImageExample {...image} />
             </Neos.Fusion:Augmenter>
-        </Neos.Fusion:Collection>
+        </Neos.Fusion:Loop>
      </div>
   `
 }