🔥 Legacy App, wipe EM calls, wipe dead code in App

Author: Volmarg

src/Command/Crons/CronAddRecurringPaymentsCommand.php

@@ -2,13 +2,14 @@
 
 namespace App\Command\Crons;
 
-use App\Controller\Core\Application;
 use App\Entity\Modules\Payments\MyPaymentsMonthly;
 use App\Entity\Modules\Payments\MyRecurringPaymentMonthly;
 use App\Repository\Modules\Payments\MyPaymentsMonthlyRepository;
 use App\Repository\Modules\Payments\MyRecurringPaymentMonthlyRepository;
 use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
 use Exception;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -38,24 +39,19 @@ class CronAddRecurringPaymentsCommand extends Command
      */
     private $countOfAddedPayments = 0;
 
-    /**
-     * @var Application $app
-     */
-    private $app;
-
     /**
      * @var string $currYearMonth
      */
     private $currYearMonth;
 
     public function __construct(
-        Application $app,
+        private readonly LoggerInterface $logger,
+        private readonly EntityManagerInterface $em,
         private readonly MyPaymentsMonthlyRepository $paymentsMonthlyRepository,
         private readonly MyRecurringPaymentMonthlyRepository $recurringPaymentMonthlyRepository,
         string $name = null
     ) {
         parent::__construct($name);
-        $this->app           = $app;
         $this->currYearMonth = (new DateTime())->format('Y-m');
     }
 
@@ -89,8 +85,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $this->report($io);
 
             }catch(Exception $e){
-                $this->app->logger->critical("There was an error while trying to add recurring payments.");
-                $this->app->logger->critical($e->getMessage());
+                $this->logger->critical("There was an error while trying to add recurring payments.");
+                $this->logger->critical($e->getMessage());
                 return Command::FAILURE;
             }
 
@@ -144,8 +140,8 @@ private function addRecurringPaymentsToDatabase(array $recurringPaymentsToSet):v
             $payment->setMoney($recurringPayment->getMoney());
             $payment->setType($recurringPayment->getType());
 
-            $this->app->em->persist($payment);
-            $this->app->em->flush();
+            $this->em->persist($payment);
+            $this->em->flush();
             $this->countOfAddedPayments++;
         }
 

src/Controller/Core/Application.php

@@ -3,24 +3,14 @@
 
 
 use App\Controller\Utils\Utils;
-use App\Services\Core\Logger;
 use App\Services\Core\Translator;
