drop PHP 7.x support

.github/workflows/ci.yaml

@@ -22,7 +22,7 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                    - '7.4'
+                    - '8.0'
 
         steps:
             -
@@ -99,11 +99,11 @@ jobs:
                 allow-dev-deps-in-apps: ['0']
                 include:
                     # testing lowest PHP version with LTS
-                    - php-version: '7.2.5'
+                    - php-version: '8.0.0'
                       symfony-version: '5.4.*'
                       dependency-versions: 'lowest'
                     # testing lowest php version with highest 5.x stable
-                    - php-version: '7.2.5'
+                    - php-version: '8.0.0'
                       symfony-version: '5.4.*'
                       dependency-versions: 'highest'
                     # testing bleeding edge PHP with highest 5.x stable

appveyor.yml

@@ -27,7 +27,7 @@ environment:
     TEST_DATABASE_DSN: mysql://root:[email protected]:3306/test_maker
     matrix:
       - dependencies: highest
-        php_ver_target: 7.2.5
+        php_ver_target: 8.0.19
 
 install:
     - ps: Set-Service wuauserv -StartupType Manual

composer.json

@@ -13,7 +13,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=8.0",
         "doctrine/inflector": "^2.0",
         "nikic/php-parser": "^4.11",
         "symfony/config": "^5.4.7|^6.0",

src/Command/MakerCommand.php

