Skip to content

Commit e38c746

Browse files
derhansenderhansen
committed
Merge branch 'typo3-v14'
# Conflicts: # Resources/Private/Templates/Event/Registration.fluid.html # ext_emconf.php
2 parents 6d9f285 + 43e13c9 commit e38c746

198 files changed

Lines changed: 2703 additions & 1509 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.Build/composer.json‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,50 @@
11
{
2-
"name": "derhansen/sf_event_mgt_build",
3-
"description": "composer.json for builds",
4-
"repositories": [
5-
{
6-
"type": "path",
7-
"url": "../"
8-
}
9-
],
10-
"require": {
11-
"derhansen/sf_event_mgt": "@dev",
12-
"typo3/cms-core": "^13.4",
13-
"php": ">=8.2"
14-
},
15-
"require-dev": {
16-
"typo3/cms-composer-installers": "^5.0",
17-
"typo3/cms-backend": "^13.4",
18-
"typo3/cms-frontend": "^13.4",
19-
"typo3/cms-extbase": "^13.4",
20-
"typo3/cms-felogin": "^13.4",
21-
"typo3/cms-fluid-styled-content": "^13.4",
22-
"typo3/cms-fluid": "^13.4",
23-
"typo3/cms-tstemplate": "^13.4",
24-
"typo3/cms-install": "^13.4",
25-
"typo3/cms-extensionmanager": "^13.4",
26-
"typo3/testing-framework": "^9.0",
27-
"friendsofphp/php-cs-fixer": "^3.12.0",
28-
"saschaegerer/phpstan-typo3": "^2.1.1",
29-
"phpstan/extension-installer": "^1.1",
30-
"codeception/codeception": "^5.0",
31-
"codeception/module-webdriver": "^4.0",
32-
"koehnlein/codeception-email-mailpit": "^0.3.0",
33-
"codeception/module-db": "^3.1"
34-
},
35-
"config": {
36-
"lock": false,
37-
"allow-plugins": {
38-
"typo3/class-alias-loader": true,
39-
"typo3/cms-composer-installers": true,
40-
"phpstan/extension-installer": true
41-
}
42-
},
43-
"autoload-dev": {
44-
"psr-4": {
45-
"DERHANSEN\\SfEventMgt\\Tests\\": "../Tests"
46-
}
47-
}
2+
"name": "derhansen/sf_event_mgt_build",
3+
"description": "composer.json for builds",
4+
"repositories": [
5+
{
6+
"type": "path",
7+
"url": "../"
8+
}
9+
],
10+
"require": {
11+
"derhansen/sf_event_mgt": "@dev",
12+
"typo3/cms-core": "^14.3",
13+
"php": ">=8.2"
14+
},
15+
"require-dev": {
16+
"typo3/cms-composer-installers": "^5.0",
17+
"typo3/cms-backend": "^14.3",
18+
"typo3/cms-frontend": "^14.3",
19+
"typo3/cms-extbase": "^14.3",
20+
"typo3/cms-felogin": "^14.3",
21+
"typo3/cms-fluid-styled-content": "^14.3",
22+
"typo3/cms-fluid": "^14.3",
23+
"typo3/cms-tstemplate": "^14.3",
24+
"typo3/cms-install": "^14.3",
25+
"typo3/cms-extensionmanager": "^14.3",
26+
"typo3/cms-scheduler": "^14.3",
27+
"typo3/testing-framework": "^9.0",
28+
"phpunit/phpunit": "^11.5.50",
29+
"friendsofphp/php-cs-fixer": "^3.12.0",
30+
"saschaegerer/phpstan-typo3": "^3.0",
31+
"phpstan/extension-installer": "^1.1",
32+
"codeception/codeception": "^5.0",
33+
"codeception/module-webdriver": "^4.0",
34+
"koehnlein/codeception-email-mailpit": "^0.3.0",
35+
"codeception/module-db": "^3.1"
36+
},
37+
"config": {
38+
"lock": false,
39+
"allow-plugins": {
40+
"typo3/class-alias-loader": true,
41+
"typo3/cms-composer-installers": true,
42+
"phpstan/extension-installer": true
43+
}
44+
},
45+
"autoload-dev": {
46+
"psr-4": {
47+
"DERHANSEN\\SfEventMgt\\Tests\\": "../Tests"
48+
}
49+
}
4850
}

‎.Build/phpstan/phpstan-baseline.neon‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: "#^Parameter \\#2 \\$optionKey of method TYPO3\\\\CMS\\\\Extbase\\\\Property\\\\PropertyMappingConfiguration\\:\\:setTypeConverterOption\\(\\) expects string, int given\\.$#"
5-
count: 1
6-
path: ../../Classes/Controller/EventController.php
7-
83
-
94
message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryInterface\\:\\:between\\(\\)\\.$#"
105
count: 4

