Merge branch 'Leuchtfeuer:mautic5-support' into mautic5-support

Leuchtfeuer · Oct 17, 2024 · 48ea0c5 · 48ea0c5
2 parents 8ec4052 + 691832d
commit 48ea0c5
Show file tree

Hide file tree

Showing 24 changed files with 138 additions and 150 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,7 +2,7 @@ name: Continous Integration
 on:
   push:
     branches:
-      - master
+      - mautic5-support
       - '[0-9]+\-[0-9]+\-x'
   pull_request:
 
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-version: [ 8.0 ]
+        php-version: [ 8.1 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -23,4 +23,4 @@ jobs:
       - name: Install composer requirements.
         run: composer install
       - name: Check PHP CS
-        run: ./vendor/bin/php-cs-fixer fix --config .php-cs-fixer.php --dry-run --using-cache no --show-progress dots -v
+        run: ./vendor/bin/php-cs-fixer fix --config .php-cs-fixer.php --dry-run --using-cache no --show-progress dots -v
diff --git a/Api/GototrainingApi.php b/Api/GototrainingApi.php
@@ -10,7 +10,7 @@ class GototrainingApi
     use GoToApi;
 
     public function __construct(
-      private GototrainingIntegration $integration
+        private GototrainingIntegration $integration
     ) {
     }
 

diff --git a/Api/GotowebinarApi.php b/Api/GotowebinarApi.php
@@ -19,7 +19,7 @@ public function __construct(
      *
      * @throws ApiErrorException
      */
-    public function request(string $operation, array $parameters = [], string $method = 'GET', string $organizerKey = null): mixed
+    public function request(string $operation, array $parameters = [], string $method = 'GET', ?string $organizerKey = null): mixed
     {
         $settings = [
             'module'          => 'G2W',

diff --git a/Command/SyncCommand.php b/Command/SyncCommand.php
@@ -57,9 +57,6 @@ protected function configure(): void
         parent::configure();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $options = $input->getOptions();

diff --git a/Entity/GoToEvent.php b/Entity/GoToEvent.php
@@ -102,9 +102,6 @@ public function setEventType(string $eventType): static
         return $this;
     }
 
-    /**
-     * @param mixed $joinUrl
-     */
     public function setJoinUrl($joinUrl): void
     {
         $this->joinUrl = $joinUrl;

diff --git a/Entity/GoToEventRepository.php b/Entity/GoToEventRepository.php
@@ -18,11 +18,9 @@ class GoToEventRepository extends CommonRepository
     /**
      * Fetch the base event data from the database.
      *
-     * @return mixed
-     *
      * @throws \InvalidArgumentException
      */
-    public function getEvents(string $product, string $eventType, \DateTime $fromDate = null)
+    public function getEvents(string $product, string $eventType, ?\DateTime $fromDate = null)
     {
         $q = $this->createQueryBuilder('c');
 
@@ -50,7 +48,7 @@ public function getEvents(string $product, string $eventType, \DateTime $fromDat
      *
      * @return mixed[]
      */
-    public function getEventsForTimeline(mixed $product, int $leadId = null, array $options = []): array
+    public function getEventsForTimeline(mixed $product, ?int $leadId = null, array $options = []): array
     {
         $eventType = null;
         if (is_array($product)) {
@@ -160,7 +158,6 @@ public function getEntities(array $args = []): Paginator
 
     /**
      * @param QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder $qb
-     * @param mixed                                          $filter
      *
      * @return mixed[]
      */
@@ -172,7 +169,6 @@ protected function addCatchAllWhereClause($qb, $filter): array
 
     /**
      * @param QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder $q
-     * @param mixed                                          $filter
      *
      * @return mixed[]
      */

diff --git a/Entity/GoToProduct.php b/Entity/GoToProduct.php
@@ -44,49 +44,31 @@ public static function loadMetadata(ClassMetadata $metadata): void
         $builder->addNamedField('status', 'text', 'status', true);
     }
 
-    /**
-     * @return mixed
-     */
     public function getId()
     {
         return $this->id;
     }
 
-    /**
-     * @param mixed $id
-     */
     public function setId($id): void
     {
         $this->id = $id;
     }
 
-    /**
-     * @return mixed
-     */
     public function getProductKey()
     {
         return $this->product_key;
     }
 
-    /**
-     * @param mixed $product_key
-     */
     public function setProductKey($product_key): void
     {
         $this->product_key = $product_key;
     }
 
-    /**
-     * @return mixed
-     */
     public function getOrganizerKey()
     {
         return $this->organizer_key;
     }
 
-    /**
-     * @param mixed $organizer_key
-     */
     public function setOrganizerKey($organizer_key): void
     {
         $this->organizer_key = $organizer_key;

diff --git a/Entity/GoToProductRepository.php b/Entity/GoToProductRepository.php
@@ -71,7 +71,7 @@ public function getFutureProducts(): mixed
     /**
      * @throws \Exception
      */
-    public function getProductsBetweenSpecificDates(\DateTime $from = null, \DateTime $to = null): mixed
+    public function getProductsBetweenSpecificDates(?\DateTime $from = null, ?\DateTime $to = null): mixed
     {
         if (null === $to) {
             $to = new \DateTime('now + 50 years');
@@ -81,7 +81,7 @@ public function getProductsBetweenSpecificDates(\DateTime $from = null, \DateTim
             $from = new \DateTime('now - 10 years');
         }
 
-        $qb = $this->createQueryBuilder('e');
+        $qb   = $this->createQueryBuilder('e');
         $expr = $qb->expr();
         $qb
             ->andWhere('e.date BETWEEN :from AND :to')

diff --git a/EventListener/FormSubscriber.php b/EventListener/FormSubscriber.php
@@ -81,7 +81,7 @@ public static function getSubscribedEvents(): array
     /**
      * @throws ValidationException
      */
-    private function _doRegistration(SubmissionEvent $event, string $product, string $startType = null): void
+    private function _doRegistration(SubmissionEvent $event, string $product, ?string $startType = null): void
     {
         $submission = $event->getSubmission();
         $form       = $submission->getForm();
@@ -224,11 +224,11 @@ public function onAssistRemote(SubmissionEvent $event): void
     public function onResponse(PluginIntegrationRequestEvent $event): void
     {
         //        /** @var Response $response */
-//        $response = $event->getResponse();
-//        $this->goToHelper->log(
-//            PHP_EOL. //$response->getStatusCode() . ' ' .
-//            print_r($response, true)
-//        );
+        //        $response = $event->getResponse();
+        //        $this->goToHelper->log(
+        //            PHP_EOL. //$response->getStatusCode() . ' ' .
+        //            print_r($response, true)
+        //        );
     }
 
     /**

diff --git a/EventListener/LeadSubscriber.php b/EventListener/LeadSubscriber.php
@@ -18,7 +18,6 @@
 use MauticPlugin\LeuchtfeuerGoToBundle\Helper\GoToHelper;
 use MauticPlugin\LeuchtfeuerGoToBundle\Helper\GoToProductTypes;
 use MauticPlugin\LeuchtfeuerGoToBundle\Model\GoToModel;
-use MauticPlugin\MauticSocialBundle\Entity\Lead;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/EventListener/PluginEventSubscriber.php b/EventListener/PluginEventSubscriber.php
@@ -22,9 +22,6 @@ public function __construct(Connection $connection, LoggerInterface $logger)
         $this->logger     = $logger;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [

diff --git a/Form/Type/GoToActionType.php b/Form/Type/GoToActionType.php
@@ -34,8 +34,6 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws ServiceCircularReferenceException
      * @throws ServiceNotFoundException
      * @throws ConstraintDefinitionException
@@ -44,9 +42,9 @@ public function __construct(
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        if (!(array_key_exists('attr', $options) && array_key_exists('data-product', $options['attr'])) ||
-            !GoToProductTypes::isValidValue($options['attr']['data-product']) ||
-            !$this->goToHelper->isAuthorized('Goto'.$options['attr']['data-product'])
+        if (!(array_key_exists('attr', $options) && array_key_exists('data-product', $options['attr']))
+            || !GoToProductTypes::isValidValue($options['attr']['data-product'])
+            || !$this->goToHelper->isAuthorized('Goto'.$options['attr']['data-product'])
         ) {
             return;
         }
@@ -76,9 +74,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             $choices[$f['id']] = $f['label'];
         }
 
-        if (array_key_exists('data-product-action', $options['attr']) &&
-            ('register' === $options['attr']['data-product-action'] ||
-                'start' === $options['attr']['data-product-action'])
+        if (array_key_exists('data-product-action', $options['attr'])
+            && ('register' === $options['attr']['data-product-action']
+                || 'start' === $options['attr']['data-product-action'])
         ) {
             $products = [
                 'form' => 'User selection from form',
@@ -108,9 +106,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             );
         }
 
-        if (array_key_exists('data-product-action', $options['attr']) &&
-            ('register' === $options['attr']['data-product-action'] ||
-                'screensharing' === $options['attr']['data-product-action'])
+        if (array_key_exists('data-product-action', $options['attr'])
+            && ('register' === $options['attr']['data-product-action']
+                || 'screensharing' === $options['attr']['data-product-action'])
         ) {
             $builder->add(
                 'firstname',
@@ -196,9 +194,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ]
         );
 
-        if (array_key_exists('data-product-action', $options['attr']) &&
-            ('start' === $options['attr']['data-product-action'] ||
-             'screensharing' === $options['attr']['data-product-action'])
+        if (array_key_exists('data-product-action', $options['attr'])
+            && ('start' === $options['attr']['data-product-action']
+             || 'screensharing' === $options['attr']['data-product-action'])
         ) {
             $defaultOptions = [
                 'label'      => 'plugin.citrix.emailtemplate',

diff --git a/Form/Type/GoToCampaignActionType.php b/Form/Type/GoToCampaignActionType.php
@@ -30,8 +30,6 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws ServiceCircularReferenceException
      * @throws ServiceNotFoundException
      * @throws \InvalidArgumentException

diff --git a/Form/Type/GoToCampaignEventType.php b/Form/Type/GoToCampaignEventType.php
@@ -30,8 +30,6 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws ServiceCircularReferenceException
      * @throws ServiceNotFoundException
      * @throws \InvalidArgumentException

diff --git a/Form/Type/GoToListType.php b/Form/Type/GoToListType.php
@@ -26,9 +26,6 @@ public function __construct(private GoToModel $citrixModel)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $selectMessage = 'Please Select...';
@@ -222,8 +219,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws AccessException
      */
     public function configureOptions(OptionsResolver $resolver): void

diff --git a/Helper/BasicEnum.php b/Helper/BasicEnum.php
@@ -44,9 +44,6 @@ public static function isValidName(string $name, bool $strict = false): bool
         return in_array(strtolower($name), $keys, true);
     }
 
-    /**
-     * @param mixed $value
-     */
     public static function isValidValue($value, bool $strict = true): bool
     {
         $values = array_values(self::getConstants());

diff --git a/Helper/GoToHelper.php b/Helper/GoToHelper.php
@@ -242,12 +242,6 @@ public function getCleanString(string $str, int $limit = 20): string
     }
 
     /**
-     * @param mixed $productId
-     * @param mixed $email
-     * @param mixed $firstname
-     * @param mixed $lastname
-     * @param mixed $company
-     *
      * @throws BadRequestHttpException
      */
     public function registerToProduct(string $product, $productId, $email, $firstname, $lastname, $company): bool
@@ -287,11 +281,6 @@ public function registerToProduct(string $product, $productId, $email, $firstnam
     }
 
     /**
-     * @param mixed $productId
-     * @param mixed $email
-     * @param mixed $firstname
-     * @param mixed $lastname
-     *
      * @throws BadRequestHttpException
      */
     public function startToProduct(string $product, $productId, $email, $firstname, $lastname): bool|string