[shopsys] all relevant entities are now created with factory (#3004)

Author: grossmannmartin

src/Component/Cron/CronModuleFactory.php

@@ -21,8 +21,8 @@ public function __construct(protected readonly EntityNameResolver $entityNameRes
      */
     public function create(string $serviceId): CronModule
     {
-        $classData = $this->entityNameResolver->resolve(CronModule::class);
+        $entityClassName = $this->entityNameResolver->resolve(CronModule::class);
 
-        return new $classData($serviceId);
+        return new $entityClassName($serviceId);
     }
 }

src/Component/Cron/CronModuleRunFactory.php

@@ -4,15 +4,27 @@
 
 namespace Shopsys\FrameworkBundle\Component\Cron;
 
+use Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver;
+
 class CronModuleRunFactory
 {
+    /**
+     * @param \Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver $entityNameResolver
+     */
+    public function __construct(
+        protected readonly EntityNameResolver $entityNameResolver,
+    ) {
+    }
+
     /**
      * @param \Shopsys\FrameworkBundle\Component\Cron\CronModule $cronModule
      * @return \Shopsys\FrameworkBundle\Component\Cron\CronModuleRun
      */
     public function createFromFinishedCronModule(CronModule $cronModule): CronModuleRun
     {
-        return new CronModuleRun(
+        $entityClassName = $this->entityNameResolver->resolve(CronModuleRun::class);
+
+        return new $entityClassName(
             $cronModule,
             $cronModule->getStatus(),
             $cronModule->getLastStartedAt(),

src/Component/DataFixture/PersistentReferenceFactory.php

@@ -26,8 +26,8 @@ public function create(
         string $entityName,
         int $entityId,
     ): PersistentReference {
-        $classData = $this->entityNameResolver->resolve(PersistentReference::class);
+        $entityClassName = $this->entityNameResolver->resolve(PersistentReference::class);
 
-        return new $classData($referenceName, $entityName, $entityId);
+        return new $entityClassName($referenceName, $entityName, $entityId);
     }
 }

src/Component/Image/ImageFactory.php

@@ -42,9 +42,9 @@ public function create(
         $temporaryFilePath = $this->fileUpload->getTemporaryFilepath($temporaryFilename);
         $convertedFilePath = $this->imageProcessor->convertToShopFormatAndGetNewFilename($temporaryFilePath);
 
-        $classData = $this->entityNameResolver->resolve(Image::class);
+        $entityClassName = $this->entityNameResolver->resolve(Image::class);
 
-        return new $classData($entityName, $entityId, $namesIndexedByLocale, $convertedFilePath, $type);
+        return new $entityClassName($entityName, $entityId, $namesIndexedByLocale, $convertedFilePath, $type);
     }
 
     /**

src/Component/Router/FriendlyUrl/FriendlyUrlFactory.php

@@ -33,9 +33,9 @@ public function create(
         int $domainId,
         string $slug,
     ): FriendlyUrl {
-        $classData = $this->entityNameResolver->resolve(FriendlyUrl::class);
+        $entityClassName = $this->entityNameResolver->resolve(FriendlyUrl::class);
 
-        return new $classData($routeName, $entityId, $domainId, $slug);
+        return new $entityClassName($routeName, $entityId, $domainId, $slug);
     }
 
     /**

src/Component/Setting/SettingValueFactory.php

@@ -26,8 +26,8 @@ public function create(
         $value,
         int $domainId,
     ): SettingValue {
-        $classData = $this->entityNameResolver->resolve(SettingValue::class);
+        $entityClassName = $this->entityNameResolver->resolve(SettingValue::class);
 
-        return new $classData($name, $value, $domainId);
+        return new $entityClassName($name, $value, $domainId);
     }
 }

src/Component/UploadedFile/UploadedFileFactory.php

@@ -38,9 +38,9 @@ public function create(
     ): UploadedFile {
         $temporaryFilepath = $this->fileUpload->getTemporaryFilepath($temporaryFilename);
 
-        $classData = $this->entityNameResolver->resolve(UploadedFile::class);
+        $entityClassName = $this->entityNameResolver->resolve(UploadedFile::class);
 
-        return new $classData($entityName, $entityId, $type, pathinfo(
+        return new $entityClassName($entityName, $entityId, $type, pathinfo(
             $temporaryFilepath,
             PATHINFO_BASENAME,
         ), $uploadedFilename, $position);

src/Model/Administrator/Activity/AdministratorActivityFactory.php

@@ -23,8 +23,8 @@ public function __construct(protected readonly EntityNameResolver $entityNameRes
      */
     public function create(Administrator $administrator, string $ipAddress): AdministratorActivity
     {
-        $classData = $this->entityNameResolver->resolve(AdministratorActivity::class);
+        $entityClassName = $this->entityNameResolver->resolve(AdministratorActivity::class);
 
-        return new $classData($administrator, $ipAddress);
+        return new $entityClassName($administrator, $ipAddress);
     }
 }

src/Model/Administrator/AdministratorFactory.php

@@ -21,8 +21,8 @@ public function __construct(protected readonly EntityNameResolver $entityNameRes
      */
     public function create(AdministratorData $data): Administrator
     {
-        $classData = $this->entityNameResolver->resolve(Administrator::class);
+        $entityClassName = $this->entityNameResolver->resolve(Administrator::class);
 
-        return new $classData($data);
+        return new $entityClassName($data);
     }
 }

src/Model/Administrator/AdministratorGridLimitFactory.php

@@ -23,8 +23,8 @@ public function __construct(protected readonly EntityNameResolver $entityNameRes
      */
     public function create(Administrator $administrator, string $gridId, int $limit): AdministratorGridLimit
     {
-        $classData = $this->entityNameResolver->resolve(AdministratorGridLimit::class);
+        $entityClassName = $this->entityNameResolver->resolve(AdministratorGridLimit::class);
 
-        return new $classData($administrator, $gridId, $limit);
+        return new $entityClassName($administrator, $gridId, $limit);
     }
 }