v0.36.x - Add package auto-discovery

app/bootstrap.php

@@ -11,7 +11,7 @@
 |
 */
 
-$app = new LaravelZero\Framework\Application(
+$app = new Hyde\Framework\Application(
     dirname(__DIR__)
 );
 

bootstrap/app.php

@@ -17,7 +17,7 @@
 |
 */
 
-$app = new LaravelZero\Framework\Application(
+$app = new Hyde\Framework\Application(
     dirname(__DIR__)
 );
 

build/tools/update-composer.php

@@ -33,5 +33,5 @@
 
 file_put_contents('composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 
-echo "Done. Finished in " . number_format((microtime(true) - $time_start) * 1000, 2) . "ms\n";
+echo 'Done. Finished in '.number_format((microtime(true) - $time_start) * 1000, 2)."ms\n";
 exit(0);

composer.json

@@ -36,6 +36,11 @@
             "Hyde\\Testing\\": "tests/"
         }
     },
+    "scripts": {
+        "post-autoload-dump": [
+            "@php hyde package:discover --ansi"
+        ]
+    },
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,

packages/framework/src/Application.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Hyde\Framework;
+
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\PackageManifest;
+
+class Application extends \LaravelZero\Framework\Application
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function registerBaseBindings(): void
+    {
+        parent::registerBaseBindings();
+
+        /*
+         * Enable auto-discovery.
+         */
+        $this->app->singleton(PackageManifest::class, function () {
+            return new PackageManifest(
+                new Filesystem, $this->basePath(), $this->basePath('storage/framework/cache/packages.php')
+            );
+        });
+    }
+}

packages/framework/src/Commands/HydePackageDiscoverCommand.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Hyde\Framework\Commands;
+
+use Hyde\Framework\Hyde;
+use Illuminate\Foundation\Console\PackageDiscoverCommand as BaseCommand;
+use Illuminate\Foundation\PackageManifest;
+
+class HydePackageDiscoverCommand extends BaseCommand
+{
+    protected $hidden = true;
+
+    public function handle(PackageManifest $manifest)
+    {
+        $manifest->manifestPath = Hyde::path('storage/framework/cache/packages.php');
+        parent::handle($manifest);
+    }
+}

packages/framework/src/HydeServiceProvider.php

@@ -77,6 +77,8 @@ function () {
             Commands\HydeInstallCommand::class,
             Commands\HydeDebugCommand::class,
             Commands\HydeServeCommand::class,
+
+            Commands\HydePackageDiscoverCommand::class,
         ]);
     }
 

packages/realtime-compiler/bin/server.php

@@ -14,11 +14,10 @@
         \Hyde\RealtimeCompiler\Http\ExceptionHandler::handle($exception);
         exit($exception->getCode());
     }
-
 } catch (\Throwable $th) {
     // Auxiliary exception handler
     echo '<h1>Something went really wrong!</h1>';
     echo '<p>An error occurred that the core exception handler failed to process. Here\'s all we know:</p>';
-    echo '<h2>Initial exception:</h2><pre>' . print_r($exception, true).'</pre>';
-    echo '<h2>Auxiliary exception:</h2><pre>' . print_r($th, true).'</pre>';
-}
+    echo '<h2>Initial exception:</h2><pre>'.print_r($exception, true).'</pre>';
+    echo '<h2>Auxiliary exception:</h2><pre>'.print_r($th, true).'</pre>';
+}

packages/realtime-compiler/src/Concerns/InteractsWithLaravel.php

@@ -26,7 +26,7 @@ protected function createApplication(): void
 
     protected function bootApplication(): void
     {
-        if (!isset($this->laravel)) {
+        if (! isset($this->laravel)) {
             $this->createApplication();
         }
 

projects/rocket/app/Exceptions/Handler.php

@@ -58,6 +58,7 @@ public function render($request, Throwable $exception)
             $whoops->writeToOutput(false);
             $whoops->pushHandler(new PrettyPageHandler());
             $html = $whoops->handleException($exception);
+
             return response()->make($html, 500);
         }
 

projects/rocket/app/Http/Controllers/ApiController.php

@@ -15,7 +15,7 @@ public function pingRealtimeCompiler()
             ? response()->json(['success' => true])
             : response()->json([
                 'success' => false,
-                'error' => 'Could not ping Realtime Compiler on default port 8080'
+                'error' => 'Could not ping Realtime Compiler on default port 8080',
             ]);
     }
 
@@ -24,9 +24,9 @@ public static function isRealtimeCompilerRunning()
         try {
             $client = new Client(['timeout' => 1]);
             $client->head('http://localhost:8080');
+
             return true;
-        }
-        catch (\Throwable) {
+        } catch (\Throwable) {
             return false;
         }
     }

projects/rocket/app/Http/Controllers/DashboardController.php

@@ -3,8 +3,8 @@
 namespace Hyde\Rocket\Http\Controllers;
 
 use Hyde\Framework\Models\MarkdownPost;
-use Hyde\Rocket\Models\Project;
 use Hyde\Framework\Services\CollectionService;
+use Hyde\Rocket\Models\Project;
 
 class DashboardController extends Controller
 {
@@ -31,10 +31,10 @@ public function index()
     protected function getContentList(): array
     {
         return array_merge([
-           'Blade Pages' => CollectionService::getBladePageList(),
-           'Markdown Pages' => CollectionService::getMarkdownPageList(),
-           'Markdown Posts' => CollectionService::getMarkdownPostList(),
-           'Documentation Pages' => CollectionService::getDocumentationPageList(),
+            'Blade Pages' => CollectionService::getBladePageList(),
+            'Markdown Pages' => CollectionService::getMarkdownPageList(),
+            'Markdown Posts' => CollectionService::getMarkdownPostList(),
+            'Documentation Pages' => CollectionService::getDocumentationPageList(),
         ]);
     }
 }

projects/rocket/app/Http/Controllers/DebugController.php

@@ -2,8 +2,8 @@
 
 namespace Hyde\Rocket\Http\Controllers;
 
-use Hyde\Rocket\Models\Project;
 use Hyde\Framework\Hyde;
+use Hyde\Rocket\Models\Project;
 
 class DebugController extends Controller
 {
@@ -19,7 +19,7 @@ public function __invoke()
         $information = [
             'Hyde/Framework version' => Hyde::version(),
             'Hyde project path' => Hyde::path(),
-            'PHP version' => phpversion() . ' (' . PHP_SAPI . ')',
+            'PHP version' => phpversion().' ('.PHP_SAPI.')',
             'Lumen version' => app()->version(),
         ];
         dump($information);

projects/rocket/app/Http/Controllers/FilesystemController.php

@@ -17,7 +17,7 @@ class FilesystemController extends Controller
     public function __construct()
     {
         if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-            throw new \Exception('This API is only supported on Windows. ' .
+            throw new \Exception('This API is only supported on Windows. '.
                 'Please send a PR to open up support for other systems!');
         }
     }
@@ -26,27 +26,27 @@ public function open(Request $request)
     {
         if (! $request->has('path')) {
             return response()->json([
-                'error' => 'Missing path parameter.'
+                'error' => 'Missing path parameter.',
             ], 400);
         }
 
-        $file = trim(Project::get()->path . '/' . $request->input('path'), '/');
+        $file = trim(Project::get()->path.'/'.$request->input('path'), '/');
 
         if (! file_exists($file)) {
             return response()->json([
-                'error' => 'File does not exist.'
+                'error' => 'File does not exist.',
             ], 404);
         }
 
         if (is_dir($file)) {
-            shell_exec('explorer.exe "' . $file . '"');
+            shell_exec('explorer.exe "'.$file.'"');
         } else {
-            shell_exec('start "" "' . $file . '"');
+            shell_exec('start "" "'.$file.'"');
         }
 
         if ($request->expectsJson()) {
             return response()->json([
-                'success' => true
+                'success' => true,
             ]);
         }
 

projects/rocket/app/Http/Controllers/PostController.php

@@ -12,7 +12,7 @@ class PostController extends Controller
 {
     public function show(string $slug, Request $request)
     {
-        $path = Hyde::path($localPath = '_posts/' . $slug . '.md');
+        $path = Hyde::path($localPath = '_posts/'.$slug.'.md');
 
         if (! file_exists($path)) {
             return response('File not found.', 404);
@@ -40,7 +40,7 @@ public function store(Request $request)
             $request->input('description'),
             $request->input('category'),
             $request->input('author')
-        );   
+        );
 
         try {
             $creator->save();
@@ -50,19 +50,19 @@ public function store(Request $request)
             ]);
         }
 
-        return redirect('/_posts/' . $creator->slug . '?saved=true');
+        return redirect('/_posts/'.$creator->slug.'?saved=true');
     }
 
     public function update(string $slug, Request $request)
     {
-        $path = Hyde::path('_posts/' . $slug . '.md');
+        $path = Hyde::path('_posts/'.$slug.'.md');
 
         if (! file_exists($path)) {
             return response('File not found.', 404);
         }
 
         file_put_contents($path, $request->get('markdown'));
 
-        return redirect('/_posts/' . $slug . '?saved=true');
+        return redirect('/_posts/'.$slug.'?saved=true');
     }
 }

projects/rocket/app/Http/Controllers/RealtimeCompiler.php

@@ -19,7 +19,7 @@ public function render(Request $request)
     {
         $path = $request->get('path', '');
 
-        return redirect('http://localhost:8080/' . $path);
+        return redirect('http://localhost:8080/'.$path);
     }
 
     public function markdown(Request $request)
@@ -32,7 +32,7 @@ public function markdown(Request $request)
 
         return view('markdown-preview', [
             'page' => basename($path),
-            'markdown' => Str::markdown(YamlFrontMatter::markdownCompatibleParse(file_get_contents($path))->body())
+            'markdown' => Str::markdown(YamlFrontMatter::markdownCompatibleParse(file_get_contents($path))->body()),
         ]);
     }
 }

projects/rocket/app/Models/Artisan.php

@@ -19,14 +19,14 @@ public function __construct(string $absoluteProjectPath)
      */
     public function run(string $command): string
     {
-        return shell_exec('cd '.$this->path.' && php hyde ' . $command);
+        return shell_exec('cd '.$this->path.' && php hyde '.$command);
     }
 
     /**
      * Run a command in the project's HydeCLI and stream the output.
      */
     public function passthru(string $command): void
     {
-        passthru('cd '.$this->path.' && php hyde ' . $command);
+        passthru('cd '.$this->path.' && php hyde '.$command);
     }
 }

projects/rocket/app/Models/Project.php

