[TASK] Drop Venue.zip

CHANGELOG.md

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

Classes/Model/Place.php

@@ -24,14 +24,6 @@ public function getFullAddress(): string
         return $this->getAsString('address');
     }
 
-    /**
-     * @return string the ZIP code, might be empty
-     */
-    public function getZip(): string
-    {
-        return $this->getAsString('zip');
-    }
-
     /**
      * @return string the city name, will not be empty
      */

Classes/OldModel/LegacyEvent.php

@@ -339,11 +339,6 @@ protected function getPlaceWithDetailsRaw(): string
             if ((string)($place['address'] ?? '') !== '') {
                 $descriptionParts[] = str_replace("\r", ',', $place['address']);
             }
-            if ((string)($place['city'] ?? '') !== '') {
-                $descriptionParts[] = trim(
-                    $place['zip'] . ' ' . $place['city']
-                );
-            }
 
             if (!empty($descriptionParts)) {
                 $placeText .= ', ' . implode(', ', $descriptionParts);
@@ -373,7 +368,7 @@ protected function getPlacesAsArray(): array
         $queryBuilder = self::getQueryBuilderForTable('tx_seminars_sites');
 
         return $queryBuilder
-            ->select('uid', 'title', 'address', 'zip', 'city', 'homepage', 'directions')
+            ->select('uid', 'title', 'address', 'city', 'homepage', 'directions')
             ->from('tx_seminars_sites')
             ->leftJoin(
                 'tx_seminars_sites',

Configuration/TCA/tx_seminars_sites.php

@@ -33,15 +33,6 @@
                 'eval' => 'trim',
             ],
         ],
-        'zip' => [
-            'exclude' => 0,
-            'label' => 'LLL:EXT:seminars/Resources/Private/Language/locallang_db.xlf:tx_seminars_sites.zip',
-            'config' => [
-                'type' => 'input',
-                'size' => 30,
-                'eval' => 'trim',
-            ],
-        ],
         'city' => [
             'exclude' => 0,
             'label' => 'LLL:EXT:seminars/Resources/Private/Language/locallang_db.xlf:tx_seminars_sites.city',
@@ -113,7 +104,7 @@
     ],
     'types' => [
         '0' => [
-            'showitem' => 'title, address, zip, city, homepage, directions, '
+            'showitem' => 'title, address, city, homepage, directions, '
                 . 'contact_person, email_address, phone_number, notes',
         ],
     ],

Resources/Private/Language/locallang_db.xlf

@@ -510,9 +510,6 @@
 			<trans-unit id="tx_seminars_sites.address">
 				<source>Full address</source>
 			</trans-unit>
-			<trans-unit id="tx_seminars_sites.zip">
-				<source>ZIP code</source>
-			</trans-unit>
 			<trans-unit id="tx_seminars_sites.city">
 				<source>City</source>
 			</trans-unit>

Tests/Functional/Controller/Fixtures/EventController/archiveAction/PastEventWithOneVenue.csv

@@ -3,8 +3,8 @@
 ,1,2,"Extension Development with Extbase and Fluid",1,2,1
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/archiveAction/PastEventWithTwoVenuesInDifferentCities.csv

@@ -3,9 +3,9 @@
 ,1,2,"Extension Development with Extbase and Fluid",1,2,2
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
-,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","50676","Köln"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
+,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","Köln"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/archiveAction/PastEventWithTwoVenuesInSameCity.csv

@@ -3,9 +3,9 @@
 ,1,2,"Extension Development with Extbase and Fluid",1,2,2
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
-,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
+,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/outlookAction/FutureEventWithOneVenue.csv

@@ -3,8 +3,8 @@
 ,1,2,"Extension Development with Extbase and Fluid",2524604400,2524604401,1
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/outlookAction/FutureEventWithTwoVenuesInDifferentCities.csv

@@ -3,9 +3,9 @@
 ,1,2,"Extension Development with Extbase and Fluid",2524604400,2524604401,2
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
-,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","50676","Köln"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
+,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","Köln"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/outlookAction/FutureEventWithTwoVenuesInSameCity.csv

@@ -3,9 +3,9 @@
 ,1,2,"Extension Development with Extbase and Fluid",2524604400,2524604401,2
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
-,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
+,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/showAction/PastEventWithOneVenue.csv

@@ -3,9 +3,9 @@
 ,1,2,"Extension Development with Extbase and Fluid",1,2,1
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
+,"uid","pid","title","address","city"
 ,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1
