Merge remote-tracking branch 'ContaoBlackForest-Archive/hotfix/deep_delete' into hotfix/alpha-12

Author: stefanheimes

src/MetaModels/DcGeneral/Events/Table/MetaModels/Subscriber.php

@@ -335,142 +335,6 @@ public function ensureTableNamePrefix(EncodePropertyValueFromWidgetEvent $event)
         $event->setValue($tableName);
     }
 
-    /**
-     * Destroy auxiliary data of attributes and delete the attributes themselves from the database.
-     *
-     * @param IMetaModel $metaModel The MetaModel to destroy.
-     *
-     * @return void
-     */
-    protected function destroyAttributes(IMetaModel $metaModel)
-    {
-        foreach ($metaModel->getAttributes() as $attribute) {
-            $attribute->destroyAUX();
-        }
-
-        $this->getDatabase()
-            ->prepare('DELETE FROM tl_metamodel_attribute WHERE pid=?')
-            ->execute($metaModel->get('id'));
-    }
-
-    /**
-     * Destroy the dca combinations for a MetaModel.
-     *
-     * @param IMetaModel $metaModel The MetaModel to destroy.
-     *
-     * @return void
-     */
-    protected function destroyDcaCombinations(IMetaModel $metaModel)
-    {
-        $this->getDatabase()
-            ->prepare('DELETE FROM tl_metamodel_dca_combine WHERE pid=?')
-            ->execute($metaModel->get('id'));
-    }
-
-    /**
-     * Destroy the input screens for a MetaModel.
-     *
-     * @param IMetaModel $metaModel The MetaModel to destroy.
-     *
-     * @return void
-     */
-    protected function destroyInputScreens(IMetaModel $metaModel)
-    {
-        $database = $this->getDatabase();
-        // Delete everything from dca settings.
-        $idList = $database
-            ->prepare('SELECT id FROM tl_metamodel_dca WHERE pid=?')
-            ->execute($metaModel->get('id'))
-            ->fetchEach('id');
-
-        if ($idList) {
-            $database
-                ->prepare(
-                    sprintf(
-                        'DELETE FROM tl_metamodel_dcasetting WHERE pid IN (%s)',
-                        implode(',', $idList)
-                    )
-                )
-                ->execute();
-            $database
-                ->prepare(
-                    sprintf(
-                        'DELETE FROM tl_metamodel_dca_sortgroup WHERE pid IN (%s)',
-                        implode(',', $idList)
-                    )
-                )
-                ->execute();
-        }
-
-        // Delete the input screens.
-        $database
-            ->prepare('DELETE FROM tl_metamodel_dca WHERE pid=?')
-            ->execute($metaModel->get('id'));
-    }
-
-    /**
-     * Destroy the render settings for a MetaModel.
-     *
-     * @param IMetaModel $metaModel The MetaModel to destroy.
-     *
-     * @return void
-     */
-    protected function destroyRenderSettings(IMetaModel $metaModel)
-    {
-        $database = $this->getDatabase();
-        // Delete everything from render settings.
-        $arrIds = $database
-            ->prepare('SELECT id FROM tl_metamodel_rendersettings WHERE pid=?')
-            ->execute($metaModel->get('id'))
-            ->fetchEach('id');
-
-        if ($arrIds) {
-            $database
-                ->prepare(
-                    sprintf(
-                        'DELETE FROM tl_metamodel_rendersetting WHERE pid IN (%s)',
-                        implode(',', $arrIds)
-                    )
-                )
-                ->execute();
-        }
-
-        // Delete the render settings.
-        $database
-            ->prepare('DELETE FROM tl_metamodel_rendersettings WHERE pid=?')
-            ->execute($metaModel->get('id'));
-    }
-
-    /**
-     * Destroy the filter settings for a MetaModel.
-     *
-     * @param IMetaModel $metaModel The MetaModel to destroy.
-     *
-     * @return void
-     */
-    protected function destroyFilterSettings(IMetaModel $metaModel)
-    {
-        $database = $this->getDatabase();
-        // Delete everything from filter settings.
-        $arrIds = $database
-            ->prepare('SELECT id FROM tl_metamodel_filter WHERE pid=?')
-            ->execute($metaModel->get('id'))
-            ->fetchEach('id');
-        if ($arrIds) {
-            $database
-                ->prepare(
-                    sprintf(
-                        'DELETE FROM tl_metamodel_filtersetting WHERE pid IN (%s)',
-                        implode(',', $arrIds)
-                    )
-                )
-                ->execute();
-        }
-        $database
-            ->prepare('DELETE FROM tl_metamodel_filter WHERE pid=?')
-            ->execute($metaModel->get('id'));
-    }
-
     /**
      * Handle the deletion of a MetaModel and all attached data.
      *
@@ -480,20 +344,14 @@ protected function destroyFilterSettings(IMetaModel $metaModel)
      */
     public function handleDelete(PreDeleteModelEvent $event)
     {
-        if ($event->getEnvironment()->getDataDefinition()->getName() !== 'tl_metamodel') {
+        if ($event->getModel()->getProviderName() !== 'tl_metamodel') {
             return;
         }
 
         $factory = $this->getServiceContainer()->getFactory();
 
         $metaModel = $factory->getMetaModel($factory->translateIdToMetaModelName($event->getModel()->getId()));
         if ($metaModel) {
-            $this->destroyAttributes($metaModel);
-            $this->destroyDcaCombinations($metaModel);
-            $this->destroyInputScreens($metaModel);
-            $this->destroyRenderSettings($metaModel);
-            $this->destroyFilterSettings($metaModel);
-
             TableManipulation::deleteTable($metaModel->getTableName());
         }
     }