[TASK] Drop Venue.country (#4273)

Part of #3923

Author: oliverklee

CHANGELOG.md

@@ -110,6 +110,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Removed
 
+- Drop `Venue.country` (#4273)
 - Drop `Event.language` (#4271)
 - Drop the event language from the FE list and single view (#4270)
 - Drop the country column from the FE list views (#4269)

Classes/BackEnd/TceForms.php

@@ -4,11 +4,7 @@
 
 namespace OliverKlee\Seminars\Model;
 
-use OliverKlee\Oelib\Exception\NotFoundException;
-use OliverKlee\Oelib\Mapper\CountryMapper;
-use OliverKlee\Oelib\Mapper\MapperRegistry;
 use OliverKlee\Oelib\Model\AbstractModel;
-use OliverKlee\Oelib\Model\Country;
 
 /**
  * This class represents a place.
@@ -43,25 +39,4 @@ public function getCity(): string
     {
         return $this->getAsString('city');
     }
-
-    public function getCountry(): ?Country
-    {
-        $countryCode = $this->getAsString('country');
-        if ($countryCode === '') {
-            return null;
-        }
-
-        try {
-            $country = MapperRegistry::get(CountryMapper::class)->findByIsoAlpha2Code($countryCode);
-        } catch (NotFoundException $exception) {
-            $country = null;
-        }
-
-        return $country;
-    }
-
-    public function hasCountry(): bool
-    {
-        return $this->getCountry() !== null;
-    }
 }

Classes/Model/Place.php

@@ -263,75 +263,6 @@ public function getPlaceWithDetails(TemplateHelper $plugin): string
         return $plugin->getSubpart('PLACE_LIST_COMPLETE');
     }
 
-    /**
-     * Checks whether the current event has at least one place set, and if
-     * this/these pace(s) have a country set.
-     * Returns a boolean TRUE if at least one of the set places has a
-     * country set, returns FALSE otherwise.
-     *
-     * IMPORTANT: This function does not check whether the saved ISO code is
-     * valid at all. As this field is filled through the BE from a prefilled
-     * list, this should never be an issue at all.
-     *
-     * @return bool whether at least one place with country are set for the current event
-     */
-    public function hasCountry(): bool
-    {
-        $placesWithCountry = $this->getPlacesWithCountry();
-
-        return $this->hasPlace() && !empty($placesWithCountry);
-    }
-
-    /**
-     * Returns an array of two-char ISO codes of countries for this event.
-     * These are fetched from the referenced place records of this event. If no
-     * place is set, or the set place(s) don't have any country set, an empty
-     * array will be returned.
-     *
-     * @return list<string> the list of ISO codes for the countries of this event, may be empty
-     */
-    public function getPlacesWithCountry(): array
-    {
-        if (!$this->hasPlace()) {
-            return [];
-        }
-
-        $countries = array_column($this->getPlacesAsArray(), 'country');
-        return array_filter(
-            $countries,
-            static fn (string $country): bool => $country !== ''
-        );
-    }
-
-    /**
-     * Returns a comma-separated list of country names that were set in the
-     * place record(s).
-     * If no places are set, or no countries are selected in the set places,
-     * an empty string will be returned.
-     *
-     * @return string comma-separated list of countries for this event, may be empty
-     */
-    public function getCountry(): string
-    {
-        if (!$this->hasCountry()) {
-            return '';
-        }
-
-        $countryList = [];
-
-        // Fetches the countries from the corresponding place records, may be
-        // an empty array.
-        // Get the real country names from the ISO codes.
-        foreach ($this->getPlacesWithCountry() as $currentCountry) {
-            $countryList[] = $this->getCountryNameFromIsoCode($currentCountry);
-        }
-
-        // Makes sure that each country is exactly once in the array and then
-        // returns this list.
-        $countryListUnique = array_unique($countryList);
-        return implode(', ', $countryListUnique);
-    }
-
     /**
      * Returns a comma-separated list of city names that were set in the place
      * record(s).
@@ -381,25 +312,6 @@ public function getCitiesFromPlaces(): array
         return \array_column($this->getPlacesAsArray(), 'city');
     }
 
-    /**
-     * Returns the name of the requested country from the static info tables.
-     * If the country with this ISO code could not be found in the database,
-     * an empty string is returned instead.
-     *
-     * @param string $isoCode the ISO 3166-1 alpha-2 code of the country, must not be empty
-     *
-     * @return string the short local name of the country or an empty
-     *                string if the country could not be found
-     */
-    public function getCountryNameFromIsoCode(string $isoCode): string
-    {
-        $table = 'static_countries';
-        $title = self::getConnectionForTable($table)
-            ->select(['cn_short_local'], $table, ['cn_iso_2' => $isoCode])->fetchOne();
-
-        return \is_string($title) ? $title : '';
-    }
-
     /**
      * Gets our place (or places) with address and links as HTML, not RTE'ed yet,
      * separated by LF.
@@ -432,12 +344,6 @@ protected function getPlaceWithDetailsRaw(): string
                     $place['zip'] . ' ' . $place['city']
                 );
             }
-            if ((string)($place['country'] ?? '') !== '') {
-                $countryName = $this->getCountryNameFromIsoCode($place['country']);
-                if ($countryName !== '') {
-                    $descriptionParts[] = $countryName;
-                }
-            }
 
             if (!empty($descriptionParts)) {
                 $placeText .= ', ' . implode(', ', $descriptionParts);
@@ -457,7 +363,7 @@ protected function getPlaceWithDetailsRaw(): string
      *
      * The array will be two-dimensional: The first dimensional is just numeric.
      * The second dimension is associative with the following keys:
-     * title, address, city, country, homepage, directions
+     * title, address, city, homepage, directions
      *
      * @return list<array<string, string|int>>
      *         all places as a two-dimensional array, will be empty if there are no places assigned
@@ -467,7 +373,7 @@ protected function getPlacesAsArray(): array
         $queryBuilder = self::getQueryBuilderForTable('tx_seminars_sites');
 
         return $queryBuilder
-            ->select('uid', 'title', 'address', 'zip', 'city', 'country', 'homepage', 'directions')
+            ->select('uid', 'title', 'address', 'zip', 'city', 'homepage', 'directions')
             ->from('tx_seminars_sites')
             ->leftJoin(
                 'tx_seminars_sites',

Classes/OldModel/LegacyEvent.php

@@ -1,7 +1,5 @@
 <?php
 
-use OliverKlee\Seminars\BackEnd\TceForms;
-
 defined('TYPO3') or die();
 
 $tca = [
@@ -53,19 +51,6 @@
                 'eval' => 'required,trim',
             ],
         ],
-        'country' => [
-            'exclude' => 1,
-            'label' => 'LLL:EXT:seminars/Resources/Private/Language/locallang_db.xlf:tx_seminars_sites.country',
-            'config' => [
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'items' => [['', '0']],
-                'itemsProcFunc' => TceForms::class . '->createCountrySelector',
-                'size' => 1,
-                'minitems' => 0,
-                'maxitems' => 1,
-            ],
-        ],
         'homepage' => [
             'exclude' => 1,
             'label' => 'LLL:EXT:seminars/Resources/Private/Language/locallang_db.xlf:tx_seminars_sites.homepage',
@@ -128,7 +113,7 @@
     ],
     'types' => [
         '0' => [
-            'showitem' => 'title, address, zip, city, country, homepage, directions, '
+            'showitem' => 'title, address, zip, city, homepage, directions, '
                 . 'contact_person, email_address, phone_number, notes',
         ],
     ],

Configuration/TCA/tx_seminars_sites.php

@@ -516,9 +516,6 @@
 			<trans-unit id="tx_seminars_sites.city">
 				<source>City</source>
 			</trans-unit>
-			<trans-unit id="tx_seminars_sites.country">
-				<source>Country</source>
-			</trans-unit>
 			<trans-unit id="tx_seminars_sites.homepage">
 				<source>Homepage</source>
 			</trans-unit>

Resources/Private/Language/locallang_db.xlf

@@ -87,27 +87,6 @@
         <directions>3 turns left, then always right</directions>
         <homepage>www.example.com</homepage>
     </tx_seminars_sites>
-    <tx_seminars_sites>
-        <uid>2</uid>
-        <title>with valid country</title>
-        <country>ch</country>
-    </tx_seminars_sites>
-    <tx_seminars_sites>
-        <uid>3</uid>
-        <title>with invalid country</title>
-        <country>xy</country>
-    </tx_seminars_sites>
-    <tx_seminars_sites>
-        <uid>4</uid>
-        <title>with deleted country</title>
-        <deleted>1</deleted>
-        <country>de</country>
-    </tx_seminars_sites>
-    <tx_seminars_sites>
-        <uid>5</uid>
-        <title>with another valid country</title>
-        <country>de</country>
-    </tx_seminars_sites>
     <tx_seminars_sites>
         <uid>6</uid>
         <title>The garden (without country)</title>