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

Remove deprecated code

CHANGELOG.md

@@ -33,6 +33,11 @@ This serves two purposes:
 
 ### Removed
 - Removes the automatic check to see if the configuration file is up to date https://github.com/hydephp/develop/pull/143
+- Remove deprecated `Hyde::titleFromSlug()` helper, use `Hyde::makeTitle()` instead
+- Removed deprecated CollectionService::getBladePageList, is renamed to getBladePageFiles
+- Removed deprecated CollectionService::getMarkdownPageList, is renamed to getMarkdownPageFiles
+- Removed deprecated CollectionService::getMarkdownPostList, is renamed to getMarkdownPostFiles
+- Removed deprecated CollectionService::getDocumentationPageList, is renamed to getDocumentationPageFiles
 
 ### Fixed
 - Fix bug causing files starting with underscores to add empty values to the file collection array https://github.com/hydephp/develop/pull/140

packages/framework/src/Actions/GeneratesDocumentationSearchIndexFile.php

@@ -73,7 +73,7 @@ public function generatePageObject(string $slug): object
     public function getSourceFileSlugs(): array
     {
         return array_diff(
-            CollectionService::getDocumentationPageList(),
+            CollectionService::getDocumentationPageFiles(),
             config('docs.exclude_from_search', [])
         );
     }

packages/framework/src/Actions/GeneratesNavigationMenu.php

@@ -155,8 +155,8 @@ protected function getListOfCustomPages(): array
     {
         return array_unique(
             array_merge(
-                CollectionService::getBladePageList(),
-                CollectionService::getMarkdownPageList()
+                CollectionService::getBladePageFiles(),
+                CollectionService::getMarkdownPageFiles()
             )
         );
     }

packages/framework/src/Commands/HydeBuildSearchCommand.php

@@ -69,7 +69,7 @@ protected function createSearchPage(): void
 
     protected function guesstimateGenerationTime(): float
     {
-        return count(CollectionService::getDocumentationPageList()) * 52.5;
+        return count(CollectionService::getDocumentationPageFiles()) * 52.5;
     }
 
     protected function getExecutionTimeInMs(float $timeStart): string

packages/framework/src/Commands/HydeBuildStaticSiteCommand.php

@@ -216,12 +216,12 @@ protected function canGenerateSitemap(): bool
     protected function canGenerateFeed(): bool
     {
         return RssFeedService::canGenerateFeed()
-            && count(CollectionService::getMarkdownPostList()) > 0;
+            && count(CollectionService::getMarkdownPostFiles()) > 0;
     }
 
     protected function canGenerateSearch(): bool
     {
         return Features::hasDocumentationSearch()
-            && count(CollectionService::getDocumentationPageList()) > 0;
+            && count(CollectionService::getDocumentationPageFiles()) > 0;
     }
 }

packages/framework/src/Helpers/HydeHelperFacade.php

@@ -21,9 +21,6 @@ public static function hasFeature(string $feature): bool
         return Features::enabled($feature);
     }
 
-    /**
-     * @since 0.44.0-beta (renamed from titleFromSlug)
-     */
     public static function makeTitle(string $slug): string
     {
         $alwaysLowercase = ['a', 'an', 'the', 'in', 'on', 'by', 'with', 'of', 'and', 'or', 'but'];

packages/framework/src/Hyde.php

@@ -6,7 +6,6 @@
 use Hyde\Framework\Concerns\Internal\FileHelpers;
 use Hyde\Framework\Concerns\Internal\FluentPathHelpers;
 use Hyde\Framework\Helpers\HydeHelperFacade;
-use Illuminate\Support\Str;
 
 /**
  * General facade for Hyde services.
@@ -43,12 +42,4 @@ public static function setBasePath(string $path): void
     {
         static::$basePath = $path;
     }
-
-    /**
-     * @deprecated v0.44.0-beta use Hyde::makeTitle() instead.
-     */
-    public static function titleFromSlug(string $slug): string
-    {
-        return Str::title(str_replace('-', ' ', ($slug)));
-    }
 }

packages/framework/src/Services/CollectionService.php

@@ -40,43 +40,9 @@ public static function getSourceFileListForModel(string $model): array|false
         return $files;
     }
 
-    /**
-     * @deprecated v0.44.x Is renamed to getBladePageFiles
-     */
-    public static function getBladePageList(): array
-    {
-        return static::getBladePageFiles();
-    }
-
-    /**
-     * @deprecated v0.44.x Is renamed to getMarkdownPageFiles
-     */
-    public static function getMarkdownPageList(): array
-    {
-        return static::getMarkdownPageFiles();
-    }
-
-    /**
-     * @deprecated v0.44.x Is renamed to getMarkdownPostFiles
-     */
-    public static function getMarkdownPostList(): array
-    {
-        return static::getMarkdownPostFiles();
-    }
-
-    /**
-     * @deprecated v0.44.x Is renamed to getDocumentationPageFiles
-     */
-    public static function getDocumentationPageList(): array
-    {
-        return static::getDocumentationPageFiles();
-    }
-
     /**
      * Get all the Blade files in the resources/views/vendor/hyde/pages directory.
      *
-     * @since 0.44.x replaces getBladePageList
-     *
      * @return array
      */
     public static function getBladePageFiles(): array
@@ -87,8 +53,6 @@ public static function getBladePageFiles(): array
     /**
      * Get all the Markdown files in the _pages directory.
      *
-     * @since 0.44.x replaces getMarkdownPageList
-     *
      * @return array
      */
     public static function getMarkdownPageFiles(): array
