Rename enum and adjust casing

Author: stevebauman

README.md

@@ -179,24 +179,24 @@ By default, the discovered structures will be sorted according to the OS' defaul
 You can change the sorting like this:
 
 ```php
-use Spatie\StructureDiscoverer\Enums\StructureResolverSort;
+use Spatie\StructureDiscoverer\Enums\Sort;
 
-Discover::in(__DIR__)->sortBy(StructureResolverSort::NAME)->get();
+Discover::in(__DIR__)->sortBy(Sort::Name)->get();
 ```
 
-Here are all the available sorting options: 
+Here are all the available sorting options:
 
 ```php
-use Spatie\StructureDiscoverer\Enums\StructureResolverSort;
+use Spatie\StructureDiscoverer\Enums\Sort;
 
-Discover::in(__DIR__)->sortBy(StructureResolverSort::NAME);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::SIZE);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::TYPE);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::EXTENSION);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::CHANGED_TIME);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::MODIFIED_TIME);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::ACCESSED_TIME);
-Discover::in(__DIR__)->sortBy(StructureResolverSort::CASE_INSENSITIVE_NAME);
+Discover::in(__DIR__)->sortBy(Sort::Name);
+Discover::in(__DIR__)->sortBy(Sort::Size);
+Discover::in(__DIR__)->sortBy(Sort::Type);
+Discover::in(__DIR__)->sortBy(Sort::Extension);
+Discover::in(__DIR__)->sortBy(Sort::ChangedTime);
+Discover::in(__DIR__)->sortBy(Sort::ModifiedTime);
+Discover::in(__DIR__)->sortBy(Sort::AccessedTime);
+Discover::in(__DIR__)->sortBy(Sort::CaseInsensitiveName);
 ```
 
 ### Combining conditions

src/Data/DiscoverProfileConfig.php

@@ -5,7 +5,7 @@
 use Spatie\StructureDiscoverer\Cache\DiscoverCacheDriver;
 use Spatie\StructureDiscoverer\DiscoverConditions\ExactDiscoverCondition;
 use Spatie\StructureDiscoverer\DiscoverWorkers\DiscoverWorker;
