WIP: SF5 Compatibility, Drop FOS USER

src/SendinblueBridgeBundle.php → src/BrevoBridgeBundle.php

@@ -11,31 +11,31 @@
  *  file that was distributed with this source code.
  */
 
-namespace BadPixxel\SendinblueBridge;
+namespace BadPixxel\BrevoBridge;
 
-use BadPixxel\SendinblueBridge\Services\EventManager;
-use BadPixxel\SendinblueBridge\Services\SmsManager;
-use BadPixxel\SendinblueBridge\Services\SmtpManager;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
  * A Small Bundle to Manage Sending User Email, Events & Sms via Sendinblue Transactional API.
  */
-class SendinblueBridgeBundle extends Bundle
+class BrevoBridgeBundle extends Bundle
 {
     /**
      * @return void
      */
-    public function boot()
+    public function boot(): void
     {
+        if (!$this->container) {
+            return;
+        }
         //==============================================================================
         // Force Loading of SendInBlue Smtp Service
-        $this->container->get(SmtpManager::class);
+        $this->container->get(Services\SmtpManager::class);
         //==============================================================================
         // Force Loading of SendInBlue Events Service
-        $this->container->get(EventManager::class);
+        $this->container->get(Services\EventManager::class);
         //==============================================================================
         // Force Loading of SendInBlue Sms Service
-        $this->container->get(SmsManager::class);
+        $this->container->get(Services\SmsManager::class);
     }
 }

src/Services/AccountManager.php

@@ -11,21 +11,22 @@
  *  file that was distributed with this source code.
  */
 
-namespace BadPixxel\SendinblueBridge\Services;
+namespace BadPixxel\BrevoBridge\Services;
 
-use BadPixxel\SendinblueBridge\Services\ConfigurationManager as Configuration;
+use BadPixxel\BrevoBridge\Models\Managers\ErrorLoggerTrait;
+use BadPixxel\BrevoBridge\Services\ConfigurationManager as Configuration;
+use Brevo\Client\Api\AccountApi;
+use Brevo\Client\ApiException;
+use Brevo\Client\Model\GetAccount;
 use Exception;
 use GuzzleHttp\Client;
