Abandon mcrypt

composer.json

@@ -21,11 +21,17 @@
     "source": "https://github.com/richardhj/contao-newsletter2go-sync"
   },
   "require": {
-    "php": "^5.6|^7.0",
+    "php": "^7.2",
     "contao/core-bundle": "~4.4",
+    "contao/manager-plugin": "^2.2",
     "codefog/contao-haste": "~4.12",
+    "doctrine/dbal": "^2.7",
     "friends-of-contao/contao-associategroups": "~1.3",
-    "richardhj/newsletter2go-api": "~2.0"
+    "paragonie/halite": "^4.4",
+    "richardhj/newsletter2go-api": "~2.0",
+    "richardhj/oauth2-newsletter2go": "~2.0",
+    "symfony/config": "^3.3 || ^4.0",
+    "symfony/dependency-injection": "^3.3 || ^4.0"
   },
   "autoload": {
     "psr-4": {

src/AbstractHelper.php

@@ -37,7 +37,7 @@ abstract class AbstractHelper
      *
      * @return array
      */
-    public function getNewsletter2GoGroups()
+    public function getNewsletter2GoGroups(): array
     {
         $return = [];
         try {
@@ -65,7 +65,7 @@ public function getNewsletter2GoGroups()
      * @throws \LogicException
      * @throws \InvalidArgumentException
      */
-    protected static function getListId()
+    protected static function getListId(): string
     {
         /** @var NewsletterList[] $lists */
         $lists = NewsletterList::findAll(null, self::getApiCredentials());
@@ -78,7 +78,7 @@ protected static function getListId()
     /**
      * @return ApiCredentials|null
      */
-    protected static function getApiCredentials()
+    protected static function getApiCredentials(): ?ApiCredentials
     {
         /** @var BackendUser|\User $backendUser */
         $backendUser = BackendUser::getInstance();

src/ContaoManager/Plugin.php

@@ -31,11 +31,15 @@ class Plugin implements BundlePluginInterface
      *
      * @return ConfigInterface[]
      */
-    public function getBundles(ParserInterface $parser)
+    public function getBundles(ParserInterface $parser): array
     {
         return [
             BundleConfig::create(RichardhjContaoNewsletter2GoSyncBundle::class)
-                ->setLoadAfter([ContaoCoreBundle::class])
+                ->setLoadAfter(
+                    [
+                        ContaoCoreBundle::class,
+                    ]
+                )
                 ->setReplace(['newsletter2go-sync']),
         ];
     }

src/Dca/Member.php

@@ -13,9 +13,11 @@
 
 namespace Richardhj\Newsletter2Go\Contao\SyncBundle\Dca;
 
-use Contao\Database;
 use Contao\DataContainer;
 use Contao\MemberModel;
+use Contao\System;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\FetchMode;
 use Richardhj\Newsletter2Go\Api\Model\NewsletterRecipient;
 use Richardhj\Newsletter2Go\Contao\SyncBundle\AbstractHelper;
 
@@ -28,6 +30,19 @@
 class Member extends AbstractHelper
 {
 
+    /**
+     * @var Connection
+     */
+    private $connection;
+
+    /**
+     * Member constructor.
+     */
+    public function __construct()
+    {
+        $this->connection = System::getContainer()->get('database_connection');
+    }
+
     /**
      * Remove a member from all groups after deleting
      *
@@ -39,7 +54,7 @@ class Member extends AbstractHelper
      * @throws \LogicException
      * @throws \InvalidArgumentException
      */
-    public function deleteMember(DataContainer $dc)
+    public function deleteMember(DataContainer $dc): void
     {
         if (!$dc->id) {
             return;
@@ -58,14 +73,16 @@ public function deleteMember(DataContainer $dc)
         // Fetch id
         $recipient->save();
 
-        $groups = Database::getInstance()
-            ->prepare(
-                'SELECT mg.n2g_group_id FROM tl_member_group AS mg INNER JOIN tl_member_to_group mtg ON mg.id=mtg.group_id WHERE mtg.member_id=? AND mg.n2g_sync=1'
-            )
-            ->execute($dc->id)
-            ->fetchEach('n2g_group_id');
+        $statement = $this->connection->createQueryBuilder()
+            ->select('mg.n2g_group_id')
+            ->from('tl_member_group', 'mg')
+            ->innerJoin('mg', 'tl_member_to_group', 'mtg', 'mg.id=mtg.group_id')
+            ->where('mtg.member_id=:member_id')
+            ->andWhere('mg.n2g_sync=1')
+            ->setParameter('member_id', $dc->id)
+            ->execute();
 
-        foreach ($groups as $group) {
+        foreach ($statement->fetchAll(FetchMode::COLUMN, 0) as $group) {
             $recipient->removeFromGroup($group);
         }
     }
@@ -94,19 +111,25 @@ public function syncMemberGroupsWithNewsletter2Go($value, $dc)
         }
 
         $groupsNew = $groups ?
-            Database::getInstance()
-                ->query(
-                    'SELECT n2g_group_id FROM tl_member_group WHERE id IN('.implode(',', $groups).') AND n2g_sync=1'
-                )
-                ->fetchEach('n2g_group_id')
+            $this->connection->createQueryBuilder()
+                ->select('n2g_group_id')
+                ->from('tl_member_group')
+                ->where('id IN (:groups)')
+                ->andWhere('n2g_sync=1')
+                ->setParameter('groups', $groups, Connection::PARAM_STR_ARRAY)
+                ->execute()
+                ->fetchAll(FetchMode::COLUMN, 0)
             : [];
 
-        $groupsOld = Database::getInstance()
-            ->prepare(
-                'SELECT g.n2g_group_id FROM tl_member_to_group AS mtg INNER JOIN tl_member_group g ON g.id=mtg.group_id WHERE mtg.member_id=? AND g.n2g_sync=1'
-            )
-            ->execute($dc->id)
-            ->fetchEach('n2g_group_id');
+        $groupsOld = $this->connection->createQueryBuilder()
+            ->select('g.n2g_group_id')
+            ->from('tl_member_to_group', 'mtg')
+            ->innerJoin('mtg', 'tl_member_group', 'g', 'g.id=mtg.group_id')
+            ->where('mtg.member_id=:member')
+            ->andWhere('n2g_sync=1')
+            ->setParameter('member', $dc->id)
+            ->execute()
+            ->fetchAll(FetchMode::COLUMN, 0);
 
         // Nothing to sync here
         if (0 === \count($groupsNew) && 0 === \count($groupsOld)) {
@@ -115,6 +138,9 @@ public function syncMemberGroupsWithNewsletter2Go($value, $dc)
 
         /** @type \Model $member */
         $member = MemberModel::findByPk($dc->id);
+        if (null === $member) {
+            return $value;
+        }
 
         # $member           contains obsolete data (pre save)
         # $dc->activeRecord contains current data

src/Dca/MemberGroup.php

@@ -13,9 +13,11 @@
 
 namespace Richardhj\Newsletter2Go\Contao\SyncBundle\Dca;
 
-use Contao\Database;
 use Contao\DataContainer;
 use Contao\MemberGroupModel;
+use Contao\System;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\FetchMode;
 use Richardhj\Newsletter2Go\Api\Model\NewsletterGroup;
 use Richardhj\Newsletter2Go\Api\Model\NewsletterRecipient;
 use Richardhj\Newsletter2Go\Contao\SyncBundle\AbstractHelper;
@@ -29,6 +31,19 @@
 class MemberGroup extends AbstractHelper
 {
 
+    /**
+     * @var Connection
+     */
+    private $connection;
+
+    /**
+     * Member constructor.
+     */
+    public function __construct()
+    {
+        $this->connection = System::getContainer()->get('database_connection');
+    }
+
     /**
      * Create a group on Newsletter2Go if sync for member group was enabled but no existing group was selected
      *
@@ -40,7 +55,7 @@ class MemberGroup extends AbstractHelper
      * @throws \RuntimeException
      * @throws \LogicException
      */
-    public function createNewsletter2GoGroup(DataContainer $dc)
+    public function createNewsletter2GoGroup(DataContainer $dc): void
     {
         if (!$dc->id) {
             return;
@@ -76,7 +91,7 @@ public function createNewsletter2GoGroup(DataContainer $dc)
      * @throws \RuntimeException
      * @throws \LogicException
      */
-    public function deleteMemberGroup(DataContainer $dc)
+    public function deleteMemberGroup(DataContainer $dc): void
     {
         if (!$dc->id || !$dc->activeRecord->n2g_sync || !$dc->activeRecord->n2g_group_id) {
             return;
@@ -87,12 +102,14 @@ public function deleteMemberGroup(DataContainer $dc)
             return;
         }
 
-        $members = Database::getInstance()
-            ->prepare(
-                'SELECT m.email FROM tl_member AS m INNER JOIN tl_member_to_group mg ON m.id=mg.member_id WHERE mg.group_id=?'
-            )
-            ->execute($dc->id)
-            ->fetchEach('email');
+        $members = $this->connection->createQueryBuilder()
+            ->select('m.email')
+            ->from('tl_member', 'm')
+            ->innerJoin('m', 'tl_member_to_group', 'mg', 'm.id=mg.member_id')
+            ->where('mg.group_id=:group')
+            ->setParameter('group', $dc->id)
+            ->execute()
+            ->fetchAll(FetchMode::COLUMN, 0);
 
         foreach ($members as $member) {
             $recipient = new NewsletterRecipient();

src/Dca/Newsletter2GoUser.php

@@ -42,7 +42,7 @@ class Newsletter2GoUser extends AbstractHelper
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      */
-    public function authenticateUser(DataContainer $dc)
+    public function authenticateUser(DataContainer $dc): string
     {
         if (!$dc->id) {
             return '';
@@ -97,7 +97,6 @@ public function authenticateUser(DataContainer $dc)
 
         $form = new Form(
             'authenticate_n2g_user', 'POST', function ($haste) {
-            /** @noinspection PhpUndefinedMethodInspection */
             return $haste->getFormId() === Input::post('FORM_SUBMIT');
         }
         );

src/DependencyInjection/RichardhjContaoNewsletter2GoSyncExtension.php

@@ -30,7 +30,7 @@ class RichardhjContaoNewsletter2GoSyncExtension extends Extension
      *
      * @throws \Exception
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');