Skip to content

Commit f081eae

Browse files
committed
Upgrade coding standard library
1 parent 0ea79fd commit f081eae

File tree

10 files changed

+56
-40
lines changed

10 files changed

+56
-40
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require-dev": {
2222
"ext-phar": "*",
2323
"ext-pdo": "*",
24-
"doctrine/coding-standard": "^6.0",
24+
"doctrine/coding-standard": "^8.0",
2525
"phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
2626
"phpstan/phpstan": "^0.12",
2727
"phpstan/phpstan-phpunit": "^0.12",

phpcs.xml.dist

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@
1919
<exclude name="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly.ReferencedGeneralException"/>
2020
</rule>
2121

22+
<!-- Disable the rules that will require PHP 7.4 -->
23+
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
24+
<properties>
25+
<property name="enableNativeTypeHint" value="false"/>
26+
</properties>
27+
</rule>
28+
29+
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
30+
<exclude-pattern>*/src/*</exclude-pattern>
31+
</rule>
32+
33+
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
34+
<exclude-pattern>*/src/*</exclude-pattern>
35+
</rule>
36+
2237
<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming">
2338
<exclude-pattern>tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php</exclude-pattern>
2439
</rule>

src/Doctrine/Instantiator/Exception/InvalidArgumentException.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use InvalidArgumentException as BaseInvalidArgumentException;
66
use ReflectionClass;
7+
78
use function interface_exists;
89
use function sprintf;
910
use function trait_exists;
@@ -13,7 +14,7 @@
1314
*/
1415
class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface
1516
{
16-
public static function fromNonExistingClass(string $className) : self
17+
public static function fromNonExistingClass(string $className): self
1718
{
1819
if (interface_exists($className)) {
1920
return new self(sprintf('The provided type "%s" is an interface, and can not be instantiated', $className));
@@ -30,7 +31,7 @@ public static function fromNonExistingClass(string $className) : self
3031
* @template T of object
3132
* @phpstan-param ReflectionClass<T> $reflectionClass
3233
*/
33-
public static function fromAbstractClass(ReflectionClass $reflectionClass) : self
34+
public static function fromAbstractClass(ReflectionClass $reflectionClass): self
3435
{
3536
return new self(sprintf(
3637
'The provided class "%s" is abstract, and can not be instantiated',

src/Doctrine/Instantiator/Exception/UnexpectedValueException.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Exception;
66
use ReflectionClass;
77
use UnexpectedValueException as BaseUnexpectedValueException;
8+
89
use function sprintf;
910

1011
/**
@@ -19,7 +20,7 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements E
1920
public static function fromSerializationTriggeredException(
2021
ReflectionClass $reflectionClass,
2122
Exception $exception
22-
) : self {
23+
): self {
2324
return new self(
2425
sprintf(
2526
'An exception was raised while trying to instantiate an instance of "%s" via un-serialization',
@@ -40,7 +41,7 @@ public static function fromUncleanUnSerialization(
4041
int $errorCode,
4142
string $errorFile,
4243
int $errorLine
43-
) : self {
44+
): self {
4445
return new self(
4546
sprintf(
4647
'Could not produce an instance of "%s" via un-serialization, since an error was triggered '

src/Doctrine/Instantiator/Instantiator.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use ReflectionClass;
1010
use ReflectionException;
1111
use Serializable;
12+
1213
use function class_exists;
1314
use function is_subclass_of;
1415
use function restore_error_handler;
@@ -17,9 +18,6 @@
1718
use function strlen;
1819
use function unserialize;
1920

20-
/**
21-
* {@inheritDoc}
22-
*/
2321
final class Instantiator implements InstantiatorInterface
2422
{
2523
/**
@@ -97,7 +95,7 @@ private function buildAndCacheFromFactory(string $className)
9795
*
9896
* @phpstan-return callable(): T
9997
*/
100-
private function buildFactory(string $className) : callable
98+
private function buildFactory(string $className): callable
10199
{
102100
$reflectionClass = $this->getReflectionClass($className);
103101

@@ -128,7 +126,7 @@ private function buildFactory(string $className) : callable
128126
*
129127
* @phpstan-return ReflectionClass<T>
130128
*/
131-
private function getReflectionClass(string $className) : ReflectionClass
129+
private function getReflectionClass(string $className): ReflectionClass
132130
{
133131
if (! class_exists($className)) {
134132
throw InvalidArgumentException::fromNonExistingClass($className);
@@ -149,9 +147,9 @@ private function getReflectionClass(string $className) : ReflectionClass
149147
* @template T of object
150148
* @phpstan-param ReflectionClass<T> $reflectionClass
151149
*/
152-
private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, string $serializedString) : void
150+
private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, string $serializedString): void
153151
{
154-
set_error_handler(static function (int $code, string $message, string $file, int $line) use ($reflectionClass, &$error) : bool {
152+
set_error_handler(static function (int $code, string $message, string $file, int $line) use ($reflectionClass, &$error): bool {
155153
$error = UnexpectedValueException::fromUncleanUnSerialization(
156154
$reflectionClass,
157155
$message,
@@ -180,7 +178,7 @@ private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionCl
180178
* @template T of object
181179
* @phpstan-param ReflectionClass<T> $reflectionClass
182180
*/
183-
private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, string $serializedString) : void
181+
private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, string $serializedString): void
184182
{
185183
try {
186184
unserialize($serializedString);
@@ -193,7 +191,7 @@ private function attemptInstantiationViaUnSerialization(ReflectionClass $reflect
193191
* @template T of object
194192
* @phpstan-param ReflectionClass<T> $reflectionClass
195193
*/
196-
private function isInstantiableViaReflection(ReflectionClass $reflectionClass) : bool
194+
private function isInstantiableViaReflection(ReflectionClass $reflectionClass): bool
197195
{
198196
return ! ($this->hasInternalAncestors($reflectionClass) && $reflectionClass->isFinal());
199197
}
@@ -204,7 +202,7 @@ private function isInstantiableViaReflection(ReflectionClass $reflectionClass) :
204202
* @template T of object
205203
* @phpstan-param ReflectionClass<T> $reflectionClass
206204
*/
207-
private function hasInternalAncestors(ReflectionClass $reflectionClass) : bool
205+
private function hasInternalAncestors(ReflectionClass $reflectionClass): bool
208206
{
209207
do {
210208
if ($reflectionClass->isInternal()) {
@@ -225,7 +223,7 @@ private function hasInternalAncestors(ReflectionClass $reflectionClass) : bool
225223
* @template T of object
226224
* @phpstan-param ReflectionClass<T> $reflectionClass
227225
*/
228-
private function isSafeToClone(ReflectionClass $reflectionClass) : bool
226+
private function isSafeToClone(ReflectionClass $reflectionClass): bool
229227
{
230228
return $reflectionClass->isCloneable()
231229
&& ! $reflectionClass->hasMethod('__clone')

tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class InstantiatorPerformanceEvent
2020
/** @var Instantiator */
2121
private $instantiator;
2222

23-
public function init() : void
23+
public function init(): void
2424
{
2525
$this->instantiator = new Instantiator();
2626

@@ -34,39 +34,39 @@ public function init() : void
3434
/**
3535
* @Revs(20000)
3636
*/
37-
public function benchInstantiateSelf() : void
37+
public function benchInstantiateSelf(): void
3838
{
3939
$this->instantiator->instantiate(self::class);
4040
}
4141

4242
/**
4343
* @Revs(20000)
4444
*/
45-
public function benchInstantiateInternalClass() : void
45+
public function benchInstantiateInternalClass(): void
4646
{
4747
$this->instantiator->instantiate(ArrayObject::class);
4848
}
4949

5050
/**
5151
* @Revs(20000)
5252
*/
53-
public function benchInstantiateSimpleSerializableAssetClass() : void
53+
public function benchInstantiateSimpleSerializableAssetClass(): void
5454
{
5555
$this->instantiator->instantiate(SimpleSerializableAsset::class);
5656
}
5757

5858
/**
5959
* @Revs(20000)
6060
*/
61-
public function benchInstantiateSerializableArrayObjectAsset() : void
61+
public function benchInstantiateSerializableArrayObjectAsset(): void
6262
{
6363
$this->instantiator->instantiate(SerializableArrayObjectAsset::class);
6464
}
6565

6666
/**
6767
* @Revs(20000)
6868
*/
69-
public function benchInstantiateUnCloneableAsset() : void
69+
public function benchInstantiateUnCloneableAsset(): void
7070
{
7171
$this->instantiator->instantiate(UnCloneableAsset::class);
7272
}

tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use DoctrineTest\InstantiatorTestAsset\SimpleTraitAsset;
99
use PHPUnit\Framework\TestCase;
1010
use ReflectionClass;
11+
1112
use function sprintf;
1213
use function str_replace;
1314
use function uniqid;
@@ -19,7 +20,7 @@
1920
*/
2021
class InvalidArgumentExceptionTest extends TestCase
2122
{
22-
public function testFromNonExistingTypeWithNonExistingClass() : void
23+
public function testFromNonExistingTypeWithNonExistingClass(): void
2324
{
2425
$className = self::class . str_replace('.', '', uniqid('', true));
2526
$exception = InvalidArgumentException::fromNonExistingClass($className);
@@ -28,7 +29,7 @@ public function testFromNonExistingTypeWithNonExistingClass() : void
2829
self::assertSame('The provided class "' . $className . '" does not exist', $exception->getMessage());
2930
}
3031

31-
public function testFromNonExistingTypeWithTrait() : void
32+
public function testFromNonExistingTypeWithTrait(): void
3233
{
3334
$exception = InvalidArgumentException::fromNonExistingClass(SimpleTraitAsset::class);
3435

@@ -38,7 +39,7 @@ public function testFromNonExistingTypeWithTrait() : void
3839
);
3940
}
4041

41-
public function testFromNonExistingTypeWithInterface() : void
42+
public function testFromNonExistingTypeWithInterface(): void
4243
{
4344
$exception = InvalidArgumentException::fromNonExistingClass(InstantiatorInterface::class);
4445

@@ -51,7 +52,7 @@ public function testFromNonExistingTypeWithInterface() : void
5152
);
5253
}
5354

54-
public function testFromAbstractClass() : void
55+
public function testFromAbstractClass(): void
5556
{
5657
$reflection = new ReflectionClass(AbstractClassAsset::class);
5758
$exception = InvalidArgumentException::fromAbstractClass($reflection);

tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Exception;
88
use PHPUnit\Framework\TestCase;
99
use ReflectionClass;
10+
1011
use function sprintf;
1112

1213
/**
@@ -16,7 +17,7 @@
1617
*/
1718
class UnexpectedValueExceptionTest extends TestCase
1819
{
19-
public function testFromSerializationTriggeredException() : void
20+
public function testFromSerializationTriggeredException(): void
2021
{
2122
$reflectionClass = new ReflectionClass($this);
2223
$previous = new Exception();
@@ -31,7 +32,7 @@ public function testFromSerializationTriggeredException() : void
3132
);
3233
}
3334

34-
public function testFromUncleanUnSerialization() : void
35+
public function testFromUncleanUnSerialization(): void
3536
{
3637
$reflection = new ReflectionClass(AbstractClassAsset::class);
3738
$exception = UnexpectedValueException::fromUncleanUnSerialization($reflection, 'foo', 123, 'bar', 456);

tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use PharException;
2626
use PHPUnit\Framework\TestCase;
2727
use stdClass;
28+
2829
use function str_replace;
2930
use function uniqid;
3031

@@ -38,10 +39,7 @@ class InstantiatorTest extends TestCase
3839
/** @var Instantiator */
3940
private $instantiator;
4041

41-
/**
42-
* {@inheritDoc}
43-
*/
44-
protected function setUp() : void
42+
protected function setUp(): void
4543
{
4644
parent::setUp();
4745

@@ -52,7 +50,7 @@ protected function setUp() : void
5250
* @dataProvider getInstantiableClasses
5351
* @phpstan-param class-string $className
5452
*/
55-
public function testCanInstantiate(string $className) : void
53+
public function testCanInstantiate(string $className): void
5654
{
5755
self::assertInstanceOf($className, $this->instantiator->instantiate($className));
5856
}
@@ -61,7 +59,7 @@ public function testCanInstantiate(string $className) : void
6159
* @dataProvider getInstantiableClasses
6260
* @phpstan-param class-string $className
6361
*/
64-
public function testInstantiatesSeparateInstances(string $className) : void
62+
public function testInstantiatesSeparateInstances(string $className): void
6563
{
6664
$instance1 = $this->instantiator->instantiate($className);
6765
$instance2 = $this->instantiator->instantiate($className);
@@ -70,7 +68,7 @@ public function testInstantiatesSeparateInstances(string $className) : void
7068
self::assertNotSame($instance1, $instance2);
7169
}
7270

73-
public function testExceptionOnUnSerializationException() : void
71+
public function testExceptionOnUnSerializationException(): void
7472
{
7573
$this->expectException(UnexpectedValueException::class);
7674

@@ -81,14 +79,14 @@ public function testExceptionOnUnSerializationException() : void
8179
* @dataProvider getInvalidClassNames
8280
* @phpstan-param class-string $invalidClassName
8381
*/
84-
public function testInstantiationFromNonExistingClass(string $invalidClassName) : void
82+
public function testInstantiationFromNonExistingClass(string $invalidClassName): void
8583
{
8684
$this->expectException(InvalidArgumentException::class);
8785

8886
$this->instantiator->instantiate($invalidClassName);
8987
}
9088

91-
public function testInstancesAreNotCloned() : void
89+
public function testInstancesAreNotCloned(): void
9290
{
9391
$className = 'TemporaryClass' . str_replace('.', '', uniqid('', true));
9492

@@ -115,7 +113,7 @@ public function testInstancesAreNotCloned() : void
115113
*
116114
* @phpstan-return list<array{class-string}>
117115
*/
118-
public function getInstantiableClasses() : array
116+
public function getInstantiableClasses(): array
119117
{
120118
return [
121119
[stdClass::class],
@@ -144,7 +142,7 @@ public function getInstantiableClasses() : array
144142
*
145143
* @return string[][]
146144
*/
147-
public function getInvalidClassNames() : array
145+
public function getInvalidClassNames(): array
148146
{
149147
return [
150148
[self::class . str_replace('.', '', uniqid('', true))],

tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace DoctrineTest\InstantiatorTestAsset;
44

55
use ArrayObject;
6+
67
use function trigger_error;
78

89
/**
@@ -16,7 +17,7 @@ class WakeUpNoticesAsset extends ArrayObject
1617
/**
1718
* Wakeup method called after un-serialization
1819
*/
19-
public function __wakeup()
20+
public function __wakeup(): void
2021
{
2122
trigger_error('Something went bananas while un-serializing this instance');
2223
}

0 commit comments

Comments
 (0)