Run phplint and phpcs through "composer test" entry point

Also fixed files to match coding standards. (Checked against
tools/codesniffer v0.2.0)

Bug: T90943
Change-Id: I38dcb7a5389cf6986dc1247b9291bfb1ad3fca7d
This commit is contained in:
Vivek Ghaisas 2015-06-09 16:36:04 +03:00
parent 9fba5ed3ee
commit e0289b7d0c
3 changed files with 29 additions and 7 deletions

View File

@ -11,4 +11,4 @@ if ( function_exists( 'wfLoadSkin' ) ) {
return true;
} else {
die( 'This version of the Vector skin requires MediaWiki 1.25+' );
}
}

View File

@ -112,8 +112,11 @@ class VectorTemplate extends BaseTemplate {
}
if ( !empty( $this->data['title'] ) ) {
?>
<h1 id="firstHeading" class="firstHeading" lang="<?php $this->text( 'pageLanguage' ); ?>"><?php $this->html( 'title' ) ?></h1>
<?php } ?>
<h1 id="firstHeading" class="firstHeading" lang="<?php $this->text( 'pageLanguage' ); ?>">
<?php $this->html( 'title' ) ?>
</h1>
<?php
} ?>
<?php $this->html( 'prebodyhtml' ) ?>
<div id="bodyContent" class="mw-body-content">
<?php
@ -123,7 +126,9 @@ class VectorTemplate extends BaseTemplate {
<?php
}
?>
<div id="contentSub"<?php $this->html( 'userlangattributes' ) ?>><?php $this->html( 'subtitle' ) ?></div>
<div id="contentSub"<?php $this->html( 'userlangattributes' ) ?>>
<?php $this->html( 'subtitle' ) ?>
</div>
<?php
if ( $this->data['undelete'] ) {
?>
@ -140,7 +145,9 @@ class VectorTemplate extends BaseTemplate {
?>
<div id="jump-to-nav" class="mw-jump">
<?php $this->msg( 'jumpto' ) ?>
<a href="#mw-head"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?>
<a href="#mw-head">
<?php $this->msg( 'jumptonavigation' ) ?>
</a><?php $this->msg( 'comma-separator' ) ?>
<a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
</div>
<?php
@ -192,7 +199,9 @@ class VectorTemplate extends BaseTemplate {
foreach ( $this->getFooterLinks() as $category => $links ) {
?>
<ul id="footer-<?php echo $category ?>">
<?php foreach ( $links as $link ) { ?>
<?php
foreach ( $links as $link ) {
?>
<li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
<?php
}
@ -383,7 +392,9 @@ class VectorTemplate extends BaseTemplate {
}
}
?>
<h3 id="p-variants-label"><span><?php echo htmlspecialchars( $variantLabel ) ?></span><a href="#"></a></h3>
<h3 id="p-variants-label">
<span><?php echo htmlspecialchars( $variantLabel ) ?></span><a href="#"></a>
</h3>
<div class="menu">
<ul>

View File

@ -36,5 +36,16 @@
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.8.*",
"mediawiki/mediawiki-codesniffer": "0.2.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
"phpcs --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --extensions=php,php5,inc --ignore=vendor -p ."
]
}
}