Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TASK] Allow php 8.3 #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[TASK] Allow php 8.3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
585eb96
[TASK] Allow php 8.3
mschwemer Feb 20, 2024
d7351b9
[BUGFIX] Avoid 'Undefined array key "uid"'
mschwemer Mar 13, 2024
d8127bd
[TASK] Improve docheader in backend module
mschwemer Mar 13, 2024
ab26c48
[BUGFIX] Avoid 'Undefined array key "uid"'
mschwemer Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Controller/ModuleController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ public function ajaxGroupsImport(ServerRequestInterface $request): ResponseInter
// Merge LDAP and TYPO3 information
$group = Authentication::merge($ldapGroup, $typo3Groups[0], $config['groups']['mapping']);

if ((int)$group['uid'] === 0) {
if ((int)($group['uid'] ?? 0) === 0) {
$group = Typo3GroupRepository::add($table, $group);
} else {
// Restore group that may have been previously deleted
Expand Down
2 changes: 1 addition & 1 deletion Classes/Task/ImportUsers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function execute()

// Import the user using information from LDAP
$restoreBehaviour = $this->restoredUsersHandling;
if (in_array($user['uid'], $disabledOrDeletedUserUids, true)) {
if (in_array($user['uid'] ?? 0, $disabledOrDeletedUserUids, true)) {
// We disabled this user ourselves
if ($this->missingUsersHandling === 'disable') {
if ($restoreBehaviour === 'nothing') {
Expand Down
7 changes: 7 additions & 0 deletions Resources/Private/Language/locallang.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
<source><![CDATA[This module cannot be used until you create at least one configuration record. Please refer to the <a href="%s" target="_blank">administrator manual</a> for further information.<br /><br /><a href="%s">Click here</a> to create a configuration record.]]></source>
</trans-unit>

<trans-unit id="module_docheader.configurations.switch">
<source>Switch configuration</source>
</trans-unit>
<trans-unit id="module_docheader.configurations.edit">
<source>Edit current configuration</source>
</trans-unit>

<trans-unit id="module_overview">
<source>Overview</source>
</trans-unit>
Expand Down
19 changes: 12 additions & 7 deletions Resources/Private/Partials/ConfigurationRecords.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,25 @@
<f:format.raw>{editLink}</f:format.raw>
</f:then>
<f:else>
<f:form action="{action}" method="post" class="form-inline">
<div class="form-group form-group-sm">
<f:form action="{action}" method="post" class="form-inline;">
<div class="form-group" style="display: flex;">
<f:form.select name="configuration"
options="{configurationRecords}"
value="{currentConfiguration}"
optionValueField="uid"
optionLabelField="name"
class="form-select form-select-sm form-control"/>
class="form-select"
style="display: inline-flex; width: 100%;"/>

<div style="display: inline-block; margin-left: 5px;">
<f:format.raw>{editLink}</f:format.raw>
</div>
<f:form.submit
class="form-submit form-submit-sm form-control"
style="margin-inline-start: 1rem;"
value="{f:translate(key: 'module_docheader.configurations.switch')}"/>

</div>
<div style="margin-block-start: .5rem; display: flex;">
<span style="margin-inline: .375rem;">{f:translate(key: 'module_docheader.configurations.edit')}</span> <f:format.raw>{editLink}</f:format.raw>
</div>
<f:form.submit/>
</f:form>
</f:else>
</f:if>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0 <=8.2.99",
"php": ">=8.1.0 <=8.3.99",
"ext-ldap": "*",
"ext-json": "*",
"typo3/cms-core": "^12"
Expand Down