Split SkinFallback and SkinfallbackTemplate

Change-Id: I55c866c08d4f442021c43068efe64be871afb96b

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 6c92139..872e89b 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -159,7 +159,7 @@ $wgAutoloadLocalClasses = array(
        'Skin' => 'includes/Skin.php',
        'SkinTemplate' => 'includes/SkinTemplate.php',
        'SkinFallback' => 'includes/SkinFallback.php',
-       'SkinFallbackTemplate' => 'includes/SkinFallback.php',
+       'SkinFallbackTemplate' => 'includes/SkinFallbackTemplate.php',
        'SquidPurgeClient' => 'includes/SquidPurgeClient.php',
        'SquidPurgeClientPool' => 'includes/SquidPurgeClient.php',
        'StatCounter' => 'includes/StatCounter.php',

diff --git a/includes/SkinFallback.php b/includes/SkinFallback.php
index f50eabc..6055473 100644 (file)
--- a/includes/SkinFallback.php
+++ b/includes/SkinFallback.php
@@ -24,102 +24,3 @@ class SkinFallback extends SkinTemplate {
                $out->addModuleStyles( 'mediawiki.skinning.interface' );
        }
 }
-
-/**
- * BaseTemplate class for the fallback skin
- */
-class SkinFallbackTemplate extends BaseTemplate {
-       /**
-        * @return array
-        */
-       private function findInstalledSkins() {
-               $styleDirectory = $this->config->get( 'StyleDirectory' ); // @todo we should inject this directly?
-               // Get all subdirectories which might contains skins
-               $possibleSkins = scandir( $styleDirectory );
-               $possibleSkins = array_filter( $possibleSkins, function ( $maybeDir ) use ( $styleDirectory ) {
-                       return $maybeDir !== '.' && $maybeDir !== '..' && is_dir( "$styleDirectory/$maybeDir" );
-               } );
-
-               // Only keep the ones that contain a .php file with the same name inside
-               $possibleSkins = array_filter( $possibleSkins, function ( $skinDir ) use ( $styleDirectory ) {
-                       return is_file( "$styleDirectory/$skinDir/$skinDir.php" );
-               } );
-
-               return $possibleSkins;
-       }
-
-       /**
-        * Inform the user why they are seeing this skin.
-        *
-        * @return string
-        */
-       private function buildHelpfulInformationMessage() {
-               $defaultSkin = $this->config->get( 'DefaultSkin' );
-               $installedSkins = $this->findInstalledSkins();
-               $enabledSkins = $this->config->get( 'ValidSkinNames' );
-               $enabledSkins = array_change_key_case( $enabledSkins, CASE_LOWER );
-
-               if ( $installedSkins ) {
-                       $skinsInstalledText = array();
-                       $skinsInstalledSnippet = array();
-
-                       foreach ( $installedSkins as $skin ) {
-                               $normalizedKey = strtolower( $skin );
-                               $isEnabled = array_key_exists( $normalizedKey, $enabledSkins );
-                               if ( $isEnabled ) {
-                                       $skinsInstalledText[] = $this->getMsg( 'default-skin-not-found-row-enabled' )
-                                               ->params( $normalizedKey, $skin )->plain();
-                               } else {
-                                       $skinsInstalledText[] = $this->getMsg( 'default-skin-not-found-row-disabled' )
-                                               ->params( $normalizedKey, $skin )->plain();
-                                       $skinsInstalledSnippet[] = "require_once \"\$IP/skins/$skin/$skin.php\";";
-                               }
-                       }
-
-                       return $this->getMsg( 'default-skin-not-found' )->params(
-                               $defaultSkin,
-                               implode( "\n", $skinsInstalledText ),
-                               implode( "\n", $skinsInstalledSnippet )
-                       )->parseAsBlock();
-               } else {
-                       return $this->getMsg( 'default-skin-not-found-no-skins' )->params(
-                               $defaultSkin
-                       )->parseAsBlock();
-               }
-       }
-
-       /**
-        * Outputs the entire contents of the page. No navigation (other than search box), just the big
-        * warning message and page content.
-        */
-       public function execute() {
-               $this->html( 'headelement' ) ?>
-
-               <div class="warningbox">
-                       <?php echo $this->buildHelpfulInformationMessage() ?>
-               </div>
-
-               <form action="<?php $this->text( 'wgScript' ) ?>">
-                       <input type="hidden" name="title" value="<?php $this->text( 'searchtitle' ) ?>" />
-                       <h3><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h3>
-                       <?php echo $this->makeSearchInput( array( "id" => "searchInput" ) ) ?>
-                       <?php echo $this->makeSearchButton( 'go' ) ?>
-               </form>
-
-               <div class="mw-body" role="main">
-                       <h1 class="firstHeading">
-                               <span dir="auto"><?php $this->html( 'title' ) ?></span>
-                       </h1>
-
-                       <div class="mw-body-content">
-                               <?php $this->html( 'bodytext' ) ?>
-                               <?php $this->html( 'catlinks' ) ?>
-                       </div>
-               </div>
-
-               <?php $this->printTrail() ?>
-               </body></html>
-
-               <?php
-       }
-}