@@ -99,8 +63,6 @@ public static function getMarkdownPageFiles(): array
     /**
      * Get all the Markdown files in the _posts directory.
      *
-     * @since 0.44.x replaces getMarkdownPostList
-     *
      * @return array
      */
     public static function getMarkdownPostFiles(): array
@@ -111,8 +73,6 @@ public static function getMarkdownPostFiles(): array
     /**
      * Get all the Markdown files in the _docs directory.
      *
-     * @since 0.44.x replaces getDocumentationPageList
-     *
      * @return array
      */
     public static function getDocumentationPageFiles(): array

packages/framework/src/Services/DocumentationSidebarService.php

@@ -109,7 +109,7 @@ protected function withoutHidden(): self
      */
     protected function getSidebarItems(): array
     {
-        return CollectionService::getDocumentationPageList();
+        return CollectionService::getDocumentationPageFiles();
     }
 
     /**

packages/framework/src/Services/ValidationService.php

@@ -66,7 +66,7 @@ public function check_documentation_site_has_an_index_page(Result $result): Resu
             return $result->skip('The documentation page feature is disabled in config');
         }
 
-        if (count(CollectionService::getDocumentationPageList()) === 0) {
+        if (count(CollectionService::getDocumentationPageFiles()) === 0) {
             return $result->skip('There are no documentation pages');
         }
 
@@ -121,8 +121,8 @@ public function check_a_torchlight_api_token_is_set(Result $result): Result
     public function check_for_conflicts_between_blade_and_markdown_pages(Result $result): Result
     {
         $conflicts = array_intersect(
-            CollectionService::getMarkdownPageList(),
-            CollectionService::getBladePageList()
+            CollectionService::getMarkdownPageFiles(),
+            CollectionService::getBladePageFiles()
         );
 
         if (count($conflicts)) {

packages/framework/tests/Feature/DocumentationPageParserTest.php

@@ -20,7 +20,7 @@ public function test_can_get_collection_of_slugs()
 
         file_put_contents(Hyde::path('_docs/phpunit-test.md'), "# PHPUnit Test File \n Hello World!");
 
-        $array = CollectionService::getDocumentationPageList();
+        $array = CollectionService::getDocumentationPageFiles();
 
         $this->assertIsArray($array);
         $this->assertCount(1, $array);

packages/framework/tests/Feature/MarkdownPageTest.php

@@ -38,7 +38,7 @@ protected function tearDown(): void
      */
     public function test_can_get_collection_of_slugs()
     {
-        $array = CollectionService::getMarkdownPageList();
+        $array = CollectionService::getMarkdownPageFiles();
 
         $this->assertIsArray($array);
         $this->assertCount(1, $array);

packages/framework/tests/Feature/Services/CollectionServiceTest.php

@@ -22,27 +22,27 @@ public function test_class_exists()
 
     public function test_get_source_file_list_for_blade_page()
     {
-        $this->assertEquals(['404', 'index'], CollectionService::getBladePageList());
+        $this->assertEquals(['404', 'index'], CollectionService::getBladePageFiles());
     }
 
     public function test_get_source_file_list_for_markdown_page()
     {
         touch(Hyde::path('_pages/foo.md'));
-        $this->assertEquals(['foo'], CollectionService::getMarkdownPageList());
+        $this->assertEquals(['foo'], CollectionService::getMarkdownPageFiles());
         unlink(Hyde::path('_pages/foo.md'));
     }
 
     public function test_get_source_file_list_for_markdown_post()
     {
         touch(Hyde::path('_posts/foo.md'));
-        $this->assertEquals(['foo'], CollectionService::getMarkdownPostList());
+        $this->assertEquals(['foo'], CollectionService::getMarkdownPostFiles());
         unlink(Hyde::path('_posts/foo.md'));
     }
 
     public function test_get_source_file_list_for_documentation_page()
     {
         touch(Hyde::path('_docs/foo.md'));
-        $this->assertEquals(['foo'], CollectionService::getDocumentationPageList());
+        $this->assertEquals(['foo'], CollectionService::getDocumentationPageFiles());
         unlink(Hyde::path('_docs/foo.md'));
     }
 
@@ -135,28 +135,28 @@ public function test_blade_page_files_starting_with_underscore_are_ignored()
         $this->assertEquals([
             '404',
             'index',
-        ], CollectionService::getBladePageList());
+        ], CollectionService::getBladePageFiles());
         unlink(Hyde::path('_pages/_foo.blade.php'));
     }
 
     public function test_markdown_page_files_starting_with_underscore_are_ignored()
     {
         touch(Hyde::path('_pages/_foo.md'));
-        $this->assertEquals([], CollectionService::getMarkdownPageList());
+        $this->assertEquals([], CollectionService::getMarkdownPageFiles());
         unlink(Hyde::path('_pages/_foo.md'));
     }
 
     public function test_post_files_starting_with_underscore_are_ignored()
     {
         touch(Hyde::path('_posts/_foo.md'));
-        $this->assertEquals([], CollectionService::getMarkdownPostList());
+        $this->assertEquals([], CollectionService::getMarkdownPostFiles());
         unlink(Hyde::path('_posts/_foo.md'));
     }
 
     public function test_documentation_page_files_starting_with_underscore_are_ignored()
     {
         touch(Hyde::path('_docs/_foo.md'));
-        $this->assertEquals([], CollectionService::getDocumentationPageList());
+        $this->assertEquals([], CollectionService::getDocumentationPageFiles());
         unlink(Hyde::path('_docs/_foo.md'));
     }