Merge pull request #845 from hydephp/housekeeping

emmadesilva · web-flow · commit 4a97acbade59 · 2023-01-21T13:57:56.000+01:00
Clean up code
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/packages/framework/src/Foundation/Application.php b/packages/framework/src/Foundation/Application.php
@@ -20,9 +20,9 @@ protected function registerBaseBindings(): void
         parent::registerBaseBindings();
 
         /*
-         * Enable auto-discovery.
+         * Enable package auto-discovery.
          */
-        $this->app->singleton(PackageManifest::class, function (): \Illuminate\Foundation\PackageManifest {
+        $this->app->singleton(PackageManifest::class, function (): PackageManifest {
             return new PackageManifest(
                 new Filesystem,
                 $this->basePath(),
diff --git a/packages/framework/src/Foundation/Facades/Router.php b/packages/framework/src/Foundation/Facades/Router.php
@@ -5,14 +5,15 @@
 namespace Hyde\Foundation\Facades;
 
 use Hyde\Foundation\HydeKernel;
+use Hyde\Foundation\RouteCollection;
 use Illuminate\Support\Facades\Facade;
 
 /**
  * @mixin \Hyde\Foundation\RouteCollection
  */
 class Router extends Facade
 {
-    public static function getFacadeRoot(): \Hyde\Foundation\RouteCollection
+    public static function getFacadeRoot(): RouteCollection
     {
         return HydeKernel::getInstance()->routes();
     }
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
@@ -51,8 +51,6 @@ public function getBasePath(): string
      *
      * You may also use the function to generate a fully qualified path to a given file
      * relative to the project root directory when supplying the path argument.
-     *
-     * @param  string  $path
      */
     public function path(string $path = ''): string
     {
diff --git a/packages/framework/src/Framework/Actions/BladeMatterParser.php b/packages/framework/src/Framework/Actions/BladeMatterParser.php
@@ -46,7 +46,7 @@ class BladeMatterParser
     protected string $contents;
     protected array $matter;
 
-    /** The directive signature used to determine if a line should be parsed. */
+    /** @var string The directive signature used to determine if a line should be parsed. */
     protected const SEARCH = '@php($';
 
     public static function parseFile(string $localFilePath): array
@@ -86,13 +86,13 @@ public function parse(): static
 
     protected static function lineMatchesFrontMatter(string $line): bool
     {
-        return str_starts_with($line, (string) static::SEARCH);
+        return str_starts_with($line, static::SEARCH);
     }
 
     protected static function extractKey(string $line): string
     {
         // Remove search prefix
-        $key = substr($line, strlen((string) static::SEARCH));
+        $key = substr($line, strlen(static::SEARCH));
 
         // Remove everything after the first equals sign
         $key = substr($key, 0, strpos($key, '='));
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -39,7 +39,7 @@ public function register(): void
 
         $this->app->singleton(AssetService::class, AssetService::class);
 
-        $this->app->singleton(MarkdownConverter::class, function (): \Hyde\Markdown\MarkdownConverter {
+        $this->app->singleton(MarkdownConverter::class, function (): MarkdownConverter {
             return new MarkdownConverter();
         });
 
diff --git a/packages/framework/src/Markdown/Models/FrontMatter.php b/packages/framework/src/Markdown/Models/FrontMatter.php
@@ -40,6 +40,7 @@ public function __toString(): string
         return (new ConvertsArrayToFrontMatter())->execute($this->data);
     }
 
+    /** @return mixed|static */
     public function __get(string $key): mixed
     {
         return $this->get($key);

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,15 @@`
`5`	`5`	`namespace Hyde\Foundation\Facades;`
`6`	`6`
`7`	`7`	`use Hyde\Foundation\HydeKernel;`
	`8`	`+use Hyde\Foundation\RouteCollection;`
`8`	`9`	`use Illuminate\Support\Facades\Facade;`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* @mixin \Hyde\Foundation\RouteCollection`
`12`	`13`	`*/`
`13`	`14`	`class Router extends Facade`
`14`	`15`	`{`
`15`		`- public static function getFacadeRoot(): \Hyde\Foundation\RouteCollection`
	`16`	`+ public static function getFacadeRoot(): RouteCollection`
`16`	`17`	`{`
`17`	`18`	`return HydeKernel::getInstance()->routes();`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ public function getBasePath(): string`
`51`	`51`	`*`
`52`	`52`	`* You may also use the function to generate a fully qualified path to a given file`
`53`	`53`	`* relative to the project root directory when supplying the path argument.`
`54`		`- *`
`55`		`- * @param string $path`
`56`	`54`	`*/`
`57`	`55`	`public function path(string $path = ''): string`
`58`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class BladeMatterParser`
`46`	`46`	`protected string $contents;`
`47`	`47`	`protected array $matter;`
`48`	`48`
`49`		`- /** The directive signature used to determine if a line should be parsed. */`
	`49`	`+ /** @var string The directive signature used to determine if a line should be parsed. */`
`50`	`50`	`protected const SEARCH = '@php($';`
`51`	`51`
`52`	`52`	`public static function parseFile(string $localFilePath): array`
`@@ -86,13 +86,13 @@ public function parse(): static`
`86`	`86`
`87`	`87`	`protected static function lineMatchesFrontMatter(string $line): bool`
`88`	`88`	`{`
`89`		`- return str_starts_with($line, (string) static::SEARCH);`
	`89`	`+ return str_starts_with($line, static::SEARCH);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`protected static function extractKey(string $line): string`
`93`	`93`	`{`
`94`	`94`	`// Remove search prefix`
`95`		`- $key = substr($line, strlen((string) static::SEARCH));`
	`95`	`+ $key = substr($line, strlen(static::SEARCH));`
`96`	`96`
`97`	`97`	`// Remove everything after the first equals sign`
`98`	`98`	`$key = substr($key, 0, strpos($key, '='));`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public function __toString(): string`
`40`	`40`	`return (new ConvertsArrayToFrontMatter())->execute($this->data);`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ /** @return mixed\|static */`
`43`	`44`	`public function __get(string $key): mixed`
`44`	`45`	`{`
`45`	`46`	`return $this->get($key);`