From 269ecf4a96d54b4abac917acbe7c486cd6978ffb Mon Sep 17 00:00:00 2001 From: "J. King" Date: Sat, 11 Aug 2018 14:44:55 -0400 Subject: [PATCH] Style fixes --- lib/Encoding/Encoding.php | 2 +- lib/Encoding/GenericEncoding.php | 3 +-- lib/Encoding/SingleByteEncoding.php | 2 +- lib/Encoding/StatefulEncoding.php | 2 +- lib/Encoding/StatelessEncoding.php | 2 +- lib/Encoding/UTF8.php | 2 +- tests/cases/Encoding/TestSingleByte.php | 10 +++++----- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/Encoding/Encoding.php b/lib/Encoding/Encoding.php index 8cf7561..3fe7019 100644 --- a/lib/Encoding/Encoding.php +++ b/lib/Encoding/Encoding.php @@ -19,7 +19,7 @@ interface Encoding { const E_UNAVAILABLE_CODE_POINT = 4; /** Constructs a new decoder - * + * * If $fatal is true, an exception will be thrown whenever an invalid code sequence is encountered; otherwise replacement characters will be substituted */ public function __construct(string $string, bool $fatal = false); diff --git a/lib/Encoding/GenericEncoding.php b/lib/Encoding/GenericEncoding.php index b184552..3959e36 100644 --- a/lib/Encoding/GenericEncoding.php +++ b/lib/Encoding/GenericEncoding.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace MensBeam\Intl\Encoding; trait GenericEncoding { - protected $string; protected $posByte = 0; protected $posChar = 0; @@ -16,7 +15,7 @@ trait GenericEncoding { protected $errMode = self::MODE_REPLACE; /** Constructs a new decoder - * + * * If $fatal is true, an exception will be thrown whenever an invalid code sequence is encountered; otherwise replacement characters will be substituted */ public function __construct(string $string, bool $fatal = false) { diff --git a/lib/Encoding/SingleByteEncoding.php b/lib/Encoding/SingleByteEncoding.php index ee7593c..b8bb3d1 100644 --- a/lib/Encoding/SingleByteEncoding.php +++ b/lib/Encoding/SingleByteEncoding.php @@ -54,7 +54,7 @@ abstract class SingleByteEncoding implements StatelessEncoding { /** Returns the encoding of $codePoint as a byte string * * If $codePoint is less than 0 or greater than 1114111, an exception is thrown - * + * * If $fatal is true, an exception will be thrown if the code point cannot be encoded into a character; otherwise HTML character references will be substituted */ public static function encode(int $codePoint, bool $fatal = true): string { diff --git a/lib/Encoding/StatefulEncoding.php b/lib/Encoding/StatefulEncoding.php index 5232e13..612c098 100644 --- a/lib/Encoding/StatefulEncoding.php +++ b/lib/Encoding/StatefulEncoding.php @@ -11,7 +11,7 @@ interface StatefulEncoding extends Encoding { /** Returns the encoding of $codePoint as a byte string * * If $codePoint is less than 0 or greater than 1114111, an exception is thrown - * + * * If $fatal is true, an exception will be thrown if the code point cannot be encoded into a character; otherwise HTML character references will be substituted */ public static function encode(array $codePoints, bool $fatal = true): string; diff --git a/lib/Encoding/StatelessEncoding.php b/lib/Encoding/StatelessEncoding.php index 1f34f55..9f644bb 100644 --- a/lib/Encoding/StatelessEncoding.php +++ b/lib/Encoding/StatelessEncoding.php @@ -11,7 +11,7 @@ interface StatelessEncoding extends Encoding { /** Returns the encoding of $codePoint as a byte string * * If $codePoint is less than 0 or greater than 1114111, an exception is thrown - * + * * If $fatal is true, an exception will be thrown if the code point cannot be encoded into a character; otherwise HTML character references will be substituted */ public static function encode(int $codePoint, bool $fatal = true): string; diff --git a/lib/Encoding/UTF8.php b/lib/Encoding/UTF8.php index 360876e..aca0384 100644 --- a/lib/Encoding/UTF8.php +++ b/lib/Encoding/UTF8.php @@ -95,7 +95,7 @@ class UTF8 implements StatelessEncoding { /** Returns the encoding of $codePoint as a byte string * * If $codePoint is less than 0 or greater than 1114111, an exception is thrown - * + * * If $fatal is true, an exception will be thrown if the code point cannot be encoded into a character; otherwise HTML character references will be substituted. When encoding to UTF-8, all Unicode characters can be encoded, so the argument is ignored */ public static function encode(int $codePoint, bool $fatal = true): string { diff --git a/tests/cases/Encoding/TestSingleByte.php b/tests/cases/Encoding/TestSingleByte.php index e14fcb4..f81ddf1 100644 --- a/tests/cases/Encoding/TestSingleByte.php +++ b/tests/cases/Encoding/TestSingleByte.php @@ -11,9 +11,9 @@ use MensBeam\Intl\Encoding\EncoderException; use MensBeam\Intl\Encoding\DecoderException; class TestSingleByte extends \PHPUnit\Framework\TestCase { - // maps taken from https://github.com/web-platform-tests/wpt/blob/d6c29bef8d4bcdfe4f689defca73360b07647d71/encoding/single-byte-decoder.html - // ISO-8859-8 was duplicated for ISO-8859-8-I - protected static $maps = [ + // maps taken from https://github.com/web-platform-tests/wpt/blob/d6c29bef8d4bcdfe4f689defca73360b07647d71/encoding/single-byte-decoder.html + // ISO-8859-8 was duplicated for ISO-8859-8-I + protected static $maps = [ "IBM866" => [1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,9617,9618,9619,9474,9508,9569,9570,9558,9557,9571,9553,9559,9565,9564,9563,9488,9492,9524,9516,9500,9472,9532,9566,9567,9562,9556,9577,9574,9568,9552,9580,9575,9576,9572,9573,9561,9560,9554,9555,9579,9578,9496,9484,9608,9604,9612,9616,9600,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1025,1105,1028,1108,1031,1111,1038,1118,176,8729,183,8730,8470,164,9632,160], "ISO-8859-2" => [128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,728,321,164,317,346,167,168,352,350,356,377,173,381,379,176,261,731,322,180,318,347,711,184,353,351,357,378,733,382,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729], "ISO-8859-3" => [128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,294,728,163,164,null,292,167,168,304,350,286,308,173,null,379,176,295,178,179,180,181,293,183,184,305,351,287,309,189,null,380,192,193,194,null,196,266,264,199,200,201,202,203,204,205,206,207,null,209,210,211,212,288,214,215,284,217,218,219,220,364,348,223,224,225,226,null,228,267,265,231,232,233,234,235,236,237,238,239,null,241,242,243,244,289,246,247,285,249,250,251,252,365,349,729], @@ -43,7 +43,7 @@ class TestSingleByte extends \PHPUnit\Framework\TestCase { "windows-1258" => [8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,339,157,158,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,258,196,197,198,199,200,201,202,203,768,205,206,207,272,209,777,211,212,416,214,215,216,217,218,219,220,431,771,223,224,225,226,259,228,229,230,231,232,233,234,235,769,237,238,239,273,241,803,243,244,417,246,247,248,249,250,251,252,432,8363,255], "x-mac-cyrillic" => [1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,8224,176,1168,163,167,8226,182,1030,174,169,8482,1026,1106,8800,1027,1107,8734,177,8804,8805,1110,181,1169,1032,1028,1108,1031,1111,1033,1113,1034,1114,1112,1029,172,8730,402,8776,8710,171,187,8230,160,1035,1115,1036,1116,1109,8211,8212,8220,8221,8216,8217,247,8222,1038,1118,1039,1119,8470,1025,1105,1103,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,8364], ]; - protected static $classes = [ + protected static $classes = [ "IBM866" => "IBM866", "ISO-8859-2" => "ISO88592", "ISO-8859-3" => "ISO88593", @@ -450,7 +450,7 @@ class TestSingleByte extends \PHPUnit\Framework\TestCase { return $out; })(); foreach (self::$classes as $name => $class) { - $codes = array_merge(range(0,127),array_map(function($v) { + $codes = array_merge(range(0, 127), array_map(function($v) { return $v ?? 0xFFFD; }, self::$maps[$name])); yield $name => [$class, $bytes, $codes];