Fix CodeSniffer errors and warnings

More fixes will be submitted upstream.

Change-Id: Ib22997f8756537b063fd6eed3f1f74f3eda315d7
This commit is contained in:
Siebrand Mazeland
2013-08-02 14:23:20 +02:00
parent b3677810c4
commit 102f257427
5 changed files with 10 additions and 9 deletions

View File

@@ -18,7 +18,7 @@
* @licence MIT License * @licence MIT License
*/ */
class LanguageNameSearch { class LanguageNameSearch {
static $languagenames; protected static $languagenames;
public static function init() { public static function init() {
self::$languagenames = unserialize( file_get_contents( __DIR__ . '/langnames.ser' ) ); self::$languagenames = unserialize( file_get_contents( __DIR__ . '/langnames.ser' ) );
@@ -74,11 +74,12 @@ class LanguageNameSearch {
static function getCodepoint( $str ) { static function getCodepoint( $str ) {
$values = array(); $values = array();
$lookingFor = 1; $lookingFor = 1;
for ( $i = 0; $i < strlen( $str ); $i++ ) { $strLen = strlen( $str );
for ( $i = 0; $i < $strLen; $i++ ) {
$thisValue = ord( $str[$i] ); $thisValue = ord( $str[$i] );
if ( $thisValue < 128 ) { if ( $thisValue < 128 ) {
return $thisValue; return $thisValue;
} else { // Codepoints larger than 127 are represented by multi-byte sequences, } else { // Codepoints larger than 127 are represented by multi-byte sequences
if ( count( $values ) === 0 ) { if ( count( $values ) === 0 ) {
// 224 is the lowest non-overlong-encoded codepoint. // 224 is the lowest non-overlong-encoded codepoint.
$lookingFor = ( $thisValue < 224 ) ? 2 : 3; $lookingFor = ( $thisValue < 224 ) ? 2 : 3;

View File

@@ -89,7 +89,7 @@ ksort( $list['fonts'] );
$json = json_encode( $list ); $json = json_encode( $list );
$js = <<<JAVASCRIPT $js = <<<JAVASCRIPT
// Please do not edit. This file is generated from data/fontrepo by data/fontrepo/scripts/compile.php // Do not edit! This file is generated from data/fontrepo by data/fontrepo/scripts/compile.php
( function ( $ ) { ( function ( $ ) {
$.webfonts = $.webfonts || {}; $.webfonts = $.webfonts || {};
$.webfonts.repository = $json; $.webfonts.repository = $json;

View File

@@ -17,7 +17,7 @@
* @licence GNU General Public Licence 2.0 or later * @licence GNU General Public Licence 2.0 or later
* @licence MIT License * @licence MIT License
*/ */
require_once( __DIR__ . '/../../data/LanguageNameSearch.php' ); require_once __DIR__ . '/../../data/LanguageNameSearch.php';
class LanguageSearchTest extends PHPUnit_Framework_TestCase { class LanguageSearchTest extends PHPUnit_Framework_TestCase {
/** /**