-use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Throwable;
 
 class Application extends AbstractController {
 
-    /**
-     * @var EntityManagerInterface
-     */
-    public $em;
-
     /**
      * @var \App\Services\Core\Translator $translator
      */
@@ -31,49 +21,19 @@ class Application extends AbstractController {
      */
     public $logger;
 
-    /**
-     * @var Logger $customLoggers
-     */
-    public $customLoggers;
-
-    /**
-     * @deprecated should no longer be used, needs to be checked if there is some old service to be removed / replaced
-     */
-    public $translations;
-
     /**
      * @var ConfigLoaders $configLoaders
      */
     public $configLoaders;
 
-    /**
-     * @var TokenStorageInterface $tokenStorage
-     */
-    private TokenStorageInterface $tokenStorage;
-
     public function __construct(
-        EntityManagerInterface  $em,
         LoggerInterface         $logger,
-        Logger                  $customLoggers,
         TranslatorInterface     $translator,
         ConfigLoaders           $configLoaders,
-        TokenStorageInterface   $tokenStorage
     ) {
-        $this->customLoggers = $customLoggers;
         $this->logger        = $logger;
-        $this->em            = $em;
         $this->translator    = new Translator($translator);
         $this->configLoaders = $configLoaders;
-        $this->tokenStorage  = $tokenStorage;
-    }
-
-    /**
-     * Adds green box message on front
-     * @param $message
-     */
-    public function addSuccessFlash($message)
-    {
-        $this->addFlash(Utils::FLASH_TYPE_SUCCESS, $message);
     }
 
     /**
@@ -85,28 +45,6 @@ public function addDangerFlash($message)
         $this->addFlash(Utils::FLASH_TYPE_DANGER, $message);
     }
 
-    /**
-     * @param string $camelString
-     * @return string
-     */
-    public static function camelCaseToSnakeCaseConverter(string $camelString)
-    {
-        $camelCaseToSnakeConverter = new CamelCaseToSnakeCaseNameConverter(null, true);
-        $snakeString               = $camelCaseToSnakeConverter->normalize($camelString);
-        return $snakeString;
-    }
-
-    /**
-     * @param string $snakeCase
-     * @return string
-     */
-    public static function snakeCaseToCamelCaseConverter(string $snakeCase)
-    {
-        $camelCaseToSnakeConverter = new CamelCaseToSnakeCaseNameConverter(null, true);
-        $camelString               = $camelCaseToSnakeConverter->denormalize($snakeCase);
-        return $camelString;
-    }
-
     /**
      * Logs the standard exception data
      * @param Throwable $throwable
@@ -124,44 +62,4 @@ public function logExceptionWasThrown(Throwable $throwable, array $dataBag = [])
         ]);
     }
 
-    /**
-     * Returns currently logged in user
-     * @return object|UserInterface|null
-     */
-    public function getCurrentlyLoggedInUser()
-    {
-        return $this->getUser();
-    }
-
-    /**
-     * Will force logout from system
-     */
-    public function logoutCurrentlyLoggedInUser()
-    {
-        $this->tokenStorage->setToken(null);
-    }
-
-    /**
-     * Begins a transaction
-     */
-    public function beginTransaction(): void
-    {
-        $this->em->beginTransaction();
-    }
-
-    /**
-     * Commits the transaction
-     */
-    public function commitTransaction(): void
-    {
-        $this->em->commit();
-    }
-
-    /**
-     * Rollback the transaction
-     */
-    public function rollbackTransaction(): void
-    {
-        $this->em->rollback();
-    }
 }

src/DataFixtures/Modules/Issues/MyIssues.php

@@ -2,7 +2,6 @@
 
 namespace App\DataFixtures\Modules\Issues;
 
-use App\Controller\Core\Application;
 use App\DataFixtures\Providers\Modules\Issues;
 use App\Entity\Modules\Issues\MyIssue;
 use App\Entity\Modules\Issues\MyIssueContact;
@@ -11,6 +10,7 @@
 use DateTime;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\DBAL\DBALException;
 use Faker\Factory;
@@ -22,17 +22,11 @@ class MyIssues extends Fixture implements OrderedFixtureInterface
      */
     private $faker;
 
-    /**
-     * @var Application $app
-     */
-    private $app;
-
     public function __construct(
-        Application                        $app,
+        private readonly EntityManagerInterface $em,
         private readonly MyIssueRepository $myIssueRepository
     ) {
         $this->faker = Factory::create('en');
-        $this->app   = $app;
     }
 
     /**
@@ -116,7 +110,7 @@ private function addAllIssuesProgress(ObjectManager $manager)
      */
     private function resetIssuesIndex()
     {
-        $connection = $this->app->em->getConnection();
+        $connection = $this->em->getConnection();
 
         $sql = "
             ALTER TABLE my_issue AUTO_INCREMENT = 1

src/DataFixtures/SettingFixtures.php

@@ -2,13 +2,13 @@
 
 namespace App\DataFixtures;
 
-use App\Controller\Core\Application;
 use App\DataFixtures\Providers\SettingProvider;
 use App\DTO\Settings\Finances\SettingsCurrencyDTO;
 use App\DTO\Settings\Finances\SettingsFinancesDTO;
 use App\Services\Exceptions\ExceptionValueNotAllowed;
 use App\Services\Settings\SettingsLoader;
 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\DBAL\DBALException;
 
@@ -25,17 +25,9 @@ class SettingFixtures extends Fixture
     const ROLES                 = 'ROLE_SUPER_ADMIN';
     const USERNAME              = 'admin';
 
-    /**
-     * @var Application $app
-     */
-    private $app;
-
-    /**
-     * SettingFixtures constructor.
-     * @param Application $app
-     */
-    public function __construct(Application $app) {
-        $this->app = $app;
+    public function __construct(
+        private readonly EntityManagerInterface $em,
+    ) {
     }
 
     /**
@@ -117,6 +109,6 @@ private function insertCurrenciesIntoDb(SettingsFinancesDTO $financesSettingsDto
                 VALUES(2, '{$settingType}', '{$json}')
             ";
 
-        $this->app->em->getConnection()->executeQuery($sql);
+        $this->em->getConnection()->executeQuery($sql);
     }
 }