Skip to content

Commit 017a91a

Browse files
Zales0123Zales0123
committed
Use PHP 7.4 syntax (finally)
1 parent be1a7d3 commit 017a91a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+128
-181
lines changed

Diff for: ‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
"symfony/twig-bundle": "^4.4 || ^5.2",
7373
"twig/extensions": "^1.5",
7474
"twig/twig": "^2.12 || ^3.0",
75-
"vimeo/psalm": "4.6.4"
75+
"vimeo/psalm": "4.6.4",
76+
"rector/rector": "^0.11.47"
7677
},
7778
"suggest": {
7879
"sylius/currency-bundle": "^1.7"

Diff for: ‎rector.php

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Rector\Core\Configuration\Option;
6+
use Rector\Php74\Rector\Property\TypedPropertyRector;
7+
use Rector\Set\ValueObject\SetList;
8+
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
9+
10+
return static function (ContainerConfigurator $containerConfigurator): void
11+
{
12+
$parameters = $containerConfigurator->parameters();
13+
$parameters->set(Option::AUTO_IMPORT_NAMES, true);
14+
$parameters->set(Option::IMPORT_SHORT_CLASSES, false);
15+
16+
$services = $containerConfigurator->services();
17+
$services->set(TypedPropertyRector::class);
18+
};

Diff for: ‎src/Bundle/Doctrine/DBAL/DataSource.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
final class DataSource implements DataSourceInterface
2424
{
25-
/** @var QueryBuilder */
26-
private $queryBuilder;
25+
private QueryBuilder $queryBuilder;
2726

28-
/** @var ExpressionBuilderInterface */
29-
private $expressionBuilder;
27+
private ExpressionBuilderInterface $expressionBuilder;
3028

3129
public function __construct(QueryBuilder $queryBuilder)
3230
{

Diff for: ‎src/Bundle/Doctrine/DBAL/Driver.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ final class Driver implements DriverInterface
2222
{
2323
public const NAME = 'doctrine/dbal';
2424

25-
/** @var Connection */
26-
private $connection;
25+
private Connection $connection;
2726

2827
public function __construct(Connection $connection)
2928
{

Diff for: ‎src/Bundle/Doctrine/DBAL/ExpressionBuilder.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
final class ExpressionBuilder implements ExpressionBuilderInterface
2020
{
21-
/** @var QueryBuilder */
22-
private $queryBuilder;
21+
private QueryBuilder $queryBuilder;
2322

2423
public function __construct(QueryBuilder $queryBuilder)
2524
{

Diff for: ‎src/Bundle/Doctrine/ORM/DataSource.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
final class DataSource implements DataSourceInterface
2424
{
25-
/** @var QueryBuilder */
26-
private $queryBuilder;
25+
private QueryBuilder $queryBuilder;
2726

28-
/** @var ExpressionBuilderInterface */
29-
private $expressionBuilder;
27+
private ExpressionBuilderInterface $expressionBuilder;
3028

3129
public function __construct(QueryBuilder $queryBuilder)
3230
{

Diff for: ‎src/Bundle/Doctrine/ORM/Driver.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ final class Driver implements DriverInterface
2424
{
2525
public const NAME = 'doctrine/orm';
2626

27-
/** @var ManagerRegistry */
28-
private $managerRegistry;
27+
private ManagerRegistry $managerRegistry;
2928

3029
public function __construct(ManagerRegistry $managerRegistry)
3130
{

Diff for: ‎src/Bundle/Doctrine/ORM/ExpressionBuilder.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
final class ExpressionBuilder implements ExpressionBuilderInterface
2323
{
24-
/** @var QueryBuilder */
25-
private $queryBuilder;
24+
private QueryBuilder $queryBuilder;
2625

2726
public function __construct(QueryBuilder $queryBuilder)
2827
{

Diff for: ‎src/Bundle/Doctrine/PHPCRODM/DataSource.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@
2424

2525
final class DataSource implements DataSourceInterface
2626
{
27-
/** @var QueryBuilder */
28-
private $queryBuilder;
27+
private QueryBuilder $queryBuilder;
2928

30-
/** @var ExpressionBuilderInterface */
31-
private $expressionBuilder;
29+
private ExpressionBuilderInterface $expressionBuilder;
3230

3331
public function __construct(QueryBuilder $queryBuilder, ?ExpressionBuilderInterface $expressionBuilder = null)
3432
{

Diff for: ‎src/Bundle/Doctrine/PHPCRODM/Driver.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ final class Driver implements DriverInterface
3232
*/
3333
public const QB_SOURCE_ALIAS = 'o';
3434

35-
/** @var DocumentManagerInterface */
36-
private $documentManager;
35+
private DocumentManagerInterface $documentManager;
3736

3837
public function __construct(DocumentManagerInterface $documentManager)
3938
{

Diff for: ‎src/Bundle/Doctrine/PHPCRODM/ExpressionBuilder.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
*/
2525
final class ExpressionBuilder implements ExpressionBuilderInterface
2626
{
27-
/** @var CollectionsExpressionBuilder */
28-
private $expressionBuilder;
27+
private CollectionsExpressionBuilder $expressionBuilder;
2928

3029
/** @var array */
3130
private $orderBys = [];

Diff for: ‎src/Bundle/Doctrine/PHPCRODM/ExpressionVisitor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
final class ExpressionVisitor
2929
{
30-
private $queryBuilder;
30+
private QueryBuilder $queryBuilder;
3131

3232
public function __construct(QueryBuilder $queryBuilder)
3333
{

Diff for: ‎src/Bundle/FieldTypes/TwigFieldType.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121

2222
final class TwigFieldType implements FieldTypeInterface
2323
{
24-
/** @var DataExtractorInterface */
25-
private $dataExtractor;
24+
private DataExtractorInterface $dataExtractor;
2625

27-
/** @var Environment */
28-
private $twig;
26+
private Environment $twig;
2927

3028
public function __construct(DataExtractorInterface $dataExtractor, Environment $twig)
3129
{

Diff for: ‎src/Bundle/Form/DataTransformer/DateTimeFilterTransformer.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919
final class DateTimeFilterTransformer implements DataTransformerInterface
2020
{
2121
/** @var array<string, array{hour: string, minute: string}> */
22-
private static $defaultTime = [
22+
private static array $defaultTime = [
2323
'from' => ['hour' => '00', 'minute' => '00'],
2424
'to' => ['hour' => '23', 'minute' => '59'],
2525
];
2626

27-
/** @var string */
28-
private $type;
27+
private string $type;
2928

3029
public function __construct(string $type)
3130
{

Diff for: ‎src/Bundle/Form/Registry/FormTypeRegistry.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
final class FormTypeRegistry implements FormTypeRegistryInterface
1717
{
18-
/** @var array */
19-
private $formTypes = [];
18+
private array $formTypes = [];
2019

2120
public function add(string $identifier, string $typeIdentifier, string $formType): void
2221
{

Diff for: ‎src/Bundle/Renderer/TwigBulkActionGridRenderer.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020

2121
final class TwigBulkActionGridRenderer implements BulkActionGridRendererInterface
2222
{
23-
/** @var Environment */
24-
private $twig;
23+
private Environment $twig;
2524

26-
/** @var array */
27-
private $bulkActionTemplates;
25+
private array $bulkActionTemplates;
2826

2927
public function __construct(Environment $twig, array $bulkActionTemplates)
3028
{

Diff for: ‎src/Bundle/Renderer/TwigGridRenderer.php

+7-14
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,19 @@
2828

2929
final class TwigGridRenderer implements GridRendererInterface
3030
{
31-
/** @var Environment */
32-
private $twig;
31+
private Environment $twig;
3332

34-
/** @var ServiceRegistryInterface */
35-
private $fieldsRegistry;
33+
private ServiceRegistryInterface $fieldsRegistry;
3634

37-
/** @var FormFactoryInterface */
38-
private $formFactory;
35+
private FormFactoryInterface $formFactory;
3936

40-
/** @var FormTypeRegistryInterface */
41-
private $formTypeRegistry;
37+
private FormTypeRegistryInterface $formTypeRegistry;
4238

43-
/** @var string */
44-
private $defaultTemplate;
39+
private string $defaultTemplate;
4540

46-
/** @var array */
47-
private $actionTemplates;
41+
private array $actionTemplates;
4842

49-
/** @var array */
50-
private $filterTemplates;
43+
private array $filterTemplates;
5144

5245
public function __construct(
5346
Environment $twig,

Diff for: ‎src/Bundle/Templating/Helper/BulkActionGridHelper.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
*/
2323
class BulkActionGridHelper
2424
{
25-
/** @var BulkActionGridRendererInterface */
26-
private $bulkActionGridRenderer;
25+
private BulkActionGridRendererInterface $bulkActionGridRenderer;
2726

2827
public function __construct(BulkActionGridRendererInterface $bulkActionGridRenderer)
2928
{

Diff for: ‎src/Bundle/Templating/Helper/GridHelper.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
class GridHelper
2323
{
24-
/** @var GridRendererInterface */
25-
private $gridRenderer;
24+
private GridRendererInterface $gridRenderer;
2625

2726
public function __construct(GridRendererInterface $gridRenderer)
2827
{

Diff for: ‎src/Bundle/Twig/BulkActionGridExtension.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
final class BulkActionGridExtension extends AbstractExtension
2121
{
22-
/** @var BulkActionGridHelper */
23-
private $bulkActionGridHelper;
22+
private BulkActionGridHelper $bulkActionGridHelper;
2423

2524
public function __construct(BulkActionGridHelper $bulkActionGridHelper)
2625
{

Diff for: ‎src/Bundle/Twig/GridExtension.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
final class GridExtension extends AbstractExtension
2121
{
22-
/** @var GridHelper */
23-
private $gridHelper;
22+
private GridHelper $gridHelper;
2423

2524
public function __construct(GridHelper $gridHelper)
2625
{

Diff for: ‎src/Bundle/test/config/bundles.php

+25-12
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,30 @@
1111

1212
declare(strict_types=1);
1313

14+
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
15+
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
16+
use Symfony\Bundle\TwigBundle\TwigBundle;
17+
use FOS\RestBundle\FOSRestBundle;
18+
use JMS\SerializerBundle\JMSSerializerBundle;
19+
use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
20+
use Sylius\Bundle\GridBundle\SyliusGridBundle;
21+
use BabDev\PagerfantaBundle\BabDevPagerfantaBundle;
22+
use Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle;
23+
use winzou\Bundle\StateMachineBundle\winzouStateMachineBundle;
24+
use Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle;
25+
use Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle;
26+
1427
return [
15-
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
16-
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
17-
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
18-
FOS\RestBundle\FOSRestBundle::class => ['all' => true],
19-
JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
20-
Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
21-
Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
22-
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
23-
Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
24-
winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
25-
Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['all' => true],
26-
Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['all' => true],
28+
FrameworkBundle::class => ['all' => true],
29+
DoctrineBundle::class => ['all' => true],
30+
TwigBundle::class => ['all' => true],
31+
FOSRestBundle::class => ['all' => true],
32+
JMSSerializerBundle::class => ['all' => true],
33+
SyliusResourceBundle::class => ['all' => true],
34+
SyliusGridBundle::class => ['all' => true],
35+
BabDevPagerfantaBundle::class => ['all' => true],
36+
BazingaHateoasBundle::class => ['all' => true],
37+
winzouStateMachineBundle::class => ['all' => true],
38+
FidryAliceDataFixturesBundle::class => ['all' => true],
39+
NelmioAliceBundle::class => ['all' => true],
2740
];

Diff for: ‎src/Bundle/test/src/Entity/Author.php

+4-8
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,26 @@
2424
class Author implements ResourceInterface
2525
{
2626
/**
27-
* @var int|null
2827
*
2928
* @Serializer\Expose
3029
* @Serializer\Type("integer")
3130
*/
32-
private $id;
31+
private ?int $id = null;
3332

3433
/**
35-
* @var string|null
3634
*
3735
* @Serializer\Expose
3836
* @Serializer\Type("string")
3937
*/
40-
private $name;
38+
private ?string $name = null;
4139

4240
/**
43-
* @var Nationality|null
44-
*
4541
* @Serializer\Expose
4642
*/
47-
private $nationality;
43+
private ?Nationality $nationality = null;
4844

4945
/** @var Collection&Book[] */
50-
private $books;
46+
private Collection $books;
5147

5248
public function __construct()
5349
{

Diff for: ‎src/Bundle/test/src/Entity/Book.php

+5-12
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,30 @@ class Book implements ResourceInterface
2828
public const STATE_UNPUBLISHED = 'unpublished';
2929

3030
/**
31-
* @var int|null
3231
*
3332
* @Serializer\Expose
3433
* @Serializer\Type("integer")
3534
*/
36-
private $id;
35+
private ?int $id = null;
3736

3837
/**
39-
* @var string|null
4038
*
4139
* @Serializer\Expose
4240
* @Serializer\Type("string")
4341
*/
44-
private $title;
42+
private ?string $title = null;
4543

4644
/**
47-
* @var Author|null
48-
*
4945
* @Serializer\Expose
5046
*/
51-
private $author;
47+
private ?Author $author = null;
5248

5349
/**
54-
* @var Price|null
55-
*
5650
* @Serializer\Expose
5751
*/
58-
private $price;
52+
private ?Price $price = null;
5953

60-
/** @var string */
61-
private $state;
54+
private string $state;
6255

6356
public function __construct()
6457
{

0 commit comments

Comments
 (0)