From 6ef9962ce2cdffe6cbb845fe36a75b980eaedc8e Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 14 Mar 2023 10:20:43 +0100 Subject: [PATCH 1/4] Remove IDE helpers for removed global variables from the IDE helper file --- RELEASE_NOTES.md | 2 +- _ide_helper.php | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e3d1b60364c..e914fcc958f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -19,7 +19,7 @@ This serves two purposes: - for soon-to-be removed features. ### Removed -- for now removed features. +- Removed IDE helpers for removed global variables from the IDE helper file. ### Fixed - for any bug fixes. diff --git a/_ide_helper.php b/_ide_helper.php index 5ac7da5a349..bc0a05b8288 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -16,18 +16,6 @@ /** @var \Hyde\Pages\Concerns\HydePage $page The page being compiled/previewed */ $page = \Hyde\Support\Facades\Render::getPage(); -/** - * @var \Hyde\Support\Models\Route $currentRoute The route for the page being compiled/previewed - * @deprecated Renamed to $route as "current" is implied - */ -$currentRoute = \Hyde\Support\Facades\Render::getRoute(); - -/** - * @var string $currentPage The route key for the page being compiled/previewed - * @deprecated Renamed to $routeKey as "current" is implied, and it's not a page - */ -$currentPage = \Hyde\Support\Facades\Render::getRouteKey(); - /*** @var \Hyde\Support\Models\Route $currentRoute The route for the page being compiled/previewed */ $route = \Hyde\Support\Facades\Render::getRoute(); From 67aa5b408c6411b57f7458dfc9f6a8e425881eb7 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 14 Mar 2023 10:21:40 +0100 Subject: [PATCH 2/4] Update RELEASE_NOTES.md --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e914fcc958f..d7002e97423 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -19,7 +19,7 @@ This serves two purposes: - for soon-to-be removed features. ### Removed -- Removed IDE helpers for removed global variables from the IDE helper file. +- Removed IDE helpers for removed global variables from the IDE helper file. https://github.com/hydephp/develop/pull/1274 ### Fixed - for any bug fixes. From f827334de8547a3d75cb36798113b3a7814f1430 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 14 Mar 2023 10:22:50 +0100 Subject: [PATCH 3/4] Remove extra star from PHPDoc comment --- _ide_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_ide_helper.php b/_ide_helper.php index bc0a05b8288..ea98521f92c 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -16,7 +16,7 @@ /** @var \Hyde\Pages\Concerns\HydePage $page The page being compiled/previewed */ $page = \Hyde\Support\Facades\Render::getPage(); -/*** @var \Hyde\Support\Models\Route $currentRoute The route for the page being compiled/previewed */ +/** @var \Hyde\Support\Models\Route $currentRoute The route for the page being compiled/previewed */ $route = \Hyde\Support\Facades\Render::getRoute(); /** @var string $currentPage The route key for the page being compiled/previewed */ From 0fd69c0c56b4d486c6c413da42fb0f4518ff7d95 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 14 Mar 2023 10:24:03 +0100 Subject: [PATCH 4/4] Fix PHPDoc annotations not using same variable name as variable --- _ide_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_ide_helper.php b/_ide_helper.php index ea98521f92c..7d868d7bbb5 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -16,10 +16,10 @@ /** @var \Hyde\Pages\Concerns\HydePage $page The page being compiled/previewed */ $page = \Hyde\Support\Facades\Render::getPage(); -/** @var \Hyde\Support\Models\Route $currentRoute The route for the page being compiled/previewed */ +/** @var \Hyde\Support\Models\Route $route The route for the page being compiled/previewed */ $route = \Hyde\Support\Facades\Render::getRoute(); -/** @var string $currentPage The route key for the page being compiled/previewed */ +/** @var string $routeKey The route key for the page being compiled/previewed */ $routeKey = \Hyde\Support\Facades\Render::getRouteKey(); // Facades (aliased in app/config.php)