Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Console
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lib
unicaen
Console
Commits
7b85a732
Commit
7b85a732
authored
Nov 13, 2023
by
Jean-Philippe Metivier
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/php82' into HEAD
parents
4d52eee8
d1ad9321
Branches
detached
Branches containing commit
Tags
6.1.0
Tags containing commit
No related merge requests found
Pipeline
#26041
failed
Jan 22, 2024
Stage: publish
Stage: tests
Changes
3
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Adapter/AbstractAdapter.php
+13
-11
13 additions, 11 deletions
src/Adapter/AbstractAdapter.php
src/RouteMatcher/DefaultRouteMatcher.php
+2
-0
2 additions, 0 deletions
src/RouteMatcher/DefaultRouteMatcher.php
src/View/RouteNotFoundStrategy.php
+2
-0
2 additions, 0 deletions
src/View/RouteNotFoundStrategy.php
with
17 additions
and
11 deletions
src/Adapter/AbstractAdapter.php
+
13
−
11
View file @
7b85a732
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/RouteMatcher/DefaultRouteMatcher.php
+
2
−
0
View file @
7b85a732
...
@@ -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
*
*
...
...
This diff is collapsed.
Click to expand it.
src/View/RouteNotFoundStrategy.php
+
2
−
0
View file @
7b85a732
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment