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

src/Adapter/AbstractAdapter.php

+13 −11
Original line number Diff line number Diff line
@@ -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;

    }

src/RouteMatcher/DefaultRouteMatcher.php

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ class DefaultRouteMatcher implements RouteMatcherInterface 
     */

    protected $filters = [];



    protected array $constraints;



    /**

     * Class constructor

     *

src/View/RouteNotFoundStrategy.php

+2 −0
Original line number Diff line number Diff line
@@ -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;

                }