Skip to content

Commit 9723f2e

Browse files
oliverkleeoliverklee
authored
[TASK] Drop Venue.zip (#4274)
This is now part of the "full address" field. Part of #3923 Closes #3923 Closes #4087
1 parent 69d0d02 commit 9723f2e

19 files changed

+32
-98
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
110110

111111
### Removed
112112

113+
- Drop `Venue.zip` (#4274)
113114
- Drop `Venue.country` (#4273)
114115
- Drop `Event.language` (#4271)
115116
- Drop the event language from the FE list and single view (#4270)

‎Classes/Model/Place.php

-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ public function getFullAddress(): string
2424
return $this->getAsString('address');
2525
}
2626

27-
/**
28-
* @return string the ZIP code, might be empty
29-
*/
30-
public function getZip(): string
31-
{
32-
return $this->getAsString('zip');
33-
}
34-
3527
/**
3628
* @return string the city name, will not be empty
3729
*/

‎Classes/OldModel/LegacyEvent.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,6 @@ protected function getPlaceWithDetailsRaw(): string
339339
if ((string)($place['address'] ?? '') !== '') {
340340
$descriptionParts[] = str_replace("\r", ',', $place['address']);
341341
}
342-
if ((string)($place['city'] ?? '') !== '') {
343-
$descriptionParts[] = trim(
344-
$place['zip'] . ' ' . $place['city']
345-
);
346-
}
347342

348343
if (!empty($descriptionParts)) {
349344
$placeText .= ', ' . implode(', ', $descriptionParts);
@@ -373,7 +368,7 @@ protected function getPlacesAsArray(): array
373368
$queryBuilder = self::getQueryBuilderForTable('tx_seminars_sites');
374369

375370
return $queryBuilder
376-
->select('uid', 'title', 'address', 'zip', 'city', 'homepage', 'directions')
371+
->select('uid', 'title', 'address', 'city', 'homepage', 'directions')
377372
->from('tx_seminars_sites')
378373
->leftJoin(
379374
'tx_seminars_sites',

‎Configuration/TCA/tx_seminars_sites.php

+1-10
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
'eval' => 'trim',
3434
],
3535
],
36-
'zip' => [
37-
'exclude' => 0,
38-
'label' => 'LLL:EXT:seminars/Resources/Private/Language/locallang_db.xlf:tx_seminars_sites.zip',
39-
'config' => [
40-
'type' => 'input',
41-
'size' => 30,
42-
'eval' => 'trim',
43-
],
44-
],
4536
'city' => [
4637
'exclude' => 0,
4738
'label' => 'LLL:EXT:seminars/Resources/Private/Language/locallang_db.xlf:tx_seminars_sites.city',
@@ -113,7 +104,7 @@
113104
],
114105
'types' => [
115106
'0' => [
116-
'showitem' => 'title, address, zip, city, homepage, directions, '
107+
'showitem' => 'title, address, city, homepage, directions, '
117108
. 'contact_person, email_address, phone_number, notes',
118109
],
119110
],

‎Resources/Private/Language/locallang_db.xlf

-3
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,6 @@
510510
<trans-unit id="tx_seminars_sites.address">
511511
<source>Full address</source>
512512
</trans-unit>
513-
<trans-unit id="tx_seminars_sites.zip">
514-
<source>ZIP code</source>
515-
</trans-unit>
516513
<trans-unit id="tx_seminars_sites.city">
517514
<source>City</source>
518515
</trans-unit>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
,1,2,"Extension Development with Extbase and Fluid",1,2,1
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
88

99
"tx_seminars_seminars_place_mm"
1010
,"uid_local","uid_foreign","tablenames"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,2,"Extension Development with Extbase and Fluid",1,2,2
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
8-
,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","50676","Köln"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
8+
,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","Köln"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,2,"Extension Development with Extbase and Fluid",1,2,2
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
8-
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
8+
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
,1,2,"Extension Development with Extbase and Fluid",2524604400,2524604401,1
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
88

99
"tx_seminars_seminars_place_mm"
1010
,"uid_local","uid_foreign","tablenames"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,2,"Extension Development with Extbase and Fluid",2524604400,2524604401,2
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
8-
,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","50676","Köln"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
8+
,2,2,"Premier Inn","Perlengraben 2, 50676 Köln","Köln"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,2,"Extension Development with Extbase and Fluid",2524604400,2524604401,2
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
8-
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
8+
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,2,"Extension Development with Extbase and Fluid",1,2,1
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
6+
,"uid","pid","title","address","city"
77
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1
8-
53175 Bonn","53175","Bonn"
8+
53175 Bonn","Bonn"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,2,"Extension Development with Extbase and Fluid",1,2,2
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
8-
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
8+
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,1,"the event title",1,1
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
6+
,"uid","pid","title","address","city"
77
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1
8-
53175 Bonn","53175","Bonn"
8+
53175 Bonn","Bonn"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
,1,1,"the event title",1,2
44

55
"tx_seminars_sites"
6-
,"uid","pid","title","address","zip","city"
7-
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","53175","Bonn"
8-
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","53227","Bonn"
6+
,"uid","pid","title","address","city"
7+
,1,2,"Maritim Hotel","Kurt-Georg-Kiesinger-Allee 1, 53175 Bonn","Bonn"
8+
,2,2,"Kameha Grand","Am Bonner Bogen 1, 53227 Bonn","Bonn"
99

1010
"tx_seminars_seminars_place_mm"
1111
,"uid_local","uid_foreign","tablenames"

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

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<title>The Castle (without country)</title>
8383
<address>On top of the mountain
8484
12345 Hamm</address>
85-
<zip>12345</zip>
8685
<city>Hamm</city>
8786
<directions>3 turns left, then always right</directions>
8887
<homepage>www.example.com</homepage>

‎Tests/LegacyFunctional/Model/PlaceTest.php

-13
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,6 @@ public function getFullAddressWithNonEmptyFullAddressReturnsAddress(): void
8282
self::assertSame($address, $this->subject->getFullAddress());
8383
}
8484

85-
/**
86-
* @test
87-
*/
88-
public function getZipWithNonEmptyZipReturnsZip(): void
89-
{
90-
$this->subject->setData(['zip' => '13373']);
91-
92-
self::assertEquals(
93-
'13373',
94-
$this->subject->getZip()
95-
);
96-
}
97-
9885
/**
9986
* @test
10087
*/

‎Tests/LegacyFunctional/OldModel/LegacyEventTest.php

+3-30
Original file line numberDiff line numberDiff line change
@@ -5573,9 +5573,8 @@ public function getEventDataSeparatesPlacePartsByCommaAndSpace(): void
55735573
$place = [
55745574
'title' => 'Hotel Ibis',
55755575
'homepage' => '',
5576-
'address' => 'Kaiser-Karl-Ring 91',
5576+
'address' => 'Kaiser-Karl-Ring 91, 53111 Bonn',
55775577
'city' => 'Bonn',
5578-
'zip' => '',
55795578
'country' => '',
55805579
'directions' => '',
55815580
];
@@ -5585,7 +5584,7 @@ public function getEventDataSeparatesPlacePartsByCommaAndSpace(): void
55855584
$subject->method('hasPlace')->willReturn(true);
55865585

55875586
self::assertSame(
5588-
'Hotel Ibis, Kaiser-Karl-Ring 91, Bonn',
5587+
'Hotel Ibis, Kaiser-Karl-Ring 91, 53111 Bonn',
55895588
$subject->getEventData('place')
55905589
);
55915590
}
@@ -5629,33 +5628,7 @@ public function getEventDataForPlaceWithoutZipContainsTitleAndAddressAndCity():
56295628
{
56305629
$place = [
56315630
'title' => 'Hotel Ibis',
5632-
'address' => 'Kaiser-Karl-Ring 91',
5633-
'zip' => '',
5634-
'city' => 'Bonn',
5635-
'country' => '',
5636-
'homepage' => '',
5637-
'directions' => '',
5638-
];
5639-
5640-
$subject = $this->createPartialMock(LegacyEvent::class, ['getPlacesAsArray', 'hasPlace']);
5641-
$subject->method('getPlacesAsArray')->willReturn([$place]);
5642-
$subject->method('hasPlace')->willReturn(true);
5643-
5644-
self::assertSame(
5645-
'Hotel Ibis, Kaiser-Karl-Ring 91, Bonn',
5646-
$subject->getEventData('place')
5647-
);
5648-
}
5649-
5650-
/**
5651-
* @test
5652-
*/
5653-
public function getEventDataForPlaceWithZipContainsTitleAndAddressAndZipAndCity(): void
5654-
{
5655-
$place = [
5656-
'title' => 'Hotel Ibis',
5657-
'address' => 'Kaiser-Karl-Ring 91',
5658-
'zip' => '53111',
5631+
'address' => 'Kaiser-Karl-Ring 91, 53111 Bonn',
56595632
'city' => 'Bonn',
56605633
'country' => '',
56615634
'homepage' => '',

‎ext_tables.sql

-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ CREATE TABLE tx_seminars_attendances (
339339
CREATE TABLE tx_seminars_sites (
340340
title tinytext,
341341
address text,
342-
zip tinytext,
343342
city tinytext,
344343
homepage tinytext,
345344
directions text,

0 commit comments

Comments
 (0)