-use SendinBlue\Client\Api\AccountApi;
-use SendinBlue\Client\ApiException;
-use SendinBlue\Client\Model\GetAccount;
 
 /**
- * Account Manager for SendingBlue Api.
+ * Account Manager for Brevo Api.
  */
 class AccountManager
 {
-    use \BadPixxel\SendinblueBridge\Models\Managers\ErrorLoggerTrait;
+    use ErrorLoggerTrait;
 
     /**
      * @var AccountApi

src/Services/ConfigurationManager.php

@@ -11,46 +11,45 @@
  *  file that was distributed with this source code.
  */
 
-namespace BadPixxel\SendinblueBridge\Services;
+namespace BadPixxel\BrevoBridge\Services;
 
-use SendinBlue\Client\Configuration;
-use SendinBlue\Client\Model\SendSmtpEmailReplyTo;
-use SendinBlue\Client\Model\SendSmtpEmailSender;
+use Brevo\Client\Configuration;
+use Brevo\Client\Model\SendSmtpEmailReplyTo;
+use Brevo\Client\Model\SendSmtpEmailSender;
 use Symfony\Component\Routing\RouterInterface as Router;
 
 /**
- * Bridge Configuration Manager for SendingBlue Api.
+ * Bridge Configuration Manager for Brevo Api.
  */
 class ConfigurationManager
 {
     /**
      * @var array
      */
-    private $config;
+    private array $config;
 
     /**
      * @var null|Configuration
      */
-    private $sdkConfig;
+    private ?Configuration $sdkConfig;
 
     /**
      * @var null|array
      */
-    private $eventsCurlConfig;
+    private ?array $eventsCurlConfig;
 
     /**
      * @var bool
      */
-    private $enabled;
+    private bool $enabled;
 
     /**
      * @param array $configuration
-     * @param bool  $disabled
      */
-    public function __construct(array $configuration, bool $disabled)
+    public function __construct(array $configuration)
     {
         $this->config = $configuration;
-        $this->enabled = !$disabled;
+        $this->enabled = empty($configuration['disable_emails']);
     }
 
     /**
@@ -86,6 +85,7 @@ public function getEventsCurlConfig(): array
         if (empty($this->config["track_key"])) {
             return $this->eventsCurlConfig = array();
         }
+
         //==============================================================================
         // Generate Curl Options Array
         return $this->eventsCurlConfig = array(

src/Services/EventManager.php

@@ -11,18 +11,19 @@
  *  file that was distributed with this source code.
  */
 
-namespace BadPixxel\SendinblueBridge\Services;
+namespace BadPixxel\BrevoBridge\Services;
 
-use BadPixxel\SendinblueBridge\Models\AbstractTrackEvent;
-use BadPixxel\SendinblueBridge\Services\ConfigurationManager as Configuration;
+use BadPixxel\BrevoBridge\Models\AbstractTrackEvent;
+use BadPixxel\BrevoBridge\Models\Managers\ErrorLoggerTrait;
+use BadPixxel\BrevoBridge\Services\ConfigurationManager as Configuration;
 use Exception;
 
 /**
- * Tracker Events Manager for SendingBlue Api.
+ * Tracker Events Manager for Brevo Api.
  */
 class EventManager
 {
-    use \BadPixxel\SendinblueBridge\Models\Managers\ErrorLoggerTrait;
+    use ErrorLoggerTrait;
 
     /**
      * Bridge Configuration.

src/Services/TemplateManager.php

@@ -11,25 +11,26 @@
  *  file that was distributed with this source code.
  */
 
-namespace BadPixxel\SendinblueBridge\Services;
-
-use BadPixxel\SendinblueBridge\Helpers\MjmlConverter;
-use BadPixxel\SendinblueBridge\Interfaces\HtmlTemplateProviderInterface;
-use BadPixxel\SendinblueBridge\Interfaces\MjmlTemplateProviderInterface;
-use BadPixxel\SendinblueBridge\Services\ConfigurationManager as Configuration;
+namespace BadPixxel\BrevoBridge\Services;
+
+use BadPixxel\BrevoBridge\Helpers\MjmlConverter;
+use BadPixxel\BrevoBridge\Interfaces\HtmlTemplateProviderInterface;
+use BadPixxel\BrevoBridge\Interfaces\MjmlTemplateProviderInterface;
+use BadPixxel\BrevoBridge\Models\Managers\ErrorLoggerTrait;
+use BadPixxel\BrevoBridge\Services\ConfigurationManager as Configuration;
+use Brevo\Client\Api\TransactionalEmailsApi;
+use Brevo\Client\ApiException;
+use Brevo\Client\Model\UpdateSmtpTemplate;
 use Exception;
 use GuzzleHttp\Client;
-use SendinBlue\Client\Api\TransactionalEmailsApi;
-use SendinBlue\Client\ApiException;
-use SendinBlue\Client\Model\UpdateSmtpTemplate;
 use Symfony\Component\Security\Core\User\UserInterface as User;
 
 /**
- * Emails Templates Manager for SendingBlue Api.
+ * Emails Templates Manager for Brevo Api.
  */
 class TemplateManager
 {
-    use \BadPixxel\SendinblueBridge\Models\Managers\ErrorLoggerTrait;
+    use ErrorLoggerTrait;
 
     /**
      * Smtp API Service.
@@ -178,6 +179,7 @@ public function getMjmlConverter(): ?MjmlConverter
         if (!$this->config->isMjmlAllowed()) {
             return $this->setError("Mjml Api is not configured");
         }
+
         //==============================================================================
         // Build Mjml Converter
         return new MjmlConverter(

src/Templates/TestUserEmail.php

@@ -11,9 +11,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace BadPixxel\SendinblueBridge\Templates;
+namespace BadPixxel\BrevoBridge\Templates;
 
-use BadPixxel\SendinblueBridge\Models\AbstractEmail;
+use BadPixxel\BrevoBridge\Models\AbstractEmail;
 use Sonata\UserBundle\Model\UserInterface as User;
 
 /**