-53175 Bonn","53175","Bonn"
+53175 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/EventController/showAction/PastEventWithTwoVenuesInSameCity.csv

@@ -3,9 +3,9 @@
 ,1,2,"Extension Development with Extbase and Fluid",1,2,2
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
-,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
+,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/MyRegistrationsController/showAction/RegistrationWithOneVenue.csv

@@ -3,9 +3,9 @@
 ,1,1,"the event title",1,1
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
+,"uid","pid","title","address","city"
 ,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1
-53175 Bonn","53175","Bonn"
+53175 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/Controller/Fixtures/MyRegistrationsController/showAction/RegistrationWithTwoVenuesInSameCity.csv

@@ -3,9 +3,9 @@
 ,1,1,"the event title",1,2
 
 "tx_seminars_sites"
-,"uid","pid","title","address","zip","city"
-,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
-,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
+,"uid","pid","title","address","city"
+,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
+,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
 
 "tx_seminars_seminars_place_mm"
 ,"uid_local","uid_foreign","tablenames"

Tests/Functional/OldModel/Fixtures/Events/EventsWithPlaces.xml

@@ -82,7 +82,6 @@
         <title>The Castle (without country)</title>
         <address>On top of the mountain
 12345 Hamm</address>
-        <zip>12345</zip>
         <city>Hamm</city>
         <directions>3 turns left, then always right</directions>
         <homepage>www.example.com</homepage>

Tests/LegacyFunctional/Model/PlaceTest.php

@@ -82,19 +82,6 @@ public function getFullAddressWithNonEmptyFullAddressReturnsAddress(): void
         self::assertSame($address, $this->subject->getFullAddress());
     }
 
-    /**
-     * @test
-     */
-    public function getZipWithNonEmptyZipReturnsZip(): void
-    {
-        $this->subject->setData(['zip' => '13373']);
-
-        self::assertEquals(
-            '13373',
-            $this->subject->getZip()
-        );
-    }
-
     /**
      * @test
      */

Tests/LegacyFunctional/OldModel/LegacyEventTest.php

@@ -5573,9 +5573,8 @@ public function getEventDataSeparatesPlacePartsByCommaAndSpace(): void
         $place = [
             'title' => 'Hotel Ibis',
             'homepage' => '',
-            'address' => 'Kaiser-Karl-Ring 91',
+            'address' => 'Kaiser-Karl-Ring 91, 53111 Bonn',
             'city' => 'Bonn',
-            'zip' => '',
             'country' => '',
             'directions' => '',
         ];
@@ -5585,7 +5584,7 @@ public function getEventDataSeparatesPlacePartsByCommaAndSpace(): void
         $subject->method('hasPlace')->willReturn(true);
 
         self::assertSame(
-            'Hotel Ibis, Kaiser-Karl-Ring 91, Bonn',
+            'Hotel Ibis, Kaiser-Karl-Ring 91, 53111 Bonn',
             $subject->getEventData('place')
         );
     }
@@ -5629,33 +5628,7 @@ public function getEventDataForPlaceWithoutZipContainsTitleAndAddressAndCity():
     {
         $place = [
             'title' => 'Hotel Ibis',
-            'address' => 'Kaiser-Karl-Ring 91',
-            'zip' => '',
-            'city' => 'Bonn',
-            'country' => '',
-            'homepage' => '',
-            'directions' => '',
-        ];
-
-        $subject = $this->createPartialMock(LegacyEvent::class, ['getPlacesAsArray', 'hasPlace']);
-        $subject->method('getPlacesAsArray')->willReturn([$place]);
-        $subject->method('hasPlace')->willReturn(true);
-
-        self::assertSame(
-            'Hotel Ibis, Kaiser-Karl-Ring 91, Bonn',
-            $subject->getEventData('place')
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getEventDataForPlaceWithZipContainsTitleAndAddressAndZipAndCity(): void
-    {
-        $place = [
-            'title' => 'Hotel Ibis',
-            'address' => 'Kaiser-Karl-Ring 91',
-            'zip' => '53111',
+            'address' => 'Kaiser-Karl-Ring 91, 53111 Bonn',
             'city' => 'Bonn',
             'country' => '',
             'homepage' => '',

ext_tables.sql

@@ -339,7 +339,6 @@ CREATE TABLE tx_seminars_attendances (
 CREATE TABLE tx_seminars_sites (
     title tinytext,
     address text,
-    zip tinytext,
     city tinytext,
     homepage tinytext,
     directions text,