Skip to content

Commit 7bdcb9c

Browse files
author
Mohamed Khaled
committed
Fix PHPCS style violations
Fix code style issues in Registry integration: • Fix multi-line function declaration formatting • Fix MockModel file header issues • Fix newline endings for all interface files • Remove trailing whitespace from all files All PHPCS errors resolved, warnings remain for other test files.
1 parent 40b926b commit 7bdcb9c

13 files changed

+132
-158
lines changed

‎src/Providers/AiProviderRegistry.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,11 @@ public function findProviderModelsMetadataForSupport(
194194
* @return ModelInterface The configured model instance.
195195
* @throws InvalidArgumentException If provider or model is not found.
196196
*/
197-
public function getProviderModel(string $idOrClassName, string $modelId, ?ModelConfig $modelConfig = null): ModelInterface
198-
{
197+
public function getProviderModel(
198+
string $idOrClassName,
199+
string $modelId,
200+
?ModelConfig $modelConfig = null
201+
): ModelInterface {
199202
$className = $this->resolveProviderClassName($idOrClassName);
200203

201204
// Use static method from ProviderInterface

‎tests/unit/Files/DTO/FileTest.php

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@ public function testCreateFromPlainBase64(): void
117117
public function testPlainBase64WithoutMimeTypeThrowsException(): void
118118
{
119119
$this->expectException(InvalidArgumentException::class);
120-
$this->expectExceptionMessage(
121-
'MIME type is required when providing plain base64 data without data URI format.'
122-
);
120+
$this->expectExceptionMessage('MIME type is required when providing plain base64 data without data URI format.');
123121

124122
new File('SGVsbG8gV29ybGQ=');
125123
}
@@ -186,9 +184,7 @@ public function testDirectoryThrowsException(): void
186184

187185
try {
188186
$this->expectException(InvalidArgumentException::class);
189-
$this->expectExceptionMessage(
190-
'Invalid file provided. Expected URL, base64 data, or valid local file path.'
191-
);
187+
$this->expectExceptionMessage('Invalid file provided. Expected URL, base64 data, or valid local file path.');
192188

193189
new File($tempDir, 'text/plain');
194190
} finally {
@@ -211,10 +207,6 @@ public function testMimeTypeMethods(): void
211207
$this->assertFalse($file->isImage());
212208
$this->assertFalse($file->isAudio());
213209
$this->assertFalse($file->isText());
214-
$this->assertTrue($file->isMimeType('video'));
215-
$this->assertFalse($file->isMimeType('image'));
216-
$this->assertFalse($file->isMimeType('audio'));
217-
$this->assertFalse($file->isMimeType('text'));
218210
}
219211

220212
/**
@@ -237,21 +229,15 @@ public function testJsonSchema(): void
237229
$this->assertArrayHasKey(File::KEY_FILE_TYPE, $remoteSchema['properties']);
238230
$this->assertArrayHasKey(File::KEY_MIME_TYPE, $remoteSchema['properties']);
239231
$this->assertArrayHasKey(File::KEY_URL, $remoteSchema['properties']);
240-
$this->assertEquals(
241-
[File::KEY_FILE_TYPE, File::KEY_MIME_TYPE, File::KEY_URL],
242-
$remoteSchema['required']
243-
);
232+
$this->assertEquals([File::KEY_FILE_TYPE, File::KEY_MIME_TYPE, File::KEY_URL], $remoteSchema['required']);
244233

245234
// Check inline file schema
246235
$inlineSchema = $schema['oneOf'][1];
247236
$this->assertArrayHasKey('properties', $inlineSchema);
248237
$this->assertArrayHasKey(File::KEY_FILE_TYPE, $inlineSchema['properties']);
249238
$this->assertArrayHasKey(File::KEY_MIME_TYPE, $inlineSchema['properties']);
250239
$this->assertArrayHasKey(File::KEY_BASE64_DATA, $inlineSchema['properties']);
251-
$this->assertEquals(
252-
[File::KEY_FILE_TYPE, File::KEY_MIME_TYPE, File::KEY_BASE64_DATA],
253-
$inlineSchema['required']
254-
);
240+
$this->assertEquals([File::KEY_FILE_TYPE, File::KEY_MIME_TYPE, File::KEY_BASE64_DATA], $inlineSchema['required']);
255241
}
256242

257243
/**

‎tests/unit/Operations/DTO/GenerativeAiOperationTest.php

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,7 @@ public function testJsonSchemaForSucceededState(): void
247247
);
248248

249249
// Required fields
250-
$this->assertEquals(
251-
[GenerativeAiOperation::KEY_ID, GenerativeAiOperation::KEY_STATE, GenerativeAiOperation::KEY_RESULT],
252-
$succeededSchema['required']
253-
);
250+
$this->assertEquals([GenerativeAiOperation::KEY_ID, GenerativeAiOperation::KEY_STATE, GenerativeAiOperation::KEY_RESULT], $succeededSchema['required']);
254251
}
255252

256253
/**
@@ -278,10 +275,7 @@ public function testJsonSchemaForNonSucceededStates(): void
278275
$this->assertContains(OperationStateEnum::canceled()->value, $stateEnum);
279276

280277
// Required fields
281-
$this->assertEquals(
282-
[GenerativeAiOperation::KEY_ID, GenerativeAiOperation::KEY_STATE],
283-
$otherStatesSchema['required']
284-
);
278+
$this->assertEquals([GenerativeAiOperation::KEY_ID, GenerativeAiOperation::KEY_STATE], $otherStatesSchema['required']);
285279
}
286280

287281
/**
@@ -349,10 +343,7 @@ public function testToArraySucceededState(): void
349343

350344
$json = $this->assertToArrayReturnsArray($operation);
351345

352-
$this->assertArrayHasKeys(
353-
$json,
354-
[GenerativeAiOperation::KEY_ID, GenerativeAiOperation::KEY_STATE, GenerativeAiOperation::KEY_RESULT]
355-
);
346+
$this->assertArrayHasKeys($json, [GenerativeAiOperation::KEY_ID, GenerativeAiOperation::KEY_STATE, GenerativeAiOperation::KEY_RESULT]);
356347
$this->assertEquals('op_success_456', $json[GenerativeAiOperation::KEY_ID]);
357348
$this->assertEquals(OperationStateEnum::succeeded()->value, $json[GenerativeAiOperation::KEY_STATE]);
358349
$this->assertIsArray($json[GenerativeAiOperation::KEY_RESULT]);
@@ -395,14 +386,10 @@ public function testFromArraySucceededState(): void
395386
[
396387
Candidate::KEY_MESSAGE => [
397388
Message::KEY_ROLE => MessageRoleEnum::model()->value,
398-
Message::KEY_PARTS => [
399-
[
400-
MessagePart::KEY_TYPE => 'text',
401-
MessagePart::KEY_TEXT => 'Response text'
402-
]
403-
]
389+
Message::KEY_PARTS => [[MessagePart::KEY_TYPE => 'text', MessagePart::KEY_TEXT => 'Response text']]
404390
],
405391
Candidate::KEY_FINISH_REASON => FinishReasonEnum::stop()->value,
392+
Candidate::KEY_TOKEN_COUNT => 30
406393
]
407394
],
408395
GenerativeAiResult::KEY_TOKEN_USAGE => [

‎tests/unit/Providers/AiProviderRegistryTest.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function setUp(): void
3030
public function testRegisterProviderWithValidProvider(): void
3131
{
3232
$this->registry->registerProvider(MockProvider::class);
33-
33+
3434
$this->assertTrue($this->registry->hasProvider('mock'));
3535
$this->assertTrue($this->registry->hasProvider(MockProvider::class));
3636
$this->assertEquals(MockProvider::class, $this->registry->getProviderClassName('mock'));
@@ -45,7 +45,7 @@ public function testRegisterProviderWithNonExistentClass(): void
4545
{
4646
$this->expectException(InvalidArgumentException::class);
4747
$this->expectExceptionMessage('Provider class does not exist: NonExistentProvider');
48-
48+
4949
$this->registry->registerProvider('NonExistentProvider');
5050
}
5151

@@ -69,7 +69,7 @@ public function testGetProviderClassNameWithUnregisteredProvider(): void
6969
{
7070
$this->expectException(InvalidArgumentException::class);
7171
$this->expectExceptionMessage('Provider not registered: nonexistent');
72-
72+
7373
$this->registry->getProviderClassName('nonexistent');
7474
}
7575

@@ -81,7 +81,7 @@ public function testGetProviderClassNameWithUnregisteredProvider(): void
8181
public function testIsProviderConfiguredWithRegisteredProvider(): void
8282
{
8383
$this->registry->registerProvider(MockProvider::class);
84-
84+
8585
$this->assertTrue($this->registry->isProviderConfigured('mock'));
8686
$this->assertTrue($this->registry->isProviderConfigured(MockProvider::class));
8787
}
@@ -105,7 +105,7 @@ public function testFindModelsMetadataForSupportWithNoProviders(): void
105105
{
106106
$requirements = new ModelRequirements([CapabilityEnum::textGeneration()], []);
107107
$results = $this->registry->findModelsMetadataForSupport($requirements);
108-
108+
109109
$this->assertIsArray($results);
110110
$this->assertEmpty($results);
111111
}
@@ -118,10 +118,10 @@ public function testFindModelsMetadataForSupportWithNoProviders(): void
118118
public function testFindModelsMetadataForSupportWithRegisteredProvider(): void
119119
{
120120
$this->registry->registerProvider(MockProvider::class);
121-
121+
122122
$requirements = new ModelRequirements([CapabilityEnum::textGeneration()], []);
123123
$results = $this->registry->findModelsMetadataForSupport($requirements);
124-
124+
125125
$this->assertIsArray($results);
126126
// Should now find models that match the text generation requirement
127127
$this->assertNotEmpty($results);
@@ -136,10 +136,10 @@ public function testFindModelsMetadataForSupportWithRegisteredProvider(): void
136136
public function testFindProviderModelsMetadataForSupportWithRegisteredProvider(): void
137137
{
138138
$this->registry->registerProvider(MockProvider::class);
139-
139+
140140
$requirements = new ModelRequirements([CapabilityEnum::textGeneration()], []);
141141
$results = $this->registry->findProviderModelsMetadataForSupport('mock', $requirements);
142-
142+
143143
$this->assertIsArray($results);
144144
// Should now find models that match the text generation requirement
145145
$this->assertNotEmpty($results);
@@ -155,7 +155,7 @@ public function testFindProviderModelsMetadataForSupportWithUnregisteredProvider
155155
{
156156
$this->expectException(InvalidArgumentException::class);
157157
$this->expectExceptionMessage('Provider not registered: nonexistent');
158-
158+
159159
$requirements = new ModelRequirements([CapabilityEnum::textGeneration()], []);
160160
$this->registry->findProviderModelsMetadataForSupport('nonexistent', $requirements);
161161
}
@@ -168,10 +168,10 @@ public function testFindProviderModelsMetadataForSupportWithUnregisteredProvider
168168
public function testGetProviderModelThrowsException(): void
169169
{
170170
$this->registry->registerProvider(MockProvider::class);
171-
171+
172172
$this->expectException(InvalidArgumentException::class);
173173
$this->expectExceptionMessage('Model not found: test-model');
174-
174+
175175
$modelConfig = new \WordPress\AiClient\Providers\Models\DTO\ModelConfig([]);
176176
$this->registry->getProviderModel('mock', 'test-model', $modelConfig);
177177
}
@@ -184,10 +184,10 @@ public function testGetProviderModelThrowsException(): void
184184
public function testMultipleProviderRegistration(): void
185185
{
186186
$this->registry->registerProvider(MockProvider::class);
187-
187+
188188
// Register another instance of the same provider (should update)
189189
$this->registry->registerProvider(MockProvider::class);
190-
190+
191191
$this->assertTrue($this->registry->hasProvider('mock'));
192192
$this->assertEquals(MockProvider::class, $this->registry->getProviderClassName('mock'));
193193
}
@@ -200,12 +200,12 @@ public function testMultipleProviderRegistration(): void
200200
public function testProviderInstanceCaching(): void
201201
{
202202
$this->registry->registerProvider(MockProvider::class);
203-
203+
204204
// Call methods that create instances
205205
$this->assertTrue($this->registry->isProviderConfigured('mock'));
206206
$this->assertTrue($this->registry->isProviderConfigured('mock'));
207-
207+
208208
// Should not throw any errors and should reuse cached instance
209209
$this->addToAssertionCount(1);
210210
}
211-
}
211+
}

‎tests/unit/Providers/MockModel.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<?php
32

43
declare(strict_types=1);
@@ -61,4 +60,4 @@ public function setConfig(ModelConfig $config): void
6160
{
6261
$this->config = $config;
6362
}
64-
}
63+
}

‎tests/unit/Providers/MockModelMetadataDirectory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ public function getModelMetadata(string $modelId): ModelMetadata
5959

6060
return $this->models[$modelId];
6161
}
62-
}
62+
}

‎tests/unit/Providers/MockProvider.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public static function metadata(): ProviderMetadata
4848
public static function model(string $modelId, ?ModelConfig $modelConfig = null): ModelInterface
4949
{
5050
$modelMetadata = static::modelMetadataDirectory()->getModelMetadata($modelId);
51-
51+
5252
$config = $modelConfig ?? new ModelConfig();
53-
53+
5454
return new MockModel($modelMetadata, $config);
5555
}
5656

@@ -62,7 +62,7 @@ public static function availability(): ProviderAvailabilityInterface
6262
if (static::$availability === null) {
6363
static::$availability = new MockProviderAvailability(true);
6464
}
65-
65+
6666
return static::$availability;
6767
}
6868

@@ -81,10 +81,10 @@ public static function modelMetadataDirectory(): ModelMetadataDirectoryInterface
8181
[]
8282
)
8383
];
84-
84+
8585
static::$modelMetadataDirectory = new MockModelMetadataDirectory($mockModels);
8686
}
87-
87+
8888
return static::$modelMetadataDirectory;
8989
}
9090

@@ -116,4 +116,4 @@ public static function reset(): void
116116
static::$availability = null;
117117
static::$modelMetadataDirectory = null;
118118
}
119-
}
119+
}

‎tests/unit/Providers/MockProviderAvailability.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ public function isConfigured(): bool
3535
{
3636
return $this->configured;
3737
}
38-
}
38+
}

‎tests/unit/Providers/Models/DTO/ModelConfigTest.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,10 @@ public function testGetJsonSchema(): void
160160

161161
// Check all properties exist
162162
$expectedProperties = [
163-
ModelConfig::KEY_OUTPUT_MODALITIES,
164-
ModelConfig::KEY_SYSTEM_INSTRUCTION,
165-
ModelConfig::KEY_CANDIDATE_COUNT,
166-
ModelConfig::KEY_MAX_TOKENS,
167-
ModelConfig::KEY_TEMPERATURE,
168-
ModelConfig::KEY_TOP_P,
169-
ModelConfig::KEY_TOP_K,
170-
ModelConfig::KEY_STOP_SEQUENCES,
171-
ModelConfig::KEY_PRESENCE_PENALTY,
172-
ModelConfig::KEY_FREQUENCY_PENALTY,
173-
ModelConfig::KEY_LOGPROBS,
174-
ModelConfig::KEY_TOP_LOGPROBS,
175-
ModelConfig::KEY_TOOLS,
176-
ModelConfig::KEY_OUTPUT_MIME_TYPE,
177-
ModelConfig::KEY_OUTPUT_SCHEMA,
178-
ModelConfig::KEY_CUSTOM_OPTIONS
163+
ModelConfig::KEY_OUTPUT_MODALITIES, ModelConfig::KEY_SYSTEM_INSTRUCTION, ModelConfig::KEY_CANDIDATE_COUNT, ModelConfig::KEY_MAX_TOKENS,
164+
ModelConfig::KEY_TEMPERATURE, ModelConfig::KEY_TOP_P, ModelConfig::KEY_TOP_K, ModelConfig::KEY_STOP_SEQUENCES, ModelConfig::KEY_PRESENCE_PENALTY,
165+
ModelConfig::KEY_FREQUENCY_PENALTY, ModelConfig::KEY_LOGPROBS, ModelConfig::KEY_TOP_LOGPROBS, ModelConfig::KEY_TOOLS,
166+
ModelConfig::KEY_OUTPUT_MIME_TYPE, ModelConfig::KEY_OUTPUT_SCHEMA, ModelConfig::KEY_CUSTOM_OPTIONS
179167
];
180168

181169
foreach ($expectedProperties as $property) {

0 commit comments

Comments
 (0)