Merge branch 'release/0.43.0'

Author: dwenzel

ChangeLog

@@ -1,3 +1,14 @@
+2019-06-28         [RELEASE] Release of t3events 0.43.0 (Dirk Wenzel)
+2019-06-28 3102df5 [TASK] documentation updated, obsolete update skript removed (Dirk Wenzel)
+2019-06-28 b8e9986 [TASK] unit tests for Update/MigratePluginRecords removed - unit tests make no longer sense due to switch to symfony query builder (Dirk Wenzel)
+2019-06-28 7e880d7 [BUGFIX] requirement for dwenzel/t3extension-tools loosened (Dirk Wenzel)
+2019-06-25 b57e6ff [TASK] use dwenzel/extension-tools - allows to toggle caching of plugin (Dirk Wenzel)
+2019-06-03 e6fcaba [RELEASE] Release of t3events 0.42.3 (Dirk Wenzel) (Dirk Wenzel)
+2019-06-03 9d2e672 [BUGFIX] fixed error where Performance->quickMenuAction was not registered correctly as non-cacheable (Dirk Wenzel)
+2019-03-06 45654f6 [RELEASE] Release of t3events 0.42.2 (Dirk Wenzel) (Dirk Wenzel)
+2019-03-06 7310b86 [BUGFIX] fixed error in unit tests for CleanUpCommandController caused by insufficient mocking (Dirk Wenzel)
+2019-03-06 c21e5d7 [BUGFIX] fixed error in command controller where deletion of records was not persisted (Dirk Wenzel)
+
 2019-06-03         [RELEASE] Release of t3events 0.42.3 (Dirk Wenzel)
 2019-06-03 9d2e672 [BUGFIX] fixed error where Performance->quickMenuAction was not registered correctly as non-cacheable (Dirk Wenzel)
 

Classes/Service/ExtensionService.php

@@ -3,27 +3,38 @@
 
 namespace DWenzel\T3events\Update;
 
