Allow outputting URLs with trailing slash

src/Collection/Collection.php

@@ -15,7 +15,7 @@ class Collection extends BaseCollection
 
     public static function withSettings(IterableObject $settings, $name)
     {
-        $collection = new static();
+        $collection = new static;
         $collection->settings = $settings;
         $collection->name = $name;
 

src/Console/BuildCommand.php

@@ -45,7 +45,7 @@ protected function fire()
         $cacheExists = $this->app[TemporaryFilesystem::class]->hasTempDirectory();
 
         if ($this->input->getOption('pretty') === 'true' && $this->app->config->get('pretty') !== false) {
-            $this->app->instance('outputPathResolver', new PrettyOutputPathResolver());
+            $this->app->instance('outputPathResolver', new PrettyOutputPathResolver);
         }
 
         if ($this->input->getOption('quiet')) {

src/Events/EventBus.php

@@ -41,7 +41,7 @@ public function fire($event, Jigsaw $jigsaw)
             if (is_callable($task)) {
                 $task($jigsaw);
             } else {
-                (new $task())->handle($jigsaw);
+                (new $task)->handle($jigsaw);
             }
         });
     }

src/File/Filesystem.php

@@ -72,7 +72,7 @@ protected function getFinder($directory, $match = [], $ignore = [], $ignore_dotf
             $finder->notPath($this->getWildcardRegex($pattern));
         });
 
-        return $finder;
+        return $finder->sortByName();
     }
 
     protected function getWildcardRegex($pattern)

src/File/TemporaryFilesystem.php

@@ -14,7 +14,7 @@ class TemporaryFilesystem
     public function __construct($tempPath, $filesystem = null)
     {
         $this->tempPath = $tempPath;
-        $this->filesystem = $filesystem ?: new Filesystem();
+        $this->filesystem = $filesystem ?: new Filesystem;
     }
 
     public function buildTempPath($filename, $extension)

src/PageVariable.php

@@ -32,10 +32,10 @@ public function __call($method, $args)
     public function getPath($key = null)
     {
         if (($key || $this->_meta->extending) && $this->_meta->path instanceof IterableObject) {
-            return $this->_meta->path->get($key ?: $this->getExtending());
+            return $this->enforceTrailingSlash($this->_meta->path->get($key ?: $this->getExtending()));
         }
 
-        return (string) $this->_meta->path;
+        return $this->enforceTrailingSlash((string) $this->_meta->path);
     }
 
     public function getPaths()
@@ -46,10 +46,10 @@ public function getPaths()
     public function getUrl($key = null)
     {
         if (($key || $this->_meta->extending) && $this->_meta->path instanceof IterableObject) {
-            return $this->_meta->url->get($key ?: $this->getExtending());
+            return $this->enforceTrailingSlash($this->_meta->url->get($key ?: $this->getExtending()));
         }
 
-        return (string) $this->_meta->url;
+        return $this->enforceTrailingSlash((string) $this->_meta->url);
     }
 
     public function getUrls()
@@ -61,4 +61,20 @@ protected function missingHelperError($functionName)
     {
         return 'No function named "' . $functionName . '" was found in the file "config.php".';
     }
+
+    protected function enforceTrailingSlash($path)
+    {
+        return $path && app()->config->get('trailing_slash') && ! $this->pathIsFile($path)
+            ? Str::finish($path, '/')
+            : $path;
+    }
+
+    protected function pathIsFile($path)
+    {
+        $final_extension = $this->_meta->extending
+            ? (Str::contains(Str::afterLast($path, '/'), '.') ? Str::afterLast($path, '.') : null)
+            : Str::afterLast($this->_meta->extension, '.');
+
+        return $final_extension && $final_extension !== 'md' && $final_extension !== 'php';
+    }
 }

src/Scaffold/PresetPackage.php

@@ -44,7 +44,7 @@ public function __construct(DefaultInstaller $default, CustomInstaller $custom,
         $this->defaultInstaller = $default;
         $this->customInstaller = $custom;
         $this->process = $process;
-        $this->files = new Filesystem();
+        $this->files = new Filesystem;
     }
 
     public function init($preset, PresetScaffoldBuilder $builder)

src/SiteData.php

