Merge pull request #1260 from hydephp/remove-deprecated-code

emmadesilva · web-flow · commit 721b09e9584b · 2023-03-12T22:01:09.000+01:00
Remove deprecated `SourceFile::withoutDirectoryPrefix ` method only used in one test
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -27,6 +27,7 @@ This serves two purposes:
 - Removed `RenderData:.getCurrentPage` method deprecated in v1.0.0-RC.2
 - Removed `RenderData:.getCurrentRoute` method deprecated in v1.0.0-RC.2
 - Removed deprecated `HydePage::$canonicalUrl` property (replaced with `HydePage::getCanonicalUrl()`).
+- Removed deprecated `SourceFile::withoutDirectoryPrefix` method only used in one test.
 
 ### Fixed
 - Fixed the blog post article view where metadata assembly used legacy hard-coded paths instead of dynamic path information.
diff --git a/packages/framework/src/Support/Filesystem/SourceFile.php b/packages/framework/src/Support/Filesystem/SourceFile.php
@@ -5,7 +5,6 @@
 namespace Hyde\Support\Filesystem;
 
 use Hyde\Pages\Concerns\HydePage;
-use Illuminate\Support\Str;
 
 /**
  * File abstraction for a project source file.
@@ -40,11 +39,4 @@ public function toArray(): array
             'pageClass' => $this->pageClass,
         ]);
     }
-
-    /** @deprecated This method is not used anywhere other than tests and may be removed */
-    public function withoutDirectoryPrefix(): string
-    {
-        // Works like basename, but keeps subdirectory names.
-        return Str::after($this->path, $this->pageClass::sourceDirectory().'/');
-    }
 }
diff --git a/packages/framework/tests/Feature/Support/SourceFileTest.php b/packages/framework/tests/Feature/Support/SourceFileTest.php
@@ -121,15 +121,4 @@ public function test_to_array_with_file_in_subdirectory()
         Filesystem::unlink('foo/bar.txt');
         rmdir(Hyde::path('foo'));
     }
-
-    public function test_without_directory_prefix_retains_subdirectories()
-    {
-        $this->assertSame('foo/bar/baz.txt',
-            SourceFile::make('foo/bar/baz.txt', MarkdownPage::class)->withoutDirectoryPrefix()
-        );
-
-        $this->assertSame('foo/bar.txt',
-            SourceFile::make('_pages/foo/bar.txt', MarkdownPage::class)->withoutDirectoryPrefix()
-        );
-    }
 }
