wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-24 07:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "SkinVector22.php: Add missing typehints"

Browse source
This commit is contained in:
jenkins-bot 2023-02-23 23:34:51 +00:00 committed by Gerrit Code Review
parent 2cd8fc5782 01e11d68b9
commit ffc69eca91
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/SkinVector22.php
View file

@ -59,6 +59,7 @@ class SkinVector22 extends SkinMustache {
* This should be upstreamed to the Skin class in core once the logic is finalized.
* Returns false if the page is a special page without any languages, or if an action
* other than view is being used.
*
* @return bool
*/
private function canHaveLanguages(): bool {
@ -82,7 +83,7 @@ class SkinVector22 extends SkinMustache {
* @param string $location Either 'top' or 'bottom' is accepted.
* @return bool
*/
protected function isLanguagesInContentAt( $location ) {
protected function isLanguagesInContentAt( string $location ): bool {
if ( !$this->canHaveLanguages() ) {
return false;
}
@ -109,14 +110,16 @@ class SkinVector22 extends SkinMustache {
/**
* Whether or not the languages are out of the sidebar and in the content either at
* the top or the bottom.
*
* @return bool
*/
final protected function isLanguagesInContent() {
final protected function isLanguagesInContent(): bool {
return $this->isLanguagesInContentAt( 'top' ) || $this->isLanguagesInContentAt( 'bottom' );
}
/**
* Calls getLanguages with caching.
*
* @return array
*/
protected function getLanguagesCached(): array {
@ -165,10 +168,11 @@ class SkinVector22 extends SkinMustache {
* Merges the `view-overflow` menu into the `action` menu.
* This ensures that the previous state of the menu e.g. emptyPortlet class
* is preserved.
*
* @param array $data
* @return array
*/
private function mergeViewOverflowIntoActions( $data ) {
private function mergeViewOverflowIntoActions( array $data ): array {
$portlets = $data['data-portlets'];
$actions = $portlets['data-actions'];
$overflow = $portlets['data-views-overflow'];
@ -213,7 +217,7 @@ class SkinVector22 extends SkinMustache {
*
* @return bool
*/
private function isMainMenuVisible() {
private function isMainMenuVisible(): bool {
$skin = $this->getSkin();
if ( $skin->getUser()->isRegistered() ) {
$userOptionsLookup = MediaWikiServices::getInstance()->getUserOptionsLookup();
@ -243,7 +247,7 @@ class SkinVector22 extends SkinMustache {
* @param array &$sidebar
* @param array &$pageToolsMenu
*/
private static function extractPageToolsFromSidebar( &$sidebar, &$pageToolsMenu ) {
private static function extractPageToolsFromSidebar( array &$sidebar, array &$pageToolsMenu ) {
$restPortlets = $sidebar[ 'array-portlets-rest' ] ?? [];
$toolboxMenuIndex = array_search(
VectorComponentPageTools::TOOLBOX_ID,