From 962ce7eeaee0181eed7b34d5e4daafd57bd617f4 Mon Sep 17 00:00:00 2001 From: Shalvah Date: Sun, 24 Dec 2023 16:40:09 +0100 Subject: [PATCH] Move PathConfig to different namespace --- camel/Camel.php | 2 +- src/Commands/GenerateDocumentation.php | 4 ++-- src/Commands/Upgrade.php | 2 +- src/Extracting/ApiDetails.php | 4 ++-- src/GroupedEndpoints/GroupedEndpointsFactory.php | 2 +- src/GroupedEndpoints/GroupedEndpointsFromApp.php | 5 ++--- src/GroupedEndpoints/GroupedEndpointsFromCamelDir.php | 2 +- src/{Configuration => Tools}/PathConfig.php | 2 +- src/Writing/Writer.php | 2 +- tests/Unit/PathConfigurationTest.php | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-) rename src/{Configuration => Tools}/PathConfig.php (96%) diff --git a/camel/Camel.php b/camel/Camel.php index 9dc10800..0a858c72 100644 --- a/camel/Camel.php +++ b/camel/Camel.php @@ -6,7 +6,7 @@ use Illuminate\Support\Arr; use Illuminate\Support\Str; use Knuckles\Camel\Output\OutputEndpointData; -use Knuckles\Scribe\Configuration\PathConfig; +use Knuckles\Scribe\Tools\PathConfig; use Knuckles\Scribe\Tools\Utils; use Symfony\Component\Yaml\Yaml; diff --git a/src/Commands/GenerateDocumentation.php b/src/Commands/GenerateDocumentation.php index 1668dd1a..e7083b14 100644 --- a/src/Commands/GenerateDocumentation.php +++ b/src/Commands/GenerateDocumentation.php @@ -7,14 +7,14 @@ use Illuminate\Support\Facades\URL; use Illuminate\Support\Str; use Knuckles\Camel\Camel; -use Knuckles\Scribe\Configuration\PathConfig; use Knuckles\Scribe\GroupedEndpoints\GroupedEndpointsFactory; use Knuckles\Scribe\Matching\RouteMatcherInterface; +use Knuckles\Scribe\Scribe; use Knuckles\Scribe\Tools\ConsoleOutputUtils as c; use Knuckles\Scribe\Tools\DocumentationConfig; use Knuckles\Scribe\Tools\ErrorHandlingUtils as e; use Knuckles\Scribe\Tools\Globals; -use Knuckles\Scribe\Scribe; +use Knuckles\Scribe\Tools\PathConfig; use Knuckles\Scribe\Writing\Writer; use Shalvah\Upgrader\Upgrader; diff --git a/src/Commands/Upgrade.php b/src/Commands/Upgrade.php index ed59e256..dc53ffe5 100644 --- a/src/Commands/Upgrade.php +++ b/src/Commands/Upgrade.php @@ -4,9 +4,9 @@ use Illuminate\Console\Command; use Knuckles\Camel\Camel; -use Knuckles\Scribe\Configuration\PathConfig; use Knuckles\Scribe\GroupedEndpoints\GroupedEndpointsFactory; use Knuckles\Scribe\Scribe; +use Knuckles\Scribe\Tools\PathConfig; use Shalvah\Upgrader\Upgrader; use Symfony\Component\VarExporter\VarExporter; diff --git a/src/Extracting/ApiDetails.php b/src/Extracting/ApiDetails.php index 7b7b49dc..52055f38 100644 --- a/src/Extracting/ApiDetails.php +++ b/src/Extracting/ApiDetails.php @@ -2,10 +2,10 @@ namespace Knuckles\Scribe\Extracting; -use Knuckles\Scribe\Configuration\PathConfig; use Knuckles\Scribe\Tools\ConsoleOutputUtils as c; -use Knuckles\Scribe\Tools\Utils as u; use Knuckles\Scribe\Tools\DocumentationConfig; +use Knuckles\Scribe\Tools\PathConfig; +use Knuckles\Scribe\Tools\Utils as u; /** * Handles extracting other API details — intro, auth diff --git a/src/GroupedEndpoints/GroupedEndpointsFactory.php b/src/GroupedEndpoints/GroupedEndpointsFactory.php index 5d233fb6..285ea63d 100644 --- a/src/GroupedEndpoints/GroupedEndpointsFactory.php +++ b/src/GroupedEndpoints/GroupedEndpointsFactory.php @@ -3,8 +3,8 @@ namespace Knuckles\Scribe\GroupedEndpoints; use Knuckles\Scribe\Commands\GenerateDocumentation; -use Knuckles\Scribe\Configuration\PathConfig; use Knuckles\Scribe\Matching\RouteMatcherInterface; +use Knuckles\Scribe\Tools\PathConfig; class GroupedEndpointsFactory { diff --git a/src/GroupedEndpoints/GroupedEndpointsFromApp.php b/src/GroupedEndpoints/GroupedEndpointsFromApp.php index 036ead1a..da388c8a 100644 --- a/src/GroupedEndpoints/GroupedEndpointsFromApp.php +++ b/src/GroupedEndpoints/GroupedEndpointsFromApp.php @@ -2,7 +2,6 @@ namespace Knuckles\Scribe\GroupedEndpoints; -use Illuminate\Routing\Route; use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Str; @@ -10,7 +9,6 @@ use Knuckles\Camel\Extraction\ExtractedEndpointData; use Knuckles\Camel\Output\OutputEndpointData; use Knuckles\Scribe\Commands\GenerateDocumentation; -use Knuckles\Scribe\Configuration\PathConfig; use Knuckles\Scribe\Exceptions\CouldntGetRouteDetails; use Knuckles\Scribe\Extracting\ApiDetails; use Knuckles\Scribe\Extracting\Extractor; @@ -19,8 +17,9 @@ use Knuckles\Scribe\Tools\ConsoleOutputUtils as c; use Knuckles\Scribe\Tools\DocumentationConfig; use Knuckles\Scribe\Tools\ErrorHandlingUtils as e; -use Knuckles\Scribe\Tools\Utils as u; +use Knuckles\Scribe\Tools\PathConfig; use Knuckles\Scribe\Tools\Utils; +use Knuckles\Scribe\Tools\Utils as u; use Mpociot\Reflection\DocBlock; use Mpociot\Reflection\DocBlock\Tag; use ReflectionClass; diff --git a/src/GroupedEndpoints/GroupedEndpointsFromCamelDir.php b/src/GroupedEndpoints/GroupedEndpointsFromCamelDir.php index 7f4773e8..294e321b 100644 --- a/src/GroupedEndpoints/GroupedEndpointsFromCamelDir.php +++ b/src/GroupedEndpoints/GroupedEndpointsFromCamelDir.php @@ -3,7 +3,7 @@ namespace Knuckles\Scribe\GroupedEndpoints; use Knuckles\Camel\Camel; -use Knuckles\Scribe\Configuration\PathConfig; +use Knuckles\Scribe\Tools\PathConfig; class GroupedEndpointsFromCamelDir implements GroupedEndpointsContract { diff --git a/src/Configuration/PathConfig.php b/src/Tools/PathConfig.php similarity index 96% rename from src/Configuration/PathConfig.php rename to src/Tools/PathConfig.php index 1c63f4c3..a1161104 100644 --- a/src/Configuration/PathConfig.php +++ b/src/Tools/PathConfig.php @@ -1,6 +1,6 @@