Merge pull request #580 from hydephp/develop

v1.2.1 - 2023-10-19
hydephp · Oct 19, 2023 · 36505de · 36505de
2 parents 1683b8d + c9cf6fa
commit 36505de
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 11 deletions.
diff --git a/src/Console/Commands/VendorPublishCommand.php b/src/Console/Commands/VendorPublishCommand.php
@@ -13,6 +13,7 @@
 use function realpath;
 use function sprintf;
 use function str_replace;
+use function Laravel\Prompts\select;
 
 /**
  * Publish any publishable assets from vendor packages.
@@ -42,6 +43,26 @@ public function handle(): void
         ServiceProvider::$publishGroups = $originalGroups;
     }
 
+    /**
+     * Our child method only uses the select function, instead of the search one.
+     */
+    protected function promptForProviderOrTag(): void
+    {
+        $choices = $this->publishableChoices();
+
+        $choice = select(
+            "Which provider or tag's files would you like to publish?",
+            $choices,
+            scroll: 15,
+        );
+
+        if ($choice == $choices[0]) {
+            return;
+        }
+
+        $this->parseChoice($choice);
+    }
+
     /**
      * Write a status message to the console.
      *

diff --git a/src/Foundation/HydeKernel.php b/src/Foundation/HydeKernel.php
@@ -49,7 +49,7 @@ class HydeKernel implements SerializableContract
     use Serializable;
     use Macroable;
 
-    final public const VERSION = '1.1.0';
+    final public const VERSION = '1.2.1';
 
     protected static self $instance;
 

diff --git a/src/Framework/Features/Navigation/DropdownNavItem.php b/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -19,9 +20,9 @@ class DropdownNavItem extends NavItem
     public array $items;
 
     /** @param array<NavItem> $items */
-    public function __construct(string $label, array $items)
+    public function __construct(string $label, array $items, ?int $priority = null)
     {
-        parent::__construct('', $label, 999);
+        parent::__construct('', $label, $priority ?? $this->searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
     }
 
@@ -34,4 +35,13 @@ public function getItems(): Collection
     {
         return collect($this->items);
     }
+
+    private function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    {
+        return Config::getArray('hyde.navigation.order', [
+            'index' => 0,
+            'posts' => 10,
+            'docs/index' => 100,
+        ])[$groupKey] ?? null;
+    }
 }
diff --git a/src/helpers.php b/src/helpers.php
@@ -32,7 +32,7 @@ function unslash(string $string): string
     use Illuminate\Contracts\Support\Arrayable;
     use Symfony\Component\Yaml\Yaml;
 
-use function function_exists;
+    use function function_exists;
     use function array_merge;
     use function str_replace;
     use function implode;

diff --git a/tests/Feature/Commands/VendorPublishCommandTest.php b/tests/Feature/Commands/VendorPublishCommandTest.php
@@ -44,9 +44,9 @@ public function test_command_prompts_for_provider_or_tag()
 
         $this->artisan('vendor:publish')
             ->expectsChoice('Which provider or tag\'s files would you like to publish?', 'Tag: example-configs', [
-                '<comment>Publish files from all providers and tags listed below</comment>',
                 '<fg=gray>Provider:</> ExampleProvider',
                 '<fg=gray>Tag:</> example-configs',
+                'All providers and tags',
             ])
             ->assertExitCode(0);
     }
@@ -60,7 +60,7 @@ public function test_unhelpful_publishers_are_removed()
 
         $this->artisan('vendor:publish')
             ->expectsChoice('Which provider or tag\'s files would you like to publish?', 'Tag: example-configs', [
-                '<comment>Publish files from all providers and tags listed below</comment>',
+                'All providers and tags',
             ])->assertExitCode(0);
     }
 
@@ -73,11 +73,22 @@ public function test_config_group_is_renamed_to_be_more_helpful()
 
         $this->artisan('vendor:publish')
             ->expectsChoice('Which provider or tag\'s files would you like to publish?', 'Tag: vendor-configs', [
-                '<comment>Publish files from all providers and tags listed below</comment>',
+                'All providers and tags',
                 '<fg=gray>Tag:</> vendor-configs',
             ])->assertExitCode(0);
     }
 
+    public function test_can_select_default()
+    {
+        ServiceProvider::$publishes = [];
+        ServiceProvider::$publishGroups = [];
+
+        $this->artisan('vendor:publish')
+            ->expectsChoice('Which provider or tag\'s files would you like to publish?', 'All providers and tags', [
+                'All providers and tags',
+            ])->assertExitCode(0);
+    }
+
     public function test_status_method()
     {
         $command = new StatusMethodTestClass($this->createMock(Filesystem::class));

diff --git a/tests/Feature/HydeKernelTest.php b/tests/Feature/HydeKernelTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Throwable;
 use Composer\InstalledVersions;
 use Hyde\Facades\Features;
 use Hyde\Foundation\Facades\Pages;
@@ -294,11 +295,30 @@ public function test_version_constant_is_a_valid_semver_string()
         );
     }
 
-    public function test_version_constant_is_up_to_date()
+    public function test_version_constant_is_up_to_date_with_composer()
     {
-        $this->assertTrue(version_compare(
-            HydeKernel::VERSION, InstalledVersions::getPrettyVersion('hyde/framework')
-        ) >= 0);
+        $version = InstalledVersions::getPrettyVersion('hyde/framework');
+
+        if (str_starts_with($version, 'dev-')) {
+            $this->markTestSkipped('Installed version is for development');
+        }
+
+        $this->assertSame(HydeKernel::VERSION, $version);
+    }
+
+    public function test_version_constant_is_up_to_date_with_git()
+    {
+        try {
+            $version = trim(shell_exec('git describe --abbrev=0 --tags'));
+        } catch (Throwable) {
+            $this->markTestSkipped('Could not get version from Git');
+        }
+
+        if ('v'.HydeKernel::VERSION === $version) {
+            $this->assertSame('v'.HydeKernel::VERSION, $version);
+        } else {
+            $this->markTestSkipped('Version constant does not match Git version!');
+        }
     }
 
     public function test_version_method_returns_version_constant()

diff --git a/tests/Unit/DropdownNavItemTest.php b/tests/Unit/DropdownNavItemTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Facades\Config;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\MarkdownPage;
@@ -37,6 +38,21 @@ public function testConstruct()
 
         $this->assertSame('foo', $item->label);
         $this->assertSame([], $item->items);
+        $this->assertSame(999, $item->priority);
+    }
+
+    public function testConstructWithCustomPriority()
+    {
+        $item = new DropdownNavItem('foo', [], 500);
+
+        $this->assertSame(500, $item->priority);
+    }
+
+    public function testConstructWithNullPriority()
+    {
+        $item = new DropdownNavItem('foo', [], null);
+
+        $this->assertSame(999, $item->priority);
     }
 
     public function testFromArray()
@@ -72,4 +88,18 @@ public function testGetItems()
         $item = DropdownNavItem::fromArray('foo', $children);
         $this->assertSame($children, $item->getItems()->all());
     }
+
+    public function testCanSetPriorityInConfig()
+    {
+        $root = Config::getFacadeRoot();
+        $mock = clone $root;
+        Config::swap($mock);
+
+        Config::set('hyde.navigation.order.foo', 500);
+        $item = new DropdownNavItem('foo', []);
+
+        $this->assertSame(500, $item->priority);
+
+        Config::swap($root);
+    }
 }