Skip to content

Commit 1776848

Browse files
authored
Merge pull request #4 from php-openapi-tools/no-loading-slash-for-namespaces
No leading slashes for namespaces
2 parents 82f3833 + 500f686 commit 1776848

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

etc/qa/phpstan.neon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ parameters:
22
ignoreErrors:
33
- '#Access to an undefined property OpenAPITools\\Contract\\Package::#'
44
- '#Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert::assertStringContainsString\(\) expects string, PhpParser\\Node\|string given.#'
5+
- '#Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert::assertStringNotContainsString\(\) expects string, PhpParser\\Node\|string given.#'
56
- '#extends PHPUnit\\Framework\\TestCase, is concrete, but does not have a Test suffix.#'
67
includes:
78
- ../../vendor/wyrihaximus/test-utilities/rules.neon

src/Hydrator.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use function array_map;
2424
use function array_unique;
2525
use function count;
26+
use function trim;
2627
use function ucfirst;
2728

2829
final readonly class Hydrator implements FileGenerator
@@ -76,7 +77,7 @@ public function generate(Package $package, Representation\Namespaced\Representat
7677
static fn (string $className): bool => count((new ReflectionMethod($className, '__construct'))->getParameters()) > 0,
7778
),
7879
),
79-
$hydrator->className->fullyQualified->source,
80+
trim($hydrator->className->fullyQualified->source, '\\'),
8081
),
8182
File::DO_LOAD_ON_WRITE,
8283
);

tests/DataTests/Basic.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ public static function assert(File ...$files): void
1616
self::assertArrayHasKey('Internal\Hydrators', $files);
1717
self::assertArrayHasKey('Internal\Hydrator\Operation\Root', $files);
1818

19+
self::assertStringNotContainsString('namespace \\', $files['Internal\Hydrators']->contents);
1920
self::assertStringContainsString('public function hydrateObject(string $className, array $payload) : object', $files['Internal\Hydrators']->contents);
2021
self::assertStringContainsString('public function hydrateObjects(string $className, iterable $payloads) : \EventSauce\ObjectHydrator\IterableList', $files['Internal\Hydrators']->contents);
2122
self::assertStringContainsString('public function serializeObject(object $object) : mixed', $files['Internal\Hydrators']->contents);
2223
self::assertStringContainsString('public function serializeObjects(iterable $payloads) : \EventSauce\ObjectHydrator\IterableList', $files['Internal\Hydrators']->contents);
2324
self::assertStringContainsString('public function getObjectMapperOperation🌀Root() : \ApiClients\Client\GitHub\Internal\Hydrator\Operation\Root', $files['Internal\Hydrators']->contents);
2425
self::assertStringContainsString('final class Hydrators implements \EventSauce\ObjectHydrator\ObjectMapper', $files['Internal\Hydrators']->contents);
2526

27+
self::assertStringNotContainsString('namespace \\', $files['Internal\Hydrator\Operation\Root']->contents);
2628
self::assertStringContainsString('public function hydrateObject(string $className, array $payload): object', $files['Internal\Hydrator\Operation\Root']->contents);
2729
self::assertStringContainsString('public function hydrateObjects(string $className, iterable $payloads): IterableList', $files['Internal\Hydrator\Operation\Root']->contents);
2830
self::assertStringContainsString('public function serializeObject(object $object): mixed', $files['Internal\Hydrator\Operation\Root']->contents);

0 commit comments

Comments
 (0)