Merge pull request #858 from hydephp/handle-deprecations

emmadesilva · web-flow · commit 03300a828f85 · 2023-01-22T14:41:45.000+01:00
Remove deprecated support for setting page rendering data via the view facade
diff --git a/packages/framework/src/Support/Models/Render.php b/packages/framework/src/Support/Models/Render.php
@@ -34,17 +34,17 @@ public function setPage(HydePage $page): void
 
     public function getPage(): ?HydePage
     {
-        return $this->page ?? self::handleFallback('page');
+        return $this->page ?? null;
     }
 
     public function getCurrentRoute(): ?Route
     {
-        return $this->currentRoute ?? self::handleFallback('currentRoute');
+        return $this->currentRoute ?? null;
     }
 
     public function getCurrentPage(): ?string
     {
-        return $this->currentPage ?? self::handleFallback('currentPage');
+        return $this->currentPage ?? null;
     }
 
     public function shareToView(): void
@@ -80,19 +80,4 @@ public function toArray(): array
             'currentPage' => $this->getCurrentPage(),
         ];
     }
-
-    /**
-     * @deprecated Setting page rendering data via the view facade is deprecated. Use {@see Render::share()} instead.
-     * @codeCoverageIgnore
-     */
-    protected static function handleFallback(string $property): mixed
-    {
-        $shared = View::shared($property);
-
-        if ($shared !== null) {
-            trigger_error("Setting page rendering data via the view facade is deprecated. Use `Render::share('$property', \$value)` instead", E_USER_DEPRECATED);
-        }
-
-        return $shared;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,17 @@ public function setPage(HydePage $page): void`
`34`	`34`
`35`	`35`	`public function getPage(): ?HydePage`
`36`	`36`	`{`
`37`		`- return $this->page ?? self::handleFallback('page');`
	`37`	`+ return $this->page ?? null;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function getCurrentRoute(): ?Route`
`41`	`41`	`{`
`42`		`- return $this->currentRoute ?? self::handleFallback('currentRoute');`
	`42`	`+ return $this->currentRoute ?? null;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function getCurrentPage(): ?string`
`46`	`46`	`{`
`47`		`- return $this->currentPage ?? self::handleFallback('currentPage');`
	`47`	`+ return $this->currentPage ?? null;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function shareToView(): void`
`@@ -80,19 +80,4 @@ public function toArray(): array`
`80`	`80`	`'currentPage' => $this->getCurrentPage(),`
`81`	`81`	`];`
`82`	`82`	`}`
`83`		`-`
`84`		`- /**`
`85`		`- * @deprecated Setting page rendering data via the view facade is deprecated. Use {@see Render::share()} instead.`
`86`		`- * @codeCoverageIgnore`
`87`		`- */`
`88`		`- protected static function handleFallback(string $property): mixed`
`89`		`- {`
`90`		`- $shared = View::shared($property);`
`91`		`-`
`92`		`- if ($shared !== null) {`
`93`		- trigger_error("Setting page rendering data via the view facade is deprecated. Use `Render::share('$property', \$value)` instead", E_USER_DEPRECATED);
`94`		`- }`
`95`		`-`
`96`		`- return $shared;`
`97`		`- }`
`98`	`83`	`}`