Introduce type hinting in methods prototype (PHP >= 7.1)

This commit is contained in:
Molkobain
2020-08-26 21:21:56 +02:00
parent 77cd764b1c
commit 825c70c001
30 changed files with 246 additions and 191 deletions

View File

@@ -49,9 +49,10 @@ class NewsroomMenu extends PopoverMenu
*
* @return $this
*/
public function SetParams($aParams)
public function SetParams(array $aParams)
{
$this->aParams = $aParams;
return $this;
}

View File

@@ -49,7 +49,7 @@ class PopoverMenu extends UIBlock
*
* @param string|null $sId
*/
public function __construct($sId = null)
public function __construct(?string $sId = null)
{
parent::__construct($sId);
$this->aSections = [];
@@ -63,7 +63,7 @@ class PopoverMenu extends UIBlock
*
* @return $this
*/
public function AddSection($sId)
public function AddSection(string $sId)
{
if (false === $this->HasSection($sId))
{
@@ -84,7 +84,7 @@ class PopoverMenu extends UIBlock
* @return $this
* @throws \Exception
*/
public function RemoveSection($sId)
public function RemoveSection(string $sId)
{
if (true === $this->HasSection($sId))
{
@@ -101,7 +101,7 @@ class PopoverMenu extends UIBlock
*
* @return bool
*/
public function HasSection($sId)
public function HasSection(string $sId)
{
return array_key_exists($sId, $this->aSections);
}
@@ -114,7 +114,7 @@ class PopoverMenu extends UIBlock
* @return $this
* @throws \Exception
*/
public function ClearSection($sId)
public function ClearSection(string $sId)
{
if (false === $this->HasSection($sId))
{
@@ -145,9 +145,9 @@ class PopoverMenu extends UIBlock
* @return $this
* @throws \Exception
*/
public function AddItem($sSectionId, PopoverMenuItem $oItem)
public function AddItem(string $sSectionId, PopoverMenuItem $oItem)
{
if(false === $this->HasSection($sSectionId))
if (false === $this->HasSection($sSectionId))
{
throw new Exception('Could not add an item to the "'.$sSectionId.'" section has it does not seem to exist in the "'.$this->GetId().'" menu.');
}
@@ -167,14 +167,14 @@ class PopoverMenu extends UIBlock
* @return $this
* @throws \Exception
*/
public function RemoveItem($sSectionId, $sItemId)
public function RemoveItem(string $sSectionId, string $sItemId)
{
if(false === $this->HasSection($sSectionId))
if (false === $this->HasSection($sSectionId))
{
throw new Exception('Could not remove en item from the "'.$sSectionId.'" as it does not seem to exist in the "'.$this->GetId().'" menu.');
}
if(array_key_exists($sItemId, $this->aSections[$sSectionId]['aItems']))
if (array_key_exists($sItemId, $this->aSections[$sSectionId]['aItems']))
{
unset($this->aSections[$sSectionId]['aItems'][$sItemId]);
}
@@ -191,9 +191,9 @@ class PopoverMenu extends UIBlock
* @return $this
* @throws \Exception
*/
public function SetItems($sSectionId, $aItems)
public function SetItems(string $sSectionId, array $aItems)
{
if(false === $this->HasSection($sSectionId))
if (false === $this->HasSection($sSectionId))
{
throw new Exception('Could not set items to the "'.$sSectionId.'" section has it does not seem to exist in the "'.$this->GetId().'" menu.');
}

View File

@@ -52,14 +52,15 @@ class JsPopoverMenuItem extends PopoverMenuItem
{
return $this->oPopupMenuItem->GetUrl();
}
/**
* @inheritDoc
* @throws \Exception
*/
public function GetJsFilesUrlRecursively($bAbsoluteUrl = false)
public function GetJsFilesUrlRecursively(bool $bAbsoluteUrl = false)
{
$aJsFiles = array_merge(parent::GetJsFilesUrlRecursively($bAbsoluteUrl), $this->oPopupMenuItem->GetLinkedScripts());
return $aJsFiles;
}
}

View File

@@ -70,25 +70,29 @@ class PopoverMenuItem extends UIBlock
/**
* @see \ApplicationPopupMenuItem::SetCssClasses()
*
* @param array $aCssClasses
*
* @return $this
*/
public function SetCssClasses($aCssClasses)
public function SetCssClasses(array $aCssClasses)
{
$this->oPopupMenuItem->SetCssClasses($aCssClasses);
return $this;
}
/**
* @see \ApplicationPopupMenuItem::AddCssClass()
*
* @param string $sCssClass
*
* @return $this
*/
public function AddCssClass($sCssClass)
public function AddCssClass(string $sCssClass)
{
$this->oPopupMenuItem->AddCssClass($sCssClass);
return $this;
}