beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

fix many PHP 8.4 compatibility issues

Browse Source
This commit is contained in:
Beu
2025-05-26 22:50:03 +02:00
parent 03a991cd50
commit 7a8d9f2b0b
59 changed files with 137 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/FML/Components/CheckBox.php
View File

@ -38,7 +38,7 @@ class CheckBox implements Renderable, ScriptFeatureable
* @param bool $default (optional) Default value
* @param Quad $quad (optional) CheckBox quad
*/
public function __construct($name = null, $default = null, Quad $quad = null)
public function __construct($name = null, $default = null, ?Quad $quad = null)
{
$this->feature = new CheckBoxFeature();
if ($name) {

2
libs/FML/Components/ValuePicker.php
View File

@ -39,7 +39,7 @@ class ValuePicker implements Renderable, ScriptFeatureable
* @param string $default (optional) Default value
* @param Label $label (optional) ValuePicker label
*/
public function __construct($name = null, array $values = null, $default = null, Label $label = null)
public function __construct($name = null, ?array $values = null, $default = null, ?Label $label = null)
{
$this->feature = new ValuePickerFeature();
if ($name) {

4
libs/FML/Controls/Audio.php
View File

@ -191,7 +191,7 @@ class Audio extends Control implements Playable, Scriptable
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -209,7 +209,7 @@ class Audio extends Control implements Playable, Scriptable
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

4
libs/FML/Controls/Entry.php
View File

@ -273,7 +273,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -291,7 +291,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

2
libs/FML/Controls/Frame.php
View File

@ -103,7 +103,7 @@ class Frame extends Control implements Container
* @deprecated Use Style
* @see Style
*/
public function setFormat(Format $format = null)
public function setFormat(?Format $format = null)
{
$this->format = $format;
return $this;

4
libs/FML/Controls/Frame3d.php
View File

@ -138,7 +138,7 @@ class Frame3d extends Frame implements Scriptable
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -156,7 +156,7 @@ class Frame3d extends Frame implements Scriptable
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

4
libs/FML/Controls/Label.php
View File

@ -467,7 +467,7 @@ class Label extends Control implements Actionable, Linkable, NewLineable, MultiL
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -485,7 +485,7 @@ class Label extends Control implements Actionable, Linkable, NewLineable, MultiL
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

4
libs/FML/Controls/Quad.php
View File

@ -579,7 +579,7 @@ class Quad extends Control implements Actionable, BackgroundColorable, BgColorab
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -597,7 +597,7 @@ class Quad extends Control implements Actionable, BackgroundColorable, BgColorab
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

4
libs/FML/Controls/TextEdit.php
View File

@ -281,7 +281,7 @@ class TextEdit extends Control implements MultiLineable, Scriptable, Styleable,
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -299,7 +299,7 @@ class TextEdit extends Control implements MultiLineable, Scriptable, Styleable,
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

4
libs/FML/Controls/Video.php
View File

@ -191,7 +191,7 @@ class Video extends Control implements Playable, Scriptable
/**
* @see Scriptable::setScriptAction()
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null)
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
{
$this->scriptAction = (string)$scriptAction;
$this->setScriptActionParameters($scriptActionParameters);
@ -209,7 +209,7 @@ class Video extends Control implements Playable, Scriptable
/**
* @see Scriptable::setScriptActionParameters()
*/
public function setScriptActionParameters(array $scriptActionParameters = null)
public function setScriptActionParameters(?array $scriptActionParameters = null)
{
$this->scriptActionParameters = $scriptActionParameters;
return $this;

6
libs/FML/Elements/FrameModel.php
View File

@ -41,7 +41,7 @@ class FrameModel implements Container, Identifiable, Renderable
* @param Renderable[] $children Children
* @return static
*/
public static function create($modelId = null, array $children = null)
public static function create($modelId = null, ?array $children = null)
{
return new static($modelId, $children);
}
@ -53,7 +53,7 @@ class FrameModel implements Container, Identifiable, Renderable
* @param string $modelId Model id
* @param Renderable[] $children Children
*/
public function __construct($modelId = null, array $children = null)
public function __construct($modelId = null, ?array $children = null)
{
if ($modelId) {
$this->setId($modelId);
@ -176,7 +176,7 @@ class FrameModel implements Container, Identifiable, Renderable
* @deprecated Use Style
* @see Style
*/
public function setFormat(Format $format = null)
public function setFormat(?Format $format = null)
{
$this->format = $format;
return $this;

10
libs/FML/ManiaLink.php
View File

@ -96,7 +96,7 @@ class ManiaLink
* @param Renderable[] $children (optional) Children
* @return static
*/
public static function create($maniaLinkId = null, $version = null, $name = null, array $children = null)
public static function create($maniaLinkId = null, $version = null, $name = null, ?array $children = null)
{
return new static($maniaLinkId, $version, $name, $children);
}
@ -110,7 +110,7 @@ class ManiaLink
* @param string $name (optional) Name
* @param Renderable[] $children (optional) Children
*/
public function __construct($maniaLinkId = null, $version = null, $name = null, array $children = null)
public function __construct($maniaLinkId = null, $version = null, $name = null, ?array $children = null)
{
if (is_string($version) && (!$name || is_array($name)) && !$children) {
// backwards-compatibility (version has been introduced later, if it's a string it's supposed to be the name)
@ -418,7 +418,7 @@ class ManiaLink
* @param Dico $dico Dictionary
* @return static
*/
public function setDico(Dico $dico = null)
public function setDico(?Dico $dico = null)
{
$this->dico = $dico;
return $this;
@ -445,7 +445,7 @@ class ManiaLink
* @param Stylesheet $stylesheet Stylesheet
* @return static
*/
public function setStylesheet(Stylesheet $stylesheet = null)
public function setStylesheet(?Stylesheet $stylesheet = null)
{
$this->stylesheet = $stylesheet;
return $this;
@ -489,7 +489,7 @@ class ManiaLink
* @param Script $script Script
* @return static
*/
public function setScript(Script $script = null)
public function setScript(?Script $script = null)
{
$this->script = $script;
return $this;

6
libs/FML/ManiaLinks.php
View File

@ -29,7 +29,7 @@ class ManiaLinks
* @param ManiaLink[] $children ManiaLink children
* @return static
*/
public static function create(array $children = null)
public static function create(?array $children = null)
{
return new static($children);
}
@ -40,7 +40,7 @@ class ManiaLinks
* @api
* @param ManiaLink[] $children ManiaLink children
*/
public function __construct(array $children = null)
public function __construct(?array $children = null)
{
if ($children) {
$this->setChildren($children);
@ -162,7 +162,7 @@ class ManiaLinks
* @param CustomUI $customUI CustomUI object
* @return static
*/
public function setCustomUI(CustomUI $customUI = null)
public function setCustomUI(?CustomUI $customUI = null)
{
$this->customUI = $customUI;
return $this;

4
libs/FML/Script/Features/ActionTrigger.php
View File

@ -41,7 +41,7 @@ class ActionTrigger extends ScriptFeature
* @param Control $control (optional) Action Control
* @param string $labelName (optional) Script label name
*/
public function __construct($actionName = null, Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
public function __construct($actionName = null, ?Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
{
if ($actionName) {
$this->setActionName($actionName);
@ -96,7 +96,7 @@ class ActionTrigger extends ScriptFeature
* @param Control $control Action Control
* @return static
*/
public function setControl(Control $control = null)
public function setControl(?Control $control = null)
{
if ($control) {
$control->checkId();

2
libs/FML/Script/Features/CheckBoxFeature.php
View File

@ -66,7 +66,7 @@ class CheckBoxFeature extends ScriptFeature
* @param Entry $entry (optional) Hidden Entry
* @param bool $default (optional) Default value
*/
public function __construct(Quad $quad = null, Entry $entry = null, $default = null)
public function __construct(?Quad $quad = null, ?Entry $entry = null, $default = null)
{
if ($quad) {
$this->setQuad($quad);

2
libs/FML/Script/Features/Clock.php
View File

@ -41,7 +41,7 @@ class Clock extends ScriptFeature
* @param bool $showSeconds (optional) Show the seconds
* @param bool $showFullDate (optional) Show the date
*/
public function __construct(Label $label = null, $showSeconds = true, $showFullDate = false)
public function __construct(?Label $label = null, $showSeconds = true, $showFullDate = false)
{
if ($label) {
$this->setLabel($label);

2
libs/FML/Script/Features/ControlScript.php
View File

@ -41,7 +41,7 @@ class ControlScript extends ScriptFeature
* @param string $scriptText (optional) Script text
* @param string $labelName (optional) Script Label name
*/
public function __construct(Control $control = null, $scriptText = null, $labelName = ScriptLabel::MOUSECLICK)
public function __construct(?Control $control = null, $scriptText = null, $labelName = ScriptLabel::MOUSECLICK)
{
if ($control) {
$this->setControl($control);

2
libs/FML/Script/Features/EntrySubmit.php
View File

@ -35,7 +35,7 @@ class EntrySubmit extends ScriptFeature
* @param Entry $entry (optional) Entry Control
* @param string $url (optional) Submit url
*/
public function __construct(Entry $entry = null, $url = null)
public function __construct(?Entry $entry = null, $url = null)
{
if ($entry) {
$this->setEntry($entry);

4
libs/FML/Script/Features/GraphCurve.php
View File

@ -54,7 +54,7 @@ class GraphCurve extends ScriptFeature
* @param Graph $graph (optional) Graph
* @param array[] $points (optional) Points
*/
public function __construct(Graph $graph = null, array $points = null)
public function __construct(?Graph $graph = null, ?array $points = null)
{
if ($graph) {
$this->setGraph($graph);
@ -200,7 +200,7 @@ class GraphCurve extends ScriptFeature
* @param float[] $color (optional) Color
* @return static
*/
public function setColor(array $color = null)
public function setColor(?array $color = null)
{
$this->color = $color;
return $this;

2
libs/FML/Script/Features/GraphSettings.php
View File

@ -38,7 +38,7 @@ class GraphSettings extends ScriptFeature
* @api
* @param Graph $graph (optional) Graph
*/
public function __construct(Graph $graph = null)
public function __construct(?Graph $graph = null)
{
if ($graph) {
$this->setGraph($graph);

2
libs/FML/Script/Features/MapInfo.php
View File

@ -35,7 +35,7 @@ class MapInfo extends ScriptFeature
* @param Control $control (optional) Map Info Control
* @param string $labelName (optional) Script Label name
*/
public function __construct(Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
public function __construct(?Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
{
if ($control) {
$this->setControl($control);

4
libs/FML/Script/Features/Menu.php
View File

@ -40,7 +40,7 @@ class Menu extends ScriptFeature
* @param Control $control (optional) Toggled Menu Control
* @param bool $isStartElement (optional) Whether the Menu should start with the given Element
*/
public function __construct(Control $item = null, Control $control = null, $isStartElement = true)
public function __construct(?Control $item = null, ?Control $control = null, $isStartElement = true)
{
if ($item && $control) {
$this->addItem($item, $control, $isStartElement);
@ -116,7 +116,7 @@ class Menu extends ScriptFeature
* @param MenuElement $startElement Start Element
* @return static
*/
public function setStartElement(MenuElement $startElement = null)
public function setStartElement(?MenuElement $startElement = null)
{
$this->startElement = $startElement;
if ($startElement && !in_array($startElement, $this->elements, true)) {

2
libs/FML/Script/Features/MenuElement.php
View File

@ -32,7 +32,7 @@ class MenuElement
* @param Control $item (optional) Item Control in the Menu bar
* @param Control $control (optional) Toggled Menu Control
*/
public function __construct(Control $item = null, Control $control = null)
public function __construct(?Control $item = null, ?Control $control = null)
{
if ($item) {
$this->setItem($item);

2
libs/FML/Script/Features/Paging.php
View File

@ -73,7 +73,7 @@ class Paging extends ScriptFeature
* @param PagingPage[] $pages (optional) Pages
* @param PagingButton[] $buttons (optional) Pageing Buttons
*/
public function __construct(Label $label = null, array $pages = null, array $buttons = null)
public function __construct(?Label $label = null, ?array $pages = null, ?array $buttons = null)
{
if ($label) {
$this->setLabel($label);

2
libs/FML/Script/Features/PagingButton.php
View File

@ -32,7 +32,7 @@ class PagingButton
* @param Control $control (optional) Paging Control
* @param int $pagingCount (optional) Number of browsed pages per click
*/
public function __construct(Control $control = null, $pagingCount = 1)
public function __construct(?Control $control = null, $pagingCount = 1)
{
if ($control) {
$this->setControl($control);

2
libs/FML/Script/Features/PagingPage.php
View File

@ -31,7 +31,7 @@ class PagingPage
* @param Control $control (optional) Page Control
* @param int $pageNumber (optional) Number of the Page
*/
public function __construct(Control $control = null, $pageNumber = null)
public function __construct(?Control $control = null, $pageNumber = null)
{
if ($control) {
$this->setControl($control);

2
libs/FML/Script/Features/PlayerProfile.php
View File

@ -46,7 +46,7 @@ class PlayerProfile extends ScriptFeature
* @param Control $control (optional) Profile Control
* @param string $labelName (optional) Script Label name
*/
public function __construct($login = null, Control $control = null, $labelName = ScriptLabel::MOUSECLICK, $titleId = "Trackmania")
public function __construct($login = null, ?Control $control = null, $labelName = ScriptLabel::MOUSECLICK, $titleId = "Trackmania")
{
if ($login) {
$this->setLogin($login);

2
libs/FML/Script/Features/Preload.php
View File

@ -27,7 +27,7 @@ class Preload extends ScriptFeature
* @api
* @param string[] $imageUrls (optional) Image urls
*/
public function __construct(array $imageUrls = null)
public function __construct(?array $imageUrls = null)
{
if ($imageUrls) {
$this->setImageUrls($imageUrls);

2
libs/FML/Script/Features/RadioButtonGroupFeature.php
View File

@ -40,7 +40,7 @@ class RadioButtonGroupFeature extends ScriptFeature
* @api
* @param Entry $entry (optional) Hidden Entry
*/
public function __construct(Entry $entry = null)
public function __construct(?Entry $entry = null)
{
if ($entry) {
$this->setEntry($entry);

4
libs/FML/Script/Features/Toggle.php
View File

@ -54,8 +54,8 @@ class Toggle extends ScriptFeature
* @param bool $onlyHide (optional) If it should only hide the Control but not toggle
*/
public function __construct(
Control $togglingControl = null,
Control $toggledControl = null,
?Control $togglingControl = null,
?Control $toggledControl = null,
$labelName = ScriptLabel::MOUSECLICK,
$onlyShow = false,
$onlyHide = false

2
libs/FML/Script/Features/Tooltip.php
View File

@ -54,7 +54,7 @@ class Tooltip extends ScriptFeature
* @param bool $invert (optional) If the visibility toggling should be inverted
* @param string $text (optional) Text to display if the TooltipControl is a Label
*/
public function __construct(Control $hoverControl = null, Control $tooltipControl = null, $stayOnClick = null, $invert = null, $text = null)
public function __construct(?Control $hoverControl = null, ?Control $tooltipControl = null, $stayOnClick = null, $invert = null, $text = null)
{
if ($hoverControl) {
$this->setHoverControl($hoverControl);

4
libs/FML/Script/Features/UISound.php
View File

@ -85,7 +85,7 @@ class UISound extends ScriptFeature
* @param int $variant (optional) Sound variant
* @param string $labelName (optional) Script Label name
*/
public function __construct($soundName = null, Control $control = null, $variant = 0, $labelName = ScriptLabel::MOUSECLICK)
public function __construct($soundName = null, ?Control $control = null, $variant = 0, $labelName = ScriptLabel::MOUSECLICK)
{
if ($soundName) {
$this->setSoundName($soundName);
@ -143,7 +143,7 @@ class UISound extends ScriptFeature
* @param Control $control (optional) Sound Control
* @return static
*/
public function setControl(Control $control = null)
public function setControl(?Control $control = null)
{
if ($control) {
$control->checkId();

2
libs/FML/Script/Features/ValuePickerFeature.php
View File

@ -56,7 +56,7 @@ class ValuePickerFeature extends ScriptFeature
* @param string[] $values (optional) Possible values
* @param string $default (optional) Default value
*/
public function __construct(Label $label = null, Entry $entry = null, array $values = null, $default = null)
public function __construct(?Label $label = null, ?Entry $entry = null, ?array $values = null, $default = null)
{
if ($label) {
$this->setLabel($label);

2
libs/FML/Stylesheet/Stylesheet.php
View File

@ -150,7 +150,7 @@ class Stylesheet
* @param Mood $mood Mood
* @return static
*/
public function setMood(Mood $mood = null)
public function setMood(?Mood $mood = null)
{
$this->mood = $mood;
return $this;

2
libs/FML/Types/Container.php
View File

@ -90,6 +90,6 @@ interface Container
* @deprecated Use Style
* @see Style
*/
public function setFormat(Format $format = null);
public function setFormat(?Format $format = null);
}

4
libs/FML/Types/Scriptable.php
View File

@ -45,7 +45,7 @@ interface Scriptable
* @param string[] $scriptActionParameters (optional) Script action parameters
* @return static
*/
public function setScriptAction($scriptAction, array $scriptActionParameters = null);
public function setScriptAction($scriptAction, ?array $scriptActionParameters = null);
/**
* Get script action parameters
@ -62,6 +62,6 @@ interface Scriptable
* @param string[] $scriptActionParameters (optional) Script action parameters
* @return static
*/
public function setScriptActionParameters(array $scriptActionParameters = null);
public function setScriptActionParameters(?array $scriptActionParameters = null);
}