From d27a607a670fde981cfb4c216bab4fbc25e025ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anke=20H=C3=A4slich?= <anke@neos.io>
Date: Mon, 10 Jun 2024 13:14:29 +0200
Subject: [PATCH] TASK: Remove generation of site.xml in `./flow
 kickstart:site`

As the `./flow site:import` command was removed we don't need to generate a `site.xml` anymore.
---
 .../Command/KickstartCommandController.php    |  2 +-
 .../Generator/AfxTemplateGenerator.php        | 28 +----------------
 .../Private/AfxGenerator/Content/Sites.xml    | 31 -------------------
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100755 Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml

diff --git a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
index a294af48583..1e9dabe5cd2 100755
--- a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
+++ b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
@@ -44,7 +44,7 @@ class KickstartCommandController extends CommandController
     /**
      * Kickstart a new site package
      *
-     * This command generates a new site package with basic Fusion and Sites.xml
+     * This command generates a new site package with basic Fusion
      *
      * @param string $packageKey The packageKey for your site
      * @param string $siteName The siteName of your site
diff --git a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
index a9d6687f9ea..e9aa151cde5 100755
--- a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
+++ b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
@@ -17,9 +17,9 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Package\PackageManager;
 use Neos\Kickstarter\Service\GeneratorService;
+use Neos\SiteKickstarter\Service\FusionRecursiveDirectoryRenderer;
 use Neos\SiteKickstarter\Service\SimpleTemplateRenderer;
 use Neos\Utility\Files;
-use Neos\SiteKickstarter\Service\FusionRecursiveDirectoryRenderer;
 
 /**
  * Service to generate site packages
@@ -63,7 +63,6 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
             ]
         ]);
 
-        $this->generateSitesXml($packageKey, $siteName);
         $this->generateSitesFusionDirectory($packageKey, $siteName);
         $this->generateNodeTypesConfiguration($packageKey);
         $this->generateAdditionalFolders($packageKey);
@@ -71,31 +70,6 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
         return $this->generatedFiles;
     }
 
-    /**
-     * Generate a "Sites.xml" for the given package and name.
-     *
-     * @param string $packageKey
-     * @param string $siteName
-     * @throws \Neos\Flow\Package\Exception\UnknownPackageException
-     * @throws \Neos\FluidAdaptor\Core\Exception
-     */
-    protected function generateSitesXml(string $packageKey, string $siteName) : void
-    {
-        $templatePathAndFilename = $this->getResourcePathForFile('Content/Sites.xml');
-
-        $contextVariables = [
-            'packageKey' => $packageKey,
-            'siteName' => htmlspecialchars($siteName),
-            'siteNodeName' => $this->generateSiteNodeName($packageKey),
-            'dimensions' => 'wat' //$this->contentDimensionZookeeper->getAllowedDimensionSubspace()
-        ];
-
-        $fileContent = $this->renderTemplate($templatePathAndFilename, $contextVariables);
-
-        $sitesXmlPathAndFilename = $this->packageManager->getPackage($packageKey)->getResourcesPath() . 'Private/Content/Sites.xml';
-        $this->generateFile($sitesXmlPathAndFilename, $fileContent);
-    }
-
     /**
      * Generate basic root Fusion file.
      *
diff --git a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml
deleted file mode 100755
index dcba85e68f6..00000000000
--- a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <site name="{siteName}" state="1" siteResourcesPackageKey="{packageKey}" siteNodeName="{siteNodeName}">
-  <nodes formatVersion="2.0">
-   <node nodeName="{siteNodeName}">
-    <variant workspace="live" nodeType="{packageKey}:Document.Page" sortingIndex="100" version="1" removed="" hidden="" hiddenInIndex="">
-     <dimensions>
-     <f:for each="{dimensions}" as="dimension">
-      <{dimension.identifier}>{dimension.default}</{dimension.identifier}>
-     </f:for>
-     </dimensions>
-     <accessRoles __type="array"/>
-     <properties>
-      <title __type="string">Home</title>
-      <uriPathSegment __type="string">home</uriPathSegment>
-     </properties>
-    </variant>
-    <node nodeName="main">
-     <variant workspace="live" nodeType="Neos.Neos:ContentCollection" sortingIndex="100" version="1" removed="" hidden="" hiddenInIndex="">
-      <dimensions>
-      <f:for each="{dimensions}" as="dimension">
-       <{dimension.identifier}>{dimension.default}</{dimension.identifier}>
-      </f:for>
-      </dimensions>
-      <accessRoles __type="array"/>
-     </variant>
-    </node>
-   </node>
-  </nodes>
- </site>
-</root>