Merge pull request #8 from rocketweb/ICP-8-change_pipe

Rocket Web · web-flow · commit 6f9d3e7c4e06 · 2024-01-10T19:46:27.000+02:00
changed pipe[#8]
diff --git a/Model/Service/DumpCmsDataService.php b/Model/Service/DumpCmsDataService.php
@@ -136,16 +136,16 @@ private function dumpPages(string $path, WriteInterface $varDirectory, ?array $i
         $pages = $pagesList->getItems();
 
         foreach ($pages as $page) {
-            $identifier = str_replace('/', '|', trim($page->getIdentifier()));
+            $identifier = str_replace('/', '---', trim($page->getIdentifier()));
             if (strpos($identifier, '.html') !== false) {
                 $identifier = str_replace('.html', '_html', $identifier);
             }
 
             $storeCodes = $this->getStoreCodes($page->getStores());
-            $htmlPath = $path . $identifier . '|' . implode('|', $storeCodes) . '.html';
+            $htmlPath = $path . $identifier . '---' . implode('---', $storeCodes) . '.html';
             $pageContent = $this->replaceBlockIds($page->getContent());
             $this->write($varDirectory, $htmlPath, $pageContent);
-            $jsonPath = $path . $identifier . '|' . implode('|', $storeCodes) . '.json';
+            $jsonPath = $path . $identifier . '---' . implode('---', $storeCodes) . '.json';
             $jsonContent = [
                 'title' => $page->getTitle(),
                 'is_active' => $page->isActive(),
@@ -181,9 +181,9 @@ private function dumpBlocks(string $path, WriteInterface $varDirectory, ?array $
             }
             $this->blockIdentifiers[$block->getId()] = $block->getIdentifier();
             $storeCodes = $this->getStoreCodes($block->getStores());
-            $htmlPath = $path . trim($block->getIdentifier()) . '|' . implode('|', $storeCodes) . '.html';
+            $htmlPath = $path . trim($block->getIdentifier()) . '---' . implode('---', $storeCodes) . '.html';
             $this->write($varDirectory, $htmlPath, $block->getContent());
-            $jsonPath = $path . trim($block->getIdentifier()) . '|' . implode('|', $storeCodes) . '.json';
+            $jsonPath = $path . trim($block->getIdentifier()) . '---' . implode('---', $storeCodes) . '.json';
             $jsonContent = [
                 'title' => $block->getTitle(),
                 'identifier' => $block->getIdentifier(),
diff --git a/Model/Service/ImportCmsDataService.php b/Model/Service/ImportCmsDataService.php
@@ -107,7 +107,7 @@ private function importBlocks(string $dirPath, ?array $identifiers): void
             }
             $identifier = str_replace($dirPath, '', $filePath);
             $identifier = str_replace('.html', '', $identifier);
-            $identifier = substr_replace($identifier, '', strpos($identifier, '|'));
+            $identifier = substr_replace($identifier, '', strpos($identifier, '---'));
             if ($identifiers !== null && !in_array($identifier, $identifiers)) {
                 // If we have a list of items, we skip if its not in the list
                 continue;
@@ -140,7 +140,7 @@ private function importBlocks(string $dirPath, ?array $identifiers): void
             try {
                 $this->blockRepository->save($block);
             } catch (\Exception $exception) {
-                echo $exception->getMessage() . ' | Block ID: ' . $identifier . "\n";
+                echo $exception->getMessage() . ', Block ID: ' . $identifier . "\n";
             }
         }
     }
@@ -155,8 +155,8 @@ private function importPages(string $dirPath, ?array $identifiers): void
             }
             $identifier = str_replace($dirPath, '', $filePath);
             $identifier = str_replace('.html', '', $identifier);
-            $identifier = substr_replace($identifier, '', strpos($identifier, '|'));
-            $identifier = str_replace('|', '/', $identifier);
+            $identifier = substr_replace($identifier, '', strpos($identifier, '---'));
+            $identifier = str_replace('---', '/', $identifier);
             $identifier = str_replace('_html', '.html', $identifier);
             if ($identifiers !== null && !in_array($identifier, $identifiers)) {
                 // If we have a list of items, we skip if its not in the list

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private function importBlocks(string $dirPath, ?array $identifiers): void`
`107`	`107`	`}`
`108`	`108`	`$identifier = str_replace($dirPath, '', $filePath);`
`109`	`109`	`$identifier = str_replace('.html', '', $identifier);`
`110`		`- $identifier = substr_replace($identifier, '', strpos($identifier, '\|'));`
	`110`	`+ $identifier = substr_replace($identifier, '', strpos($identifier, '---'));`
`111`	`111`	`if ($identifiers !== null && !in_array($identifier, $identifiers)) {`
`112`	`112`	`// If we have a list of items, we skip if its not in the list`
`113`	`113`	`continue;`
`@@ -140,7 +140,7 @@ private function importBlocks(string $dirPath, ?array $identifiers): void`
`140`	`140`	`try {`
`141`	`141`	`$this->blockRepository->save($block);`
`142`	`142`	`} catch (\Exception $exception) {`
`143`		`- echo $exception->getMessage() . ' \| Block ID: ' . $identifier . "\n";`
	`143`	`+ echo $exception->getMessage() . ', Block ID: ' . $identifier . "\n";`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -155,8 +155,8 @@ private function importPages(string $dirPath, ?array $identifiers): void`
`155`	`155`	`}`
`156`	`156`	`$identifier = str_replace($dirPath, '', $filePath);`
`157`	`157`	`$identifier = str_replace('.html', '', $identifier);`
`158`		`- $identifier = substr_replace($identifier, '', strpos($identifier, '\|'));`
`159`		`- $identifier = str_replace('\|', '/', $identifier);`
	`158`	`+ $identifier = substr_replace($identifier, '', strpos($identifier, '---'));`
	`159`	`+ $identifier = str_replace('---', '/', $identifier);`
`160`	`160`	`$identifier = str_replace('_html', '.html', $identifier);`
`161`	`161`	`if ($identifiers !== null && !in_array($identifier, $identifiers)) {`
`162`	`162`	`// If we have a list of items, we skip if its not in the list`