Use multibyte functions (#34)

Author: slavcodev

composer.json

@@ -15,6 +15,7 @@
   "require": {
     "php": "^7.1",
     "ext-json": "*",
+    "ext-mbstring": "*",
     "psr/http-message": "^1.0",
     "justinrainbow/json-schema": "~5.2",
     "phpunit/phpunit": "~7.5"

src/PhpUnit/Asserts.php

@@ -116,7 +116,7 @@ final protected static function assertMethodAllowed(Schema $schema, string $path
     final protected static function assertResponseDefined(Schema $schema, string $template, string $method, string $status, string $msg = ''): void
     {
         Assert::assertTrue(
-            $schema->isResponseDefined($template, strtolower($method), $status),
+            $schema->isResponseDefined($template, mb_strtolower($method), $status),
             $msg ?: "Operation \"{$method} {$template}\" does not support response code \"{$status}\""
         );
     }
@@ -149,15 +149,15 @@ final protected static function assertRequestHeaders(Schema $schema, string $pat
     {
         Assert::assertThat(
             $headers,
-            new HeadersConstraint($schema->getRequestHeaderSchemas($path, strtolower($method))),
+            new HeadersConstraint($schema->getRequestHeaderSchemas($path, mb_strtolower($method))),
             $msg
         );
 
         if ($schema->isRequestBodyDefined($path, $method) && isset($headers['Content-Type'][0])) {
             self::assertRequestContentType(
                 $schema,
                 $path,
-                strtolower($method),
+                mb_strtolower($method),
                 $headers['Content-Type'][0],
                 $msg
             );
@@ -169,7 +169,7 @@ final protected static function assertResponseHeaders(Schema $schema, string $pa
         Assert::assertThat(
             $headers,
             new HeadersConstraint(
-                $schema->getResponseHeaderSchemas($path, strtolower($method), $status)
+                $schema->getResponseHeaderSchemas($path, mb_strtolower($method), $status)
             ),
             $msg
         );
@@ -186,7 +186,7 @@ final protected static function assertResponseHeaders(Schema $schema, string $pa
         }
 
         if (isset($headers['Allow'])) {
-            if (isset($headers['Allow'][0]) && strpos($headers['Allow'][0], ',') !== false) {
+            if (isset($headers['Allow'][0]) && mb_strpos($headers['Allow'][0], ',') !== false) {
                 $headers['Allow'] = preg_split('#\s*,\s*#', $headers['Allow'][0], -1, PREG_SPLIT_NO_EMPTY);
             }
 
@@ -200,7 +200,7 @@ final protected static function assertResponseHeaders(Schema $schema, string $pa
 
     final protected static function assertRequestBody(Schema $schema, string $path, string $method, StreamInterface $body = null, string $msg = ''): void
     {
-        $bodySchema = $schema->getRequestBodySchema($path, strtolower($method));
+        $bodySchema = $schema->getRequestBodySchema($path, mb_strtolower($method));
 
         if ($bodySchema) {
             Assert::assertThat(
@@ -215,7 +215,7 @@ final protected static function assertRequestBody(Schema $schema, string $path,
 
     final protected static function assertResponseBody(Schema $schema, string $path, string $method, string $status, StreamInterface $body = null, string $msg = ''): void
     {
-        $bodySchema = $schema->getResponseBodySchema($path, strtolower($method), $status);
+        $bodySchema = $schema->getResponseBodySchema($path, mb_strtolower($method), $status);
 
         if ($bodySchema) {
             Assert::assertThat(

src/PhpUnit/ContentTypeConstraint.php

@@ -39,6 +39,6 @@ public function toString(): string
 
     private static function stripParams(string $type): string
     {
-        return strstr($type, ';', true) ?: $type;
+        return mb_strstr($type, ';', true) ?: $type;
     }
 }

src/PhpUnit/MethodsAllowedConstraint.php

@@ -22,16 +22,16 @@ final class MethodsAllowedConstraint extends Constraint
     public function __construct(array $allowedMethods)
     {
         parent::__construct();
-        $this->allowedMethods = array_map('strtoupper', $allowedMethods);
+        $this->allowedMethods = array_map('mb_strtoupper', $allowedMethods);
     }
 
     protected function matches($other): bool
     {
         if (is_string($other)) {
-            return in_array(strtoupper($other), $this->allowedMethods);
-        } else {
-            return empty(array_diff($this->allowedMethods, array_map('strtoupper', $other)));
+            return in_array(mb_strtoupper($other), $this->allowedMethods);
         }
+
+        return empty(array_diff($this->allowedMethods, array_map('mb_strtoupper', $other)));
     }
 
     public function toString(): string

src/PhpUnit/UriConstraint.php

@@ -61,7 +61,7 @@ private function assertPathSegment(string $expectedSegment, string $actualSegmen
 
     private function assertPathParam(string $expectedSegment, string $actualSegment)
     {
-        $pathParamSchema = $this->pathParameters[substr($expectedSegment, 1, -1)];
+        $pathParamSchema = $this->pathParameters[mb_substr($expectedSegment, 1, -1)];
 
         // TODO: Consider to disallow non-string params in path, that make no sense
         $actualSegment = $this->normalizeNumericString($actualSegment);
@@ -81,7 +81,7 @@ protected function matches($uri): bool
         $baseUrl = null;
 
         foreach ($this->servers as $serverUrl) {
-            if (strpos((string) $uri, $serverUrl) === 0) {
+            if (mb_strpos((string) $uri, $serverUrl) === 0) {
                 $baseUrl = $serverUrl;
 
                 continue;
@@ -97,8 +97,8 @@ protected function matches($uri): bool
             return false;
         }
 
-        $pathStart = strlen($baseUrl) - strpos($baseUrl, '/', strpos($baseUrl, '://') + 3);
-        $path = substr($uri->getPath(), $pathStart + 1);
+        $pathStart = mb_strlen($baseUrl) - mb_strpos($baseUrl, '/', mb_strpos($baseUrl, '://') + 3);
+        $path = mb_substr($uri->getPath(), $pathStart + 1);
         $actualSegments = $this->splitString('#\/#', $path);
         $expectedSegments = $this->splitString('#\/#', $this->path);
 
@@ -113,7 +113,7 @@ protected function matches($uri): bool
 
         foreach ($expectedSegments as $i => $expectedSegment) {
             $actualSegment = $actualSegments[$i];
-            strpos($expectedSegment, '{') === false
+            mb_strpos($expectedSegment, '{') === false
                 ? $this->assertPathSegment($expectedSegment, $actualSegment)
                 : $this->assertPathParam($expectedSegment, $actualSegment);
         }

src/Schema.php

@@ -25,7 +25,7 @@ final class Schema
 
     public function __construct(string $uri)
     {
-        if (strpos($uri, '//') === false) {
+        if (mb_strpos($uri, '//') === false) {
             $uri = "file://{$uri}";
         }
 
@@ -206,7 +206,7 @@ private function encodePath(string $path): string
 
     private function normalizeMethod(string $method): string
     {
-        return strtolower($method);
+        return mb_strtolower($method);
     }
 
     private function getRequestParameters(string $path, string $method, string $location): array