constr prop promotion

Author: jrushlow

src/EventRegistry.php

@@ -43,7 +43,7 @@
 class EventRegistry
 {
     // list of *known* events to always include (if they exist)
-    private static $newEventsMap = [
+    private static array $newEventsMap = [
         'kernel.exception' => ExceptionEvent::class,
         'kernel.request' => RequestEvent::class,
         'kernel.response' => ResponseEvent::class,
@@ -53,7 +53,7 @@ class EventRegistry
         'kernel.terminate' => TerminateEvent::class,
     ];
 
-    private static $eventsMap = [
+    private static array $eventsMap = [
         'console.command' => ConsoleCommandEvent::class,
         'console.terminate' => ConsoleTerminateEvent::class,
         'console.error' => ConsoleErrorEvent::class,
@@ -71,12 +71,9 @@ class EventRegistry
         'security.switch_user' => SwitchUserEvent::class,
     ];
 
-    private $eventDispatcher;
-
-    public function __construct(EventDispatcherInterface $eventDispatcher)
-    {
-        $this->eventDispatcher = $eventDispatcher;
-
+    public function __construct(
+        private EventDispatcherInterface $eventDispatcher,
+    ) {
         // Loop through the new event classes
         foreach (self::$newEventsMap as $eventName => $newEventClass) {
             // Check if the new event classes exist, if so replace the old one with the new.

src/FileManager.php

@@ -25,26 +25,15 @@
  */
 class FileManager
 {
-    private $fs;
-    private $autoloaderUtil;
-    private $makerFileLinkFormatter;
-    private $rootDirectory;
-    /** @var SymfonyStyle */
-    private $io;
-    private $twigDefaultPath;
+    private ?SymfonyStyle $io = null;
 
     public function __construct(
-        Filesystem $fs,
-        AutoloaderUtil $autoloaderUtil,
-        MakerFileLinkFormatter $makerFileLinkFormatter,
-        string $rootDirectory,
-        string $twigDefaultPath = null,
+        private Filesystem $fs,
+        private AutoloaderUtil $autoloaderUtil,
+        private MakerFileLinkFormatter $makerFileLinkFormatter,
+        private string $rootDirectory,
+        private ?string $twigDefaultPath = null,
     ) {
-        // move FileManagerTest stuff
-        // update EntityRegeneratorTest to mock the autoloader
-        $this->fs = $fs;
-        $this->autoloaderUtil = $autoloaderUtil;
-        $this->makerFileLinkFormatter = $makerFileLinkFormatter;
         $this->rootDirectory = rtrim($this->realPath($this->normalizeSlashes($rootDirectory)), '/');
         $this->twigDefaultPath = $twigDefaultPath ? rtrim($this->relativizePath($twigDefaultPath), '/') : null;
     }
@@ -77,13 +66,11 @@ public function dumpFile(string $filename, string $content): void
         $this->fs->dumpFile($absolutePath, $content);
         $relativePath = $this->relativizePath($filename);
 
-        if ($this->io) {
-            $this->io->comment(sprintf(
-                '%s: %s',
-                $comment,
-                $this->makerFileLinkFormatter->makeLinkedPath($absolutePath, $relativePath)
-            ));
-        }
+        $this->io?->comment(sprintf(
+            '%s: %s',
+            $comment,
+            $this->makerFileLinkFormatter->makeLinkedPath($absolutePath, $relativePath)
+        ));
     }
 
     public function fileExists($path): bool
@@ -94,24 +81,22 @@ public function fileExists($path): bool
     /**
      * Attempts to make the path relative to the root directory.
      *
-     * @param string $absolutePath
-     *
      * @throws \Exception
      */
-    public function relativizePath($absolutePath): string
+    public function relativizePath(string $absolutePath): string
     {
         $absolutePath = $this->normalizeSlashes($absolutePath);
 
         // see if the path is even in the root
-        if (false === strpos($absolutePath, $this->rootDirectory)) {
+        if (!str_contains($absolutePath, $this->rootDirectory)) {
             return $absolutePath;
         }
 
         $absolutePath = $this->realPath($absolutePath);
 
         // str_replace but only the first occurrence
         $relativePath = ltrim(implode('', explode($this->rootDirectory, $absolutePath, 2)), '/');
-        if (0 === strpos($relativePath, './')) {
+        if (str_starts_with($relativePath, './')) {
             $relativePath = substr($relativePath, 2);
         }
 
@@ -127,22 +112,17 @@ public function getFileContents(string $path): string
         return file_get_contents($this->absolutizePath($path));
     }
 
-    public function createFinder(string $in): Finder
-    {
-        $finder = new Finder();
-        $finder->in($this->absolutizePath($in));
-
-        return $finder;
-    }
-
     public function isPathInVendor(string $path): bool
     {
-        return 0 === strpos($this->normalizeSlashes($path), $this->normalizeSlashes($this->rootDirectory.'/vendor/'));
+        return str_starts_with(
+            $this->normalizeSlashes($path),
+            $this->normalizeSlashes($this->rootDirectory.'/vendor/')
+        );
     }
 
     public function absolutizePath($path): string
     {
-        if (0 === strpos($path, '/')) {
+        if (str_starts_with($path, '/')) {
             return $path;
         }
 
@@ -190,10 +170,8 @@ public function getPathForTemplate(string $filename): string
 
     /**
      * Resolve '../' in paths (like real_path), but for non-existent files.
-     *
-     * @param string $absolutePath
      */
-    private function realPath($absolutePath): string
+    private function realPath(string $absolutePath): string
     {
         $finalParts = [];
         $currentIndex = -1;
@@ -219,12 +197,10 @@ private function realPath($absolutePath): string
         $finalPath = implode('/', $finalParts);
         // Normalize: // => /
         // Normalize: /./ => /
-        $finalPath = str_replace(['//', '/./'], '/', $finalPath);
-
-        return $finalPath;
+        return str_replace(['//', '/./'], '/', $finalPath);
     }
 
-    private function normalizeSlashes(string $path)
+    private function normalizeSlashes(string $path): string
     {
         return str_replace('\\', '/', $path);
     }