@@ -32,20 +32,13 @@
  */
 final class MakerCommand extends Command
 {
-    private $maker;
-    private $fileManager;
-    private $inputConfig;
-    /** @var ConsoleStyle */
-    private $io;
-    private $checkDependencies = true;
-    private $generator;
-
-    public function __construct(MakerInterface $maker, FileManager $fileManager, Generator $generator)
+    private InputConfiguration $inputConfig;
+    private ConsoleStyle $io;
+    private bool $checkDependencies = true;
+
+    public function __construct(private MakerInterface $maker, private FileManager $fileManager, private Generator $generator)
     {
-        $this->maker = $maker;
-        $this->fileManager = $fileManager;
         $this->inputConfig = new InputConfiguration();
-        $this->generator = $generator;
 
         parent::__construct();
     }

src/Doctrine/DoctrineHelper.php

@@ -145,7 +145,7 @@ public function doesClassUsesAttributes(string $className): bool
 
     public function isDoctrineSupportingAttributes(): bool
     {
-        return $this->isDoctrineInstalled() && $this->attributeMappingSupport && $this->phpCompatUtil->canUseAttributes();
+        return $this->isDoctrineInstalled() && $this->attributeMappingSupport;
     }
 
     public function getEntitiesForAutocomplete(): array

src/Generator.php

@@ -170,9 +170,6 @@ private function addOperation(string $targetPath, string $templateName, array $v
         }
 
         $variables['relative_path'] = $this->fileManager->relativizePath($targetPath);
-        $variables['use_attributes'] = $this->phpCompatUtil->canUseAttributes();
-        $variables['use_typed_properties'] = $this->phpCompatUtil->canUseTypedProperties();
-        $variables['use_union_types'] = $this->phpCompatUtil->canUseUnionTypes();
 
         $templatePath = $templateName;
         if (!file_exists($templatePath)) {

src/Maker/MakeAuthenticator.php

@@ -65,19 +65,13 @@ final class MakeAuthenticator extends AbstractMaker
     private const AUTH_TYPE_EMPTY_AUTHENTICATOR = 'empty-authenticator';
     private const AUTH_TYPE_FORM_LOGIN = 'form-login';
 
-    private $fileManager;
-    private $configUpdater;
-    private $generator;
-    private $doctrineHelper;
-    private $securityControllerBuilder;
-
-    public function __construct(FileManager $fileManager, SecurityConfigUpdater $configUpdater, Generator $generator, DoctrineHelper $doctrineHelper, SecurityControllerBuilder $securityControllerBuilder)
-    {
-        $this->fileManager = $fileManager;
-        $this->configUpdater = $configUpdater;
-        $this->generator = $generator;
-        $this->doctrineHelper = $doctrineHelper;
-        $this->securityControllerBuilder = $securityControllerBuilder;
+    public function __construct(
+        private FileManager $fileManager,
+        private SecurityConfigUpdater $configUpdater,
+        private Generator $generator,
+        private DoctrineHelper $doctrineHelper,
+        private SecurityControllerBuilder $securityControllerBuilder
+    ) {
     }
 
     public static function getCommandName(): string

src/Maker/MakeCommand.php

@@ -33,11 +33,8 @@
  */
 final class MakeCommand extends AbstractMaker
 {
-    private $phpCompatUtil;
-
-    public function __construct(PhpCompatUtil $phpCompatUtil)
+    public function __construct(private PhpCompatUtil $phpCompatUtil)
     {
-        $this->phpCompatUtil = $phpCompatUtil;
     }
 
     public static function getCommandName(): string
@@ -77,12 +74,9 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             InputOption::class,
             OutputInterface::class,
             SymfonyStyle::class,
+            AsCommand::class,
         ]);
 
-        if ($this->phpCompatUtil->canUseAttributes()) {
-            $useStatements->addUseStatement(AsCommand::class);
-        }
-
         $generator->generateClass(
             $commandClassNameDetails->getFullName(),
             'command/Command.tpl.php',

src/Maker/MakeController.php

@@ -36,7 +36,7 @@
  */
 final class MakeController extends AbstractMaker
 {
-    private $phpCompatUtil;
+    private PhpCompatUtil $phpCompatUtil;
 
     public function __construct(PhpCompatUtil $phpCompatUtil = null)
     {
@@ -116,7 +116,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
     public function configureDependencies(DependencyBuilder $dependencies): void
     {
         // @legacy - Remove method when support for Symfony 5.4 is dropped
-        if (null !== $this->phpCompatUtil && 60000 <= Kernel::VERSION_ID && $this->phpCompatUtil->canUseAttributes()) {
+        if (null !== $this->phpCompatUtil && 60000 <= Kernel::VERSION_ID) {
             return;
         }
 

src/Maker/MakeCrud.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MakerBundle\Maker;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Doctrine\Inflector\Inflector;
 use Doctrine\Inflector\InflectorFactory;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -45,16 +46,12 @@
  */
 final class MakeCrud extends AbstractMaker
 {
-    private $doctrineHelper;
-    private $formTypeRenderer;
-    private $inflector;
-    private $controllerClassName;
-    private $generateTests = false;
+    private Inflector $inflector;
+    private string $controllerClassName;
+    private bool $generateTests = false;
 
-    public function __construct(DoctrineHelper $doctrineHelper, FormTypeRenderer $formTypeRenderer)
+    public function __construct(private DoctrineHelper $doctrineHelper, private FormTypeRenderer $formTypeRenderer)
     {
-        $this->doctrineHelper = $doctrineHelper;
-        $this->formTypeRenderer = $formTypeRenderer;
         $this->inflector = InflectorFactory::create()->build();
     }
 

src/Maker/MakeEntity.php

@@ -45,23 +45,18 @@
  */
 final class MakeEntity extends AbstractMaker implements InputAwareMakerInterface
 {
-    private $fileManager;
-    private $doctrineHelper;
-    private $generator;
-    private $entityClassGenerator;
-    private $phpCompatUtil;
+    private Generator $generator;
+    private EntityClassGenerator $entityClassGenerator;
+    private PhpCompatUtil $phpCompatUtil;
 
     public function __construct(
-        FileManager $fileManager,
-        DoctrineHelper $doctrineHelper,
+        private FileManager $fileManager,
+        private DoctrineHelper $doctrineHelper,
         string $projectDirectory = null,
         Generator $generator = null,
         EntityClassGenerator $entityClassGenerator = null,
         PhpCompatUtil $phpCompatUtil = null
     ) {
-        $this->fileManager = $fileManager;
-        $this->doctrineHelper = $doctrineHelper;
-
         if (null !== $projectDirectory) {
             @trigger_error('The $projectDirectory constructor argument is no longer used since 1.41.0', \E_USER_DEPRECATED);
         }
@@ -877,10 +872,6 @@ private function doesEntityUseAnnotationMapping(string $className): bool
     /** @legacy Drop when Annotations are no longer supported */
     private function doesEntityUseAttributeMapping(string $className): bool
     {
-        if (!$this->phpCompatUtil->canUseAttributes()) {
-            return false;
-        }
-
         if (!class_exists($className)) {
             $otherClassMetadatas = $this->doctrineHelper->getMetadata(Str::getNamespace($className).'\\', true);
 

src/Maker/MakeForm.php

@@ -34,13 +34,8 @@
  */
 final class MakeForm extends AbstractMaker
 {
-    private $entityHelper;
-    private $formTypeRenderer;
-
-    public function __construct(DoctrineHelper $entityHelper, FormTypeRenderer $formTypeRenderer)
+    public function __construct(private DoctrineHelper $entityHelper, private FormTypeRenderer $formTypeRenderer)
     {
-        $this->entityHelper = $entityHelper;
-        $this->formTypeRenderer = $formTypeRenderer;
     }
 
     public static function getCommandName(): string

src/Maker/MakeMessage.php

@@ -32,11 +32,8 @@
  */
 final class MakeMessage extends AbstractMaker
 {
-    private $fileManager;
-
-    public function __construct(FileManager $fileManager)
+    public function __construct(private FileManager $fileManager)
     {
-        $this->fileManager = $fileManager;
     }
 
     public static function getCommandName(): string

src/Maker/MakeMigration.php

@@ -31,16 +31,10 @@
  */
 final class MakeMigration extends AbstractMaker implements ApplicationAwareMakerInterface
 {
-    private $projectDir;
+    private Application $application;
 
-    /**
-     * @var Application
-     */
-    private $application;
-
-    public function __construct(string $projectDir)
+    public function __construct(private string $projectDir)
     {
-        $this->projectDir = $projectDir;
     }
 
     public static function getCommandName(): string

src/Maker/MakeRegistrationForm.php

@@ -67,11 +67,6 @@
  */
 final class MakeRegistrationForm extends AbstractMaker
 {
-    private $fileManager;
-    private $formTypeRenderer;
-    private $router;
-    private $doctrineHelper;
-
     private $userClass;
     private $usernameField;
     private $passwordField;
@@ -87,12 +82,12 @@ final class MakeRegistrationForm extends AbstractMaker
     private $addUniqueEntityConstraint;
     private $useNewAuthenticatorSystem = false;
 
-    public function __construct(FileManager $fileManager, FormTypeRenderer $formTypeRenderer, RouterInterface $router, DoctrineHelper $doctrineHelper)
-    {
-        $this->fileManager = $fileManager;
-        $this->formTypeRenderer = $formTypeRenderer;
-        $this->router = $router;
-        $this->doctrineHelper = $doctrineHelper;
+    public function __construct(
+        private FileManager $fileManager,
+        private FormTypeRenderer $formTypeRenderer,
+        private RouterInterface $router,
+        private DoctrineHelper $doctrineHelper
+    ) {
     }
 
     public static function getCommandName(): string

src/Maker/MakeResetPassword.php

@@ -78,23 +78,19 @@
  */
 class MakeResetPassword extends AbstractMaker
 {
-    private $fileManager;
-    private $doctrineHelper;
-    private $entityClassGenerator;
-
-    private $fromEmailAddress;
-    private $fromEmailName;
-    private $controllerResetSuccessRedirect;
-    private $userClass;
-    private $emailPropertyName;
-    private $emailGetterMethodName;
-    private $passwordSetterMethodName;
-
-    public function __construct(FileManager $fileManager, DoctrineHelper $doctrineHelper, EntityClassGenerator $entityClassGenerator)
-    {
-        $this->fileManager = $fileManager;
-        $this->doctrineHelper = $doctrineHelper;
-        $this->entityClassGenerator = $entityClassGenerator;
+    private string $fromEmailAddress;
+    private string $fromEmailName;
+    private string $controllerResetSuccessRedirect;
+    private string $userClass;
+    private string $emailPropertyName;
+    private string $emailGetterMethodName;
+    private string $passwordSetterMethodName;
+
+    public function __construct(
+        private FileManager $fileManager,
+        private DoctrineHelper $doctrineHelper,
+        private EntityClassGenerator $entityClassGenerator
+    ) {
     }
 
     public static function getCommandName(): string

src/Maker/MakeSubscriber.php

@@ -31,11 +31,8 @@
  */
 final class MakeSubscriber extends AbstractMaker
 {
-    private $eventRegistry;
-
-    public function __construct(EventRegistry $eventRegistry)
+    public function __construct(private EventRegistry $eventRegistry)
     {
-        $this->eventRegistry = $eventRegistry;
     }
 
     public static function getCommandName(): string

src/Maker/MakeUser.php

@@ -48,19 +48,13 @@
  */
 final class MakeUser extends AbstractMaker
 {
-    private $fileManager;
-    private $userClassBuilder;
-    private $configUpdater;
-    private $entityClassGenerator;
-    private $doctrineHelper;
-
-    public function __construct(FileManager $fileManager, UserClassBuilder $userClassBuilder, SecurityConfigUpdater $configUpdater, EntityClassGenerator $entityClassGenerator, DoctrineHelper $doctrineHelper)
-    {
-        $this->fileManager = $fileManager;
-        $this->userClassBuilder = $userClassBuilder;
-        $this->configUpdater = $configUpdater;
-        $this->entityClassGenerator = $entityClassGenerator;
-        $this->doctrineHelper = $doctrineHelper;
+    public function __construct(
+        private FileManager $fileManager,
+        private UserClassBuilder $userClassBuilder,
+        private SecurityConfigUpdater $configUpdater,
+        private EntityClassGenerator $entityClassGenerator,
+        private DoctrineHelper $doctrineHelper
+    ) {
     }
 
     public static function getCommandName(): string

src/Resources/skeleton/authenticator/LoginFormAuthenticator.tpl.php

@@ -10,11 +10,8 @@ class <?= $class_name; ?> extends AbstractLoginFormAuthenticator
 
     public const LOGIN_ROUTE = 'app_login';
 
-    private <?= $use_typed_properties ? 'UrlGeneratorInterface ' : null ?>$urlGenerator;
-
-    public function __construct(UrlGeneratorInterface $urlGenerator)
+    public function __construct(private UrlGeneratorInterface $urlGenerator)
     {
-        $this->urlGenerator = $urlGenerator;
     }
 
     public function authenticate(Request $request): Passport