Skip to content
GitLab
Commit a24e80ac authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'feature/drop-terfe2-v1-emconf-fields' into 'develop' 

[TASK] Drop unused ext_emconf v1 fields from TER v2

See merge request t3o/ter!520
parents 1a6df9c5 1050802d
Pipeline #9165 passed with stages
in 8 minutes and 52 seconds
Hide whitespace changes
Inline Side-by-side
extensions/ter_fe2/Classes/Domain/Model/Version.php
View file @ a24e80ac
......@@ -114,41 +114,6 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
*/
protected $emCategory = '';
/**
* Loading order in Extension Manager
*
* @var string
*/
protected $loadOrder = '';
/**
* Priority
*
* @var string
*/
protected $priority = '';
/**
* Information if extension is shy
*
* @var bool
*/
protected $shy = false;
/**
* Internal
*
* @var bool
*/
protected $internal = false;
/**
* Whether extension will be loaded in Frontend or not
*
* @var bool
*/
protected $doNotLoadInFe = false;
/**
* Whether an upload folder will be created or not
*
......@@ -163,13 +128,6 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
*/
protected $clearCacheOnLoad = false;
/**
* Module identifier
*
* @var string
*/
protected $module = '';
/**
* Names of dirs to create on load
*
......@@ -177,34 +135,6 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
*/
protected $createDirs = '';
/**
* Information which existing DB tables will be modified
*
* @var string
*/
protected $modifyTables = '';
/**
* Lock type
*
* @var string
*/
protected $lockType = '';
/**
* CGL compliance
*
* @var string
*/
protected $cglCompliance = '';
/**
* Note for the CGL compliance
*
* @var string
*/
protected $cglComplianceNote = '';
/**
* Review state (-2=outdated, -1=insecure, 0=standard, 1=reviewed)
*
......@@ -558,126 +488,6 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
return $this->emCategory;
}
/**
* Setter for loadOrder
*
* @param string $loadOrder Loading order in Extension Manager
*/
public function setLoadOrder(string $loadOrder)
{
$this->loadOrder = $loadOrder;
}
/**
* Getter for loadOrder
*
* @return string Loading order in Extension Manager
*/
public function getLoadOrder(): string
{
return $this->loadOrder;
}
/**
* Setter for priority
*
* @param string $priority Priority
*/
public function setPriority(string $priority)
{
$this->priority = $priority;
}
/**
* Getter for priority
*
* @return string Priority
*/
public function getPriority(): string
{
return $this->priority;
}
/**
* Setter for shy
*
* @param bool $shy Information if extension is shy
*/
public function setShy(bool $shy)
{
$this->shy = $shy;
}
/**
* Getter for shy
*
* @return bool Information if extension is shy
*/
public function getShy(): bool
{
return $this->shy;
}
/**
* Setter for internal
*
* @param bool $internal Internal
*/
public function setInternal(bool $internal)
{
$this->internal = $internal;
}
/**
* Getter for internal
*
* @return bool Internal
*/
public function getInternal(): bool
{
return $this->internal;
}
/**
* Setter for module
*
* @param string $module Module identifier
*/
public function setModule(string $module)
{
$this->module = $module;
}
/**
* Getter for module
*
* @return string Module identifier
*/
public function getModule(): string
{
return $this->module;
}
/**
* Setter for doNotLoadInFe
*
* @param bool $doNotLoadInFe Whether extension will be loaded in Frontend or not
*/
public function setDoNotLoadInFe(bool $doNotLoadInFe)
{
$this->doNotLoadInFe = $doNotLoadInFe;
}
/**
* Getter for doNotLoadInFe
*
* @return bool Whether extension will be loaded in Frontend or not
*/
public function getDoNotLoadInFe(): bool
{
return $this->doNotLoadInFe;
}
/**
* Setter for uploadfolder
*
......@@ -718,26 +528,6 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
return $this->createDirs;
}
/**
* Setter for modifyTables
*
* @param string $modifyTables Information which existing DB tables will be modified
*/
public function setModifyTables(string $modifyTables)
{
$this->modifyTables = $modifyTables;
}
/**
* Getter for modifyTables
*
* @return string Information which existing DB tables will be modified
*/
public function getModifyTables(): string
{
return $this->modifyTables;
}
/**
* Setter for clearCacheOnLoad
*
......@@ -758,66 +548,6 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
return $this->clearCacheOnLoad;
}
/**
* Setter for lockType
*
* @param string $lockType Lock type
*/
public function setLockType(string $lockType)
{
$this->lockType = $lockType;
}
/**
* Getter for lockType
*
* @return string Lock type
*/
public function getLockType(): string
{
return $this->lockType;
}
/**
* Setter for cglCompliance
*
* @param string $cglCompliance CGL compliance
*/
public function setCglCompliance(string $cglCompliance)
{
$this->cglCompliance = $cglCompliance;
}
/**
* Getter for cglCompliance
*
* @return string CGL compliance
*/
public function getCglCompliance(): string
{
return $this->cglCompliance;
}
/**
* Setter for cglComplianceNote
*
* @param string $cglComplianceNote Note for the CGL compliance
*/
public function setCglComplianceNote(string $cglComplianceNote)
{
$this->cglComplianceNote = $cglComplianceNote;
}
/**
* Getter for cglComplianceNote
*
* @return string Note for the CGL compliance
*/
public function getCglComplianceNote(): string
{
return $this->cglComplianceNote;
}
/**
* Setter for reviewState
*
......
extensions/ter_fe2/Classes/Provider/FileProvider.php
View file @ a24e80ac
......@@ -254,7 +254,6 @@ class FileProvider extends \T3o\TerFe2\Provider\AbstractProvider
'upload_comment' => $extension['uploadcomment'],
'state' => $states[(int)$extension['state']],
'em_category' => $categories[(int)$extension['category']],
'do_not_load_in_fe' => $extension['doNotLoadInFE'],
'uploadfolder' => $extension['uploadfolder'],
'clear_cache_on_load' => $extension['clearcacheonload'],
'create_dirs' => $extension['createDirs'],
......
extensions/ter_fe2/Classes/Task/ImportExtensionsFromQueueTask.php
View file @ a24e80ac
......@@ -274,23 +274,9 @@ class ImportExtensionsFromQueueTask extends Task
'frontend_download_counter' => 0,
'state' => in_array((string)$extData['state'], $states) ? (string)$extData['state'] : 'n/a',
'em_category' => array_key_exists((string)$extData['category'], $categories) ? (string)$extData['category'] : '',
// unused since 2020, not used in TYPO3 v6+ anymore
'load_order' => '',
// unused since 2020, not used in TYPO3 v6+ anymore
'priority' => '',
// unused since 2020, not used in TYPO3 v6+ anymore
'shy' => 0,
'uploadfolder' => $extData['uploadfolder'] ? 1 : 0,
'create_dirs' => $extData['createdirs'] ? $extData['createdirs'] : '',
// unused since 2020, not used in TYPO3 v6+ anymore
'modify_tables' => '',
// unused since 2020, not used in TYPO3 v6+ anymore
'lock_type' => '',
'clear_cache_on_load' => (int)(boolean)$extData['clearcacheonload'],
// unused since 2020, not used in TYPO3 v6+ anymore
'cgl_compliance' => '',
// unused since 2020, not used in TYPO3 v6+ anymore
'cgl_compliance_note' => '',
'review_state' => 0,
'manual' => '',
'has_manual' => (int)(boolean)$extData['ismanualincluded'],
......
extensions/ter_fe2/Configuration/TCA/tx_terfe2_domain_model_version.php
View file @ a24e80ac
......@@ -15,10 +15,10 @@ return [
'iconfile' => 'EXT:ter_fe2/Resources/Public/Icons/version.gif',
],
'interface' => [
'showRecordFieldList' => 'title,description,version_number,version_string,upload_date,upload_comment,download_counter,frontend_download_counter,state,em_category,load_order,priority,shy,internal,do_not_load_in_fe,uploadfolder,clear_cache_on_load,module,create_dirs,modify_tables,lock_type,cgl_compliance,cgl_compliance_note,review_state,manual,has_manual,software_relations,author,file_hash,extension_provider,has_zip_file,has_images,composer_info',
'showRecordFieldList' => 'title,description,version_number,version_string,upload_date,upload_comment,download_counter,frontend_download_counter,state,em_category,uploadfolder,clear_cache_on_load,create_dirs,review_state,manual,has_manual,software_relations,author,file_hash,extension_provider,has_zip_file,has_images,composer_info',
],
'types' => [
'1' => ['showitem' => 'title,description,version_number,version_string,upload_date,upload_comment,download_counter,frontend_download_counter,state,em_category,load_order,priority,shy,internal,do_not_load_in_fe,uploadfolder,clear_cache_on_load,module,create_dirs,modify_tables,lock_type,cgl_compliance,cgl_compliance_note,review_state,manual,has_manual,software_relations,author,file_hash,extension_provider,has_zip_file,has_images,composer_info'],
'1' => ['showitem' => 'title,description,version_number,version_string,upload_date,upload_comment,download_counter,frontend_download_counter,state,em_category,uploadfolder,clear_cache_on_load,create_dirs,review_state,manual,has_manual,software_relations,author,file_hash,extension_provider,has_zip_file,has_images,composer_info'],
],
'palettes' => [
'1' => ['showitem' => ''],
......@@ -143,54 +143,6 @@ return [
],
],
],
'load_order' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.load_order',
'config' => [
'type' => 'select',
'size' => 1,
'minitems' => 0,
'maxitems' => 1,
'items' => [
['', ''],
['LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.load_order.top', 'top'],
['LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.load_order.bottom', 'bottom'],
],
],
],
'priority' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.priority',
'config' => [
'type' => 'input',
'size' => 30,
'eval' => 'trim',
],
],
'shy' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.shy',
'config' => [
'type' => 'check',
'default' => 0,
],
],
'internal' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.internal',
'config' => [
'type' => 'check',
'default' => 0,
],
],
'do_not_load_in_fe' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.do_not_load_in_fe',
'config' => [
'type' => 'check',
'default' => 0,
],
],
'uploadfolder' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.uploadfolder',
......@@ -207,15 +159,6 @@ return [
'default' => 0,
],
],
'module' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.module',
'config' => [
'type' => 'input',
'size' => 30,
'eval' => 'trim',
],
],
'create_dirs' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.create_dirs',
......@@ -225,42 +168,6 @@ return [
'eval' => 'trim',
],
],
'modify_tables' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.modify_tables',
'config' => [
'type' => 'input',
'size' => 30,
'eval' => 'trim',
],
],
'lock_type' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.lock_type',
'config' => [
'type' => 'input',
'size' => 30,
'eval' => 'trim',
],
],
'cgl_compliance' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.cgl_compliance',
'config' => [
'type' => 'input',
'size' => 30,
'eval' => 'trim',
],
],
'cgl_compliance_note' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.cgl_compliance_note',
'config' => [
'type' => 'text',
'cols' => 30,
'rows' => 5,
],
],
'review_state' => [
'exclude' => 1,
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_version.review_state',
......
extensions/ter_fe2/Resources/Private/Language/locallang.xlf
View file @ a24e80ac
......@@ -99,12 +99,6 @@
<trans-unit id="tx_terfe2_domain_model_version.em_category" xml:space="preserve">
<source>The category of the extension manager (frontend plugin, backend module, etc.)</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.load_order" xml:space="preserve">
<source>Loading order in Extension Manager</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.modify_tables" xml:space="preserve">
<source>Information which existing DB tables will be modified</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.manual" xml:space="preserve">
<source>Relation to manual object of ter_doc extension</source>
</trans-unit>
......
extensions/ter_fe2/Resources/Private/Language/locallang_csh_tx_terfe2_domain_model_version.xlf
View file @ a24e80ac
......@@ -36,45 +36,15 @@
<trans-unit id="em_category.description" xml:space="preserve">
<source>The category of the extension manager (frontend plugin, backend module, etc.)</source>
</trans-unit>
<trans-unit id="load_order.description" xml:space="preserve">
<source>Loading order in Extension Manager</source>
</trans-unit>
<trans-unit id="priority.description" xml:space="preserve">
<source>Priority</source>
</trans-unit>
<trans-unit id="shy.description" xml:space="preserve">
<source>Information if extension is shy</source>
</trans-unit>
<trans-unit id="internal.description" xml:space="preserve">
<source>Internal</source>
</trans-unit>
<trans-unit id="do_not_load_in_fe.description" xml:space="preserve">
<source>Whether extension will be loaded in Frontend or not</source>
</trans-unit>
<trans-unit id="uploadfolder.description" xml:space="preserve">
<source>Whether an upload folder will be created or not</source>
</trans-unit>
<trans-unit id="clear_cache_on_load.description" xml:space="preserve">
<source>Whether to clear cache on load or not</source>
</trans-unit>
<trans-unit id="module.description" xml:space="preserve">
<source>Module identifier</source>
</trans-unit>
<trans-unit id="create_dirs.description" xml:space="preserve">
<source>Names of dirs to create on load</source>
</trans-unit>
<trans-unit id="modify_tables.description" xml:space="preserve">
<source>Information which existing DB tables will be modified</source>
</trans-unit>
<trans-unit id="lock_type.description" xml:space="preserve">
<source>Lock table</source>
</trans-unit>
<trans-unit id="cgl_compliance.description" xml:space="preserve">
<source>CGL compliance</source>
</trans-unit>
<trans-unit id="cgl_compliance_note.description" xml:space="preserve">
<source>Note for the CGL compliance</source>
</trans-unit>
<trans-unit id="review_state.description" xml:space="preserve">
<source>Review state</source>
</trans-unit>
......
extensions/ter_fe2/Resources/Private/Language/locallang_db.xlf
View file @ a24e80ac
......@@ -150,51 +150,15 @@
<trans-unit id="tx_terfe2_domain_model_version.em_category.doc" xml:space="preserve">
<source>Documentation</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.load_order" xml:space="preserve">
<source>Load Order</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.load_order.top" xml:space="preserve">
<source>Top</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.load_order.bottom" xml:space="preserve">
<source>Bottom</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.priority" xml:space="preserve">
<source>Priority</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.shy" xml:space="preserve">
<source>Shy</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.internal" xml:space="preserve">
<source>Internal</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.do_not_load_in_fe" xml:space="preserve">
<source>Do not load in Frontend</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.uploadfolder" xml:space="preserve">
<source>Upload folder</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.clear_cache_on_load" xml:space="preserve">
<source>Clear cache on load</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.module" xml:space="preserve">
<source>Module</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.create_dirs" xml:space="preserve">
<source>Create dirs</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.modify_tables" xml:space="preserve">
<source>Modify tables</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.lock_type" xml:space="preserve">
<source>Lock type</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.cgl_compliance" xml:space="preserve">
<source>CGL compliance</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.cgl_compliance_note" xml:space="preserve">
<source>CGL compliance note</source>
</trans-unit>
<trans-unit id="tx_terfe2_domain_model_version.review_state" xml:space="preserve">
<source>Review state</source>
</trans-unit>
......
extensions/ter_fe2/ext_tables.sql
View file @ a24e80ac
......@@ -73,19 +73,9 @@ CREATE TABLE tx_terfe2_domain_model_version (
frontend_download_counter int(11) DEFAULT '0' NOT NULL,
state tinytext,
em_category tinytext,
load_order tinytext,
priority tinytext,
shy tinyint(4) unsigned DEFAULT '0' NOT NULL,
internal tinyint(4) unsigned DEFAULT '0' NOT NULL,
do_not_load_in_fe tinyint(4) unsigned DEFAULT '0' NOT NULL,
uploadfolder tinyint(4) unsigned DEFAULT '0' NOT NULL,
clear_cache_on_load tinyint(4) unsigned