Skip to content

Commit 9f7023e

Browse files
authored
Merge pull request #475 from stof/typed_properties
Migrate to typed properties
2 parents b76d197 + f5d3722 commit 9f7023e

File tree

8 files changed

+16
-31
lines changed

8 files changed

+16
-31
lines changed

src/DependencyInjection/StofDoctrineExtensionsExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ class StofDoctrineExtensionsExtension extends Extension
8282
);
8383

8484
/** @var list<string> */
85-
private $entityManagers = array();
85+
private array $entityManagers = array();
8686
/** @var list<string> */
87-
private $documentManagers = array();
87+
private array $documentManagers = array();
8888

8989
/**
9090
* @return void

src/EventListener/BlameListener.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818
*/
1919
class BlameListener implements EventSubscriberInterface
2020
{
21-
/** @var AuthorizationCheckerInterface|null */
22-
private $authorizationChecker;
23-
/** @var TokenStorageInterface|null */
24-
private $tokenStorage;
25-
/** @var BlameableListener */
26-
private $blameableListener;
21+
private ?AuthorizationCheckerInterface $authorizationChecker;
22+
private ?TokenStorageInterface $tokenStorage;
23+
private BlameableListener $blameableListener;
2724

2825
public function __construct(BlameableListener $blameableListener, TokenStorageInterface $tokenStorage = null, AuthorizationCheckerInterface $authorizationChecker = null)
2926
{

src/EventListener/IpTraceListener.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
*/
1414
final class IpTraceListener implements EventSubscriberInterface
1515
{
16-
/** @var IpTraceableListener */
17-
private $ipTraceableListener;
16+
private IpTraceableListener $ipTraceableListener;
1817

1918
public function __construct(IpTraceableListener $ipTraceableListener)
2019
{

src/EventListener/LocaleListener.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
*/
1515
class LocaleListener implements EventSubscriberInterface
1616
{
17-
/** @var TranslatableListener */
18-
private $translatableListener;
17+
private TranslatableListener $translatableListener;
1918

2019
public function __construct(TranslatableListener $translatableListener)
2120
{

src/EventListener/LoggerListener.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020
*/
2121
class LoggerListener implements EventSubscriberInterface
2222
{
23-
/** @var AuthorizationCheckerInterface|null */
24-
private $authorizationChecker;
25-
/** @var TokenStorageInterface|null */
26-
private $tokenStorage;
23+
private ?AuthorizationCheckerInterface $authorizationChecker;
24+
private ?TokenStorageInterface $tokenStorage;
2725
/** @var LoggableListener<T> */
28-
private $loggableListener;
26+
private LoggableListener $loggableListener;
2927

3028
/**
3129
* @param LoggableListener<T> $loggableListener

src/Uploadable/UploadableManager.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88

99
class UploadableManager
1010
{
11-
/** @var \Gedmo\Uploadable\UploadableListener */
12-
private $listener;
11+
private UploadableListener $listener;
1312
/** @var class-string<FileInfoInterface> */
14-
private $fileInfoClass;
13+
private string $fileInfoClass;
1514

1615
/**
17-
* @param UploadableListener $listener
1816
* @param class-string<FileInfoInterface> $fileInfoClass
1917
*/
20-
public function __construct(UploadableListener $listener, $fileInfoClass)
18+
public function __construct(UploadableListener $listener, string $fileInfoClass)
2119
{
2220
$this->listener = $listener;
2321
$this->fileInfoClass = $fileInfoClass;
@@ -51,5 +49,4 @@ public function getUploadableListener()
5149
{
5250
return $this->listener;
5351
}
54-
5552
}

src/Uploadable/UploadedFileInfo.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
class UploadedFileInfo implements FileInfoInterface
99
{
10-
/** @var UploadedFile */
11-
private $uploadedFile;
10+
private UploadedFile $uploadedFile;
1211

1312
public function __construct(UploadedFile $uploadedFile)
1413
{

src/Uploadable/ValidatorConfigurator.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
*/
1010
class ValidatorConfigurator
1111
{
12-
/** @var bool */
13-
private $validateWritableDirectory;
12+
private bool $validateWritableDirectory;
1413

15-
/**
16-
* @param bool $validateWritableDirectory
17-
*/
18-
public function __construct($validateWritableDirectory)
14+
public function __construct(bool $validateWritableDirectory)
1915
{
2016
$this->validateWritableDirectory = $validateWritableDirectory;
2117
}

0 commit comments

Comments
 (0)