@@ -8,7 +8,7 @@ class SiteData extends IterableObject
 {
     public static function build(Collection $config)
     {
-        $siteData = new static();
+        $siteData = new static;
         $siteData->putIterable('collections', $config->get('collections'));
         $siteData->putIterable('page', $config);
 

src/Support/helpers.php

@@ -133,7 +133,7 @@ function url(string $path): string
     function dd(...$args)
     {
         foreach ($args as $x) {
-            (new VarDumper())->dump($x);
+            (new VarDumper)->dump($x);
         }
 
         exit(1);

tests/CustomCommandTest.php

@@ -14,7 +14,7 @@ public function custom_command_with_no_arguments()
     {
         $this->createSource([]);
         $command = $this->app->make(CustomCommand::class);
-        $command->setApplication(new Application());
+        $command->setApplication(new Application);
 
         $console = new CommandTester($command);
         $console->execute([]);

tests/CustomScaffoldInstallerTest.php

@@ -18,12 +18,12 @@ class CustomScaffoldInstallerTest extends TestCase
     public function custom_installer_installs_basic_scaffold_files()
     {
         $this->createSource([]);
-        $builder = new PresetScaffoldBuilder(new Filesystem(), Mockery::mock(PresetPackage::class), new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, Mockery::mock(PresetPackage::class), new ProcessRunner);
         $builder->setBase($this->tmp);
 
         $this->assertCount(0, app('files')->filesAndDirectories($this->tmp));
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup();
 
         $this->assertFileExists($this->tmpPath('source'));
@@ -36,10 +36,10 @@ public function custom_installer_installs_basic_scaffold_files()
     public function installer_deletes_single_base_file_specified_in_delete_array()
     {
         $this->createSource([]);
-        $builder = new PresetScaffoldBuilder(new Filesystem(), Mockery::mock(PresetPackage::class), new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, Mockery::mock(PresetPackage::class), new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->delete('config.php');
 
@@ -51,10 +51,10 @@ public function installer_deletes_single_base_file_specified_in_delete_array()
     public function installer_deletes_multiple_base_files_specified_in_delete_array()
     {
         $this->createSource([]);
-        $builder = new PresetScaffoldBuilder(new Filesystem(), Mockery::mock(PresetPackage::class), new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, Mockery::mock(PresetPackage::class), new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->delete([
                 'config.php',
@@ -70,10 +70,10 @@ public function installer_deletes_multiple_base_files_specified_in_delete_array(
     public function installer_deletes_base_directories_specified_in_delete_array()
     {
         $this->createSource([]);
-        $builder = new PresetScaffoldBuilder(new Filesystem(), Mockery::mock(PresetPackage::class), new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, Mockery::mock(PresetPackage::class), new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->delete([
                 'source',
@@ -96,10 +96,10 @@ public function installer_copies_all_preset_files_if_copy_has_no_parameter()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy();
 
@@ -122,10 +122,10 @@ public function installer_copies_individual_preset_file_if_copy_parameter_is_str
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy('preset-file.php');
 
@@ -148,10 +148,10 @@ public function installer_copies_multiple_preset_files_if_copy_parameter_is_arra
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy([
                 'preset-file.php',
@@ -175,10 +175,10 @@ public function installer_can_copy_files_using_a_wildcard()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy([
                 'preset-file-*.php',
@@ -203,10 +203,10 @@ public function installer_can_call_copy_multiple_times()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy('.dotfile')
             ->copy('source');
@@ -234,10 +234,10 @@ public function installer_copies_from_specified_directory_to_root_if_from_is_spe
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->from('themes/directory-2')
             ->copy();
@@ -260,10 +260,10 @@ public function installer_can_ignore_preset_files_when_copying()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->ignore('.dotfile')
             ->copy();
@@ -287,10 +287,10 @@ public function installer_can_call_ignore_multiple_times()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->ignore('.dotfile')
             ->ignore('preset-file.php')
@@ -318,10 +318,10 @@ public function original_composer_json_is_not_deleted()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->delete('composer.json');
 
@@ -353,10 +353,10 @@ public function original_composer_json_is_merged_with_new_composer_json_after_co
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy();
 
@@ -400,10 +400,10 @@ public function composer_json_files_are_merged_when_copying_multiple_times()
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy()
             ->from('theme')
@@ -432,10 +432,10 @@ public function empty_composer_json_is_created_if_it_was_not_present_before_pres
         ]);
         $package = Mockery::mock(PresetPackage::class);
         $package->path = $this->tmp . '/package';
-        $builder = new PresetScaffoldBuilder(new Filesystem(), $package, new ProcessRunner());
+        $builder = new PresetScaffoldBuilder(new Filesystem, $package, new ProcessRunner);
         $builder->setBase($this->tmp);
 
-        (new CustomInstaller())->install($builder)
+        (new CustomInstaller)->install($builder)
             ->setup()
             ->copy();
 
@@ -454,7 +454,7 @@ public function installer_can_ask_for_user_input()
         $console = Mockery::spy(ConsoleSession::class);
         $builder = Mockery::spy(PresetScaffoldBuilder::class);
 
-        (new CustomInstaller())->setConsole($console)
+        (new CustomInstaller)->setConsole($console)
             ->install($builder)
             ->setup()
             ->ask('What is your name?');
@@ -470,7 +470,7 @@ public function installer_can_ask_for_user_input_with_choices()
         $console = Mockery::spy(ConsoleSession::class);
         $builder = Mockery::spy(PresetScaffoldBuilder::class);
 
-        (new CustomInstaller())->setConsole($console)
+        (new CustomInstaller)->setConsole($console)
             ->install($builder)
             ->setup()
             ->ask(
@@ -495,7 +495,7 @@ public function installer_can_ask_for_user_confirmation()
         $console = Mockery::spy(ConsoleSession::class);
         $builder = Mockery::spy(PresetScaffoldBuilder::class);
 
-        (new CustomInstaller())->setConsole($console)
+        (new CustomInstaller)->setConsole($console)
             ->install($builder)
             ->setup()
             ->confirm('Continue?');
@@ -511,7 +511,7 @@ public function installer_runs_specified_commands_from_init()
         $package = Mockery::mock(PresetPackage::class);
         $builder = Mockery::spy(PresetScaffoldBuilder::class);
 
-        (new CustomInstaller())->setConsole(null)
+        (new CustomInstaller)->setConsole(null)
             ->install($builder)
             ->setup()
             ->run('yarn');