ProfessionalWiki / Bootstrap

src/Bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -51,16 +51,16 @@
 	 */
 	public static function init() {
 
-		ExtensionRegistryHelper::singleton()->loadExtensionRecursive( 'Scss' );
+		ExtensionRegistryHelper::singleton()->loadExtensionRecursive('Scss');
 
-		$GLOBALS[ 'wgHooks' ][ 'SetupAfterCache' ][] = function () {
+		$GLOBALS['wgHooks']['SetupAfterCache'][] = function() {
 
 			$configuration = [];
-			$configuration[ 'IP' ] = $GLOBALS[ 'IP' ];
-			$configuration[ 'remoteBasePath' ] = $GLOBALS[ 'wgExtensionAssetsPath' ] . '/Bootstrap/resources/bootstrap';
-			$configuration[ 'localBasePath' ] = $GLOBALS[ 'wgExtensionDirectory' ] . '/Bootstrap/resources/bootstrap';
+			$configuration['IP'] = $GLOBALS['IP'];
+			$configuration['remoteBasePath'] = $GLOBALS['wgExtensionAssetsPath'] . '/Bootstrap/resources/bootstrap';
+			$configuration['localBasePath'] = $GLOBALS['wgExtensionDirectory'] . '/Bootstrap/resources/bootstrap';
 
-			$setupAfterCache = new SetupAfterCache( $configuration );
+			$setupAfterCache = new SetupAfterCache($configuration);
 			$setupAfterCache->process();
 		};
 	}

src/Definition/V4ModuleDefinition.php

Spacing +56 added lines, -56 removed lines

@@ -34,61 +34,61 @@ 
 class V4ModuleDefinition implements ModuleDefinition {
 
 	static private $moduleDescriptions = [
-		'functions'         => [ 'styles' => [ 'functions' => [ 'position' => 'functions' ] ] ],
-		'variables'         => [ 'styles' => [ 'variables' => [ 'position' => 'variables' ] ], 'dependencies' => 'functions' ],
-		'mixins'            => [ 'styles' => 'mixins' ],
-		'root'              => [ 'styles' => 'root' ],
-		'reboot'            => [ 'styles' => 'reboot' ],
-		'type'              => [ 'styles' => 'type' ],
-		'images'            => [ 'styles' => 'images' ],
-		'code'              => [ 'styles' => 'code' ],
-		'grid'              => [ 'styles' => 'grid' ],
-		'tables'            => [ 'styles' => 'tables' ],
-		'forms'             => [ 'styles' => 'forms' ],
-		'buttons'           => [ 'styles' => 'buttons' ],
-		'transitions'       => [ 'styles' => 'transitions' ],
-		'dropdown'          => [ 'styles' => 'dropdown', 'scripts' => 'dropdown.js', 'dependencies' => [ 'popper', 'js-util' ] ],
-		'button-group'      => [ 'styles' => 'button-group', 'dependencies' => [ 'buttons' ] ],
-		'input-group'       => [ 'styles' => 'input-group', 'dependencies' => [ 'forms' ] ],
-		'custom-forms'      => [ 'styles' => 'custom-forms' ],
-		'nav'               => [ 'styles' => 'nav' ],
-		'navbar'            => [ 'styles' => 'navbar' ],
-		'card'              => [ 'styles' => 'card' ],
-		'breadcrumb'        => [ 'styles' => 'breadcrumb' ],
-		'pagination'        => [ 'styles' => 'pagination' ],
-		'badge'             => [ 'styles' => 'badge' ],
-		'jumbotron'         => [ 'styles' => 'jumbotron' ],
-		'alert'             => [ 'styles' => 'alert' ],
-		'progress'          => [ 'styles' => 'progress' ],
-		'media'             => [ 'styles' => 'media' ],
-		'list-group'        => [ 'styles' => 'list-group' ],
-		'close'             => [ 'styles' => 'close' ],
-		'toasts'            => [ 'styles' => 'toasts', 'scripts' => 'toast.js', 'dependencies' => 'js-util' ],
-		'modal'             => [ 'styles' => 'modal', 'scripts' => 'modal.js' ],
-		'tooltip'           => [ 'styles' => 'tooltip', 'dependencies' => [ 'popper', 'js-util' ] ],
-		'popover'           => [ 'styles' => 'popover', 'dependencies' => [ 'popper', 'tooltip', 'js-util' ] ],
-		'carousel'          => [ 'styles' => 'carousel', 'scripts' => 'carousel.js', 'dependencies' => 'js-util' ],
-		'spinners'          => [ 'styles' => 'spinners' ],
-		'utilities'         => [ 'styles' => 'utilities' ],
-		'print'             => [ 'styles' => 'print' ],
-		'active-buttons'    => [ 'scripts' => 'button.js', 'dependencies' => [ 'buttons' ] ],
-		'dismissable-alert' => [ 'scripts' => 'alert.js', 'dependencies' => [ 'alert', 'js-util' ] ],
-		'collapse'          => [ 'scripts' => 'collapse.js' ],
-		'scrollspy'         => [ 'scripts' => 'scrollspy.js', 'dependencies' => [ 'popper', 'js-util' ] ],
-		'tab'               => [ 'scripts' => 'tab.js', 'dependencies' => [ 'list-group' ] ],
-		'js-util'           => [ 'scripts' => 'util.js' ],
-		'popper'            => [ 'scripts' => 'popper.js' ],
+		'functions'         => ['styles' => ['functions' => ['position' => 'functions']]],
+		'variables'         => ['styles' => ['variables' => ['position' => 'variables']], 'dependencies' => 'functions'],
+		'mixins'            => ['styles' => 'mixins'],
+		'root'              => ['styles' => 'root'],
+		'reboot'            => ['styles' => 'reboot'],
+		'type'              => ['styles' => 'type'],
+		'images'            => ['styles' => 'images'],
+		'code'              => ['styles' => 'code'],
+		'grid'              => ['styles' => 'grid'],
+		'tables'            => ['styles' => 'tables'],
+		'forms'             => ['styles' => 'forms'],
+		'buttons'           => ['styles' => 'buttons'],
+		'transitions'       => ['styles' => 'transitions'],
+		'dropdown'          => ['styles' => 'dropdown', 'scripts' => 'dropdown.js', 'dependencies' => ['popper', 'js-util']],
+		'button-group'      => ['styles' => 'button-group', 'dependencies' => ['buttons']],
+		'input-group'       => ['styles' => 'input-group', 'dependencies' => ['forms']],
+		'custom-forms'      => ['styles' => 'custom-forms'],
+		'nav'               => ['styles' => 'nav'],
+		'navbar'            => ['styles' => 'navbar'],
+		'card'              => ['styles' => 'card'],
+		'breadcrumb'        => ['styles' => 'breadcrumb'],
+		'pagination'        => ['styles' => 'pagination'],
+		'badge'             => ['styles' => 'badge'],
+		'jumbotron'         => ['styles' => 'jumbotron'],
+		'alert'             => ['styles' => 'alert'],
+		'progress'          => ['styles' => 'progress'],
+		'media'             => ['styles' => 'media'],
+		'list-group'        => ['styles' => 'list-group'],
+		'close'             => ['styles' => 'close'],
+		'toasts'            => ['styles' => 'toasts', 'scripts' => 'toast.js', 'dependencies' => 'js-util'],
+		'modal'             => ['styles' => 'modal', 'scripts' => 'modal.js'],
+		'tooltip'           => ['styles' => 'tooltip', 'dependencies' => ['popper', 'js-util']],
+		'popover'           => ['styles' => 'popover', 'dependencies' => ['popper', 'tooltip', 'js-util']],
+		'carousel'          => ['styles' => 'carousel', 'scripts' => 'carousel.js', 'dependencies' => 'js-util'],
+		'spinners'          => ['styles' => 'spinners'],
+		'utilities'         => ['styles' => 'utilities'],
+		'print'             => ['styles' => 'print'],
+		'active-buttons'    => ['scripts' => 'button.js', 'dependencies' => ['buttons']],
+		'dismissable-alert' => ['scripts' => 'alert.js', 'dependencies' => ['alert', 'js-util']],
+		'collapse'          => ['scripts' => 'collapse.js'],
+		'scrollspy'         => ['scripts' => 'scrollspy.js', 'dependencies' => ['popper', 'js-util']],
+		'tab'               => ['scripts' => 'tab.js', 'dependencies' => ['list-group']],
+		'js-util'           => ['scripts' => 'util.js'],
+		'popper'            => ['scripts' => 'popper.js'],
 
-		'bs-core'   => [ 'dependencies' => [ 'variables', 'mixins' ] ],
-		'bs-reboot' => [ 'dependencies' => [ 'bs-core', 'reboot' ] ],
-		'bs-grid'   => [ 'styles' => 'bootstrap-grid' ],
+		'bs-core'   => ['dependencies' => ['variables', 'mixins']],
+		'bs-reboot' => ['dependencies' => ['bs-core', 'reboot']],
+		'bs-grid'   => ['styles' => 'bootstrap-grid'],
 
-		'bs-basic'  => [ 'dependencies' => [
+		'bs-basic'  => ['dependencies' => [
 			'bs-core', 'root', 'reboot', 'type', 'images', 'code', 'grid',
 			'tables', 'transitions', 'utilities', 'print'
-		] ],
+		]],
 
-		'bs-all'    => [ 'dependencies' => [
+		'bs-all'    => ['dependencies' => [
 			'bs-core', 'root', 'reboot', 'type', 'images', 'code', 'grid',
 			'tables', 'forms', 'buttons', 'transitions', 'dropdown',
 			'button-group', 'input-group', 'custom-forms', 'nav', 'navbar',
@@ -96,7 +96,7 @@ 
 			'progress', 'media', 'list-group', 'close', 'toasts', 'modal', 'tooltip',
 			'popover', 'carousel', 'spinners', 'utilities', 'print', 'active-buttons',
 			'dismissable-alert', 'collapse', 'scrollspy', 'tab', 'js-util',
-		] ],
+		]],
 
 
 		// TODO: Add each SCSS util separately?
@@ -104,8 +104,8 @@ 
 
 	];
 
-	static private $coreModules = [	'bs-core' ];
-	static private $optionalModules = [ 'bs-all' ];
+	static private $coreModules = ['bs-core'];
+	static private $optionalModules = ['bs-all'];
 
 	/**
 	 * @see ModuleDefinition::get
@@ -117,9 +117,9 @@ 
 	 * @return array
 	 * @throws InvalidArgumentException
 	 */
-	public function get( $key ) {
+	public function get($key) {
 
-		switch ( $key ) {
+		switch ($key) {
 			case 'core':
 				return self::$coreModules;
 			case 'optional':
@@ -128,7 +128,7 @@ 
 				return self::$moduleDescriptions;
 		}
 
-		throw new InvalidArgumentException( 'Expected a valid key' );
+		throw new InvalidArgumentException('Expected a valid key');
 	}
 
 }

src/Definition/ModuleDefinition.php

Spacing +1 added lines, -1 removed lines

@@ -36,6 +36,6 @@
 	 * @param string $key
 	 * @return array
 	 */
-	public function get( $key );
+	public function get($key);
 
 }

src/BootstrapManager.php

Spacing +31 added lines, -31 removed lines

@@ -49,9 +49,9 @@ 
 	 *
 	 * @param ModuleDefinition $moduleDefinition
 	 */
-	public function __construct( ModuleDefinition $moduleDefinition ) {
+	public function __construct(ModuleDefinition $moduleDefinition) {
 		$this->moduleDefinition = $moduleDefinition;
-		$this->moduleDescriptions = $this->moduleDefinition->get( 'descriptions' );
+		$this->moduleDescriptions = $this->moduleDefinition->get('descriptions');
 	}
 
 	/**
@@ -63,8 +63,8 @@ 
 	 */
 	public static function getInstance() {
 
-		if ( self::$instance === null ) {
-			self::$instance = new self( new V4ModuleDefinition );
+		if (self::$instance === null) {
+			self::$instance = new self(new V4ModuleDefinition);
 		}
 
 		return self::$instance;
@@ -84,29 +84,29 @@ 
 	 *
 	 * @param string|string[] $modules
 	 */
-	public function addBootstrapModule( $modules ) {
+	public function addBootstrapModule($modules) {
 
 		$modules = (array) $modules;
 
-		foreach ( $modules as $module ) {
+		foreach ($modules as $module) {
 
 			// if the module is known
-			if ( isset( $this->moduleDescriptions[ $module ] ) ) {
+			if (isset($this->moduleDescriptions[$module])) {
 
-				$description = $this->moduleDescriptions[ $module ];
+				$description = $this->moduleDescriptions[$module];
 
 				// prevent adding this module again; this also prevents infinite recursion in case
 				// of dependency resolution
-				unset( $this->moduleDescriptions[ $module ] );
+				unset($this->moduleDescriptions[$module]);
 
 				// first add any dependencies recursively, so they are available when the styles and
 				// scripts of $module are loaded
-				if ( isset( $description[ 'dependencies' ] ) ) {
-					$this->addBootstrapModule( $description[ 'dependencies' ] );
+				if (isset($description['dependencies'])) {
+					$this->addBootstrapModule($description['dependencies']);
 				}
 
-				$this->addFilesToGlobalResourceModules( 'styles', $description );
-				$this->addFilesToGlobalResourceModules( 'scripts', $description );
+				$this->addFilesToGlobalResourceModules('styles', $description);
+				$this->addFilesToGlobalResourceModules('scripts', $description);
 
 			}
 		}
@@ -116,11 +116,11 @@ 
 	 * @param string       $filetype 'styles'|'scripts'
 	 * @param mixed[]      $description
 	 */
-	protected function addFilesToGlobalResourceModules ( $filetype, $description ) {
+	protected function addFilesToGlobalResourceModules($filetype, $description) {
 
-		if ( isset( $description[ $filetype ] ) ) {
+		if (isset($description[$filetype])) {
 
-			$this->adjustArrayElementOfResourceModuleDescription( $filetype, $description[ $filetype ], $filetype );
+			$this->adjustArrayElementOfResourceModuleDescription($filetype, $description[$filetype], $filetype);
 
 		}
 	}
@@ -131,7 +131,7 @@ 
 	 * @since  4.0
 	 */
 	public function addCoreBootstrapModules() {
-		$this->addBootstrapModule( $this->moduleDefinition->get( 'core' ) );
+		$this->addBootstrapModule($this->moduleDefinition->get('core'));
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 * @since  1.0
 	 */
 	public function addAllBootstrapModules() {
-		$this->addBootstrapModule( $this->moduleDefinition->get( 'optional' ) );
+		$this->addBootstrapModule($this->moduleDefinition->get('optional'));
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 *
 	 * @internal param string $path
 	 */
-	public function addStyleFile( $path, $position = 'main' ) {
-		$this->adjustArrayElementOfResourceModuleDescription( 'styles', [ $path => [ 'position' => $position ] ] );
+	public function addStyleFile($path, $position = 'main') {
+		$this->adjustArrayElementOfResourceModuleDescription('styles', [$path => ['position' => $position]]);
 	}
 
 	/**
@@ -161,8 +161,8 @@ 
 	 * @param string $key   the SCSS variable name
 	 * @param string $value the value to assign to the variable
 	 */
-	public function setScssVariable( $key, $value ) {
-		$this->setScssVariables( [ $key => $value ] );
+	public function setScssVariable($key, $value) {
+		$this->setScssVariables([$key => $value]);
 	}
 
 	/**
@@ -170,16 +170,16 @@ 
 	 *
 	 * @param mixed[] $variables
 	 */
-	public function setScssVariables( $variables ) {
-		$this->adjustArrayElementOfResourceModuleDescription( 'variables', $variables );
+	public function setScssVariables($variables) {
+		$this->adjustArrayElementOfResourceModuleDescription('variables', $variables);
 	}
 
 	/**
 	 * @since 1.1
 	 * @param string|string[] $files
 	 */
-	public function addCacheTriggerFile( $files ){
-		$this->adjustArrayElementOfResourceModuleDescription( 'cacheTriggers', $files );
+	public function addCacheTriggerFile($files) {
+		$this->adjustArrayElementOfResourceModuleDescription('cacheTriggers', $files);
 	}
 
 	/**
@@ -187,15 +187,15 @@ 
 	 * @param mixed  $value
 	 * @param string $filetype 'styles'|'scripts'
 	 */
-	protected function adjustArrayElementOfResourceModuleDescription( $key, $value, $filetype = 'styles' ) {
+	protected function adjustArrayElementOfResourceModuleDescription($key, $value, $filetype = 'styles') {
 
-		if (!isset($GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.' . $filetype ][ $key ])) {
-			$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.' . $filetype ][ $key ] = [];
+		if (!isset($GLOBALS['wgResourceModules']['ext.bootstrap.' . $filetype][$key])) {
+			$GLOBALS['wgResourceModules']['ext.bootstrap.' . $filetype][$key] = [];
 		}
 
-		$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.' . $filetype ][ $key ] =
+		$GLOBALS['wgResourceModules']['ext.bootstrap.' . $filetype][$key] =
 			array_merge(
-				$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.' . $filetype ][ $key ],
+				$GLOBALS['wgResourceModules']['ext.bootstrap.' . $filetype][$key],
 				(array) $value
 			);
 	}

src/Hooks/SetupAfterCache.php

Spacing +25 added lines, -25 removed lines

@@ -49,7 +49,7 @@ 
 	 *
 	 * @param mixed[] $configuration
 	 */
-	public function __construct( array $configuration ) {
+	public function __construct(array $configuration) {
 		$this->configuration = $configuration;
 	}
 
@@ -68,8 +68,8 @@ 
 		$this->assertAcceptableConfiguration();
 
 		$this->registerResourceLoaderModules(
-			$this->isReadablePath( $this->configuration['localBasePath'] ),
-			$this->configuration[ 'remoteBasePath' ]
+			$this->isReadablePath($this->configuration['localBasePath']),
+			$this->configuration['remoteBasePath']
 		);
 
 		$this->registerCacheTriggers();
@@ -83,9 +83,9 @@ 
 	 * @param string $localBasePath
 	 * @param string $remoteBasePath
 	 */
-	protected function registerResourceLoaderModules( $localBasePath, $remoteBasePath ) {
+	protected function registerResourceLoaderModules($localBasePath, $remoteBasePath) {
 
-		$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ] = array_replace_recursive(
+		$GLOBALS['wgResourceModules']['ext.bootstrap.styles'] = array_replace_recursive(
 			[
 				'localBasePath' => $localBasePath . '/scss',
 				'remoteBasePath' => $remoteBasePath . '/scss',
@@ -99,20 +99,20 @@ 
 					'composer.lock' => null,
 				],
 			],
-			array_key_exists( 'ext.bootstrap.styles', $GLOBALS[ 'wgResourceModules' ] ) ? $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ] : []
+			array_key_exists('ext.bootstrap.styles', $GLOBALS['wgResourceModules']) ? $GLOBALS['wgResourceModules']['ext.bootstrap.styles'] : []
 		);
 
-		$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.scripts' ] = array_replace_recursive(
+		$GLOBALS['wgResourceModules']['ext.bootstrap.scripts'] = array_replace_recursive(
 			[
 				'localBasePath'  => $localBasePath . '/js',
 				'remoteBasePath' => $remoteBasePath . '/js',
 				'scripts' => [],
 			],
-			array_key_exists( 'ext.bootstrap.scripts', $GLOBALS[ 'wgResourceModules' ] ) ? $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.scripts' ] : []
+			array_key_exists('ext.bootstrap.scripts', $GLOBALS['wgResourceModules']) ? $GLOBALS['wgResourceModules']['ext.bootstrap.scripts'] : []
 		);
 
-		$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap' ] = [
-			'dependencies' => [ 'ext.bootstrap.styles', 'ext.bootstrap.scripts' ],
+		$GLOBALS['wgResourceModules']['ext.bootstrap'] = [
+			'dependencies' => ['ext.bootstrap.styles', 'ext.bootstrap.scripts'],
 		];
 	}
 
@@ -120,8 +120,8 @@ 
 	 * @param string $id
 	 * @return bool
 	 */
-	protected function hasConfiguration( $id ) {
-		return isset( $this->configuration[ $id ] );
+	protected function hasConfiguration($id) {
+		return isset($this->configuration[$id]);
 	}
 
 	/**
@@ -129,28 +129,28 @@ 
 	 * @return string
 	 * @throws RuntimeException
 	 */
-	protected function isReadablePath( $localBasePath ) {
+	protected function isReadablePath($localBasePath) {
 
-		$localBasePath = str_replace( [ '\\', '/' ], DIRECTORY_SEPARATOR, $localBasePath );
+		$localBasePath = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $localBasePath);
 
-		if ( is_readable( $localBasePath ) ) {
+		if (is_readable($localBasePath)) {
 			return $localBasePath;
 		}
 
-		throw new RuntimeException( "Expected an accessible {$localBasePath} path" );
+		throw new RuntimeException("Expected an accessible {$localBasePath} path");
 	}
 
 	protected function registerCacheTriggers() {
 
 		$defaultRecacheTriggers = [
-			'LocalSettings.php' => $this->configuration[ 'IP' ] . '/LocalSettings.php',
-			'composer.lock' => $this->configuration[ 'IP' ] . '/composer.lock',
+			'LocalSettings.php' => $this->configuration['IP'] . '/LocalSettings.php',
+			'composer.lock' => $this->configuration['IP'] . '/composer.lock',
 		];
 
-		foreach ( $defaultRecacheTriggers as $key => $filename ) {
-			if ( array_key_exists( $key, $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][ 'cacheTriggers' ] ) &&
-				$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][ 'cacheTriggers' ][ $key ] === null ) {
-				$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][ 'cacheTriggers' ][ $key ] = $filename;
+		foreach ($defaultRecacheTriggers as $key => $filename) {
+			if (array_key_exists($key, $GLOBALS['wgResourceModules']['ext.bootstrap.styles']['cacheTriggers']) &&
+				$GLOBALS['wgResourceModules']['ext.bootstrap.styles']['cacheTriggers'][$key] === null) {
+				$GLOBALS['wgResourceModules']['ext.bootstrap.styles']['cacheTriggers'][$key] = $filename;
 			}
 		}
 	}
@@ -163,9 +163,9 @@ 
 			'IP' => 'Full path to working directory ($IP) not found.',
 		];
 
-		foreach ( $configElements as $key => $errorMessage ) {
-			if ( !$this->hasConfiguration( $key ) ) {
-				throw new InvalidArgumentException( $errorMessage );
+		foreach ($configElements as $key => $errorMessage) {
+			if (!$this->hasConfiguration($key)) {
+				throw new InvalidArgumentException($errorMessage);
 			}
 		}
 	}