jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375850 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
Also added "composer fix" command.
Change-Id: I2110f9d23b813b594272b18151b8f0990c051143
---
M .travis.yml
M composer.json
M phpcs.xml
M src/Functions.php
R tests/FunctionsTest.php
5 files changed, 57 insertions(+), 52 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.travis.yml b/.travis.yml
index c4bbd23..da7f291 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
sudo: false
language: php
php:
- - "5.3"
- - "5.4"
- "5.5"
- "5.6"
+ - "7.0"
+ - "7.1"
- "hhvm"
install:
- composer install
diff --git a/composer.json b/composer.json
index 3296518..0cf8fca 100644
--- a/composer.json
+++ b/composer.json
@@ -14,21 +14,26 @@
}
],
"autoload": {
- "files": ["src/Functions.php"]
+ "files": [
+ "src/Functions.php"
+ ]
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.5.9"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.0",
"phpunit/phpunit": "4.6.*",
- "mediawiki/mediawiki-codesniffer": "0.5.0"
+ "mediawiki/mediawiki-codesniffer": "0.12.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
"phpunit $PHPUNIT_ARGS",
- "phpcs -p"
+ "phpcs -sp"
+ ],
+ "fix": [
+ "phpcbf"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
index aa34438..f35abd9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<ruleset name="base-convert">
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
<file>.</file>
<exclude-pattern>coverage</exclude-pattern>
diff --git a/src/Functions.php b/src/Functions.php
index 8d67e74..2981013 100644
--- a/src/Functions.php
+++ b/src/Functions.php
@@ -55,7 +55,7 @@
return false;
}
- static $baseChars = array(
+ static $baseChars = [
10 => 'a', 11 => 'b', 12 => 'c', 13 => 'd', 14 => 'e', 15 =>
'f',
16 => 'g', 17 => 'h', 18 => 'i', 19 => 'j', 20 => 'k', 21 =>
'l',
22 => 'm', 23 => 'n', 24 => 'o', 25 => 'p', 26 => 'q', 27 =>
'r',
@@ -68,7 +68,7 @@
'i' => 18, 'j' => 19, 'k' => 20, 'l' => 21, 'm' => 22, 'n' =>
23,
'o' => 24, 'p' => 25, 'q' => 26, 'r' => 27, 's' => 28, 't' =>
29,
'u' => 30, 'v' => 31, 'w' => 32, 'x' => 33, 'y' => 34, 'z' => 35
- );
+ ];
if ( extension_loaded( 'gmp' ) && ( $engine == 'auto' || $engine ==
'gmp' ) ) {
// Removing leading zeros works around broken base detection
code in
@@ -90,7 +90,7 @@
$result = strrev( $result );
} else {
- $inDigits = array();
+ $inDigits = [];
foreach ( str_split( strtolower( $input ) ) as $char ) {
$inDigits[] = $baseChars[$char];
}
@@ -100,7 +100,7 @@
$result = '';
while ( $inDigits ) {
$work = 0;
- $workDigits = array();
+ $workDigits = [];
// Long division...
foreach ( $inDigits as $digit ) {
diff --git a/tests/BaseConvertTest.php b/tests/FunctionsTest.php
similarity index 77%
rename from tests/BaseConvertTest.php
rename to tests/FunctionsTest.php
index e684e7d..7ec8a9e 100644
--- a/tests/BaseConvertTest.php
+++ b/tests/FunctionsTest.php
@@ -25,45 +25,45 @@
*/
class FunctionsTest extends \PHPUnit_Framework_TestCase {
public static function provideSingleDigitConversions() {
- return array(
- // 2 3 5 8 10 16 36
- array( '0', '0', '0', '0', '0', '0', '0' ),
- array( '1', '1', '1', '1', '1', '1', '1' ),
- array( '10', '2', '2', '2', '2', '2', '2' ),
- array( '11', '10', '3', '3', '3', '3', '3' ),
- array( '100', '11', '4', '4', '4', '4', '4' ),
- array( '101', '12', '10', '5', '5', '5', '5' ),
- array( '110', '20', '11', '6', '6', '6', '6' ),
- array( '111', '21', '12', '7', '7', '7', '7' ),
- array( '1000', '22', '13', '10', '8', '8', '8'
),
- array( '1001', '100', '14', '11', '9', '9', '9'
),
- array( '1010', '101', '20', '12', '10', 'a',
'a' ),
- array( '1011', '102', '21', '13', '11', 'b',
'b' ),
- array( '1100', '110', '22', '14', '12', 'c',
'c' ),
- array( '1101', '111', '23', '15', '13', 'd',
'd' ),
- array( '1110', '112', '24', '16', '14', 'e',
'e' ),
- array( '1111', '120', '30', '17', '15', 'f',
'f' ),
- array( '10000', '121', '31', '20', '16', '10',
'g' ),
- array( '10001', '122', '32', '21', '17', '11',
'h' ),
- array( '10010', '200', '33', '22', '18', '12',
'i' ),
- array( '10011', '201', '34', '23', '19', '13',
'j' ),
- array( '10100', '202', '40', '24', '20', '14',
'k' ),
- array( '10101', '210', '41', '25', '21', '15',
'l' ),
- array( '10110', '211', '42', '26', '22', '16',
'm' ),
- array( '10111', '212', '43', '27', '23', '17',
'n' ),
- array( '11000', '220', '44', '30', '24', '18',
'o' ),
- array( '11001', '221', '100', '31', '25', '19',
'p' ),
- array( '11010', '222', '101', '32', '26', '1a',
'q' ),
- array( '11011', '1000', '102', '33', '27',
'1b', 'r' ),
- array( '11100', '1001', '103', '34', '28',
'1c', 's' ),
- array( '11101', '1002', '104', '35', '29',
'1d', 't' ),
- array( '11110', '1010', '110', '36', '30',
'1e', 'u' ),
- array( '11111', '1011', '111', '37', '31',
'1f', 'v' ),
- array( '100000', '1012', '112', '40', '32',
'20', 'w' ),
- array( '100001', '1020', '113', '41', '33',
'21', 'x' ),
- array( '100010', '1021', '114', '42', '34',
'22', 'y' ),
- array( '100011', '1022', '120', '43', '35',
'23', 'z' )
- );
+ return [
+ // 2 3 5 8 10 16 36
+ [ '0', '0', '0', '0', '0', '0', '0' ],
+ [ '1', '1', '1', '1', '1', '1', '1' ],
+ [ '10', '2', '2', '2', '2', '2', '2' ],
+ [ '11', '10', '3', '3', '3', '3', '3' ],
+ [ '100', '11', '4', '4', '4', '4', '4' ],
+ [ '101', '12', '10', '5', '5', '5', '5' ],
+ [ '110', '20', '11', '6', '6', '6', '6' ],
+ [ '111', '21', '12', '7', '7', '7', '7' ],
+ [ '1000', '22', '13', '10', '8', '8', '8' ],
+ [ '1001', '100', '14', '11', '9', '9', '9' ],
+ [ '1010', '101', '20', '12', '10', 'a', 'a' ],
+ [ '1011', '102', '21', '13', '11', 'b', 'b' ],
+ [ '1100', '110', '22', '14', '12', 'c', 'c' ],
+ [ '1101', '111', '23', '15', '13', 'd', 'd' ],
+ [ '1110', '112', '24', '16', '14', 'e', 'e' ],
+ [ '1111', '120', '30', '17', '15', 'f', 'f' ],
+ [ '10000', '121', '31', '20', '16', '10', 'g' ],
+ [ '10001', '122', '32', '21', '17', '11', 'h' ],
+ [ '10010', '200', '33', '22', '18', '12', 'i' ],
+ [ '10011', '201', '34', '23', '19', '13', 'j' ],
+ [ '10100', '202', '40', '24', '20', '14', 'k' ],
+ [ '10101', '210', '41', '25', '21', '15', 'l' ],
+ [ '10110', '211', '42', '26', '22', '16', 'm' ],
+ [ '10111', '212', '43', '27', '23', '17', 'n' ],
+ [ '11000', '220', '44', '30', '24', '18', 'o' ],
+ [ '11001', '221', '100', '31', '25', '19', 'p'
],
+ [ '11010', '222', '101', '32', '26', '1a', 'q'
],
+ [ '11011', '1000', '102', '33', '27', '1b', 'r'
],
+ [ '11100', '1001', '103', '34', '28', '1c', 's'
],
+ [ '11101', '1002', '104', '35', '29', '1d', 't'
],
+ [ '11110', '1010', '110', '36', '30', '1e', 'u'
],
+ [ '11111', '1011', '111', '37', '31', '1f', 'v'
],
+ [ '100000', '1012', '112', '40', '32', '20',
'w' ],
+ [ '100001', '1020', '113', '41', '33', '21',
'x' ],
+ [ '100010', '1021', '114', '42', '34', '22',
'y' ],
+ [ '100011', '1022', '120', '43', '35', '23',
'z' ]
+ ];
}
/**
@@ -163,7 +163,7 @@
}
public static function provideNumbers() {
- $x = array();
+ $x = [];
$chars = '0123456789abcdefghijklmnopqrstuvwxyz';
for ( $i = 0; $i < 50; $i++ ) {
$base = mt_rand( 2, 36 );
@@ -174,7 +174,7 @@
$str .= $chars[mt_rand( 0, $base - 1 )];
}
- $x[] = array( $base, $str );
+ $x[] = [ $base, $str ];
}
return $x;
--
To view, visit https://gerrit.wikimedia.org/r/375850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2110f9d23b813b594272b18151b8f0990c051143
Gerrit-PatchSet: 2
Gerrit-Project: base-convert
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
