Skip to content
Snippets Groups Projects
Commit 7b85a732 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge remote-tracking branch 'origin/php82' into HEAD

parents 4d52eee8 d1ad9321
Branches detached
Tags 6.1.0
No related merge requests found
Pipeline #26041 failed
...@@ -542,17 +542,19 @@ abstract class AbstractAdapter implements AdapterInterface ...@@ -542,17 +542,19 @@ abstract class AbstractAdapter implements AdapterInterface
*/ */
public function encodeText($text) public function encodeText($text)
{ {
if ($this->isUtf8()) { // rien à faire : nos logiciels sont en UTF-8
if (StringUtils::isValidUtf8($text)) {
return $text; // if ($this->isUtf8()) {
} // if (StringUtils::isValidUtf8($text)) {
// return $text;
return utf8_encode($text); // }
} //
// return utf8_encode($text);
if (StringUtils::isValidUtf8($text)) { // }
return utf8_decode($text); //
} // if (StringUtils::isValidUtf8($text)) {
// return utf8_decode($text);
// }
return $text; return $text;
} }
......
...@@ -45,6 +45,8 @@ class DefaultRouteMatcher implements RouteMatcherInterface ...@@ -45,6 +45,8 @@ class DefaultRouteMatcher implements RouteMatcherInterface
*/ */
protected $filters = []; protected $filters = [];
protected array $constraints;
/** /**
* Class constructor * Class constructor
* *
......
...@@ -313,6 +313,7 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate ...@@ -313,6 +313,7 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate
$tableCols = 2; $tableCols = 2;
$tableType = 1; $tableType = 1;
$table = [];
$table[] = [$a, $b]; $table[] = [$a, $b];
continue; continue;
} }
...@@ -333,6 +334,7 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate ...@@ -333,6 +334,7 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate
$tableCols = $count; $tableCols = $count;
$tableType = 2; $tableType = 2;
$table = [];
$table[] = $b; $table[] = $b;
continue; continue;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment