changed deprecated public values in ManiaLinkManager.php + CallbackManager.php to private

This commit is contained in:
Jocy 2017-04-02 16:25:04 +02:00
parent 1b110e5d17
commit 83710a9269
2 changed files with 17 additions and 27 deletions

View File

@ -47,16 +47,14 @@ class CallbackManager implements UsageInformationAble {
const CB_TM_PLAYERFINISH = 'TrackMania.PlayerFinish';
const CB_TM_PLAYERINCOHERENCE = 'TrackMania.PlayerIncoherence';
/*
* Public properties
*/
public $libXmlRpcCallbacks = null;
public $shootManiaCallbacks = null;
public $trackManiaCallbacks = null;
/*
* Private properties
*/
private $libXmlRpcCallbacks = null;
private $shootManiaCallbacks = null;
private $trackManiaCallbacks = null;
/** @var ManiaControl $maniaControl */
private $maniaControl = null;
/** @var Listening[][] $callbackListenings */

View File

@ -37,30 +37,22 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener,
const CB_MAIN_WINDOW_OPENED = 'ManialinkManagerCallback.MainWindowOpened';
const MAIN_MANIALINK_Z_VALUE = 20;
/*
* Public properties
*/
/** @var StyleManager $styleManager */
/** @deprecated
* @see getStyleManager()
*/
public $styleManager = null;
/** @var CustomUIManager $customUIManager */
/** @deprecated
* @see getCustomUIManager()
*/
public $customUIManager = null;
/** @var IconManager $iconManager */
/** @deprecated
* @see getIconManager()
*/
public $iconManager = null;
/*
* Private properties
*/
/** @var ManiaControl $maniaControl */
private $maniaControl = null;
/** @var StyleManager $styleManager */
private $styleManager = null;
/** @var CustomUIManager $customUIManager */
private $customUIManager = null;
/** @var IconManager $iconManager */
private $iconManager = null;
// TODO: use listening class
private $pageAnswerListeners = array();
private $pageAnswerRegexListener = array();
@ -370,7 +362,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener,
* @param array $properties
* @return Label_Text[]
* @deprecated use \ManiaControl\Manialinks\LabelLine instead
* @see \ManiaControl\Manialinks\LabelLine
* @see \ManiaControl\Manialinks\LabelLine
*/
public function labelLine(Frame $frame, array $labelStrings, array $properties = array()) {
// define standard properties
@ -406,7 +398,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener,
}
} else {
foreach ($labelStrings as $text => $x) {
$labelLine->addLabelEntryText($text,$x);
$labelLine->addLabelEntryText($text, $x);
}
}
$labelLine->render();