-use Spatie\StructureDiscoverer\Enums\StructureResolverSort;
+use Spatie\StructureDiscoverer\Enums\Sort;
 
 class DiscoverProfileConfig
 {
@@ -18,7 +18,7 @@ public function __construct(
         public ?string $cacheId,
         public bool $withChains,
         public ExactDiscoverCondition $conditions,
-        public ?StructureResolverSort $sortBy,
+        public ?Sort $sort,
         public bool $reverseSorting
     ) {
     }

src/Discover.php

@@ -9,7 +9,7 @@
 use Spatie\StructureDiscoverer\DiscoverWorkers\DiscoverWorker;
 use Spatie\StructureDiscoverer\DiscoverWorkers\ParallelDiscoverWorker;
 use Spatie\StructureDiscoverer\DiscoverWorkers\SynchronousDiscoverWorker;
-use Spatie\StructureDiscoverer\Enums\StructureResolverSort;
+use Spatie\StructureDiscoverer\Enums\Sort;
 use Spatie\StructureDiscoverer\Exceptions\NoCacheConfigured;
 use Spatie\StructureDiscoverer\Support\Conditions\HasConditionsTrait;
 use Spatie\StructureDiscoverer\Support\LaravelDetector;
@@ -43,7 +43,7 @@ public function __construct(
         ?DiscoverCacheDriver $cacheDriver = null,
         ?string $cacheId = null,
         bool $withChains = true,
-        StructureResolverSort $sortBy = null,
+        Sort $sort = null,
         bool $reverseSorting = false,
     ) {
         $this->config = new DiscoverProfileConfig(
@@ -55,7 +55,7 @@ public function __construct(
             cacheId: $cacheId,
             withChains: $withChains,
             conditions: $conditions,
-            sortBy: $sortBy,
+            sort: $sort,
             reverseSorting: $reverseSorting
         );
     }
@@ -74,9 +74,9 @@ public function ignoreFiles(string ...$ignoredFiles): self
         return $this;
     }
 
-    public function sortBy(StructureResolverSort $sortBy, bool $reverse = false): self
+    public function sortBy(Sort $sort, bool $reverse = false): self
     {
-        $this->config->sortBy = $sortBy;
+        $this->config->sort = $sort;
         $this->config->reverseSorting = $reverse;
 
         return $this;

src/Enums/Sort.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Spatie\StructureDiscoverer\Enums;
+
+use Symfony\Component\Finder\Finder;
+
+enum Sort
+{
+    case Name;
+    case Size;
+    case Type;
+    case Extension;
+    case ChangedTime;
+    case ModifiedTime;
+    case AccessedTime;
+    case CaseInsensitiveName;
+
+    public function apply(Finder $finder): void
+    {
+        match ($this) {
+            self::Name => $finder->sortByName(),
+            self::Size => $finder->sortBySize(),
+            self::Type => $finder->sortByType(),
+            self::Extension => $finder->sortByExtension(),
+            self::ChangedTime => $finder->sortByChangedTime(),
+            self::ModifiedTime => $finder->sortByModifiedTime(),
+            self::AccessedTime => $finder->sortByAccessedTime(),
+            self::CaseInsensitiveName => $finder->sortByCaseInsensitiveName(),
+        };
+    }
+}

src/Enums/StructureResolverSort.php

@@ -6,7 +6,7 @@
 use Spatie\StructureDiscoverer\Discover;
 use Spatie\StructureDiscoverer\DiscoverWorkers\DiscoverWorker;
 use Spatie\StructureDiscoverer\DiscoverWorkers\SynchronousDiscoverWorker;
-use Spatie\StructureDiscoverer\Enums\StructureResolverSort;
+use Spatie\StructureDiscoverer\Enums\Sort;
 use SplFileInfo;
 use Symfony\Component\Finder\Finder;
 
@@ -24,7 +24,7 @@ public function execute(Discover $profile): array
         $structures = $this->discover(
             $profile->config->directories,
             $profile->config->ignoredFiles,
-            $profile->config->sortBy,
+            $profile->config->sort,
             $profile->config->reverseSorting,
         );
 
@@ -51,7 +51,7 @@ public function execute(Discover $profile): array
     public function discover(
         array $directories,
         array $ignoredFiles,
-        ?StructureResolverSort $sort,
+        ?Sort $sort,
         bool $reverseSorting
     ): array {
         if (empty($directories)) {

src/Support/StructuresResolver.php

@@ -1,6 +1,6 @@
 <?php
 
-use Spatie\StructureDiscoverer\Enums\StructureResolverSort;
+use Spatie\StructureDiscoverer\Enums\Sort;
 use function Pest\Laravel\artisan;
 
 use Spatie\StructureDiscoverer\Cache\FileDiscoverCacheDriver;
@@ -279,16 +279,16 @@ public function satisfies(DiscoveredStructure $discoveredData): bool
 });
 
 it('can sort discovered files', function (
-    StructureResolverSort $sortBy,
+    Sort $sort,
     array $expected,
 ) {
-    $found = Discover::in(__DIR__ . '/Fakes')->classes()->sortBy($sortBy)->get();
+    $found = Discover::in(__DIR__ . '/Fakes')->classes()->sortBy($sort)->get();
 
     expect($found)->toEqual($expected);
 })->with(
     [
         'name' => [
-            StructureResolverSort::NAME,
+            Sort::Name,
             [
                 FakeClassDepender::class,
                 FakeAttribute::class,
@@ -303,16 +303,16 @@ public function satisfies(DiscoveredStructure $discoveredData): bool
 );
 
 it('can sort discovered files in reverse', function (
-    StructureResolverSort $sortBy,
+    Sort $sort,
     array $expected,
 ) {
-    $found = Discover::in(__DIR__ . '/Fakes')->classes()->sortBy($sortBy, true)->get();
+    $found = Discover::in(__DIR__ . '/Fakes')->classes()->sortBy($sort, true)->get();
 
     expect($found)->toEqual($expected);
 })->with(
     [
         'name' => [
-            StructureResolverSort::NAME,
+            Sort::Name,
             [
                 FakeOtherNestedClass::class,
                 FakeNestedClass::class,