@@ -26,13 +26,14 @@ protected function __construct()
 
     protected function getPathOrFail(): string
     {
-        $path = realpath(getcwd() . '/../../');
-        if (!is_dir($path)) {
-            throw new \Exception("Not a directory.");
+        $path = realpath(getcwd().'/../../');
+        if (! is_dir($path)) {
+            throw new \Exception('Not a directory.');
         }
-        if (!is_file($path . '/hyde')) {
-            throw new \Exception("Not a Hyde project.");
+        if (! is_file($path.'/hyde')) {
+            throw new \Exception('Not a Hyde project.');
         }
+
         return $path;
     }
 
@@ -52,18 +53,17 @@ public function artisan(): Artisan
      */
     public static function get(?string $property = null): mixed
     {
-        if (!isset(static::$instance)) {
+        if (! isset(static::$instance)) {
             static::$instance = new static();
         }
 
         return isset($property)
             ? static::$instance->$property
             : static::$instance;
-
     }
 
     protected function getVersion()
     {
-        return json_decode(file_get_contents($this->path . '/composer.json'))->require->{'hyde/framework'};
+        return json_decode(file_get_contents($this->path.'/composer.json'))->require->{'hyde/framework'};
     }
 }

projects/rocket/app/Providers/AppServiceProvider.php

@@ -14,12 +14,12 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton(\Desilva\Console\Contracts\Console::class, function() {
+        $this->app->singleton(\Desilva\Console\Contracts\Console::class, function () {
             return new \Desilva\Console\Console;
         });
     }
 
-/**
+    /**
      * Bootstrap any application services.
      *
      * @return void

projects/rocket/bootstrap/app.php

@@ -8,7 +8,6 @@
 
 date_default_timezone_set(env('APP_TIMEZONE', 'UTC'));
 
-
 /*
 |--------------------------------------------------------------------------
 | Create The Application

projects/rocket/routes/web.php

@@ -29,7 +29,6 @@
 $router->get('/create-post', 'PostController@create');
 $router->post('/create-post', 'PostController@store');
 
-
 $router->post('/fileapi/open', 'FilesystemController@open');
 $router->get('/open/_site', 'RealtimeCompiler@render');
 $router->get('/render/markdown', 'RealtimeCompiler@markdown');

projects/rocket/tests/ExampleTest.php

@@ -2,9 +2,6 @@
 
 namespace Tests;
 
-use Laravel\Lumen\Testing\DatabaseMigrations;
-use Laravel\Lumen\Testing\DatabaseTransactions;
-
 class ExampleTest extends TestCase
 {
     /**

tests/Feature/AuthorHelperTest.php

@@ -4,9 +4,9 @@
 
 use Hyde\Framework\Helpers\Author as AuthorHelper;
 use Hyde\Framework\Models\Author as AuthorModel;
+use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Config;
-use Hyde\Testing\TestCase;
 
 /**
  * Class AuthorHelperTest.

tests/Feature/AuthorPostsIntegrationTest.php

@@ -5,8 +5,8 @@
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
 use Hyde\Framework\Helpers\Author;
 use Hyde\Framework\Hyde;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Test that the Author feature works in

tests/Feature/BuildOutputDirectoryCanBeChangedTest.php

@@ -5,8 +5,8 @@
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\RebuildService;
 use Hyde\Framework\StaticPageBuilder;
-use Illuminate\Support\Facades\File;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\File;
 
 /**
  * Class BuildOutputDirectoryCanBeChangedTest.

tests/Feature/Commands/HydeUpdateConfigsCommandTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Commands\HydeUpdateConfigsCommand;
 use Hyde\Framework\Hyde;
-use Illuminate\Support\Facades\File;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\File;
 
 /**
  * @covers \Hyde\Framework\Commands\HydeUpdateConfigsCommand

tests/Feature/Concerns/GeneratesPageMetadataTest.php

@@ -3,8 +3,8 @@
 namespace Hyde\Testing\Feature\Concerns;
 
 use Hyde\Framework\Concerns\GeneratesPageMetadata;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * @covers \Hyde\Framework\Concerns\GeneratesPageMetadata

tests/Feature/ConfigurableFeaturesTest.php

@@ -3,8 +3,8 @@
 namespace Hyde\Testing\Feature;
 
 use Hyde\Framework\Helpers\Features;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * @covers \Hyde\Framework\Helpers\Features

tests/Feature/DarkmodeFeatureTest.php

@@ -5,8 +5,8 @@
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Models\DocumentationPage;
 use Hyde\Framework\Models\MarkdownPage;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * @covers \Hyde\Framework\Helpers\Features::darkmode

tests/Feature/FindsContentLengthForImageObjectTest.php

@@ -3,9 +3,9 @@
 namespace Hyde\Testing\Feature;
 
 use Hyde\Framework\Models\Image;
+use Hyde\Testing\TestCase;
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Http;
-use Hyde\Testing\TestCase;
 
 /**
  * @covers \Hyde\Framework\Actions\FindsContentLengthForImageObject

tests/Feature/GeneratesNavigationMenuTest.php

@@ -4,9 +4,9 @@
 
 use Hyde\Framework\Actions\GeneratesNavigationMenu;
 use Hyde\Framework\Hyde;
+use Hyde\Testing\TestCase;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
-use Hyde\Testing\TestCase;
 
 class GeneratesNavigationMenuTest extends TestCase
 {

tests/Feature/MarkdownPageTest.php

@@ -7,8 +7,8 @@
 use Hyde\Framework\Models\MarkdownPage;
 use Hyde\Framework\Models\Parsers\MarkdownPageParser;
 use Hyde\Framework\Services\CollectionService;
-use Illuminate\Support\Facades\File;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\File;
 
 /**
  * Test the Markdown page parser.

tests/Feature/Services/DocumentationSidebarServiceTest.php

@@ -7,9 +7,9 @@
 use Hyde\Framework\Models\DocumentationSidebar;
 use Hyde\Framework\Models\DocumentationSidebarItem;
 use Hyde\Framework\Services\DocumentationSidebarService;
+use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
-use Hyde\Testing\TestCase;
 
 /**
  * @covers \Hyde\Framework\Services\DocumentationSidebarService

tests/Feature/Services/HasConfigurableMarkdownFeaturesTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Concerns\Markdown\HasConfigurableMarkdownFeatures;
 use Hyde\Framework\Models\DocumentationPage;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * @covers \Hyde\Framework\Concerns\Markdown\HasConfigurableMarkdownFeatures

tests/Feature/Services/SitemapServiceTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\SitemapService;
-use Illuminate\Support\Facades\File;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\File;
 
 /**
  * @covers \Hyde\Framework\Services\SitemapService

tests/Feature/StaticPageBuilderTest.php

@@ -9,9 +9,9 @@
 use Hyde\Framework\Models\MarkdownPage;
 use Hyde\Framework\Models\MarkdownPost;
 use Hyde\Framework\StaticPageBuilder;
+use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
-use Hyde\Testing\TestCase;
 
 /**
  * Feature tests for the StaticPageBuilder class.

tests/TestListener.php

@@ -11,7 +11,6 @@
 
 class TestListener implements \PHPUnit\Framework\TestListener
 {
-
     public function addError(Test $test, Throwable $t, float $time): void
     {
         //
@@ -63,4 +62,4 @@ public function endTest(Test $test, float $time): void
     {
         //
     }
-}
+}

tests/Unit/BlogPostFrontMatterIsOptionalTest.php

@@ -3,8 +3,8 @@
 namespace Hyde\Testing\Unit;
 
 use Hyde\Framework\Hyde;
-use Illuminate\Support\Facades\Artisan;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Artisan;
 
 class BlogPostFrontMatterIsOptionalTest extends TestCase
 {

tests/Unit/DiscoveryServiceCanFindModelFromCustomSourceFilePathTest.php

@@ -7,8 +7,8 @@
 use Hyde\Framework\Models\MarkdownPage;
 use Hyde\Framework\Models\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Class DiscoveryServiceCanFindModelFromCustomSourceFilePathTest.

tests/Unit/GetLatestMarkdownPostsTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\MarkdownPost;
-use Illuminate\Support\Collection;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 
 /**
  * @see \Hyde\Framework\Models\MarkdownPost::latest()

tests/Unit/HasMarkdownFeaturesTest.php

@@ -3,8 +3,8 @@
 namespace Hyde\Testing\Unit;
 
 use Hyde\Framework\Concerns\Markdown\HasMarkdownFeatures;
-use Illuminate\Support\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * @covers \Hyde\Framework\Concerns\Markdown\HasMarkdownFeatures

tests/Unit/HydeGetLatestPostsHelperTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\MarkdownPost;
-use Illuminate\Support\Collection;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 
 /**
  * @deprecated as parent method is deprecated

tests/Unit/HydePathHelperTest.php

@@ -22,36 +22,35 @@ public function test_string_is_returned()
         $this->assertIsString(Hyde::path());
     }
 
-
     public function test_returned_directory_contains_content_expected_to_be_in_the_project_directory()
     {
         $this->assertTrue(
-            file_exists(Hyde::path() . DIRECTORY_SEPARATOR . 'hyde') &&
-                file_exists(Hyde::path() . DIRECTORY_SEPARATOR . '_pages') &&
-                file_exists(Hyde::path() . DIRECTORY_SEPARATOR . '_posts') &&
-                file_exists(Hyde::path() . DIRECTORY_SEPARATOR . '_site')
+            file_exists(Hyde::path().DIRECTORY_SEPARATOR.'hyde') &&
+                file_exists(Hyde::path().DIRECTORY_SEPARATOR.'_pages') &&
+                file_exists(Hyde::path().DIRECTORY_SEPARATOR.'_posts') &&
+                file_exists(Hyde::path().DIRECTORY_SEPARATOR.'_site')
         );
     }
 
     public function test_method_returns_qualified_file_path_when_supplied_with_argument()
     {
-        $this->assertEquals(Hyde::path('file.php'), Hyde::path() . DIRECTORY_SEPARATOR . 'file.php');
+        $this->assertEquals(Hyde::path('file.php'), Hyde::path().DIRECTORY_SEPARATOR.'file.php');
     }
 
     public function test_method_strips_trailing_directory_separators_from_argument()
     {
-        $this->assertEquals(Hyde::path('\\/file.php/'), Hyde::path() . DIRECTORY_SEPARATOR . 'file.php');
+        $this->assertEquals(Hyde::path('\\/file.php/'), Hyde::path().DIRECTORY_SEPARATOR.'file.php');
     }
 
     public function test_method_returns_expected_value_for_nested_path_arguments()
     {
-        $this->assertEquals(Hyde::path('directory/file.php'), Hyde::path() . DIRECTORY_SEPARATOR . 'directory/file.php');
+        $this->assertEquals(Hyde::path('directory/file.php'), Hyde::path().DIRECTORY_SEPARATOR.'directory/file.php');
     }
 
     public function test_method_returns_expected_value_regardless_of_trailing_directory_separators_in_argument()
     {
-        $this->assertEquals(Hyde::path('directory/file.php/'), Hyde::path() . DIRECTORY_SEPARATOR . 'directory/file.php');
-        $this->assertEquals(Hyde::path('/directory/file.php/'), Hyde::path() . DIRECTORY_SEPARATOR . 'directory/file.php');
-        $this->assertEquals(Hyde::path('\\/directory/file.php/'), Hyde::path() . DIRECTORY_SEPARATOR . 'directory/file.php');
+        $this->assertEquals(Hyde::path('directory/file.php/'), Hyde::path().DIRECTORY_SEPARATOR.'directory/file.php');
+        $this->assertEquals(Hyde::path('/directory/file.php/'), Hyde::path().DIRECTORY_SEPARATOR.'directory/file.php');
+        $this->assertEquals(Hyde::path('\\/directory/file.php/'), Hyde::path().DIRECTORY_SEPARATOR.'directory/file.php');
     }
 }

tests/Unit/InteractsWithDirectoriesConcernTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Hyde;
-use Illuminate\Support\Facades\File;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\File;
 
 /**
  * Class InteractsWithDirectoriesConcernTest.

tests/Unit/PageModelGetHelperTest.php

@@ -7,8 +7,8 @@
 use Hyde\Framework\Models\DocumentationPage;
 use Hyde\Framework\Models\MarkdownPage;
 use Hyde\Framework\Models\MarkdownPost;
-use Illuminate\Support\Collection;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 
 /**
  * @see \Hyde\Framework\Concerns\AbstractPage::all()

tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php

@@ -9,9 +9,9 @@
 use Hyde\Framework\Models\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Framework\StaticPageBuilder;
+use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
-use Hyde\Testing\TestCase;
 
 /**
  * Class SourceFilesInCustomDirectoriesCanBeCompiledTest.

tests/Unit/Views/ArticleExcerptViewTest.php

@@ -4,8 +4,8 @@
 
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\MarkdownPost;
-use Illuminate\Support\Facades\Blade;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Blade;
 
 /**
  * @see resources/views/components/article-excerpt.blade.php