Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Ignore phpcs in /skins but not /includes/skins

Browse source 
Since the match can be case-insensitive (apparently), this meant
ExtensionsTestSuite.php ("extensions") wasn't being validated either.

Bug: T127238
Change-Id: I679de924ebeb45150004783ce404fac92af026a7
This commit is contained in:
Timo Tijhof 2016-03-04 15:41:56 +00:00
parent 09be5db2b3
commit b3607bf2e5
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpcs.xml
View file

@ -26,9 +26,9 @@
<rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
<severity>0</severity>
</rule>
<exclude-pattern>node_modules</exclude-pattern>
<exclude-pattern>vendor</exclude-pattern>
<exclude-pattern>extensions</exclude-pattern>
<exclude-pattern>skins</exclude-pattern>
<exclude-pattern>node_modules/</exclude-pattern>
<exclude-pattern>vendor/</exclude-pattern>
<exclude-pattern type="relative">^extensions/</exclude-pattern>
<exclude-pattern type="relative">^skins/</exclude-pattern>
<exclude-pattern>.git</exclude-pattern>
</ruleset>

10
tests/phpunit/suites/ExtensionsTestSuite.php
View file

@ -8,16 +8,14 @@
class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite {
public function __construct() {
parent::__construct();
$paths = array();
$paths = [];
// Extensions can return a list of files or directories
Hooks::run( 'UnitTestsList', array( &$paths ) );
Hooks::run( 'UnitTestsList', [ &$paths ] );
foreach ( $paths as $path ) {
if ( is_dir( $path ) ) {
// If the path is a directory, search for test cases.
// @since 1.24
$suffixes = array(
'Test.php',
);
$suffixes = [ 'Test.php' ];
$fileIterator = new File_Iterator_Facade();
$matchingFiles = $fileIterator->getFilesAsArray( $path, $suffixes );
$this->addTestFiles( $matchingFiles );
@ -26,7 +24,7 @@ class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite {
$this->addTestFile( $path );
}
}
if ( !count( $paths ) ) {
if ( !$paths ) {
$this->addTest( new DummyExtensionsTest( 'testNothing' ) );
}
}