diff --git a/src/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.php index 58193b288751105ce399acb8b7d8eb94268e7a1e..70c33664f35137bc6d501c5571e1bd35b5c10184 100644 --- a/src/Adapter/AbstractAdapter.php +++ b/src/Adapter/AbstractAdapter.php @@ -542,17 +542,19 @@ abstract class AbstractAdapter implements AdapterInterface */ public function encodeText($text) { - if ($this->isUtf8()) { - if (StringUtils::isValidUtf8($text)) { - return $text; - } - - return utf8_encode($text); - } - - if (StringUtils::isValidUtf8($text)) { - return utf8_decode($text); - } + // rien à faire : nos logiciels sont en UTF-8 + +// if ($this->isUtf8()) { +// if (StringUtils::isValidUtf8($text)) { +// return $text; +// } +// +// return utf8_encode($text); +// } +// +// if (StringUtils::isValidUtf8($text)) { +// return utf8_decode($text); +// } return $text; } diff --git a/src/RouteMatcher/DefaultRouteMatcher.php b/src/RouteMatcher/DefaultRouteMatcher.php index dd54997fc98be750cbbbf27599cd9513213f7bb3..e82d4c0eba80fd690ab7501c4407e151817095c5 100644 --- a/src/RouteMatcher/DefaultRouteMatcher.php +++ b/src/RouteMatcher/DefaultRouteMatcher.php @@ -45,6 +45,8 @@ class DefaultRouteMatcher implements RouteMatcherInterface */ protected $filters = []; + protected array $constraints; + /** * Class constructor * diff --git a/src/View/RouteNotFoundStrategy.php b/src/View/RouteNotFoundStrategy.php index 5bc0d1b9d55d47f1bff8dce1a2c9c0d18caf3b8a..8629ba03819061392704384ff29d28190633bc50 100644 --- a/src/View/RouteNotFoundStrategy.php +++ b/src/View/RouteNotFoundStrategy.php @@ -313,6 +313,7 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate $tableCols = 2; $tableType = 1; + $table = []; $table[] = [$a, $b]; continue; } @@ -333,6 +334,7 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate $tableCols = $count; $tableType = 2; + $table = []; $table[] = $b; continue; }