Merge pull request #106 from ticktackk/develop

1.3.6

Author: ticktackk

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 ==========================
 
+## 1.3.6 (`1030670`)
+
+- **Fix:** Large email HTML body causes "Data too long for column" exception to be thrown (#103)
+- **Fix:** Building add-on from admin control panel does not rebuild data directory (#107)
+
 ## 1.3.5 (`1030570`)
 
 - **Change:** Improvement to how `XF\PermissionCache` class is extended (#99) (Thanks @Xon)

Cli/Command/BetterExport.php

@@ -6,22 +6,24 @@
 use XF\AddOn\StepRunnerInstallTrait;
 use XF\AddOn\StepRunnerUninstallTrait;
 use XF\AddOn\StepRunnerUpgradeTrait;
-use XF\Db\Schema\Alter;
+use XF\Db\Schema\Alter as DbAlterSchema;
 use XF\Util\File as FileUtil;
 use XF\Util\Json as JsonUtil;
 use XF\AddOn\AddOn;
 
 /**
- * Class Setup
- *
- * @package TickTackk\DeveloperTools
+ * @since 1.0.0
+ * @version 1.3.6
  */
 class Setup extends AbstractSetup
 {
     use StepRunnerInstallTrait;
     use StepRunnerUpgradeTrait;
     use StepRunnerUninstallTrait;
 
+    /**
+     * @version 1.3.6
+     */
     public function installStep1() : void
     {
         $sm = $this->schemaManager();
@@ -38,8 +40,8 @@ public function installStep1() : void
             $table->addColumn('to', 'blob');
             $table->addColumn('cc', 'blob')->nullable();
             $table->addColumn('bcc', 'blob')->nullable();
-            $table->addColumn('html_message', 'text')->nullable();
-            $table->addColumn('text_message', 'text')->nullable();
+            $table->addColumn('html_message', 'blob')->nullable();
+            $table->addColumn('text_message', 'blob')->nullable();
 
             $table->addKey('log_date');
         });
@@ -76,9 +78,12 @@ public function upgrade1000033Step1() : void
         }
     }
 
+    /**
+     * @version 1.3.6
+     */
     public function upgrade1000033Step2() : void
     {
-        $this->schemaManager()->alterTable('xf_addon', function (Alter $table)
+        $this->schemaManager()->alterTable('xf_addon', function (DbAlterSchema $table)
         {
             $table->dropColumns(['devTools_license', 'devTools_gitignore', 'devTools_readme_md', 'devTools_parse_additional_files']);
         });
@@ -238,4 +243,18 @@ public function upgrade1030070Step1() : void
     {
         $this->installStep1();
     }
+
+    /**
+     * @since 1.3.6
+     */
+    public function upgrade1030670Step1() : void
+    {
+        $sm = $this->schemaManager();
+
+        $sm->alterTable('xf_tck_developer_tools_email_log', function(DbAlterSchema $table)
+        {
+            $table->addColumn('html_message', 'blob')->nullable();
+            $table->addColumn('text_message', 'blob')->nullable();
+        });
+    }
 }

Setup.php

@@ -2,15 +2,43 @@
 
 namespace TickTackk\DeveloperTools\XF\Service\AddOn;
 
+use XF\Service\AbstractService;
+use XF\Service\AddOn\Exporter as AddOnExporterSvc;
 use XF\Util\File as FileUtil;
 
 /**
- * Class ReleaseBuilder
- *
- * @package TickTackk\DeveloperTools
+ * @version 1.3.6
  */
 class ReleaseBuilder extends XFCP_ReleaseBuilder
 {
+    /**
+     * @since 1.3.6
+     */
+    protected function prepareDataDirectory() : void
+    {
+        $addOnExporterSvc = $this->getAddonExporterSvc();
+
+        foreach ($addOnExporterSvc->getContainers() AS $containerName)
+        {
+            $addOnExporterSvc->export($containerName);
+        }
+    }
+
+    /**
+     * @version 1.3.6
+     */
+    protected function prepareFilesToCopy()
+    {
+        $this->prepareDataDirectory();
+
+        parent::prepareFilesToCopy();
+
+        foreach (['LICENSE', "README", 'CHANGELOG'] AS $fileName)
+        {
+            $this->copyFileToBuildRoot($fileName, ['md', '', 'txt', 'html']);
+        }
+    }
+
     /**
      * @throws \XF\PrintableException
      */
@@ -48,16 +76,6 @@ protected function excludeFiles(array $excludedFiles) : void
         }
     }
 
-    protected function prepareFilesToCopy()
-    {
-        parent::prepareFilesToCopy();
-
-        foreach (['LICENSE', "README", 'CHANGELOG'] AS $fileName)
-        {
-            $this->copyFileToBuildRoot($fileName, ['md', '', 'txt', 'html']);
-        }
-    }
-
     /**
      * @param array|string $possibleFileName
      * @param array|string $possibleExtensions
@@ -126,4 +144,14 @@ protected function getExcludedDirectories()
 
         return \array_unique($excludedDirectories);
     }
+
+    /**
+     * @since 1.3.6
+     *
+     * @return AbstractService|AddOnExporterSvc
+     */
+    protected function getAddonExporterSvc() : AddOnExporterSvc
+    {
+        return $this->service('XF:AddOn\Exporter', $this->addOn);
+    }
 }

XF/Service/AddOn/ReleaseBuilder.php

@@ -1,6 +1,6 @@
 {
     "from_class": "XF\\Admin\\Controller\\Log",
     "to_class": "TickTackk\\DeveloperTools\\XF\\Admin\\Controller\\Log",
-    "execute_order": 10,
+    "execute_order": 6119,
     "active": true
 }

_output/class_extensions/XF-Admin-Controller-Log_TickTackk-DeveloperTools-XF-Admin-Controller-Log.json

@@ -1,6 +1,6 @@
 {
     "from_class": "XF\\Mail\\Mailer",
     "to_class": "TickTackk\\DeveloperTools\\XF\\Mail\\Mailer",
-    "execute_order": 10,
+    "execute_order": 6119,
     "active": true
 }

_output/class_extensions/XF-Mail-Mailer_TickTackk-DeveloperTools-XF-Mail-Mailer.json

@@ -13,11 +13,6 @@ class XFCP_Template extends \XF\Admin\Controller\Template {}
 	class XFCP_TemplateModification extends \XF\Admin\Controller\TemplateModification {}
 }
 
-namespace TickTackk\DeveloperTools\XF
-{
-    class XFCP_PermissionCache extends \XF\PermissionCache {}
-}
-
 namespace TickTackk\DeveloperTools\XF\Entity
 {
 	class XFCP_CodeEventListener extends \XF\Entity\CodeEventListener {}
@@ -44,6 +39,11 @@ class XFCP_Mailer extends \XF\Mail\Mailer {}
 	class XFCP_Json extends \XF\Mvc\Renderer\Json {}
 }
 
+namespace TickTackk\DeveloperTools\XF
+{
+	class XFCP_PermissionCache extends \XF\PermissionCache {}
+}
+
 namespace TickTackk\DeveloperTools\XF\Repository
 {
 	class XFCP_CodeEvent extends \XF\Repository\CodeEvent {}

_output/extension_hint.php

@@ -2,8 +2,8 @@
     "legacy_addon_id": "",
     "title": "Developer Tools",
     "description": "This add-on provides enhancements for add-on developers.",
-    "version_id": 1030570,
-    "version_string": "1.3.5",
+    "version_id": 1030670,
+    "version_string": "1.3.6",
     "dev": "TickTackk",
     "dev_url": "https://xenforo.com/community/members/ticktackk.90375/",
     "faq_url": "",