+use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
+use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 use TYPO3\CMS\Install\Updates\AbstractUpdate;
 
 /**
  * Class MigratePluginRecords
  * Updates flex form settings in events plugins
+ * @codeCoverageIgnore
  */
 class MigratePluginRecords extends AbstractUpdate
 {
     const CONTENT_TABLE = 'tt_content';
     const FLEX_FORM_FIELD = 'pi_flexform';
-    const DEPRECATED_PLUGIN_WHERE_CLAUSE = "list_type='t3events_events' AND pi_flexform REGEXP 'settings.sortBy|Event->calendar'";
-    const MESSAGE_UPDATE_REQUIRED = 'Found %s Plugin records which need to be updated';
-    const TITLE_UPDATE_REQUIRED = 'Update required';
+    const LIST_TYPE_FIELD = 'list_type';
+    const PLUGIN_TYPE_EVENTS = 't3events_events';
+    const ID_FIELD = 'uid';
+    const DEPRECATED_FLEX_KEY = 'settings.cache.makeNonCacheable';
+    const REPLACEMENT_FLEX_KEY = 'settings.cache.notCacheable';
+    const MESSAGE_UPDATE_REQUIRED = 'Found %s plugin records which need to be updated (t3events)';
+    const WIZARD_TITLE = 'Migrate Event Plugin Records';
+    const TITLE_UPDATE_REQUIRED = 'Migrate Event Plugin Records';
+    const IDENTIFIER = 'T3eventsMigratePluginRecords';
     const MESSAGE_UPDATED = '%s Plugin records updated.';
     const TITLE_UPDATED = 'Update success';
 
+    protected $identifier = '';
+    protected $title = self::WIZARD_TITLE;
+
+
     /**
      * @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools
      */
@@ -36,17 +47,14 @@ class MigratePluginRecords extends AbstractUpdate
      */
     public function checkForUpdate(&$description)
     {
-        $versionNumber = VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version);
-        if ($versionNumber >= 8000000) {
-            return false;
-        }
+        $count = $this->countPluginRecordsWithDeprecatedSettings();
 
-        $updateRequired = false;
-        if ($this->countPluginRecordsWithDeprecatedSettings()) {
-            $updateRequired = true;
+        if ($count) {
+            $description = sprintf(self::MESSAGE_UPDATE_REQUIRED, $count);
+            return true;
         }
 
-        return $updateRequired;
+        return false;
     }
 
     /**
@@ -55,7 +63,7 @@ public function checkForUpdate(&$description)
      */
     protected function getFlexFormTools()
     {
-        if (!$this->flexFormTools instanceof  FlexFormTools) {
+        if (!$this->flexFormTools instanceof FlexFormTools) {
             /** @var FlexFormTools flexFormTools */
             $this->flexFormTools = GeneralUtility::makeInstance(FlexFormTools::class);
         }
@@ -72,90 +80,109 @@ protected function getFlexFormTools()
      */
     public function performUpdate(array &$dbQueries, &$customMessages)
     {
-        $success = false;
         $pluginRecords = $this->getPluginRecordsWithDeprecatedSettings();
         $pluginCount = count($pluginRecords);
 
         if ($pluginCount) {
+            if (!is_array($customMessages)) {
+                $customMessages = [$customMessages];
+            }
             $customMessages[] = [
                 FlashMessage::INFO,
                 self::TITLE_UPDATE_REQUIRED,
                 sprintf(self::MESSAGE_UPDATE_REQUIRED, $pluginCount)
             ];
             $updatedCount = 0;
+            $builder = $this->getQueryBuilder();
 
             foreach ($pluginRecords as $record) {
-                $sortDirectionSettings = 'asc';
-                $flexFormSettings = $this->getFlexFormSettings($record);
-                $switchableControllerActionChanged = false;
-
-                if ($flexFormSettings['data']['sDEF']['lDEF']['switchableControllerActions']['vDEF'] == 'Event->calendar') {
-                    $flexFormSettings['data']['sDEF']['lDEF']['switchableControllerActions']['vDEF'] = 'Performance->calendar';
-                    $switchableControllerActionChanged = true;
-                }
-                if (isset($flexFormSettings['data']['sDEF']['lDEF']['settings.sortBy']['vDEF'])) {
-                    $sortBySettings = $flexFormSettings['data']['sDEF']['lDEF']['settings.sortBy']['vDEF'];
-                }
-                if (isset($flexFormSettings['data']['sDEF']['lDEF']['settings.sortDirection']['vDEF'])) {
-                    $sortDirectionSettings = $flexFormSettings['data']['sDEF']['lDEF']['settings.sortDirection']['vDEF'];
-                }
-                if (!empty($sortBySettings || $switchableControllerActionChanged)) {
-                    $flexFormSettings['data']['sDEF']['lDEF']['settings.order']['vDEF'] = $sortBySettings . '|'. $sortDirectionSettings . ',performances.begin|asc';
-                    unset($flexFormSettings['data']['sDEF']['lDEF']['settings.sortBy']);
-                    unset($flexFormSettings['data']['sDEF']['lDEF']['settings.sortDirection']);
-
+                $changed = 0;
+
+                $updatedFlexXml = str_replace(
+                    self::DEPRECATED_FLEX_KEY,
+                    self::REPLACEMENT_FLEX_KEY,
+                    $record[self::FLEX_FORM_FIELD],
+                    $changed
+                );
+
+                if ($changed) {
+                    $builder->update(self::CONTENT_TABLE)
+                        ->where(
+                            $builder->expr()->eq(
+                                self::ID_FIELD,
+                                $builder->createNamedParameter(
+                                    $record[self::ID_FIELD], \PDO::PARAM_INT)
+                            )
+                        )
+                        ->set(self::FLEX_FORM_FIELD, $updatedFlexXml)
+                        ->execute();
                     $updatedCount++;
-                    $updatedXml = $this->getFlexFormTools()->flexArray2Xml($flexFormSettings, true);
-
-                    $this->getDatabaseConnection()->exec_UPDATEquery(
-                        self::CONTENT_TABLE,
-                        'uid=' . $record['uid'],
-                        [
-                            self::FLEX_FORM_FIELD => $updatedXml,
-                        ]
-                    );
                 }
             }
 
-            if ($updatedCount > 0) {
+            if (0 !== $updatedCount) {
                 $customMessages[] = [
                     FlashMessage::INFO,
                     self::TITLE_UPDATED,
                     sprintf(self::MESSAGE_UPDATED, $updatedCount)
                 ];
             }
         }
-        return $success;
+        return true;
     }
 
     /**
      * Counts plugin records with deprecated settings
      *
      * @return mixed
+     * @codeCoverageIgnore
      */
     public function countPluginRecordsWithDeprecatedSettings()
     {
-        return $this->getDatabaseConnection()
-            ->exec_SELECTcountRows(
-                '*',
-                self::CONTENT_TABLE,
-                self::DEPRECATED_PLUGIN_WHERE_CLAUSE
-            );
+        $builder = $this->getQueryBuilder();
+
+
+        return $builder
+            ->count(self::ID_FIELD)
+            ->from(self::CONTENT_TABLE)
+            ->where(
+                $builder->expr()->eq(
+                    self::LIST_TYPE_FIELD,
+                    $builder->createNamedParameter(self::PLUGIN_TYPE_EVENTS)
+                ))
+            ->andWhere(
+                $builder->expr()->like(
+                    self::FLEX_FORM_FIELD,
+                    $builder->createNamedParameter('%' . self::DEPRECATED_FLEX_KEY . '%'))
+            )
+            ->execute()->fetchColumn(0);
     }
 
     /**
      * Gets plugin records with deprecated settings
      *
-     * @return array | null
+     * @return array
+     * @codeCoverageIgnore
      */
     public function getPluginRecordsWithDeprecatedSettings()
     {
-        return $this->getDatabaseConnection()
-            ->exec_SELECTgetRows(
-                'uid,' . self::FLEX_FORM_FIELD,
-                self::CONTENT_TABLE,
-                self::DEPRECATED_PLUGIN_WHERE_CLAUSE
-            );
+        $builder = $this->getQueryBuilder();
+
+
+        return $builder
+            ->select(self::ID_FIELD, self::FLEX_FORM_FIELD)
+            ->from(self::CONTENT_TABLE)
+            ->where(
+                $builder->expr()->eq(
+                    self::LIST_TYPE_FIELD,
+                    $builder->createNamedParameter(self::PLUGIN_TYPE_EVENTS)
+                ))
+            ->andWhere(
+                $builder->expr()->like(
+                    self::FLEX_FORM_FIELD,
+                    $builder->createNamedParameter('%' . self::DEPRECATED_FLEX_KEY . '%'))
+            )
+            ->execute()->fetchAll();
     }
 
     /**
@@ -172,4 +199,10 @@ protected function getFlexFormSettings($record)
 
         return $settings;
     }
+
+    public function getQueryBuilder(): QueryBuilder
+    {
+        return GeneralUtility::makeInstance(ConnectionPool::class)
+            ->getQueryBuilderForTable(self::CONTENT_TABLE);
+    }
 }

Classes/Update/MigratePluginRecords.php

@@ -229,14 +229,14 @@
           </view.pluginNamespace>
 
           <!-- caching -->
-          <settings.cache.makeNonCacheable>
+          <settings.cache.notCacheable>
             <TCEforms>
               <label>LLL:EXT:t3events/Resources/Private/Language/locallang_be.xml:flexforms_general.cache.makeNonCacheable</label>
               <config>
                 <type>check</type>
               </config>
             </TCEforms>
-          </settings.cache.makeNonCacheable>
+          </settings.cache.notCacheable>
         </el>
       </ROOT>
     </sDEF>

Configuration/FlexForms/flexform_events.xml

@@ -160,13 +160,6 @@ plugin.tx_t3events {
 # this setting is part of a workaround for the limits of <f:widget.paginate /> view helper - specially the missing option to localize its output
 #config.tx_extbase.view.widget.Tx_Fluid_ViewHelpers_Widget_PaginateViewHelper.templateRootPath = {$plugin.tx_t3events.view.templateRootPath}
 
-config.tx_extbase.objects {
-    # overwrite class to allow USER_INT from flexform
-    TYPO3\CMS\Extbase\Service\ExtensionService {
-        className = DWenzel\T3events\Service\ExtensionService
-    }
-}
-
 ####################
 # include default CSS
 

Configuration/TypoScript/setup.txt

@@ -1,42 +1,14 @@
 Updating from previous versions
 ===============================
-
-_Events_ provides an update script which performs the following tasks:
-* migrate _Task_ records
-* migrate _Plugin_ records
+### Migrate Event Plugin Records
+This script updates all _Event_ plugins by updating the flex-form XML stored in the field _pi_flexform_ of tt_content. 
+It replaces the deprecated value `settings.cache.makeNonCacheable` with `settings.cache.notCacheable`.
 
 
 ## Usage
 * **Important**: make sure to backup your database before executing the script.
-* Go to the Install Tool and perform the _Compare current database with specification_ task.
-* Open the Extension Manager - If the update button is shown, updates are necessary.
-* Hit the update button
-* clear all caches
-
-
-### Migrate Tasks
-This script updates the table _tx_t3events_domain_model_task_.  
-It moves the content of the deprecated field _period_ to the field _period_duration_
-
-
-### Migrate Plugins
-This script updates all _Event_ plugins by updating the flex-form XML stored in the field _pi_flexform_ of tt_content. 
-It replaces the deprecated values `settings.sortBy` and `settings.sortDirection` by a new field `settings.order` and the 
-deprecated value `Event->calendar` by `Performance->calendar`.
-
-**Note**: The correspondent TypoScript option are not evaluated any more. The default has been changed from:
-
-```
-plugin.tx_t3events.settings.performance.list {
- sortBy = date
- sortDirection = asc
-}
-```
-to:
+* open the Install Tool
+* select "Upgrade Wizard"
+* execute the Wizard "Migrate Event Plugin Records"  (if displayed)
 
-```
-plugin.tx_t3events.settings.performance.list {
- order = date|asc,begin|asc
-}
-```
-Thus the time of begin is respected too.
+If the wizard is not displayed, no matching _Event_ plugins where found.