diff --git a/includes/SkinFallbackTemplate.php b/includes/SkinFallbackTemplate.php
new file mode 100644 (file)
index 0000000..0703b0e
--- /dev/null
+++ b/includes/SkinFallbackTemplate.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * Skin template for the fallback skin.
+ *
+ * The structure is copied from the example skin (mediawiki/skins/Example).
+ *
+ * @since 1.24
+ * @file
+ */
+
+/**
+ * BaseTemplate class for the fallback skin
+ */
+class SkinFallbackTemplate extends BaseTemplate {
+       /**
+        * @return array
+        */
+       private function findInstalledSkins() {
+               $styleDirectory = $this->config->get( 'StyleDirectory' ); // @todo we should inject this directly?
+               // Get all subdirectories which might contains skins
+               $possibleSkins = scandir( $styleDirectory );
+               $possibleSkins = array_filter( $possibleSkins, function ( $maybeDir ) use ( $styleDirectory ) {
+                       return $maybeDir !== '.' && $maybeDir !== '..' && is_dir( "$styleDirectory/$maybeDir" );
+               } );
+
+               // Only keep the ones that contain a .php file with the same name inside
+               $possibleSkins = array_filter( $possibleSkins, function ( $skinDir ) use ( $styleDirectory ) {
+                       return is_file( "$styleDirectory/$skinDir/$skinDir.php" );
+               } );
+
+               return $possibleSkins;
+       }
+
+       /**
+        * Inform the user why they are seeing this skin.
+        *
+        * @return string
+        */
+       private function buildHelpfulInformationMessage() {
+               $defaultSkin = $this->config->get( 'DefaultSkin' );
+               $installedSkins = $this->findInstalledSkins();
+               $enabledSkins = $this->config->get( 'ValidSkinNames' );
+               $enabledSkins = array_change_key_case( $enabledSkins, CASE_LOWER );
+
+               if ( $installedSkins ) {
+                       $skinsInstalledText = array();
+                       $skinsInstalledSnippet = array();
+
+                       foreach ( $installedSkins as $skin ) {
+                               $normalizedKey = strtolower( $skin );
+                               $isEnabled = array_key_exists( $normalizedKey, $enabledSkins );
+                               if ( $isEnabled ) {
+                                       $skinsInstalledText[] = $this->getMsg( 'default-skin-not-found-row-enabled' )
+                                               ->params( $normalizedKey, $skin )->plain();
+                               } else {
+                                       $skinsInstalledText[] = $this->getMsg( 'default-skin-not-found-row-disabled' )
+                                               ->params( $normalizedKey, $skin )->plain();
+                                       $skinsInstalledSnippet[] = "require_once \"\$IP/skins/$skin/$skin.php\";";
+                               }
+                       }
+
+                       return $this->getMsg( 'default-skin-not-found' )->params(
+                               $defaultSkin,
+                               implode( "\n", $skinsInstalledText ),
+                               implode( "\n", $skinsInstalledSnippet )
+                       )->parseAsBlock();
+               } else {
+                       return $this->getMsg( 'default-skin-not-found-no-skins' )->params(
+                               $defaultSkin
+                       )->parseAsBlock();
+               }
+       }
+
+       /**
+        * Outputs the entire contents of the page. No navigation (other than search box), just the big
+        * warning message and page content.
+        */
+       public function execute() {
+               $this->html( 'headelement' ) ?>
+
+               <div class="warningbox">
+                       <?php echo $this->buildHelpfulInformationMessage() ?>
+               </div>
+
+               <form action="<?php $this->text( 'wgScript' ) ?>">
+                       <input type="hidden" name="title" value="<?php $this->text( 'searchtitle' ) ?>" />
+                       <h3><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h3>
+                       <?php echo $this->makeSearchInput( array( "id" => "searchInput" ) ) ?>
+                       <?php echo $this->makeSearchButton( 'go' ) ?>
+               </form>
+
+               <div class="mw-body" role="main">
+                       <h1 class="firstHeading">
+                               <span dir="auto"><?php $this->html( 'title' ) ?></span>
+                       </h1>
+
+                       <div class="mw-body-content">
+                               <?php $this->html( 'bodytext' ) ?>
+                               <?php $this->html( 'catlinks' ) ?>
+                       </div>
+               </div>
+
+               <?php $this->printTrail() ?>
+               </body></html>
+
+       <?php
+       }
+}