refactor: update php up to 8.3 version

butschster · butschster · commit 088b056ee13e · 2025-03-29T14:06:36.000+04:00
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     }
   ],
   "require": {
-    "php": "^8.2",
+    "php": "^8.3",
     "ext-curl": "*",
     "guzzlehttp/guzzle": "^7.0",
     "league/html-to-markdown": "^5.1",
diff --git a/rector.php b/rector.php
@@ -14,8 +14,8 @@
 
     // Register rules for PHP 8.4 migration
     $rectorConfig->sets([
-        SetList::PHP_82,
-        LevelSetList::UP_TO_PHP_82,
+        SetList::PHP_83,
+        LevelSetList::UP_TO_PHP_83,
     ]);
 
     // Skip vendor directories
diff --git a/src/ConfigLoader/Import/WildcardPathFinder.php b/src/ConfigLoader/Import/WildcardPathFinder.php
@@ -16,7 +16,7 @@
     /**
      * File extensions recognized as configuration files
      */
-    private const CONFIG_EXTENSIONS = ['yaml', 'yml', 'json', 'php'];
+    private const array CONFIG_EXTENSIONS = ['yaml', 'yml', 'json', 'php'];
 
     public function __construct(
         private FilesInterface $files,
diff --git a/src/ConfigLoader/Reader/PhpReader.php b/src/ConfigLoader/Reader/PhpReader.php
@@ -12,6 +12,7 @@
  */
 final readonly class PhpReader extends AbstractReader
 {
+    #[\Override]
     public function read(string $path): array
     {
         $this->logger?->debug('Reading PHP config file', [
diff --git a/src/Console/InitCommand.php b/src/Console/InitCommand.php
@@ -22,9 +22,9 @@
 )]
 final class InitCommand extends BaseCommand
 {
-    private const DEFAULT_CONFIG_NAME = 'context.yaml';
-    private const DEFAULT_CONFIG_TYPE = 'yaml';
-    private const SUPPORTED_TYPES = ['json', 'yaml'];
+    private const string DEFAULT_CONFIG_NAME = 'context.yaml';
+    private const string DEFAULT_CONFIG_TYPE = 'yaml';
+    private const array SUPPORTED_TYPES = ['json', 'yaml'];
 
     public function __construct(
         Container $container,
diff --git a/src/Console/Renderer/ModifierRenderer.php b/src/Console/Renderer/ModifierRenderer.php
@@ -11,7 +11,7 @@
  */
 final class ModifierRenderer
 {
-    private const MODIFIER_TYPES = [
+    private const array MODIFIER_TYPES = [
         'php-signature' => 'PHP Signature Modifier',
         'php-content-filter' => 'PHP Content Filter Modifier',
         'sanitizer' => 'Content Sanitizer Modifier',
diff --git a/src/Console/SchemaCommand.php b/src/Console/SchemaCommand.php
@@ -16,7 +16,7 @@ final class SchemaCommand extends BaseCommand
     /**
      * The URL where the JSON schema is hosted
      */
-    private const SCHEMA_URL = 'https://raw.githubusercontent.com/context-hub/generator/refs/heads/main/json-schema.json';
+    private const string SCHEMA_URL = 'https://raw.githubusercontent.com/context-hub/generator/refs/heads/main/json-schema.json';
 
     /**
      * Execute the command
diff --git a/src/Console/SelfUpdateCommand.php b/src/Console/SelfUpdateCommand.php
@@ -22,14 +22,14 @@ final class SelfUpdateCommand extends BaseCommand
     /**
      * GitHub API URL for latest release
      */
-    private const GITHUB_API_LATEST_RELEASE = 'https://api.github.com/repos/context-hub/generator/releases/latest';
+    private const string GITHUB_API_LATEST_RELEASE = 'https://api.github.com/repos/context-hub/generator/releases/latest';
 
     /**
      * GitHub download URL format for the PHAR file
      */
-    private const GITHUB_DOWNLOAD_URL = 'https://github.com/context-hub/generator/releases/download/%s/%s';
+    private const string GITHUB_DOWNLOAD_URL = 'https://github.com/context-hub/generator/releases/download/%s/%s';
 
-    private const PHAR_PATH = '/usr/local/bin/ctx';
+    private const string PHAR_PATH = '/usr/local/bin/ctx';
 
     public function __construct(
         Container $container,
diff --git a/src/Console/VersionCommand.php b/src/Console/VersionCommand.php
@@ -20,7 +20,7 @@ final class VersionCommand extends BaseCommand
     /**
      * GitHub API URL for latest release
      */
-    private const GITHUB_API_LATEST_RELEASE = 'https://api.github.com/repos/context-hub/generator/releases/latest';
+    private const string GITHUB_API_LATEST_RELEASE = 'https://api.github.com/repos/context-hub/generator/releases/latest';
 
     public function __construct(
         Container $container,
diff --git a/src/Lib/GithubClient/GithubClient.php b/src/Lib/GithubClient/GithubClient.php
@@ -9,7 +9,7 @@
 final class GithubClient implements GithubClientInterface
 {
     /** GitHub API base URL */
-    private const API_BASE_URL = 'https://api.github.com';
+    private const string API_BASE_URL = 'https://api.github.com';
 
     /**
      * @param HttpClientInterface $httpClient HTTP client for API requests
diff --git a/src/Lib/HttpClient/Exception/HttpRequestException.php b/src/Lib/HttpClient/Exception/HttpRequestException.php
@@ -6,11 +6,13 @@
 
 final class HttpRequestException extends HttpException
 {
+    #[\Override]
     public static function requestFailed(string $url, int $statusCode): self
     {
         return new self(\sprintf('Failed to request URL "%s". Server returned status code %d', $url, $statusCode));
     }
 
+    #[\Override]
     public static function missingRedirectLocation(): self
     {
         return new self('Received a redirect response but no Location header was found');
diff --git a/src/Lib/HttpClient/Psr18Client.php b/src/Lib/HttpClient/Psr18Client.php
@@ -11,7 +11,7 @@
 
 final readonly class Psr18Client implements HttpClientInterface
 {
-    private const MAX_REDIRECTS = 5;
+    private const int MAX_REDIRECTS = 5;
 
     public function __construct(
         private ClientInterface $httpClient,
diff --git a/src/McpServer/Routing/McpResponseStrategy.php b/src/McpServer/Routing/McpResponseStrategy.php
@@ -17,6 +17,7 @@ public function __construct(
         private readonly LoggerInterface $logger,
     ) {}
 
+    #[\Override]
     public function invokeRouteCallable(Route $route, ServerRequestInterface $request): ResponseInterface
     {
         try {
diff --git a/src/Modifier/PhpSignature.php b/src/Modifier/PhpSignature.php
@@ -17,7 +17,7 @@
  */
 final class PhpSignature implements SourceModifierInterface
 {
-    private const MAGIC_METHODS = [
+    private const array MAGIC_METHODS = [
         '__construct',
     ];
 
diff --git a/src/Source/Composer/ComposerSource.php b/src/Source/Composer/ComposerSource.php
@@ -156,6 +156,7 @@ public function ignoreUnreadableDirs(): bool
     /**
      * Specify data which should be serialized to JSON
      */
+    #[\Override]
     public function jsonSerialize(): array
     {
         return \array_filter([
diff --git a/src/Source/File/FileSource.php b/src/Source/File/FileSource.php
@@ -240,6 +240,7 @@ public function ignoreUnreadableDirs(): bool
         return $this->ignoreUnreadableDirs;
     }
 
+    #[\Override]
     public function jsonSerialize(): array
     {
         $result = [
diff --git a/src/Source/GitDiff/CommitDiffSource.php b/src/Source/GitDiff/CommitDiffSource.php
@@ -206,6 +206,7 @@ public function ignoreUnreadableDirs(): bool
      *
      * @return array<string, mixed>
      */
+    #[\Override]
     public function jsonSerialize(): array
     {
         return \array_filter([
diff --git a/src/Source/GitDiff/Fetcher/CommitRangeParser.php b/src/Source/GitDiff/Fetcher/CommitRangeParser.php
@@ -12,7 +12,7 @@
     /**
      * Predefined commit range aliases for easier configuration
      */
-    private const COMMIT_RANGE_PRESETS = [
+    private const array COMMIT_RANGE_PRESETS = [
         // Basic ranges
         'last' => 'HEAD~1..HEAD',
         'last-2' => 'HEAD~2..HEAD',
diff --git a/src/Source/Github/GithubFileInfo.php b/src/Source/Github/GithubFileInfo.php
@@ -34,6 +34,7 @@ public function __construct(
     /**
      * Get the file content
      */
+    #[\Override]
     public function getContents(): string
     {
         if ($this->fetchedContent) {
diff --git a/src/Source/Github/GithubSource.php b/src/Source/Github/GithubSource.php
@@ -197,6 +197,7 @@ public function ignoreUnreadableDirs(): bool
      *
      * @return array<string, mixed> JSON serializable array
      */
+    #[\Override]
     public function jsonSerialize(): array
     {
         return \array_filter([
diff --git a/src/Source/SourceWithModifiers.php b/src/Source/SourceWithModifiers.php
@@ -22,6 +22,7 @@ public function __construct(
         parent::__construct(description: $description, tags: $tags);
     }
 
+    #[\Override]
     public function parseContent(
         SourceParserInterface $parser,
         ModifiersApplierInterface $modifiersApplier,
@@ -33,6 +34,7 @@ public function parseContent(
         return $parser->parse($this, $modifiersApplier);
     }
 
+    #[\Override]
     public function jsonSerialize(): array
     {
         return [
diff --git a/src/Source/Text/TextSource.php b/src/Source/Text/TextSource.php
@@ -39,6 +39,7 @@ public static function fromArray(array $data): self
         );
     }
 
+    #[\Override]
     public function jsonSerialize(): array
     {
         return \array_filter([
diff --git a/src/Source/Tree/TreeSource.php b/src/Source/Tree/TreeSource.php
@@ -194,6 +194,7 @@ public function ignoreUnreadableDirs(): bool
         return true;
     }
 
+    #[\Override]
     public function jsonSerialize(): array
     {
         $result = [
diff --git a/src/Source/Url/UrlSource.php b/src/Source/Url/UrlSource.php
@@ -69,6 +69,7 @@ public function hasSelector(): bool
      *
      * @psalm-return array{type: 'url', urls?: array<string>, description?: string, selector?: string}
      */
+    #[\Override]
     public function jsonSerialize(): array
     {
         return \array_filter([
diff --git a/tests/src/ConfigLoader/Import/ImportResolverTest.php b/tests/src/ConfigLoader/Import/ImportResolverTest.php
@@ -15,7 +15,7 @@
 
 class ImportResolverTest extends TestCase
 {
-    private const FIXTURES_DIR = __DIR__ . '/../../../fixtures/ConfigLoader/Import';
+    private const string FIXTURES_DIR = __DIR__ . '/../../../fixtures/ConfigLoader/Import';
 
     private FilesInterface $files;
     private ConfigLoaderFactoryInterface $loaderFactory;
@@ -116,10 +116,10 @@ public function it_should_process_wildcard_imports(): void
             $loader = $this->createMock(ConfigLoaderInterface::class);
             $loader->method('isSupported')->willReturn(true);
 
-            if (\strpos($path, 'config1.json') !== false) {
+            if (\str_contains($path, 'config1.json')) {
                 $loader->method('loadRawConfig')->willReturn($wildcardConfig1);
             } else {
-                if (\strpos($path, 'config2.json') !== false) {
+                if (\str_contains($path, 'config2.json')) {
                     $loader->method('loadRawConfig')->willReturn($wildcardConfig2);
                 } else {
                     $loader->method('loadRawConfig')->willReturn([]);
@@ -172,10 +172,10 @@ public function it_should_detect_circular_imports(): void
                 $loader = $this->createMock(ConfigLoaderInterface::class);
                 $loader->method('isSupported')->willReturn(true);
 
-                if (\strpos($path, 'base-config.json') !== false) {
+                if (\str_contains($path, 'base-config.json')) {
                     $loader->method('loadRawConfig')->willReturn($baseConfig);
                 } else {
-                    if (\strpos($path, 'circular-import.json') !== false) {
+                    if (\str_contains($path, 'circular-import.json')) {
                         $loader->method('loadRawConfig')->willReturn($circularConfig);
                     } else {
                         $loader->method('loadRawConfig')->willReturn([]);
diff --git a/tests/src/Source/Url/UrlSourceTest.php b/tests/src/Source/Url/UrlSourceTest.php
@@ -13,11 +13,11 @@
 #[CoversClass(UrlSource::class)]
 class UrlSourceTest extends TestCase
 {
-    private const SAMPLE_URLS = ['https://example.com', 'https://example.org'];
-    private const SAMPLE_DESCRIPTION = 'Sample URL source';
-    private const SAMPLE_SELECTOR = '.content';
-    private const SAMPLE_HEADERS = ['Authorization' => 'Bearer token123'];
-    private const SAMPLE_TAGS = ['api', 'documentation'];
+    private const array SAMPLE_URLS = ['https://example.com', 'https://example.org'];
+    private const string SAMPLE_DESCRIPTION = 'Sample URL source';
+    private const string SAMPLE_SELECTOR = '.content';
+    private const array SAMPLE_HEADERS = ['Authorization' => 'Bearer token123'];
+    private const array SAMPLE_TAGS = ['api', 'documentation'];
 
     /**
      * @return array<string, array{selector: ?string, expectedHasSelector: bool}>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"require": {`
`19`		`- "php": "^8.2",`
	`19`	`+ "php": "^8.3",`
`20`	`20`	`"ext-curl": "*",`
`21`	`21`	`"guzzlehttp/guzzle": "^7.0",`
`22`	`22`	`"league/html-to-markdown": "^5.1",`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`*/`
`13`	`13`	`final readonly class PhpReader extends AbstractReader`
`14`	`14`	`{`
	`15`	`+ #[\Override]`
`15`	`16`	`public function read(string $path): array`
`16`	`17`	`{`
`17`	`18`	`$this->logger?->debug('Reading PHP config file', [`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`	`final class ModifierRenderer`
`13`	`13`	`{`
`14`		`- private const MODIFIER_TYPES = [`
	`14`	`+ private const array MODIFIER_TYPES = [`
`15`	`15`	`'php-signature' => 'PHP Signature Modifier',`
`16`	`16`	`'php-content-filter' => 'PHP Content Filter Modifier',`
`17`	`17`	`'sanitizer' => 'Content Sanitizer Modifier',`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`final class GithubClient implements GithubClientInterface`
`10`	`10`	`{`
`11`	`11`	`/** GitHub API base URL */`
`12`		`- private const API_BASE_URL = 'https://api.github.com';`
	`12`	`+ private const string API_BASE_URL = 'https://api.github.com';`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @param HttpClientInterface $httpClient HTTP client for API requests`