‎.Build/phpunit/FunctionalTests.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
33
backupGlobals="true"
44
bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
55
cacheDirectory=".phpunit.cache"

‎.Build/phpunit/UnitTests.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
44
backupGlobals="true"
55
bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
66
cacheResult="false"

‎.github/workflows/FunctionalTests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
php: ['8.2', '8.3']
11+
php: ['8.2', '8.3', '8.4']
1212

1313
steps:
1414
- uses: actions/checkout@v3

‎Classes/Controller/AbstractController.php‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@
1212
namespace DERHANSEN\SfEventMgt\Controller;
1313

1414
use DERHANSEN\SfEventMgt\Domain\Model\Dto\EventDemand;
15-
use DERHANSEN\SfEventMgt\Domain\Repository\CategoryRepository;
16-
use DERHANSEN\SfEventMgt\Domain\Repository\EventRepository;
17-
use DERHANSEN\SfEventMgt\Domain\Repository\LocationRepository;
18-
use DERHANSEN\SfEventMgt\Domain\Repository\OrganisatorRepository;
19-
use DERHANSEN\SfEventMgt\Domain\Repository\Registration\FieldRepository;
20-
use DERHANSEN\SfEventMgt\Domain\Repository\RegistrationRepository;
21-
use DERHANSEN\SfEventMgt\Domain\Repository\SpeakerRepository;
22-
use DERHANSEN\SfEventMgt\Service\CalendarService;
23-
use DERHANSEN\SfEventMgt\Service\ICalendarService;
24-
use DERHANSEN\SfEventMgt\Service\NotificationService;
25-
use DERHANSEN\SfEventMgt\Service\PaymentService;
26-
use DERHANSEN\SfEventMgt\Service\RegistrationService;
2715
use TYPO3\CMS\Core\Pagination\SlidingWindowPagination;
2816
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
2917
use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
@@ -36,79 +24,6 @@ abstract class AbstractController extends ActionController
3624
{
3725
protected array $ignoredSettingsForOverwriteDemand = ['storagepage', 'orderfieldallowed'];
3826

39-
protected EventRepository $eventRepository;
40-
protected RegistrationRepository $registrationRepository;
41-
protected CategoryRepository $categoryRepository;
42-
protected LocationRepository $locationRepository;
43-
protected OrganisatorRepository $organisatorRepository;
44-
protected SpeakerRepository $speakerRepository;
45-
protected NotificationService $notificationService;
46-
protected ICalendarService $icalendarService;
47-
protected RegistrationService $registrationService;
48-
protected CalendarService $calendarService;
49-
protected PaymentService $paymentService;
50-
protected FieldRepository $fieldRepository;
51-
52-
public function injectCalendarService(CalendarService $calendarService): void
53-
{
54-
$this->calendarService = $calendarService;
55-
}
56-
57-
public function injectCategoryRepository(CategoryRepository $categoryRepository): void
58-
{
59-
$this->categoryRepository = $categoryRepository;
60-
}
61-
62-
public function injectEventRepository(EventRepository $eventRepository): void
63-
{
64-
$this->eventRepository = $eventRepository;
65-
}
66-
67-
public function injectIcalendarService(ICalendarService $icalendarService): void
68-
{
69-
$this->icalendarService = $icalendarService;
70-
}
71-
72-
public function injectLocationRepository(LocationRepository $locationRepository): void
73-
{
74-
$this->locationRepository = $locationRepository;
75-
}
76-
77-
public function injectNotificationService(NotificationService $notificationService): void
78-
{
79-
$this->notificationService = $notificationService;
80-
}
81-
82-
public function injectOrganisatorRepository(OrganisatorRepository $organisatorRepository): void
83-
{
84-
$this->organisatorRepository = $organisatorRepository;
85-
}
86-
87-
public function injectSpeakerRepository(SpeakerRepository $speakerRepository): void
88-
{
89-
$this->speakerRepository = $speakerRepository;
90-
}
91-
92-
public function injectPaymentService(PaymentService $paymentService): void
93-
{
94-
$this->paymentService = $paymentService;
95-
}
96-
97-
public function injectRegistrationRepository(RegistrationRepository $registrationRepository): void
98-
{
99-
$this->registrationRepository = $registrationRepository;
100-
}
101-
102-
public function injectRegistrationService(RegistrationService $registrationService): void
103-
{
104-
$this->registrationService = $registrationService;
105-
}
106-
107-
public function injectFieldRepository(FieldRepository $fieldRepository): void
108-
{
109-
$this->fieldRepository = $fieldRepository;
110-
}
111-
11227
/**
11328
* Public getter for extbase arguments. Can be used by extending extensions in e.g. event listeners to
11429
* retrieve the current controller arguments.

0 commit comments

Comments
 (0)