From a39d4e0b8b2daad2664509cdb9bf6bd18c85aae9 Mon Sep 17 00:00:00 2001
From: Sabina Talipova <sabina.talipova@silverstripe.com>
Date: Fri, 25 Nov 2022 13:48:45 +1300
Subject: [PATCH] API Remove deprecated code

---
 src/RecipeInstaller.php | 43 ++---------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/RecipeInstaller.php b/src/RecipeInstaller.php
index 6d31c47..01d4733 100644
--- a/src/RecipeInstaller.php
+++ b/src/RecipeInstaller.php
@@ -96,8 +96,7 @@ protected function installProjectFile($sourceRoot, $destinationRoot, $sourcePath
         $relativePath = substr($sourcePath ?? '', strlen($sourceRoot ?? '') + 1); // Name path without leading '/'
 
         // Get destination path
-        $relativeDestination = $this->rewriteFilePath($destinationRoot, $relativePath);
-        $destination = $destinationRoot . DIRECTORY_SEPARATOR . $relativeDestination;
+        $destination = $destinationRoot . DIRECTORY_SEPARATOR . $relativePath;
 
         // Check if file exists
         if (file_exists($destination ?? '')) {
@@ -110,10 +109,7 @@ protected function installProjectFile($sourceRoot, $destinationRoot, $sourcePath
                     "  - Skipping <info>$relativePath</info> (<comment>existing and modified in project</comment>)"
                 );
             }
-        } elseif (
-            in_array($relativePath, $installedFiles ?? []) ||
-            in_array($relativeDestination, $installedFiles ?? [])
-        ) {
+        } elseif (in_array($relativePath, $installedFiles ?? [])) {
             // Don't re-install previously installed files that have been deleted
             $this->io->write(
                 "  - Skipping <info>$relativePath</info> (<comment>previously installed</comment>)"
@@ -220,39 +216,4 @@ public function installLibrary(PackageInterface $package)
             );
         }
     }
-
-    /**
-     * Perform any file rewrites necessary to a relative path of a file being installed.
-     * E.g. if 'mysite' folder exists, rewrite 'mysite' to 'app' and 'mysite/code' to 'app/src'
-     *
-     * This will be removed in 2.0 as the app folder will be hard coded and no rewrites supported.
-     *
-     * @deprecated 1.2.0 Will be removed without equivalent functionality to replace it
-     * @param string $destinationRoot Project root
-     * @param string $relativePath Relative path to the resource being installed
-     * @return string Relative path we should write to
-     */
-    protected function rewriteFilePath($destinationRoot, $relativePath)
-    {
-        // If app folder exists, no rewrite
-        if (is_dir($destinationRoot . DIRECTORY_SEPARATOR . 'app')) {
-            return $relativePath;
-        }
-        // if mysite folder does NOT exist, no rewrite
-        if (!is_dir($destinationRoot . DIRECTORY_SEPARATOR . 'mysite')) {
-            return $relativePath;
-        }
-
-        // Return first rewrite
-        $rewrites = [
-            'app/src' => 'mysite/code',
-            'app' => 'mysite',
-        ];
-        foreach ($rewrites as $from => $to) {
-            if (stripos($relativePath ?? '', $from ?? '') === 0) {
-                return $to . substr($relativePath ?? '', strlen($from ?? ''));
-            }
-        }
-        return $relativePath;
-    }
 }