diff --git a/app/bundles/PointBundle/Controller/Api/TriggerApiController.php b/app/bundles/PointBundle/Controller/Api/TriggerApiController.php index c1904944791..fa7a69eda34 100644 --- a/app/bundles/PointBundle/Controller/Api/TriggerApiController.php +++ b/app/bundles/PointBundle/Controller/Api/TriggerApiController.php @@ -31,8 +31,6 @@ class TriggerApiController extends CommonApiController */ protected $model; - private ?RequestStack $requestStack = null; - public function __construct( CorePermissions $security, Translator $translator, @@ -40,15 +38,13 @@ public function __construct( RouterInterface $router, FormFactoryInterface $formFactory, AppVersion $appVersion, - RequestStack $requestStack, + private ?RequestStack $requestStack, ManagerRegistry $doctrine, ModelFactory $modelFactory, EventDispatcherInterface $dispatcher, CoreParametersHelper $coreParametersHelper, MauticFactory $factory ) { - $this->requestStack = $requestStack; - $triggerModel = $modelFactory->getModel('point.trigger'); \assert($triggerModel instanceof TriggerModel); diff --git a/app/bundles/PointBundle/Event/GroupEvent.php b/app/bundles/PointBundle/Event/GroupEvent.php index 69892bf4840..7af81da8c76 100644 --- a/app/bundles/PointBundle/Event/GroupEvent.php +++ b/app/bundles/PointBundle/Event/GroupEvent.php @@ -8,11 +8,8 @@ final class GroupEvent { - private Group $entity; - - public function __construct(Group $group) + public function __construct(private Group $entity) { - $this->entity = $group; } public function getGroup(): Group diff --git a/app/bundles/PointBundle/Event/PointActionEvent.php b/app/bundles/PointBundle/Event/PointActionEvent.php index fa6186bf800..a903b2511dd 100644 --- a/app/bundles/PointBundle/Event/PointActionEvent.php +++ b/app/bundles/PointBundle/Event/PointActionEvent.php @@ -8,14 +8,8 @@ class PointActionEvent extends CommonEvent { - protected \Mautic\PointBundle\Entity\Point $point; - - protected \Mautic\LeadBundle\Entity\Lead $lead; - - public function __construct(Point $point, Lead $lead) + public function __construct(protected Point $point, protected Lead $lead) { - $this->point = $point; - $this->lead = $lead; } /** diff --git a/app/bundles/PointBundle/Event/PointBuilderEvent.php b/app/bundles/PointBundle/Event/PointBuilderEvent.php index 814627398a4..d97947bffd0 100644 --- a/app/bundles/PointBundle/Event/PointBuilderEvent.php +++ b/app/bundles/PointBundle/Event/PointBuilderEvent.php @@ -13,11 +13,8 @@ class PointBuilderEvent extends Event */ private $actions = []; - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(TranslatorInterface $translator) + public function __construct(private TranslatorInterface $translator) { - $this->translator = $translator; } /** diff --git a/app/bundles/PointBundle/Event/TriggerBuilderEvent.php b/app/bundles/PointBundle/Event/TriggerBuilderEvent.php index c9ee937f31c..4c61c6cbefa 100644 --- a/app/bundles/PointBundle/Event/TriggerBuilderEvent.php +++ b/app/bundles/PointBundle/Event/TriggerBuilderEvent.php @@ -13,11 +13,8 @@ class TriggerBuilderEvent extends Event */ private $events = []; - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(TranslatorInterface $translator) + public function __construct(private TranslatorInterface $translator) { - $this->translator = $translator; } /** diff --git a/app/bundles/PointBundle/Event/TriggerEvent.php b/app/bundles/PointBundle/Event/TriggerEvent.php index c8f7f645127..6e14454675c 100644 --- a/app/bundles/PointBundle/Event/TriggerEvent.php +++ b/app/bundles/PointBundle/Event/TriggerEvent.php @@ -12,18 +12,12 @@ class TriggerEvent extends CommonEvent */ protected $entity; - /** - * @var bool - */ - protected $isNew; - /** * @param bool $isNew */ - public function __construct(Trigger &$trigger, $isNew = false) + public function __construct(Trigger &$trigger, protected $isNew = false) { $this->entity = &$trigger; - $this->isNew = $isNew; } /** diff --git a/app/bundles/PointBundle/Event/TriggerExecutedEvent.php b/app/bundles/PointBundle/Event/TriggerExecutedEvent.php index 9b2adc6c3f2..d666ef38646 100644 --- a/app/bundles/PointBundle/Event/TriggerExecutedEvent.php +++ b/app/bundles/PointBundle/Event/TriggerExecutedEvent.php @@ -8,17 +8,11 @@ class TriggerExecutedEvent extends Event { - private TriggerEventEntity $triggerEvent; - - private \Mautic\LeadBundle\Entity\Lead $lead; - /** @var bool */ private $result; - public function __construct(TriggerEventEntity $triggerEvent, Lead $lead) + public function __construct(private TriggerEventEntity $triggerEvent, private Lead $lead) { - $this->triggerEvent = $triggerEvent; - $this->lead = $lead; } /** diff --git a/app/bundles/PointBundle/EventListener/DashboardSubscriber.php b/app/bundles/PointBundle/EventListener/DashboardSubscriber.php index 66a69cec22f..951f77eab5f 100644 --- a/app/bundles/PointBundle/EventListener/DashboardSubscriber.php +++ b/app/bundles/PointBundle/EventListener/DashboardSubscriber.php @@ -34,11 +34,8 @@ class DashboardSubscriber extends MainDashboardSubscriber 'point:points:viewother', ]; - protected \Mautic\PointBundle\Model\PointModel $pointModel; - - public function __construct(PointModel $pointModel) + public function __construct(protected PointModel $pointModel) { - $this->pointModel = $pointModel; } /** diff --git a/app/bundles/PointBundle/EventListener/GroupScoreSubscriber.php b/app/bundles/PointBundle/EventListener/GroupScoreSubscriber.php index 04e760cc91d..7d765e87eeb 100644 --- a/app/bundles/PointBundle/EventListener/GroupScoreSubscriber.php +++ b/app/bundles/PointBundle/EventListener/GroupScoreSubscriber.php @@ -11,11 +11,8 @@ class GroupScoreSubscriber implements EventSubscriberInterface { - private TriggerModel $triggerModel; - - public function __construct(TriggerModel $triggerModel) + public function __construct(private TriggerModel $triggerModel) { - $this->triggerModel = $triggerModel; } /** diff --git a/app/bundles/PointBundle/EventListener/LeadSubscriber.php b/app/bundles/PointBundle/EventListener/LeadSubscriber.php index bf3086c2fa0..1e9fa6f359b 100644 --- a/app/bundles/PointBundle/EventListener/LeadSubscriber.php +++ b/app/bundles/PointBundle/EventListener/LeadSubscriber.php @@ -16,28 +16,8 @@ class LeadSubscriber implements EventSubscriberInterface { - private \Mautic\PointBundle\Model\TriggerModel $triggerModel; - - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - private \Mautic\LeadBundle\Entity\PointsChangeLogRepository $pointsChangeLogRepository; - - private \Mautic\PointBundle\Entity\LeadPointLogRepository $leadPointLogRepository; - - private \Mautic\PointBundle\Entity\LeadTriggerLogRepository $leadTriggerLogRepository; - - public function __construct( - TriggerModel $triggerModel, - TranslatorInterface $translator, - PointsChangeLogRepository $pointsChangeLogRepository, - LeadPointLogRepository $leadPointLogRepository, - LeadTriggerLogRepository $leadTriggerLogRepository - ) { - $this->triggerModel = $triggerModel; - $this->translator = $translator; - $this->pointsChangeLogRepository = $pointsChangeLogRepository; - $this->leadPointLogRepository = $leadPointLogRepository; - $this->leadTriggerLogRepository = $leadTriggerLogRepository; + public function __construct(private TriggerModel $triggerModel, private TranslatorInterface $translator, private PointsChangeLogRepository $pointsChangeLogRepository, private LeadPointLogRepository $leadPointLogRepository, private LeadTriggerLogRepository $leadTriggerLogRepository) + { } /** diff --git a/app/bundles/PointBundle/EventListener/PointSubscriber.php b/app/bundles/PointBundle/EventListener/PointSubscriber.php index a74ad6d9ff9..5bf9f9ff3b9 100644 --- a/app/bundles/PointBundle/EventListener/PointSubscriber.php +++ b/app/bundles/PointBundle/EventListener/PointSubscriber.php @@ -10,14 +10,8 @@ class PointSubscriber implements EventSubscriberInterface { - private \Mautic\CoreBundle\Helper\IpLookupHelper $ipLookupHelper; - - private \Mautic\CoreBundle\Model\AuditLogModel $auditLogModel; - - public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel) + public function __construct(private IpLookupHelper $ipLookupHelper, private AuditLogModel $auditLogModel) { - $this->ipLookupHelper = $ipLookupHelper; - $this->auditLogModel = $auditLogModel; } /** diff --git a/app/bundles/PointBundle/EventListener/ReportSubscriber.php b/app/bundles/PointBundle/EventListener/ReportSubscriber.php index b8c314b600f..6d8f6fd2d97 100644 --- a/app/bundles/PointBundle/EventListener/ReportSubscriber.php +++ b/app/bundles/PointBundle/EventListener/ReportSubscriber.php @@ -41,11 +41,8 @@ class ReportSubscriber implements EventSubscriberInterface self::CONTEXT_GROUP_SCORE, ]; - private \Mautic\LeadBundle\Report\FieldsBuilder $fieldsBuilder; - - public function __construct(FieldsBuilder $fieldsBuilder) + public function __construct(private FieldsBuilder $fieldsBuilder) { - $this->fieldsBuilder = $fieldsBuilder; } /** diff --git a/app/bundles/PointBundle/EventListener/SearchSubscriber.php b/app/bundles/PointBundle/EventListener/SearchSubscriber.php index 4b6a9064bec..cfeedf80cc2 100644 --- a/app/bundles/PointBundle/EventListener/SearchSubscriber.php +++ b/app/bundles/PointBundle/EventListener/SearchSubscriber.php @@ -12,24 +12,8 @@ class SearchSubscriber implements EventSubscriberInterface { - private \Mautic\PointBundle\Model\PointModel $pointModel; - - private \Mautic\PointBundle\Model\TriggerModel $pointTriggerModel; - - private \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - - private \Twig\Environment $twig; - - public function __construct( - PointModel $pointModel, - TriggerModel $pointTriggerModel, - CorePermissions $security, - Environment $twig - ) { - $this->pointModel = $pointModel; - $this->pointTriggerModel = $pointTriggerModel; - $this->security = $security; - $this->twig = $twig; + public function __construct(private PointModel $pointModel, private TriggerModel $pointTriggerModel, private CorePermissions $security, private Environment $twig) + { } /** diff --git a/app/bundles/PointBundle/EventListener/SegmentFilterSubscriber.php b/app/bundles/PointBundle/EventListener/SegmentFilterSubscriber.php index a253b1f5c6b..d9e4ae0405b 100644 --- a/app/bundles/PointBundle/EventListener/SegmentFilterSubscriber.php +++ b/app/bundles/PointBundle/EventListener/SegmentFilterSubscriber.php @@ -14,20 +14,8 @@ class SegmentFilterSubscriber implements EventSubscriberInterface { - private GroupRepository $groupRepository; - - private TypeOperatorProviderInterface $typeOperatorProvider; - - private TranslatorInterface $translator; - - public function __construct( - GroupRepository $groupRepository, - TypeOperatorProviderInterface $typeOperatorProvider, - TranslatorInterface $translator) + public function __construct(private GroupRepository $groupRepository, private TypeOperatorProviderInterface $typeOperatorProvider, private TranslatorInterface $translator) { - $this->groupRepository = $groupRepository; - $this->typeOperatorProvider = $typeOperatorProvider; - $this->translator = $translator; } /** diff --git a/app/bundles/PointBundle/Form/Type/PointType.php b/app/bundles/PointBundle/Form/Type/PointType.php index a2fe75c4c0a..8bb6779e2f6 100644 --- a/app/bundles/PointBundle/Form/Type/PointType.php +++ b/app/bundles/PointBundle/Form/Type/PointType.php @@ -21,11 +21,8 @@ class PointType extends AbstractType { - private \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - - public function __construct(CorePermissions $security) + public function __construct(private CorePermissions $security) { - $this->security = $security; } /** diff --git a/app/bundles/PointBundle/Form/Type/TriggerType.php b/app/bundles/PointBundle/Form/Type/TriggerType.php index 652b53993a9..b4400bc4577 100644 --- a/app/bundles/PointBundle/Form/Type/TriggerType.php +++ b/app/bundles/PointBundle/Form/Type/TriggerType.php @@ -21,11 +21,8 @@ class TriggerType extends AbstractType { - private \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - - public function __construct(CorePermissions $security) + public function __construct(private CorePermissions $security) { - $this->security = $security; } /** diff --git a/app/bundles/PointBundle/Model/PointModel.php b/app/bundles/PointBundle/Model/PointModel.php index 516383083b3..1b0fb22cdec 100644 --- a/app/bundles/PointBundle/Model/PointModel.php +++ b/app/bundles/PointBundle/Model/PointModel.php @@ -36,27 +36,15 @@ */ class PointModel extends CommonFormModel { - protected RequestStack $requestStack; - - protected \Mautic\CoreBundle\Helper\IpLookupHelper $ipLookupHelper; - - protected \Mautic\LeadBundle\Model\LeadModel $leadModel; - - /** - * @deprecated https://github.com/mautic/mautic/issues/8229 - */ - protected \Mautic\CoreBundle\Factory\MauticFactory $mauticFactory; - - private \Mautic\LeadBundle\Tracker\ContactTracker $contactTracker; - - private PointGroupModel $pointGroupModel; - public function __construct( - RequestStack $requestStack, - IpLookupHelper $ipLookupHelper, - LeadModel $leadModel, - MauticFactory $mauticFactory, - ContactTracker $contactTracker, + protected RequestStack $requestStack, + protected IpLookupHelper $ipLookupHelper, + protected LeadModel $leadModel, + /** + * @deprecated https://github.com/mautic/mautic/issues/8229 + */ + protected MauticFactory $mauticFactory, + private ContactTracker $contactTracker, EntityManager $em, CorePermissions $security, EventDispatcherInterface $dispatcher, @@ -65,15 +53,8 @@ public function __construct( UserHelper $userHelper, LoggerInterface $mauticLogger, CoreParametersHelper $coreParametersHelper, - PointGroupModel $pointGroupModel + private PointGroupModel $pointGroupModel ) { - $this->requestStack = $requestStack; - $this->ipLookupHelper = $ipLookupHelper; - $this->leadModel = $leadModel; - $this->mauticFactory = $mauticFactory; - $this->contactTracker = $contactTracker; - $this->pointGroupModel = $pointGroupModel; - parent::__construct($em, $security, $dispatcher, $router, $translator, $userHelper, $mauticLogger, $coreParametersHelper); } diff --git a/app/bundles/PointBundle/Model/TriggerModel.php b/app/bundles/PointBundle/Model/TriggerModel.php index 34d14d3acb8..029cd6837a0 100644 --- a/app/bundles/PointBundle/Model/TriggerModel.php +++ b/app/bundles/PointBundle/Model/TriggerModel.php @@ -36,30 +36,20 @@ class TriggerModel extends CommonFormModel { protected $triggers = []; - protected \Mautic\CoreBundle\Helper\IpLookupHelper $ipLookupHelper; - - protected \Mautic\LeadBundle\Model\LeadModel $leadModel; - - protected \Mautic\PointBundle\Model\TriggerEventModel $pointTriggerEventModel; - - /** - * @deprecated https://github.com/mautic/mautic/issues/8229 - */ - protected \Mautic\CoreBundle\Factory\MauticFactory $mauticFactory; - - private \Mautic\LeadBundle\Tracker\ContactTracker $contactTracker; - /** * @var array> */ private static array $events; public function __construct( - IpLookupHelper $ipLookupHelper, - LeadModel $leadModel, - TriggerEventModel $pointTriggerEventModel, - MauticFactory $mauticFactory, - ContactTracker $contactTracker, + protected IpLookupHelper $ipLookupHelper, + protected LeadModel $leadModel, + protected TriggerEventModel $pointTriggerEventModel, + /** + * @deprecated https://github.com/mautic/mautic/issues/8229 + */ + protected MauticFactory $mauticFactory, + private ContactTracker $contactTracker, EntityManagerInterface $em, CorePermissions $security, EventDispatcherInterface $dispatcher, @@ -69,12 +59,6 @@ public function __construct( LoggerInterface $mauticLogger, CoreParametersHelper $coreParametersHelper ) { - $this->ipLookupHelper = $ipLookupHelper; - $this->leadModel = $leadModel; - $this->pointTriggerEventModel = $pointTriggerEventModel; - $this->mauticFactory = $mauticFactory; - $this->contactTracker = $contactTracker; - parent::__construct($em, $security, $dispatcher, $router, $translator, $userHelper, $mauticLogger, $coreParametersHelper); } diff --git a/app/bundles/ReportBundle/Adapter/ReportDataAdapter.php b/app/bundles/ReportBundle/Adapter/ReportDataAdapter.php index 9e3496131fa..24c84ca4bcc 100644 --- a/app/bundles/ReportBundle/Adapter/ReportDataAdapter.php +++ b/app/bundles/ReportBundle/Adapter/ReportDataAdapter.php @@ -9,11 +9,8 @@ class ReportDataAdapter { - private \Mautic\ReportBundle\Model\ReportModel $reportModel; - - public function __construct(ReportModel $reportModel) + public function __construct(private ReportModel $reportModel) { - $this->reportModel = $reportModel; } public function getReportData(Report $report, ReportExportOptions $reportExportOptions): ReportDataResult diff --git a/app/bundles/ReportBundle/Builder/MauticReportBuilder.php b/app/bundles/ReportBundle/Builder/MauticReportBuilder.php index 5d85704698c..be257945593 100644 --- a/app/bundles/ReportBundle/Builder/MauticReportBuilder.php +++ b/app/bundles/ReportBundle/Builder/MauticReportBuilder.php @@ -10,7 +10,6 @@ use Mautic\ReportBundle\Entity\Report; use Mautic\ReportBundle\Event\ReportGeneratorEvent; use Mautic\ReportBundle\ReportEvents; -use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; final class MauticReportBuilder implements ReportBuilderInterface @@ -77,28 +76,13 @@ final class MauticReportBuilder implements ReportBuilderInterface public const CHANNEL_COLUMN_CREATED_BY = 'channel.created_by'; public const CHANNEL_COLUMN_CREATED_BY_USER = 'channel.created_by_user'; - private \Doctrine\DBAL\Connection $db; - - private \Mautic\ReportBundle\Entity\Report $entity; - /** * @var string */ private $contentTemplate; - /** - * @var EventDispatcher - */ - private \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher; - - private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; - - public function __construct(EventDispatcherInterface $dispatcher, Connection $db, Report $entity, ChannelListHelper $channelListHelper) + public function __construct(private EventDispatcherInterface $dispatcher, private Connection $db, private Report $entity, private ChannelListHelper $channelListHelper) { - $this->entity = $entity; - $this->dispatcher = $dispatcher; - $this->db = $db; - $this->channelListHelper = $channelListHelper; } /** diff --git a/app/bundles/ReportBundle/Crate/ReportDataResult.php b/app/bundles/ReportBundle/Crate/ReportDataResult.php index 81a43b901f4..4e86ef60f3f 100644 --- a/app/bundles/ReportBundle/Crate/ReportDataResult.php +++ b/app/bundles/ReportBundle/Crate/ReportDataResult.php @@ -23,11 +23,6 @@ class ReportDataResult */ private $types = []; - /** - * @var array - */ - private array $totals = []; - /** * @var array */ @@ -46,15 +41,11 @@ class ReportDataResult private int $page; - private int $preBatchSize; - - private bool $isLastBatch; - /** * @param array $data - * @param array $preTotals + * @param array $totals */ - public function __construct(array $data, array $preTotals = [], int $preBatchSize = 0, bool $isLastBatch = true) + public function __construct(array $data, private array $totals = [], private int $preBatchSize = 0, private bool $isLastBatch = true) { if ( !array_key_exists('data', $data) || @@ -71,13 +62,8 @@ public function __construct(array $data, array $preTotals = [], int $preBatchSiz $this->dateTo = $data['dateTo'] ?? null; $this->limit = isset($data['limit']) ? (int) $data['limit'] : null; $this->page = isset($data['page']) ? (int) $data['page'] : 1; - $this->isLastBatch = $isLastBatch; $this->columnKeys = isset($this->data[0]) ? array_keys($this->data[0]) : []; - // Use the calculated totals for previous batch to continue - $this->preBatchSize = $preBatchSize; - $this->totals = $preTotals; - $this->buildHeader($data); $this->buildTypes($data); $this->buildTotals($data['aggregatorColumns'] ?? []); diff --git a/app/bundles/ReportBundle/Entity/Scheduler.php b/app/bundles/ReportBundle/Entity/Scheduler.php index 52d81e4fcb0..2709677217c 100644 --- a/app/bundles/ReportBundle/Entity/Scheduler.php +++ b/app/bundles/ReportBundle/Entity/Scheduler.php @@ -13,10 +13,6 @@ class Scheduler */ private $id; - private \Mautic\ReportBundle\Entity\Report $report; - - private \DateTimeInterface $scheduleDate; - public static function loadMetadata(ORM\ClassMetadata $metadata): void { $builder = new ClassMetadataBuilder($metadata); @@ -36,10 +32,8 @@ public static function loadMetadata(ORM\ClassMetadata $metadata): void ->build(); } - public function __construct(Report $report, \DateTimeInterface $scheduleDate) + public function __construct(private Report $report, private \DateTimeInterface $scheduleDate) { - $this->report = $report; - $this->scheduleDate = $scheduleDate; } /** diff --git a/app/bundles/ReportBundle/Event/ReportBuilderEvent.php b/app/bundles/ReportBundle/Event/ReportBuilderEvent.php index 036d0855fa6..f9a78ee5b3e 100644 --- a/app/bundles/ReportBundle/Event/ReportBuilderEvent.php +++ b/app/bundles/ReportBundle/Event/ReportBuilderEvent.php @@ -2,6 +2,7 @@ namespace Mautic\ReportBundle\Event; +use Doctrine\ORM\Tools\Pagination\Paginator; use Mautic\ChannelBundle\Helper\ChannelListHelper; use Mautic\ReportBundle\Builder\MauticReportBuilder; use Mautic\ReportBundle\Helper\ReportHelper; @@ -18,52 +19,41 @@ class ReportBuilderEvent extends AbstractReportEvent private $tableArray = []; /** - * Supported graphs. - * - * @var array + * @var string[] */ - private $supportedGraphs = [ + private array $supportedGraphs = [ 'table', 'bar', 'pie', 'line', ]; - private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; - - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - /** - * Container with registered graphs. - * - * @var array + * @var mixed[] */ - private $graphArray = []; + private array $graphArray = []; /** * List of published array of lead fields. * - * @var array + * @var mixed[]|Paginator|array */ private $leadFields = []; - private \Mautic\ReportBundle\Helper\ReportHelper $reportHelper; - - private ?string $reportSource; - /** - * ReportBuilderEvent constructor. - * - * @param string $context + * @param string $context + * @param mixed[]|Paginator|array $leadFields */ - public function __construct(TranslatorInterface $translator, ChannelListHelper $channelListHelper, $context, $leadFields, ReportHelper $reportHelper, ?string $reportSource = null) - { + public function __construct( + private TranslatorInterface $translator, + private ChannelListHelper $channelListHelper, + $context, + $leadFields, + private ReportHelper $reportHelper, + private ?string $reportSource = null + ) { $this->context = $context; - $this->translator = $translator; - $this->channelListHelper = $channelListHelper; $this->leadFields = $leadFields; - $this->reportHelper = $reportHelper; - $this->reportSource = $reportSource; } /** diff --git a/app/bundles/ReportBundle/Event/ReportDataEvent.php b/app/bundles/ReportBundle/Event/ReportDataEvent.php index 881982c9d4d..c80ecfbd516 100644 --- a/app/bundles/ReportBundle/Event/ReportDataEvent.php +++ b/app/bundles/ReportBundle/Event/ReportDataEvent.php @@ -6,18 +6,12 @@ class ReportDataEvent extends AbstractReportEvent { - private array $data; - - private array $options; - private int $totalResults; - public function __construct(Report $report, array $data, $totalResults, array $options) + public function __construct(Report $report, private array $data, $totalResults, private array $options) { $this->context = $report->getSource(); $this->report = $report; - $this->data = $data; - $this->options = $options; $this->totalResults = (int) $totalResults; } diff --git a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php index ef557c8788c..aed53e2269d 100644 --- a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php +++ b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php @@ -21,11 +21,6 @@ class ReportGeneratorEvent extends AbstractReportEvent */ private $selectColumns = []; - /** - * QueryBuilder object. - */ - private \Doctrine\DBAL\Query\QueryBuilder $queryBuilder; - /** * contentTemplate. * @@ -33,30 +28,23 @@ class ReportGeneratorEvent extends AbstractReportEvent */ private $contentTemplate; - /** - * @var array - */ - private $options = []; - /** * @var ExpressionBuilder|null */ private $filterExpression; - private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; - /** * @var array|null */ private $sortedFilters; - public function __construct(Report $report, array $options, QueryBuilder $qb, ChannelListHelper $channelListHelper) + public function __construct(Report $report, private array $options, /** + * QueryBuilder object. + */ + private QueryBuilder $queryBuilder, private ChannelListHelper $channelListHelper) { $this->report = $report; $this->context = $report->getSource(); - $this->options = $options; - $this->queryBuilder = $qb; - $this->channelListHelper = $channelListHelper; } /** diff --git a/app/bundles/ReportBundle/Event/ReportGraphEvent.php b/app/bundles/ReportBundle/Event/ReportGraphEvent.php index 10a25b321a2..ca2f7fd0f15 100644 --- a/app/bundles/ReportBundle/Event/ReportGraphEvent.php +++ b/app/bundles/ReportBundle/Event/ReportGraphEvent.php @@ -7,19 +7,13 @@ class ReportGraphEvent extends AbstractReportEvent { - private array $requestedGraphs; - - private \Doctrine\DBAL\Query\QueryBuilder $queryBuilder; - /** - * Constructor. + * @param mixed[] $requestedGraphs */ - public function __construct(Report $report, array $graphs, QueryBuilder $queryBuilder) + public function __construct(Report $report, private array $requestedGraphs, private QueryBuilder $queryBuilder) { $this->report = $report; $this->context = $report->getSource(); - $this->requestedGraphs = $graphs; - $this->queryBuilder = $queryBuilder; } /** diff --git a/app/bundles/ReportBundle/Event/ReportQueryEvent.php b/app/bundles/ReportBundle/Event/ReportQueryEvent.php index 03d218adc85..76b04781c37 100644 --- a/app/bundles/ReportBundle/Event/ReportQueryEvent.php +++ b/app/bundles/ReportBundle/Event/ReportQueryEvent.php @@ -7,18 +7,12 @@ class ReportQueryEvent extends AbstractReportEvent { - private \Doctrine\DBAL\Query\QueryBuilder $query; - - private array $options; - private int $totalResults; - public function __construct(Report $report, QueryBuilder $query, $totalResults, array $options) + public function __construct(Report $report, private QueryBuilder $query, $totalResults, private array $options) { $this->context = $report->getSource(); $this->report = $report; - $this->query = $query; - $this->options = $options; $this->totalResults = (int) $totalResults; } diff --git a/app/bundles/ReportBundle/Event/ReportScheduleSendEvent.php b/app/bundles/ReportBundle/Event/ReportScheduleSendEvent.php index 5c05bdafe23..03646aa0115 100644 --- a/app/bundles/ReportBundle/Event/ReportScheduleSendEvent.php +++ b/app/bundles/ReportBundle/Event/ReportScheduleSendEvent.php @@ -7,20 +7,11 @@ class ReportScheduleSendEvent extends Event { - private \Mautic\ReportBundle\Entity\Scheduler $scheduler; - - /** - * @var string - */ - private $file; - /** * @param string $file */ - public function __construct(Scheduler $scheduler, $file) + public function __construct(private Scheduler $scheduler, private $file) { - $this->scheduler = $scheduler; - $this->file = $file; } /** diff --git a/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php b/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php index 7c5ba1e9dd1..99e295a7fee 100644 --- a/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php +++ b/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php @@ -10,10 +10,6 @@ class DashboardSubscriber extends MainDashboardSubscriber { - protected \Mautic\ReportBundle\Model\ReportModel $reportModel; - - protected \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - /** * Define the name of the bundle/category of the widget(s). * @@ -42,10 +38,8 @@ class DashboardSubscriber extends MainDashboardSubscriber 'report:reports:viewother', ]; - public function __construct(ReportModel $reportModel, CorePermissions $security) + public function __construct(protected ReportModel $reportModel, protected CorePermissions $security) { - $this->reportModel = $reportModel; - $this->security = $security; } /** diff --git a/app/bundles/ReportBundle/EventListener/ReportSubscriber.php b/app/bundles/ReportBundle/EventListener/ReportSubscriber.php index a9f5ef7f265..f37a1dc9592 100644 --- a/app/bundles/ReportBundle/EventListener/ReportSubscriber.php +++ b/app/bundles/ReportBundle/EventListener/ReportSubscriber.php @@ -10,14 +10,8 @@ class ReportSubscriber implements EventSubscriberInterface { - private \Mautic\CoreBundle\Helper\IpLookupHelper $ipLookupHelper; - - private \Mautic\CoreBundle\Model\AuditLogModel $auditLogModel; - - public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel) + public function __construct(private IpLookupHelper $ipLookupHelper, private AuditLogModel $auditLogModel) { - $this->ipLookupHelper = $ipLookupHelper; - $this->auditLogModel = $auditLogModel; } /** diff --git a/app/bundles/ReportBundle/EventListener/SchedulerSubscriber.php b/app/bundles/ReportBundle/EventListener/SchedulerSubscriber.php index a7126402c11..ceed56157fd 100644 --- a/app/bundles/ReportBundle/EventListener/SchedulerSubscriber.php +++ b/app/bundles/ReportBundle/EventListener/SchedulerSubscriber.php @@ -9,11 +9,8 @@ class SchedulerSubscriber implements EventSubscriberInterface { - private \Mautic\ReportBundle\Scheduler\Model\SendSchedule $sendSchedule; - - public function __construct(SendSchedule $sendSchedule) + public function __construct(private SendSchedule $sendSchedule) { - $this->sendSchedule = $sendSchedule; } /** diff --git a/app/bundles/ReportBundle/EventListener/SearchSubscriber.php b/app/bundles/ReportBundle/EventListener/SearchSubscriber.php index 9424eba2290..c51f5d94ec2 100644 --- a/app/bundles/ReportBundle/EventListener/SearchSubscriber.php +++ b/app/bundles/ReportBundle/EventListener/SearchSubscriber.php @@ -12,24 +12,8 @@ class SearchSubscriber implements EventSubscriberInterface { - private \Mautic\CoreBundle\Helper\UserHelper $userHelper; - - private \Mautic\ReportBundle\Model\ReportModel $reportModel; - - private \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - - private \Twig\Environment $twig; - - public function __construct( - UserHelper $userHelper, - ReportModel $reportModel, - CorePermissions $security, - Environment $twig - ) { - $this->userHelper = $userHelper; - $this->reportModel = $reportModel; - $this->security = $security; - $this->twig = $twig; + public function __construct(private UserHelper $userHelper, private ReportModel $reportModel, private CorePermissions $security, private Environment $twig) + { } /** diff --git a/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php b/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php index 3ea3922f18f..aca4c4c76fa 100644 --- a/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php +++ b/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php @@ -10,17 +10,11 @@ class ReportFilterDataTransformer implements DataTransformerInterface { - /** - * @var string - */ - private $columns; - /** * @param array $columns */ - public function __construct($columns) + public function __construct(private $columns) { - $this->columns = $columns; } /** diff --git a/app/bundles/ReportBundle/Form/Type/AggregatorType.php b/app/bundles/ReportBundle/Form/Type/AggregatorType.php index 94a957c455c..b7d93cbc772 100644 --- a/app/bundles/ReportBundle/Form/Type/AggregatorType.php +++ b/app/bundles/ReportBundle/Form/Type/AggregatorType.php @@ -12,11 +12,8 @@ class AggregatorType extends AbstractType { - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(TranslatorInterface $translator) + public function __construct(private TranslatorInterface $translator) { - $this->translator = $translator; } /** diff --git a/app/bundles/ReportBundle/Form/Type/ReportType.php b/app/bundles/ReportBundle/Form/Type/ReportType.php index 59d62bca284..4386b2254b2 100644 --- a/app/bundles/ReportBundle/Form/Type/ReportType.php +++ b/app/bundles/ReportBundle/Form/Type/ReportType.php @@ -23,11 +23,8 @@ class ReportType extends AbstractType { - private \Mautic\ReportBundle\Model\ReportModel $reportModel; - - public function __construct(ReportModel $reportModel) + public function __construct(private ReportModel $reportModel) { - $this->reportModel = $reportModel; } /** diff --git a/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php b/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php index 7a6bf2704c0..958888d369c 100644 --- a/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php +++ b/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php @@ -10,11 +10,8 @@ class ReportWidgetType extends AbstractType { - protected \Mautic\ReportBundle\Model\ReportModel $model; - - public function __construct(ReportModel $reportModel) + public function __construct(protected ReportModel $model) { - $this->model = $reportModel; } public function buildForm(FormBuilderInterface $builder, array $options): void diff --git a/app/bundles/ReportBundle/Form/Type/TableOrderType.php b/app/bundles/ReportBundle/Form/Type/TableOrderType.php index 25daf9fdd00..242d102a689 100644 --- a/app/bundles/ReportBundle/Form/Type/TableOrderType.php +++ b/app/bundles/ReportBundle/Form/Type/TableOrderType.php @@ -12,11 +12,8 @@ class TableOrderType extends AbstractType { - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(TranslatorInterface $translator) + public function __construct(private TranslatorInterface $translator) { - $this->translator = $translator; } /** diff --git a/app/bundles/ReportBundle/Generator/ReportGenerator.php b/app/bundles/ReportBundle/Generator/ReportGenerator.php index 33a246fdfe3..a1b549a1dd1 100644 --- a/app/bundles/ReportBundle/Generator/ReportGenerator.php +++ b/app/bundles/ReportBundle/Generator/ReportGenerator.php @@ -8,7 +8,6 @@ use Mautic\ReportBundle\Entity\Report; use Mautic\ReportBundle\Form\Type\ReportType; use Symfony\Component\DependencyInjection\Exception\RuntimeException; -use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\FormFactoryInterface; @@ -17,17 +16,6 @@ */ class ReportGenerator { - private \Doctrine\DBAL\Connection $db; - - /** - * @var EventDispatcher - */ - private \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher; - - private ?\Symfony\Component\Form\FormFactoryInterface $formFactory; - - private \Mautic\ReportBundle\Entity\Report $entity; - /** * @var string */ @@ -38,15 +26,8 @@ class ReportGenerator */ private $contentTemplate; - private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; - - public function __construct(EventDispatcherInterface $dispatcher, Connection $db, Report $entity, ChannelListHelper $channelListHelper, FormFactoryInterface $formFactory = null) + public function __construct(private EventDispatcherInterface $dispatcher, private Connection $db, private Report $entity, private ChannelListHelper $channelListHelper, private ?FormFactoryInterface $formFactory = null) { - $this->db = $db; - $this->dispatcher = $dispatcher; - $this->formFactory = $formFactory; - $this->channelListHelper = $channelListHelper; - $this->entity = $entity; } /** diff --git a/app/bundles/ReportBundle/Model/CsvExporter.php b/app/bundles/ReportBundle/Model/CsvExporter.php index 4479be0f6f9..54389aa69b7 100644 --- a/app/bundles/ReportBundle/Model/CsvExporter.php +++ b/app/bundles/ReportBundle/Model/CsvExporter.php @@ -9,17 +9,8 @@ class CsvExporter { - protected \Mautic\CoreBundle\Twig\Helper\FormatterHelper $formatterHelper; - - private \Mautic\CoreBundle\Helper\CoreParametersHelper $coreParametersHelper; - - private TranslatorInterface $translator; - - public function __construct(FormatterHelper $formatterHelper, CoreParametersHelper $coreParametersHelper, TranslatorInterface $translator) + public function __construct(protected FormatterHelper $formatterHelper, private CoreParametersHelper $coreParametersHelper, private TranslatorInterface $translator) { - $this->formatterHelper = $formatterHelper; - $this->coreParametersHelper = $coreParametersHelper; - $this->translator = $translator; } /** diff --git a/app/bundles/ReportBundle/Model/ExcelExporter.php b/app/bundles/ReportBundle/Model/ExcelExporter.php index fe29249fe62..3e796c3e0f9 100644 --- a/app/bundles/ReportBundle/Model/ExcelExporter.php +++ b/app/bundles/ReportBundle/Model/ExcelExporter.php @@ -12,14 +12,8 @@ class ExcelExporter { - protected \Mautic\CoreBundle\Twig\Helper\FormatterHelper $formatterHelper; - - private TranslatorInterface $translator; - - public function __construct(FormatterHelper $formatterHelper, TranslatorInterface $translator) + public function __construct(protected FormatterHelper $formatterHelper, private TranslatorInterface $translator) { - $this->formatterHelper = $formatterHelper; - $this->translator = $translator; } /** diff --git a/app/bundles/ReportBundle/Model/ExportHandler.php b/app/bundles/ReportBundle/Model/ExportHandler.php index 1657b02e680..fe9fb26ce05 100644 --- a/app/bundles/ReportBundle/Model/ExportHandler.php +++ b/app/bundles/ReportBundle/Model/ExportHandler.php @@ -14,12 +14,9 @@ class ExportHandler */ private $dir; - private \Mautic\CoreBundle\Helper\FilePathResolver $filePathResolver; - - public function __construct(CoreParametersHelper $coreParametersHelper, FilePathResolver $filePathResolver) + public function __construct(CoreParametersHelper $coreParametersHelper, private FilePathResolver $filePathResolver) { $this->dir = $coreParametersHelper->get('report_temp_dir'); - $this->filePathResolver = $filePathResolver; } /** diff --git a/app/bundles/ReportBundle/Model/ReportExporter.php b/app/bundles/ReportBundle/Model/ReportExporter.php index c6474a4f4ea..f0dfd01ebb0 100644 --- a/app/bundles/ReportBundle/Model/ReportExporter.php +++ b/app/bundles/ReportBundle/Model/ReportExporter.php @@ -13,28 +13,8 @@ class ReportExporter { - private \Mautic\ReportBundle\Model\ScheduleModel $schedulerModel; - - private \Mautic\ReportBundle\Adapter\ReportDataAdapter $reportDataAdapter; - - private \Mautic\ReportBundle\Model\ReportExportOptions $reportExportOptions; - - private \Mautic\ReportBundle\Model\ReportFileWriter $reportFileWriter; - - private \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher; - - public function __construct( - ScheduleModel $schedulerModel, - ReportDataAdapter $reportDataAdapter, - ReportExportOptions $reportExportOptions, - ReportFileWriter $reportFileWriter, - EventDispatcherInterface $eventDispatcher - ) { - $this->schedulerModel = $schedulerModel; - $this->reportDataAdapter = $reportDataAdapter; - $this->reportExportOptions = $reportExportOptions; - $this->reportFileWriter = $reportFileWriter; - $this->eventDispatcher = $eventDispatcher; + public function __construct(private ScheduleModel $schedulerModel, private ReportDataAdapter $reportDataAdapter, private ReportExportOptions $reportExportOptions, private ReportFileWriter $reportFileWriter, private EventDispatcherInterface $eventDispatcher) + { } /** diff --git a/app/bundles/ReportBundle/Model/ReportFileWriter.php b/app/bundles/ReportBundle/Model/ReportFileWriter.php index e51407aa095..1d31591e0e4 100644 --- a/app/bundles/ReportBundle/Model/ReportFileWriter.php +++ b/app/bundles/ReportBundle/Model/ReportFileWriter.php @@ -9,14 +9,8 @@ class ReportFileWriter { - private \Mautic\ReportBundle\Model\CsvExporter $csvExporter; - - private \Mautic\ReportBundle\Model\ExportHandler $exportHandler; - - public function __construct(CsvExporter $csvExporter, ExportHandler $exportHandler) + public function __construct(private CsvExporter $csvExporter, private ExportHandler $exportHandler) { - $this->csvExporter = $csvExporter; - $this->exportHandler = $exportHandler; } /** diff --git a/app/bundles/ReportBundle/Model/ReportModel.php b/app/bundles/ReportBundle/Model/ReportModel.php index 46dc3bf7caf..8f8492be2f3 100644 --- a/app/bundles/ReportBundle/Model/ReportModel.php +++ b/app/bundles/ReportBundle/Model/ReportModel.php @@ -56,28 +56,14 @@ class ReportModel extends FormModel */ protected $defaultPageLimit; - protected \Twig\Environment $twig; - - protected \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; - - private RequestStack $requestStack; - - protected \Mautic\LeadBundle\Model\FieldModel $fieldModel; - - protected \Mautic\ReportBundle\Helper\ReportHelper $reportHelper; - - private \Mautic\ReportBundle\Model\CsvExporter $csvExporter; - - private \Mautic\ReportBundle\Model\ExcelExporter $excelExporter; - public function __construct( CoreParametersHelper $coreParametersHelper, - Environment $twig, - ChannelListHelper $channelListHelper, - FieldModel $fieldModel, - ReportHelper $reportHelper, - CsvExporter $csvExporter, - ExcelExporter $excelExporter, + protected Environment $twig, + protected ChannelListHelper $channelListHelper, + protected FieldModel $fieldModel, + protected ReportHelper $reportHelper, + private CsvExporter $csvExporter, + private ExcelExporter $excelExporter, EntityManagerInterface $em, CorePermissions $security, EventDispatcherInterface $dispatcher, @@ -85,16 +71,9 @@ public function __construct( Translator $translator, UserHelper $userHelper, LoggerInterface $mauticLogger, - RequestStack $requestStack + private RequestStack $requestStack ) { $this->defaultPageLimit = $coreParametersHelper->get('default_pagelimit'); - $this->twig = $twig; - $this->channelListHelper = $channelListHelper; - $this->fieldModel = $fieldModel; - $this->reportHelper = $reportHelper; - $this->csvExporter = $csvExporter; - $this->excelExporter = $excelExporter; - $this->requestStack = $requestStack; parent::__construct($em, $security, $dispatcher, $router, $translator, $userHelper, $mauticLogger, $coreParametersHelper); } diff --git a/app/bundles/ReportBundle/Model/ScheduleModel.php b/app/bundles/ReportBundle/Model/ScheduleModel.php index 4e6242962a9..ea52c772c18 100644 --- a/app/bundles/ReportBundle/Model/ScheduleModel.php +++ b/app/bundles/ReportBundle/Model/ScheduleModel.php @@ -16,15 +16,9 @@ class ScheduleModel */ private \Doctrine\ORM\EntityRepository $schedulerRepository; - private \Mautic\ReportBundle\Scheduler\Model\SchedulerPlanner $schedulerPlanner; - - private \Doctrine\ORM\EntityManager $entityManager; - - public function __construct(EntityManager $entityManager, SchedulerPlanner $schedulerPlanner) + public function __construct(private EntityManager $entityManager, private SchedulerPlanner $schedulerPlanner) { - $this->entityManager = $entityManager; $this->schedulerRepository = $entityManager->getRepository(Scheduler::class); - $this->schedulerPlanner = $schedulerPlanner; } /** diff --git a/app/bundles/ReportBundle/Scheduler/Builder/SchedulerBuilder.php b/app/bundles/ReportBundle/Scheduler/Builder/SchedulerBuilder.php index 23593ebcee6..dd28c8eb0aa 100644 --- a/app/bundles/ReportBundle/Scheduler/Builder/SchedulerBuilder.php +++ b/app/bundles/ReportBundle/Scheduler/Builder/SchedulerBuilder.php @@ -12,11 +12,8 @@ class SchedulerBuilder { - private \Mautic\ReportBundle\Scheduler\Factory\SchedulerTemplateFactory $schedulerTemplateFactory; - - public function __construct(SchedulerTemplateFactory $schedulerTemplateFactory) + public function __construct(private SchedulerTemplateFactory $schedulerTemplateFactory) { - $this->schedulerTemplateFactory = $schedulerTemplateFactory; } /** diff --git a/app/bundles/ReportBundle/Scheduler/Command/ExportSchedulerCommand.php b/app/bundles/ReportBundle/Scheduler/Command/ExportSchedulerCommand.php index 442a8f0204c..bfe831e9e1d 100644 --- a/app/bundles/ReportBundle/Scheduler/Command/ExportSchedulerCommand.php +++ b/app/bundles/ReportBundle/Scheduler/Command/ExportSchedulerCommand.php @@ -13,15 +13,9 @@ class ExportSchedulerCommand extends Command { - private \Mautic\ReportBundle\Model\ReportExporter $reportExporter; - - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(ReportExporter $reportExporter, TranslatorInterface $translator) + public function __construct(private ReportExporter $reportExporter, private TranslatorInterface $translator) { parent::__construct(); - $this->reportExporter = $reportExporter; - $this->translator = $translator; } /** diff --git a/app/bundles/ReportBundle/Scheduler/Date/DateBuilder.php b/app/bundles/ReportBundle/Scheduler/Date/DateBuilder.php index b188b257742..95313df3782 100644 --- a/app/bundles/ReportBundle/Scheduler/Date/DateBuilder.php +++ b/app/bundles/ReportBundle/Scheduler/Date/DateBuilder.php @@ -11,11 +11,8 @@ class DateBuilder { - private \Mautic\ReportBundle\Scheduler\Builder\SchedulerBuilder $schedulerBuilder; - - public function __construct(SchedulerBuilder $schedulerBuilder) + public function __construct(private SchedulerBuilder $schedulerBuilder) { - $this->schedulerBuilder = $schedulerBuilder; } /** diff --git a/app/bundles/ReportBundle/Scheduler/Entity/SchedulerEntity.php b/app/bundles/ReportBundle/Scheduler/Entity/SchedulerEntity.php index eafde362ddc..cae2c007a42 100644 --- a/app/bundles/ReportBundle/Scheduler/Entity/SchedulerEntity.php +++ b/app/bundles/ReportBundle/Scheduler/Entity/SchedulerEntity.php @@ -8,31 +8,13 @@ class SchedulerEntity implements SchedulerInterface { /** - * @var bool + * @param bool $isScheduled + * @param string|null $scheduleUnit + * @param string|null $scheduleDay + * @param string|null $scheduleMonthFrequency */ - private $isScheduled = false; - - /** - * @var string|null - */ - private $scheduleUnit; - - /** - * @var string|null - */ - private $scheduleDay; - - /** - * @var string|null - */ - private $scheduleMonthFrequency; - - public function __construct($isScheduled, $scheduleUnit, $scheduleDay, $scheduleMonthFrequency) + public function __construct(private $isScheduled, private $scheduleUnit, private $scheduleDay, private $scheduleMonthFrequency) { - $this->isScheduled = $isScheduled; - $this->scheduleUnit = $scheduleUnit; - $this->scheduleDay = $scheduleDay; - $this->scheduleMonthFrequency = $scheduleMonthFrequency; } /** diff --git a/app/bundles/ReportBundle/Scheduler/EventListener/ReportSchedulerSubscriber.php b/app/bundles/ReportBundle/Scheduler/EventListener/ReportSchedulerSubscriber.php index 16fba0b2fe9..9a2afd39571 100644 --- a/app/bundles/ReportBundle/Scheduler/EventListener/ReportSchedulerSubscriber.php +++ b/app/bundles/ReportBundle/Scheduler/EventListener/ReportSchedulerSubscriber.php @@ -9,11 +9,8 @@ class ReportSchedulerSubscriber implements EventSubscriberInterface { - private \Mautic\ReportBundle\Scheduler\Model\SchedulerPlanner $schedulerPlanner; - - public function __construct(SchedulerPlanner $schedulerPlanner) + public function __construct(private SchedulerPlanner $schedulerPlanner) { - $this->schedulerPlanner = $schedulerPlanner; } /** diff --git a/app/bundles/ReportBundle/Scheduler/Model/FileHandler.php b/app/bundles/ReportBundle/Scheduler/Model/FileHandler.php index 6991ae27583..7e248b6e956 100644 --- a/app/bundles/ReportBundle/Scheduler/Model/FileHandler.php +++ b/app/bundles/ReportBundle/Scheduler/Model/FileHandler.php @@ -13,20 +13,8 @@ class FileHandler { - private \Mautic\CoreBundle\Helper\FilePathResolver $filePathResolver; - - private \Mautic\CoreBundle\Helper\FileProperties $fileProperties; - - private \Mautic\CoreBundle\Helper\CoreParametersHelper $coreParametersHelper; - - public function __construct( - FilePathResolver $filePathResolver, - FileProperties $fileProperties, - CoreParametersHelper $coreParametersHelper - ) { - $this->filePathResolver = $filePathResolver; - $this->fileProperties = $fileProperties; - $this->coreParametersHelper = $coreParametersHelper; + public function __construct(private FilePathResolver $filePathResolver, private FileProperties $fileProperties, private CoreParametersHelper $coreParametersHelper) + { } /** diff --git a/app/bundles/ReportBundle/Scheduler/Model/MessageSchedule.php b/app/bundles/ReportBundle/Scheduler/Model/MessageSchedule.php index ff727b823c7..1f8ffaa0a28 100644 --- a/app/bundles/ReportBundle/Scheduler/Model/MessageSchedule.php +++ b/app/bundles/ReportBundle/Scheduler/Model/MessageSchedule.php @@ -10,24 +10,8 @@ class MessageSchedule { - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - private \Mautic\CoreBundle\Helper\FileProperties $fileProperties; - - private \Mautic\CoreBundle\Helper\CoreParametersHelper $coreParametersHelper; - - private \Symfony\Component\Routing\Generator\UrlGeneratorInterface $router; - - public function __construct( - TranslatorInterface $translator, - FileProperties $fileProperties, - CoreParametersHelper $coreParametersHelper, - UrlGeneratorInterface $router - ) { - $this->translator = $translator; - $this->fileProperties = $fileProperties; - $this->coreParametersHelper = $coreParametersHelper; - $this->router = $router; + public function __construct(private TranslatorInterface $translator, private FileProperties $fileProperties, private CoreParametersHelper $coreParametersHelper, private UrlGeneratorInterface $router) + { } /** diff --git a/app/bundles/ReportBundle/Scheduler/Model/SchedulerPlanner.php b/app/bundles/ReportBundle/Scheduler/Model/SchedulerPlanner.php index 4b544aa6291..a25b722a1f4 100644 --- a/app/bundles/ReportBundle/Scheduler/Model/SchedulerPlanner.php +++ b/app/bundles/ReportBundle/Scheduler/Model/SchedulerPlanner.php @@ -11,19 +11,13 @@ class SchedulerPlanner { - private \Mautic\ReportBundle\Scheduler\Date\DateBuilder $dateBuilder; - /** * @var SchedulerRepository */ private \Doctrine\ORM\EntityRepository $schedulerRepository; - private \Doctrine\ORM\EntityManager $entityManager; - - public function __construct(DateBuilder $dateBuilder, EntityManager $entityManager) + public function __construct(private DateBuilder $dateBuilder, private EntityManager $entityManager) { - $this->dateBuilder = $dateBuilder; - $this->entityManager = $entityManager; $this->schedulerRepository = $entityManager->getRepository(Scheduler::class); } diff --git a/app/bundles/ReportBundle/Scheduler/Model/SendSchedule.php b/app/bundles/ReportBundle/Scheduler/Model/SendSchedule.php index 06bbc4764c1..cfaf167b125 100644 --- a/app/bundles/ReportBundle/Scheduler/Model/SendSchedule.php +++ b/app/bundles/ReportBundle/Scheduler/Model/SendSchedule.php @@ -11,18 +11,12 @@ class SendSchedule { private \Mautic\EmailBundle\Helper\MailHelper $mailer; - private \Mautic\ReportBundle\Scheduler\Model\MessageSchedule $messageSchedule; - - private \Mautic\ReportBundle\Scheduler\Model\FileHandler $fileHandler; - public function __construct( MailHelper $mailer, - MessageSchedule $messageSchedule, - FileHandler $fileHandler + private MessageSchedule $messageSchedule, + private FileHandler $fileHandler ) { $this->mailer = $mailer->getMailer(); - $this->messageSchedule = $messageSchedule; - $this->fileHandler = $fileHandler; } /** diff --git a/app/bundles/ReportBundle/Scheduler/Validator/ScheduleIsValidValidator.php b/app/bundles/ReportBundle/Scheduler/Validator/ScheduleIsValidValidator.php index b141d6b5194..2131c6de203 100644 --- a/app/bundles/ReportBundle/Scheduler/Validator/ScheduleIsValidValidator.php +++ b/app/bundles/ReportBundle/Scheduler/Validator/ScheduleIsValidValidator.php @@ -12,11 +12,8 @@ class ScheduleIsValidValidator extends ConstraintValidator { - private \Mautic\ReportBundle\Scheduler\Builder\SchedulerBuilder $schedulerBuilder; - - public function __construct(SchedulerBuilder $schedulerBuilder) + public function __construct(private SchedulerBuilder $schedulerBuilder) { - $this->schedulerBuilder = $schedulerBuilder; } /** diff --git a/app/bundles/SmsBundle/Api/AbstractSmsApi.php b/app/bundles/SmsBundle/Api/AbstractSmsApi.php index bb77b9649cf..106dc3c6e60 100644 --- a/app/bundles/SmsBundle/Api/AbstractSmsApi.php +++ b/app/bundles/SmsBundle/Api/AbstractSmsApi.php @@ -13,11 +13,8 @@ */ abstract class AbstractSmsApi implements TransportInterface { - protected \Mautic\PageBundle\Model\TrackableModel $pageTrackableModel; - - public function __construct(TrackableModel $pageTrackableModel) + public function __construct(protected TrackableModel $pageTrackableModel) { - $this->pageTrackableModel = $pageTrackableModel; } /** diff --git a/app/bundles/SmsBundle/Broadcast/BroadcastExecutioner.php b/app/bundles/SmsBundle/Broadcast/BroadcastExecutioner.php index ce891f5e726..1913073c062 100644 --- a/app/bundles/SmsBundle/Broadcast/BroadcastExecutioner.php +++ b/app/bundles/SmsBundle/Broadcast/BroadcastExecutioner.php @@ -11,30 +11,18 @@ class BroadcastExecutioner { - private \Mautic\SmsBundle\Model\SmsModel $smsModel; - - private LeadRepository $leadRepository; - /** * @var ContactLimiter */ private $contactLimiter; - private \Mautic\SmsBundle\Broadcast\BroadcastQuery $broadcastQuery; - /** * @var BroadcastResult */ private $result; - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(SmsModel $smsModel, BroadcastQuery $broadcastQuery, TranslatorInterface $translator, LeadRepository $leadRepository) + public function __construct(private SmsModel $smsModel, private BroadcastQuery $broadcastQuery, private TranslatorInterface $translator, private LeadRepository $leadRepository) { - $this->smsModel = $smsModel; - $this->broadcastQuery = $broadcastQuery; - $this->translator = $translator; - $this->leadRepository = $leadRepository; } public function execute(ChannelBroadcastEvent $event): void diff --git a/app/bundles/SmsBundle/Broadcast/BroadcastQuery.php b/app/bundles/SmsBundle/Broadcast/BroadcastQuery.php index 5e19ca3a555..7d331340b59 100644 --- a/app/bundles/SmsBundle/Broadcast/BroadcastQuery.php +++ b/app/bundles/SmsBundle/Broadcast/BroadcastQuery.php @@ -13,19 +13,13 @@ class BroadcastQuery { use ContactLimiterTrait; - private \Doctrine\ORM\EntityManager $entityManager; - - private \Mautic\SmsBundle\Model\SmsModel $smsModel; - /** * @var \Doctrine\DBAL\Query\QueryBuilder */ private $query; - public function __construct(EntityManager $entityManager, SmsModel $smsModel) + public function __construct(private EntityManager $entityManager, private SmsModel $smsModel) { - $this->entityManager = $entityManager; - $this->smsModel = $smsModel; } /** diff --git a/app/bundles/SmsBundle/Controller/ReplyController.php b/app/bundles/SmsBundle/Controller/ReplyController.php index 41478f75fbb..44cd1b34542 100644 --- a/app/bundles/SmsBundle/Controller/ReplyController.php +++ b/app/bundles/SmsBundle/Controller/ReplyController.php @@ -12,14 +12,8 @@ class ReplyController extends AbstractController { - private \Mautic\SmsBundle\Callback\HandlerContainer $callbackHandler; - - private \Mautic\SmsBundle\Helper\ReplyHelper $replyHelper; - - public function __construct(HandlerContainer $callbackHandler, ReplyHelper $replyHelper) + public function __construct(private HandlerContainer $callbackHandler, private ReplyHelper $replyHelper) { - $this->callbackHandler = $callbackHandler; - $this->replyHelper = $replyHelper; } /** diff --git a/app/bundles/SmsBundle/Event/ReplyEvent.php b/app/bundles/SmsBundle/Event/ReplyEvent.php index 19edeab46c0..969f35837ec 100644 --- a/app/bundles/SmsBundle/Event/ReplyEvent.php +++ b/app/bundles/SmsBundle/Event/ReplyEvent.php @@ -8,13 +8,6 @@ class ReplyEvent extends Event { - private \Mautic\LeadBundle\Entity\Lead $contact; - - /** - * @var string - */ - private $message; - /** * @var Response|null */ @@ -25,10 +18,8 @@ class ReplyEvent extends Event * * @param string $message */ - public function __construct(Lead $contact, $message) + public function __construct(private Lead $contact, private $message) { - $this->contact = $contact; - $this->message = $message; } /** diff --git a/app/bundles/SmsBundle/Event/SmsSendEvent.php b/app/bundles/SmsBundle/Event/SmsSendEvent.php index 9e7e0c6bde0..a3f534e6528 100644 --- a/app/bundles/SmsBundle/Event/SmsSendEvent.php +++ b/app/bundles/SmsBundle/Event/SmsSendEvent.php @@ -12,20 +12,11 @@ class SmsSendEvent extends CommonEvent */ protected $smsId; - /** - * @var string - */ - protected $content; - - protected \Mautic\LeadBundle\Entity\Lead $lead; - /** * @param string $content */ - public function __construct($content, Lead $lead) + public function __construct(protected $content, protected Lead $lead) { - $this->content = $content; - $this->lead = $lead; } /** diff --git a/app/bundles/SmsBundle/EventListener/BroadcastSubscriber.php b/app/bundles/SmsBundle/EventListener/BroadcastSubscriber.php index 130de6cf61e..9855575db59 100644 --- a/app/bundles/SmsBundle/EventListener/BroadcastSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/BroadcastSubscriber.php @@ -9,11 +9,8 @@ class BroadcastSubscriber implements EventSubscriberInterface { - private \Mautic\SmsBundle\Broadcast\BroadcastExecutioner $broadcastExecutioner; - - public function __construct(BroadcastExecutioner $broadcastExecutioner) + public function __construct(private BroadcastExecutioner $broadcastExecutioner) { - $this->broadcastExecutioner = $broadcastExecutioner; } /** diff --git a/app/bundles/SmsBundle/EventListener/CampaignReplySubscriber.php b/app/bundles/SmsBundle/EventListener/CampaignReplySubscriber.php index 8fd0b43dd78..c33c7819263 100644 --- a/app/bundles/SmsBundle/EventListener/CampaignReplySubscriber.php +++ b/app/bundles/SmsBundle/EventListener/CampaignReplySubscriber.php @@ -17,14 +17,8 @@ class CampaignReplySubscriber implements EventSubscriberInterface { public const TYPE = 'sms.reply'; - private \Mautic\SmsBundle\Sms\TransportChain $transportChain; - - private \Mautic\CampaignBundle\Executioner\RealTimeExecutioner $realTimeExecutioner; - - public function __construct(TransportChain $transportChain, RealTimeExecutioner $realTimeExecutioner) + public function __construct(private TransportChain $transportChain, private RealTimeExecutioner $realTimeExecutioner) { - $this->transportChain = $transportChain; - $this->realTimeExecutioner = $realTimeExecutioner; } /** diff --git a/app/bundles/SmsBundle/EventListener/CampaignSendSubscriber.php b/app/bundles/SmsBundle/EventListener/CampaignSendSubscriber.php index 6bc93052120..6d293ca128c 100644 --- a/app/bundles/SmsBundle/EventListener/CampaignSendSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/CampaignSendSubscriber.php @@ -13,16 +13,8 @@ class CampaignSendSubscriber implements EventSubscriberInterface { - private \Mautic\SmsBundle\Model\SmsModel $smsModel; - - private \Mautic\SmsBundle\Sms\TransportChain $transportChain; - - public function __construct( - SmsModel $smsModel, - TransportChain $transportChain - ) { - $this->smsModel = $smsModel; - $this->transportChain = $transportChain; + public function __construct(private SmsModel $smsModel, private TransportChain $transportChain) + { } /** diff --git a/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php b/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php index ad74cfb97b4..cc863a33666 100644 --- a/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php @@ -13,11 +13,8 @@ class ChannelSubscriber implements EventSubscriberInterface { - private \Mautic\SmsBundle\Sms\TransportChain $transportChain; - - public function __construct(TransportChain $transportChain) + public function __construct(private TransportChain $transportChain) { - $this->transportChain = $transportChain; } /** diff --git a/app/bundles/SmsBundle/EventListener/LeadSubscriber.php b/app/bundles/SmsBundle/EventListener/LeadSubscriber.php index 08370a42393..56c84bbeae6 100644 --- a/app/bundles/SmsBundle/EventListener/LeadSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/LeadSubscriber.php @@ -11,17 +11,8 @@ class LeadSubscriber implements EventSubscriberInterface { - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - private \Symfony\Component\Routing\RouterInterface $router; - - private \Doctrine\ORM\EntityManager $em; - - public function __construct(TranslatorInterface $translator, RouterInterface $router, EntityManager $em) + public function __construct(private TranslatorInterface $translator, private RouterInterface $router, private EntityManager $em) { - $this->translator = $translator; - $this->router = $router; - $this->em = $em; } /** diff --git a/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php b/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php index 9f1188a1709..bcdbc721e39 100644 --- a/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php @@ -10,11 +10,8 @@ class MessageQueueSubscriber implements EventSubscriberInterface { - private \Mautic\SmsBundle\Model\SmsModel $model; - - public function __construct(SmsModel $model) + public function __construct(private SmsModel $model) { - $this->model = $model; } /** diff --git a/app/bundles/SmsBundle/EventListener/SmsSubscriber.php b/app/bundles/SmsBundle/EventListener/SmsSubscriber.php index c9c2a34feeb..60e9f4015cc 100644 --- a/app/bundles/SmsBundle/EventListener/SmsSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/SmsSubscriber.php @@ -18,29 +18,8 @@ class SmsSubscriber implements EventSubscriberInterface { - private \Mautic\CoreBundle\Model\AuditLogModel $auditLogModel; - - private \Mautic\PageBundle\Model\TrackableModel $trackableModel; - - private PageTokenHelper $pageTokenHelper; - - private AssetTokenHelper $assetTokenHelper; - - private \Mautic\SmsBundle\Helper\SmsHelper $smsHelper; - - public function __construct( - AuditLogModel $auditLogModel, - TrackableModel $trackableModel, - PageTokenHelper $pageTokenHelper, - AssetTokenHelper $assetTokenHelper, - SmsHelper $smsHelper, - private CoreParametersHelper $coreParametersHelper - ) { - $this->auditLogModel = $auditLogModel; - $this->trackableModel = $trackableModel; - $this->pageTokenHelper = $pageTokenHelper; - $this->assetTokenHelper = $assetTokenHelper; - $this->smsHelper = $smsHelper; + public function __construct(private AuditLogModel $auditLogModel, private TrackableModel $trackableModel, private PageTokenHelper $pageTokenHelper, private AssetTokenHelper $assetTokenHelper, private SmsHelper $smsHelper, private CoreParametersHelper $coreParametersHelper) + { } /** diff --git a/app/bundles/SmsBundle/EventListener/StopSubscriber.php b/app/bundles/SmsBundle/EventListener/StopSubscriber.php index 4cb99bc67fd..1cc8d45851d 100644 --- a/app/bundles/SmsBundle/EventListener/StopSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/StopSubscriber.php @@ -10,11 +10,8 @@ class StopSubscriber implements EventSubscriberInterface { - private DoNotContactModel $doNotContactModel; - - public function __construct(DoNotContactModel $doNotContactModel) + public function __construct(private DoNotContactModel $doNotContactModel) { - $this->doNotContactModel = $doNotContactModel; } /** diff --git a/app/bundles/SmsBundle/EventListener/TrackingSubscriber.php b/app/bundles/SmsBundle/EventListener/TrackingSubscriber.php index f63ddf8467a..09cbaa4cd07 100644 --- a/app/bundles/SmsBundle/EventListener/TrackingSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/TrackingSubscriber.php @@ -10,11 +10,8 @@ class TrackingSubscriber implements EventSubscriberInterface { - private \Mautic\SmsBundle\Entity\StatRepository $statRepository; - - public function __construct(StatRepository $statRepository) + public function __construct(private StatRepository $statRepository) { - $this->statRepository = $statRepository; } /** diff --git a/app/bundles/SmsBundle/EventListener/WebhookSubscriber.php b/app/bundles/SmsBundle/EventListener/WebhookSubscriber.php index 42de563fff2..adf26ca1ef2 100644 --- a/app/bundles/SmsBundle/EventListener/WebhookSubscriber.php +++ b/app/bundles/SmsBundle/EventListener/WebhookSubscriber.php @@ -13,11 +13,8 @@ final class WebhookSubscriber implements EventSubscriberInterface { - private \Mautic\WebhookBundle\Model\WebhookModel $webhookModel; - - public function __construct(WebhookModel $webhookModel) + public function __construct(private WebhookModel $webhookModel) { - $this->webhookModel = $webhookModel; } public static function getSubscribedEvents(): array diff --git a/app/bundles/SmsBundle/Exception/NumberNotFoundException.php b/app/bundles/SmsBundle/Exception/NumberNotFoundException.php index e1487ffaba3..e5c07aa834d 100644 --- a/app/bundles/SmsBundle/Exception/NumberNotFoundException.php +++ b/app/bundles/SmsBundle/Exception/NumberNotFoundException.php @@ -4,11 +4,6 @@ class NumberNotFoundException extends \Exception { - /*** - * @var string - */ - private $number; - /** * NumberNotFoundException constructor. * @@ -16,10 +11,8 @@ class NumberNotFoundException extends \Exception * @param string $message * @param int $code */ - public function __construct($number, $message = '', $code = 0, \Throwable $previous = null) + public function __construct(private $number, $message = '', $code = 0, \Throwable $previous = null) { - $this->number = $number; - if (!$message) { $message = "Phone number '{$number}' not found"; } diff --git a/app/bundles/SmsBundle/Form/Type/ConfigType.php b/app/bundles/SmsBundle/Form/Type/ConfigType.php index 3b3b0fa2a92..8b7d29eccdf 100644 --- a/app/bundles/SmsBundle/Form/Type/ConfigType.php +++ b/app/bundles/SmsBundle/Form/Type/ConfigType.php @@ -13,14 +13,8 @@ class ConfigType extends AbstractType { public const SMS_DISABLE_TRACKABLE_URLS = 'sms_disable_trackable_urls'; - private \Mautic\SmsBundle\Sms\TransportChain $transportChain; - - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(TransportChain $transportChain, TranslatorInterface $translator) + public function __construct(private TransportChain $transportChain, private TranslatorInterface $translator) { - $this->transportChain = $transportChain; - $this->translator = $translator; } public function buildForm(FormBuilderInterface $builder, array $options): void diff --git a/app/bundles/SmsBundle/Form/Type/SmsSendType.php b/app/bundles/SmsBundle/Form/Type/SmsSendType.php index fbed77ab019..7776bed87a5 100644 --- a/app/bundles/SmsBundle/Form/Type/SmsSendType.php +++ b/app/bundles/SmsBundle/Form/Type/SmsSendType.php @@ -11,11 +11,8 @@ class SmsSendType extends AbstractType { - protected \Symfony\Component\Routing\RouterInterface $router; - - public function __construct(RouterInterface $router) + public function __construct(protected RouterInterface $router) { - $this->router = $router; } public function buildForm(FormBuilderInterface $builder, array $options): void diff --git a/app/bundles/SmsBundle/Form/Type/SmsType.php b/app/bundles/SmsBundle/Form/Type/SmsType.php index ae65f639444..1f802736d25 100644 --- a/app/bundles/SmsBundle/Form/Type/SmsType.php +++ b/app/bundles/SmsBundle/Form/Type/SmsType.php @@ -23,11 +23,8 @@ class SmsType extends AbstractType { - private \Doctrine\ORM\EntityManager $em; - - public function __construct(EntityManager $em) + public function __construct(private EntityManager $em) { - $this->em = $em; } public function buildForm(FormBuilderInterface $builder, array $options): void diff --git a/app/bundles/SmsBundle/Helper/ContactHelper.php b/app/bundles/SmsBundle/Helper/ContactHelper.php index 3e52df84837..cab2c86eff2 100644 --- a/app/bundles/SmsBundle/Helper/ContactHelper.php +++ b/app/bundles/SmsBundle/Helper/ContactHelper.php @@ -10,20 +10,8 @@ class ContactHelper { - private \Mautic\LeadBundle\Entity\LeadRepository $leadRepository; - - private \Doctrine\DBAL\Connection $connection; - - private \Mautic\CoreBundle\Helper\PhoneNumberHelper $phoneNumberHelper; - - public function __construct( - LeadRepository $leadRepository, - Connection $connection, - PhoneNumberHelper $phoneNumberHelper - ) { - $this->leadRepository = $leadRepository; - $this->connection = $connection; - $this->phoneNumberHelper = $phoneNumberHelper; + public function __construct(private LeadRepository $leadRepository, private Connection $connection, private PhoneNumberHelper $phoneNumberHelper) + { } /** diff --git a/app/bundles/SmsBundle/Helper/ReplyHelper.php b/app/bundles/SmsBundle/Helper/ReplyHelper.php index b38e3aa0998..c905cce8f0f 100644 --- a/app/bundles/SmsBundle/Helper/ReplyHelper.php +++ b/app/bundles/SmsBundle/Helper/ReplyHelper.php @@ -17,17 +17,8 @@ class ReplyHelper { - private \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher; - - private \Psr\Log\LoggerInterface $logger; - - private \Mautic\LeadBundle\Tracker\ContactTracker $contactTracker; - - public function __construct(EventDispatcherInterface $eventDispatcher, LoggerInterface $logger, ContactTracker $contactTracker) + public function __construct(private EventDispatcherInterface $eventDispatcher, private LoggerInterface $logger, private ContactTracker $contactTracker) { - $this->eventDispatcher = $eventDispatcher; - $this->logger = $logger; - $this->contactTracker = $contactTracker; } /** diff --git a/app/bundles/SmsBundle/Helper/SmsHelper.php b/app/bundles/SmsBundle/Helper/SmsHelper.php index f66d258bd2e..5c1a8a5d231 100644 --- a/app/bundles/SmsBundle/Helper/SmsHelper.php +++ b/app/bundles/SmsBundle/Helper/SmsHelper.php @@ -16,36 +16,8 @@ class SmsHelper { - protected \Doctrine\ORM\EntityManager $em; - - protected \Mautic\LeadBundle\Model\LeadModel $leadModel; - - protected \Mautic\CoreBundle\Helper\PhoneNumberHelper $phoneNumberHelper; - - protected \Mautic\SmsBundle\Model\SmsModel $smsModel; - - protected \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper; - - private CoreParametersHelper $coreParametersHelper; - - private \Mautic\LeadBundle\Model\DoNotContact $doNotContact; - - public function __construct( - EntityManager $em, - LeadModel $leadModel, - PhoneNumberHelper $phoneNumberHelper, - SmsModel $smsModel, - IntegrationHelper $integrationHelper, - DoNotContact $doNotContact, - CoreParametersHelper $coreParametersHelper - ) { - $this->em = $em; - $this->leadModel = $leadModel; - $this->phoneNumberHelper = $phoneNumberHelper; - $this->smsModel = $smsModel; - $this->integrationHelper = $integrationHelper; - $this->doNotContact = $doNotContact; - $this->coreParametersHelper = $coreParametersHelper; + public function __construct(protected EntityManager $em, protected LeadModel $leadModel, protected PhoneNumberHelper $phoneNumberHelper, protected SmsModel $smsModel, protected IntegrationHelper $integrationHelper, private DoNotContact $doNotContact, private CoreParametersHelper $coreParametersHelper) + { } public function unsubscribe($number) diff --git a/app/bundles/SmsBundle/Integration/Twilio/Configuration.php b/app/bundles/SmsBundle/Integration/Twilio/Configuration.php index a40efc6178b..c5b31a10c60 100644 --- a/app/bundles/SmsBundle/Integration/Twilio/Configuration.php +++ b/app/bundles/SmsBundle/Integration/Twilio/Configuration.php @@ -7,8 +7,6 @@ class Configuration { - private \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper; - /** * @var string */ @@ -24,9 +22,8 @@ class Configuration */ private $authToken; - public function __construct(IntegrationHelper $integrationHelper) + public function __construct(private IntegrationHelper $integrationHelper) { - $this->integrationHelper = $integrationHelper; } /** diff --git a/app/bundles/SmsBundle/Integration/Twilio/TwilioCallback.php b/app/bundles/SmsBundle/Integration/Twilio/TwilioCallback.php index 23db2f4f40a..c6c42607cad 100644 --- a/app/bundles/SmsBundle/Integration/Twilio/TwilioCallback.php +++ b/app/bundles/SmsBundle/Integration/Twilio/TwilioCallback.php @@ -13,14 +13,8 @@ class TwilioCallback implements CallbackInterface { - private \Mautic\SmsBundle\Helper\ContactHelper $contactHelper; - - private \Mautic\SmsBundle\Integration\Twilio\Configuration $configuration; - - public function __construct(ContactHelper $contactHelper, Configuration $configuration) + public function __construct(private ContactHelper $contactHelper, private Configuration $configuration) { - $this->contactHelper = $contactHelper; - $this->configuration = $configuration; } public function getTransportName(): string diff --git a/app/bundles/SmsBundle/Integration/Twilio/TwilioTransport.php b/app/bundles/SmsBundle/Integration/Twilio/TwilioTransport.php index c23976ffdd6..e7ff5e610b2 100644 --- a/app/bundles/SmsBundle/Integration/Twilio/TwilioTransport.php +++ b/app/bundles/SmsBundle/Integration/Twilio/TwilioTransport.php @@ -14,19 +14,13 @@ class TwilioTransport implements TransportInterface { - private \Mautic\SmsBundle\Integration\Twilio\Configuration $configuration; - - private \Psr\Log\LoggerInterface $logger; - /** * @var Client */ private $client; - public function __construct(Configuration $configuration, LoggerInterface $logger) + public function __construct(private Configuration $configuration, private LoggerInterface $logger) { - $this->logger = $logger; - $this->configuration = $configuration; } /** diff --git a/app/bundles/SmsBundle/Model/SmsModel.php b/app/bundles/SmsBundle/Model/SmsModel.php index 923bee12c04..61eacc691b7 100644 --- a/app/bundles/SmsBundle/Model/SmsModel.php +++ b/app/bundles/SmsBundle/Model/SmsModel.php @@ -41,24 +41,8 @@ */ class SmsModel extends FormModel implements AjaxLookupModelInterface { - protected \Mautic\PageBundle\Model\TrackableModel $pageTrackableModel; - - protected \Mautic\LeadBundle\Model\LeadModel $leadModel; - - protected \Mautic\ChannelBundle\Model\MessageQueueModel $messageQueueModel; - - protected \Mautic\SmsBundle\Sms\TransportChain $transport; - - private \Mautic\CoreBundle\Helper\CacheStorageHelper $cacheStorageHelper; - - public function __construct(TrackableModel $pageTrackableModel, LeadModel $leadModel, MessageQueueModel $messageQueueModel, TransportChain $transport, CacheStorageHelper $cacheStorageHelper, EntityManagerInterface $em, CorePermissions $security, EventDispatcherInterface $dispatcher, UrlGeneratorInterface $router, Translator $translator, UserHelper $userHelper, LoggerInterface $mauticLogger, CoreParametersHelper $coreParametersHelper) + public function __construct(protected TrackableModel $pageTrackableModel, protected LeadModel $leadModel, protected MessageQueueModel $messageQueueModel, protected TransportChain $transport, private CacheStorageHelper $cacheStorageHelper, EntityManagerInterface $em, CorePermissions $security, EventDispatcherInterface $dispatcher, UrlGeneratorInterface $router, Translator $translator, UserHelper $userHelper, LoggerInterface $mauticLogger, CoreParametersHelper $coreParametersHelper) { - $this->pageTrackableModel = $pageTrackableModel; - $this->leadModel = $leadModel; - $this->messageQueueModel = $messageQueueModel; - $this->transport = $transport; - $this->cacheStorageHelper = $cacheStorageHelper; - parent::__construct($em, $security, $dispatcher, $router, $translator, $userHelper, $mauticLogger, $coreParametersHelper); } diff --git a/app/bundles/SmsBundle/Sms/TransportChain.php b/app/bundles/SmsBundle/Sms/TransportChain.php index 66bb49c7c70..406b61b8098 100644 --- a/app/bundles/SmsBundle/Sms/TransportChain.php +++ b/app/bundles/SmsBundle/Sms/TransportChain.php @@ -14,21 +14,12 @@ class TransportChain */ private array $transports; - /** - * @var string - */ - private $primaryTransport; - - private \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper; - /** * @param string $primaryTransport */ - public function __construct($primaryTransport, IntegrationHelper $integrationHelper) + public function __construct(private $primaryTransport, private IntegrationHelper $integrationHelper) { - $this->primaryTransport = $primaryTransport; $this->transports = []; - $this->integrationHelper = $integrationHelper; } /** diff --git a/app/bundles/StageBundle/Event/StageBuilderEvent.php b/app/bundles/StageBundle/Event/StageBuilderEvent.php index a269b4a22c1..88619471b52 100644 --- a/app/bundles/StageBundle/Event/StageBuilderEvent.php +++ b/app/bundles/StageBundle/Event/StageBuilderEvent.php @@ -13,11 +13,8 @@ class StageBuilderEvent extends Event */ private $actions = []; - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(TranslatorInterface $translator) + public function __construct(private TranslatorInterface $translator) { - $this->translator = $translator; } /** diff --git a/app/bundles/StageBundle/EventListener/CampaignSubscriber.php b/app/bundles/StageBundle/EventListener/CampaignSubscriber.php index c210737854b..34eef34445e 100644 --- a/app/bundles/StageBundle/EventListener/CampaignSubscriber.php +++ b/app/bundles/StageBundle/EventListener/CampaignSubscriber.php @@ -17,17 +17,8 @@ class CampaignSubscriber implements EventSubscriberInterface { - private \Mautic\LeadBundle\Model\LeadModel $leadModel; - - private \Mautic\StageBundle\Model\StageModel $stageModel; - - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - public function __construct(LeadModel $leadModel, StageModel $stageModel, TranslatorInterface $translator) + public function __construct(private LeadModel $leadModel, private StageModel $stageModel, private TranslatorInterface $translator) { - $this->leadModel = $leadModel; - $this->stageModel = $stageModel; - $this->translator = $translator; } /** diff --git a/app/bundles/StageBundle/EventListener/DashboardSubscriber.php b/app/bundles/StageBundle/EventListener/DashboardSubscriber.php index caa80aea816..e88cca6faee 100644 --- a/app/bundles/StageBundle/EventListener/DashboardSubscriber.php +++ b/app/bundles/StageBundle/EventListener/DashboardSubscriber.php @@ -34,11 +34,8 @@ class DashboardSubscriber extends MainDashboardSubscriber 'stage:stages:viewother', ]; - protected \Mautic\StageBundle\Model\StageModel $stageModel; - - public function __construct(StageModel $stageModel) + public function __construct(protected StageModel $stageModel) { - $this->stageModel = $stageModel; } /** diff --git a/app/bundles/StageBundle/EventListener/LeadSubscriber.php b/app/bundles/StageBundle/EventListener/LeadSubscriber.php index e0f6244a735..2d9cd680cc4 100644 --- a/app/bundles/StageBundle/EventListener/LeadSubscriber.php +++ b/app/bundles/StageBundle/EventListener/LeadSubscriber.php @@ -13,24 +13,8 @@ class LeadSubscriber implements EventSubscriberInterface { - private \Mautic\LeadBundle\Entity\StagesChangeLogRepository $stagesChangeLogRepository; - - private \Mautic\StageBundle\Entity\LeadStageLogRepository $leadStageLogRepository; - - private \Symfony\Contracts\Translation\TranslatorInterface $translator; - - private \Symfony\Component\Routing\RouterInterface $router; - - public function __construct( - StagesChangeLogRepository $stagesChangeLogRepository, - LeadStageLogRepository $leadStageLogRepository, - TranslatorInterface $translator, - RouterInterface $router - ) { - $this->stagesChangeLogRepository = $stagesChangeLogRepository; - $this->leadStageLogRepository = $leadStageLogRepository; - $this->translator = $translator; - $this->router = $router; + public function __construct(private StagesChangeLogRepository $stagesChangeLogRepository, private LeadStageLogRepository $leadStageLogRepository, private TranslatorInterface $translator, private RouterInterface $router) + { } /** diff --git a/app/bundles/StageBundle/EventListener/SearchSubscriber.php b/app/bundles/StageBundle/EventListener/SearchSubscriber.php index 28d541d254e..fe48bcefe36 100644 --- a/app/bundles/StageBundle/EventListener/SearchSubscriber.php +++ b/app/bundles/StageBundle/EventListener/SearchSubscriber.php @@ -11,20 +11,8 @@ class SearchSubscriber implements EventSubscriberInterface { - private \Mautic\StageBundle\Model\StageModel $stageModel; - - private \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - - private \Twig\Environment $twig; - - public function __construct( - StageModel $stageModel, - CorePermissions $security, - Environment $twig - ) { - $this->stageModel = $stageModel; - $this->security = $security; - $this->twig = $twig; + public function __construct(private StageModel $stageModel, private CorePermissions $security, private Environment $twig) + { } /** diff --git a/app/bundles/StageBundle/EventListener/StageSubscriber.php b/app/bundles/StageBundle/EventListener/StageSubscriber.php index 2eb2d04cfa2..142e6301bdc 100644 --- a/app/bundles/StageBundle/EventListener/StageSubscriber.php +++ b/app/bundles/StageBundle/EventListener/StageSubscriber.php @@ -10,14 +10,8 @@ class StageSubscriber implements EventSubscriberInterface { - private \Mautic\CoreBundle\Helper\IpLookupHelper $ipLookupHelper; - - private \Mautic\CoreBundle\Model\AuditLogModel $auditLogModel; - - public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel) + public function __construct(private IpLookupHelper $ipLookupHelper, private AuditLogModel $auditLogModel) { - $this->ipLookupHelper = $ipLookupHelper; - $this->auditLogModel = $auditLogModel; } /** diff --git a/app/bundles/StageBundle/Form/Type/StageActionListType.php b/app/bundles/StageBundle/Form/Type/StageActionListType.php index 2ff9c90092c..f2224bcc4dc 100644 --- a/app/bundles/StageBundle/Form/Type/StageActionListType.php +++ b/app/bundles/StageBundle/Form/Type/StageActionListType.php @@ -10,11 +10,8 @@ class StageActionListType extends AbstractType { - private \Mautic\StageBundle\Model\StageModel $model; - - public function __construct(StageModel $model) + public function __construct(private StageModel $model) { - $this->model = $model; } public function configureOptions(OptionsResolver $resolver): void diff --git a/app/bundles/StageBundle/Form/Type/StageType.php b/app/bundles/StageBundle/Form/Type/StageType.php index cf5d06f62a3..170b4e70121 100644 --- a/app/bundles/StageBundle/Form/Type/StageType.php +++ b/app/bundles/StageBundle/Form/Type/StageType.php @@ -20,11 +20,8 @@ class StageType extends AbstractType { - private \Mautic\CoreBundle\Security\Permissions\CorePermissions $security; - - public function __construct(CorePermissions $security) + public function __construct(private CorePermissions $security) { - $this->security = $security; } /** diff --git a/app/bundles/StageBundle/Model/StageModel.php b/app/bundles/StageBundle/Model/StageModel.php index 57c78e9ad87..f310dd843aa 100644 --- a/app/bundles/StageBundle/Model/StageModel.php +++ b/app/bundles/StageBundle/Model/StageModel.php @@ -28,10 +28,8 @@ */ class StageModel extends CommonFormModel { - protected \Mautic\LeadBundle\Model\LeadModel $leadModel; - public function __construct( - LeadModel $leadModel, + protected LeadModel $leadModel, UserHelper $userHelper, EntityManager $em, CorePermissions $security, @@ -41,8 +39,6 @@ public function __construct( LoggerInterface $mauticLogger, CoreParametersHelper $coreParametersHelper ) { - $this->leadModel = $leadModel; - parent::__construct($em, $security, $dispatcher, $router, $translator, $userHelper, $mauticLogger, $coreParametersHelper); } diff --git a/phpstan.neon b/phpstan.neon index e217528977e..2427f4c8aac 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -6,6 +6,7 @@ parameters: tmpDir: ./var/cache/phpstan level: 6 reportUnmatchedIgnoredErrors: false + checkGenericClassInNonGenericObjectType: false parallel: maximumNumberOfProcesses: 4 processTimeout: 1000.0