[TASK] Remove some fields from the contact table (obsolete and confusing ones)

ad356f30 · Stefan Galinski · fe2cd182 · ad356f30 · ad356f30 · ad356f30
Commit ad356f30 authored 2 years ago by Stefan Galinski
--- a/Classes/Domain/Model/Contact.php
+++ b/Classes/Domain/Model/Contact.php
@@ -49,21 +49,6 @@ class Contact extends AbstractEntity {
 	 */
 	protected $lastName = '';

-	/**
-	 * @var string $street
-	 */
-	protected $street = '';
-
-	/**
-	 * @var string $city
-	 */
-	protected $city = '';
-
-	/**
-	 * @var string $zip
-	 */
-	protected $zip = '';
-
 	/**
 	 * @var string $email
 	 */
@@ -74,11 +59,6 @@ class Contact extends AbstractEntity {
 	 */
 	protected $phone = '';

-	/**
-	 * @var bool
-	 */
-	protected $hideInFrontend = FALSE;
-
 	/**
 	 * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
 	 * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference
@@ -113,34 +93,6 @@ class Contact extends AbstractEntity {
 		$this->lastName = $lastName;
 	}

-	/**
-	 * @return string
-	 */
-	public function getCity() {
-		return $this->city;
-	}
-
-	/**
-	 * @param string $city
-	 */
-	public function setCity(string $city) {
-		$this->city = $city;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getZip() {
-		return $this->zip;
-	}
-
-	/**
-	 * @param string $zip
-	 */
-	public function setZip(string $zip) {
-		$this->zip = $zip;
-	}
-
 	/**
 	 * @return string
 	 */
@@ -169,20 +121,6 @@ class Contact extends AbstractEntity {
 		$this->phone = $phone;
 	}

-	/**
-	 * @return bool
-	 */
-	public function isHideInFrontend() {
-		return $this->hideInFrontend;
-	}
-
-	/**
-	 * @param bool $hideInFrontend
-	 */
-	public function setHideInFrontend(bool $hideInFrontend) {
-		$this->hideInFrontend = $hideInFrontend;
-	}
-
 	/**
 	 * @return string
 	 */
@@ -197,20 +135,6 @@ class Contact extends AbstractEntity {
 		$this->title = $title;
 	}

-	/**
-	 * @return string
-	 */
-	public function getStreet() {
-		return $this->street;
-	}
-
-	/**
-	 * @param string $street
-	 */
-	public function setStreet($street) {
-		$this->street = $street;
-	}
-
 	/**
 	 * @param FileReference $image
 	 */

--- a/Classes/Updates/DepartmentUpdateWizard.php
+++ b/Classes/Updates/DepartmentUpdateWizard.php
@@ -135,7 +135,6 @@ class DepartmentUpdateWizard implements UpgradeWizardInterface {
 				}
 			}

-			/** @noinspection NotOptimalIfConditionsInspection */
 			if (\count($jobs) > 0) {
 				\array_walk(
 					$newDepartments,
@@ -170,7 +169,6 @@ class DepartmentUpdateWizard implements UpgradeWizardInterface {
 					}
 				}

-				/** @noinspection NotOptimalIfConditionsInspection */
 				if (\count($jobs) > 0) {
 					\array_walk(
 						$jobs,

--- a/Classes/ViewHelpers/Form/UploadViewHelper.php
+++ b/Classes/ViewHelpers/Form/UploadViewHelper.php
@@ -89,7 +89,6 @@ class UploadViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\UploadViewHelpe
 		}

 		if ($resource !== NULL) {
-			/** @noinspection PhpUnhandledExceptionInspection */
 			$this->templateVariableContainer->add($this->arguments['resourceName'], $resource);
 			$output .= $this->renderChildren();
 		}

--- a/Configuration/TCA/tx_sgjobs_domain_model_contact.php
+++ b/Configuration/TCA/tx_sgjobs_domain_model_contact.php
@@ -33,7 +33,7 @@ $columns = [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'searchFields' => 'title, first_name, last_name, street, city, zip, email, phone, hide_in_frontend',
+		'searchFields' => 'title, first_name, last_name, email, phone',
 		'versioningWS' => 2,
 		'versioning_followPages' => TRUE,
 		'origUid' => 't3_origuid',
@@ -52,7 +52,7 @@ $columns = [
 	'interface' => [],
 	'types' => [
 		'1' => [
-			'showitem' => '--palette--;;sysLanguageAndHidden,hide_in_frontend,title,first_name,last_name,image,street,city,zip,email,phone,--palette--,--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,starttime,endtime',
+			'showitem' => '--palette--;;sysLanguageAndHidden,title,first_name,last_name,image,email,phone,--palette--,--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,starttime,endtime',
 		],
 	],
 	'palettes' => [
@@ -190,33 +190,6 @@ $columns = [
 				]
 			),
 		],
-		'street' => [
-			'exclude' => TRUE,
-			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_contact.street',
-			'config' => [
-				'type' => 'input',
-				'size' => 30,
-				'eval' => 'trim'
-			],
-		],
-		'city' => [
-			'exclude' => TRUE,
-			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_contact.city',
-			'config' => [
-				'type' => 'input',
-				'size' => 30,
-				'eval' => 'trim'
-			],
-		],
-		'zip' => [
-			'exclude' => TRUE,
-			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_contact.zip',
-			'config' => [
-				'type' => 'input',
-				'size' => 30,
-				'eval' => 'trim'
-			],
-		],
 		'phone' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_contact.phone',

--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -9,10 +9,6 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
-			<trans-unit id=":tx_sgjobs_domain_model_contact.city" approved="yes">
-				<source><![CDATA[City]]></source>
-				<target><![CDATA[Stadt]]></target>
-			</trans-unit>
 			<trans-unit id="application_mail.marker.gender" approved="yes">
 				<source><![CDATA[Gender]]></source>
 				<target><![CDATA[Geschlecht]]></target>
@@ -109,10 +105,6 @@
 				<source><![CDATA[Contact]]></source>
 				<target><![CDATA[Kontakt]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.city" approved="yes">
-				<source><![CDATA[City]]></source>
-				<target><![CDATA[Stadt]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_contact.company" approved="yes">
 				<source><![CDATA[Company]]></source>
 				<target><![CDATA[Firma]]></target>
@@ -125,10 +117,6 @@
 				<source><![CDATA[First name]]></source>
 				<target><![CDATA[Vorname]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.hide_in_frontend" approved="yes">
-				<source><![CDATA[Hide contact information on the website -> obsolete, will be overwritten by Job settings]]></source>
-				<target><![CDATA[Kontaktinformationen auf Website ausblenden -> obsolet, wird von Job settings überschrieben]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_contact.image" approved="yes">
 				<source><![CDATA[Image]]></source>
 				<target><![CDATA[Bild]]></target>
@@ -141,18 +129,10 @@
 				<source><![CDATA[Phone]]></source>
 				<target><![CDATA[Telefon]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.street" approved="yes">
-				<source><![CDATA[Street]]></source>
-				<target><![CDATA[Straße]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_contact.title" approved="yes">
 				<source><![CDATA[Title]]></source>
 				<target><![CDATA[Titel]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.zip" approved="yes">
-				<source><![CDATA[Zip code]]></source>
-				<target><![CDATA[PLZ]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_department" approved="yes">
 				<source><![CDATA[Department]]></source>
 				<target><![CDATA[Bereich]]></target>
@@ -515,4 +495,4 @@
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -87,9 +87,6 @@
 			<trans-unit id="tx_sgjobs_domain_model_contact">
 				<source><![CDATA[Contact]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.city">
-				<source><![CDATA[City]]></source>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_contact.company">
 				<source><![CDATA[Company]]></source>
 			</trans-unit>
@@ -99,9 +96,6 @@
 			<trans-unit id="tx_sgjobs_domain_model_contact.first_name">
 				<source><![CDATA[First name]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.hide_in_frontend">
-				<source><![CDATA[Hide contact information on the website -> obsolete, will be overwritten by Job settings]]></source>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_contact.image">
 				<source><![CDATA[Image]]></source>
 			</trans-unit>
@@ -111,15 +105,9 @@
 			<trans-unit id="tx_sgjobs_domain_model_contact.phone">
 				<source><![CDATA[Phone]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.street">
-				<source><![CDATA[Street]]></source>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_contact.title">
 				<source><![CDATA[Title]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgjobs_domain_model_contact.zip">
-				<source><![CDATA[Zip code]]></source>
-			</trans-unit>
 			<trans-unit id="tx_sgjobs_domain_model_department">
 				<source><![CDATA[Department]]></source>
 			</trans-unit>
@@ -392,4 +380,4 @@
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -5,3 +5,4 @@
 ## Version 5 Breaking Changes

 - Dropped TYPO3 9 support
+- Dropped city, street, zip and hide_in_frontend fields from the contact table. There is no upgrade wizard. The fields were not used inside the main template/code since some time. The latter one was depcrated since a while. Adjust your local template to use the company fields instead.
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -53,13 +53,9 @@ CREATE TABLE tx_sgjobs_domain_model_contact (
 	title varchar(255) DEFAULT '' NOT NULL,
 	first_name varchar(255) DEFAULT '' NOT NULL,
 	last_name varchar(255) DEFAULT '' NOT NULL,
-	street varchar(255) DEFAULT '' NOT NULL,
-	city varchar(255) DEFAULT '' NOT NULL,
-	zip varchar(255) DEFAULT '' NOT NULL,
 	email varchar(255) DEFAULT '' NOT NULL,
 	phone varchar(255) DEFAULT '' NOT NULL,
 	image int(11) unsigned DEFAULT '0',
-	hide_in_frontend tinyint(4) unsigned DEFAULT '0' NOT NULL
 );

 CREATE TABLE tx_sgjobs_domain_model_job_application (