Skip to content

Commit c7855f6

Browse files
MauricioFauthMauricioFauth
committed
Create the PhpMyAdmin\Replication namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent fcf654a commit c7855f6

14 files changed

Lines changed: 70 additions & 59 deletions

File tree

‎libraries/classes/Controllers/Database/StructureController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use PhpMyAdmin\Http\ServerRequest;
1515
use PhpMyAdmin\Query\Utilities;
1616
use PhpMyAdmin\RecentFavoriteTable;
17-
use PhpMyAdmin\Replication;
18-
use PhpMyAdmin\ReplicationInfo;
17+
use PhpMyAdmin\Replication\Replication;
18+
use PhpMyAdmin\Replication\ReplicationInfo;
1919
use PhpMyAdmin\ResponseRenderer;
2020
use PhpMyAdmin\Sanitize;
2121
use PhpMyAdmin\StorageEngine;

‎libraries/classes/Controllers/Server/DatabasesController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use PhpMyAdmin\Dbal\Connection;
1212
use PhpMyAdmin\Http\ServerRequest;
1313
use PhpMyAdmin\Query\Utilities;
14-
use PhpMyAdmin\ReplicationInfo;
14+
use PhpMyAdmin\Replication\ReplicationInfo;
1515
use PhpMyAdmin\ResponseRenderer;
1616
use PhpMyAdmin\Template;
1717
use PhpMyAdmin\Url;

‎libraries/classes/Controllers/Server/ReplicationController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use PhpMyAdmin\Controllers\AbstractController;
1111
use PhpMyAdmin\DatabaseInterface;
1212
use PhpMyAdmin\Http\ServerRequest;
13-
use PhpMyAdmin\ReplicationGui;
14-
use PhpMyAdmin\ReplicationInfo;
13+
use PhpMyAdmin\Replication\ReplicationGui;
14+
use PhpMyAdmin\Replication\ReplicationInfo;
1515
use PhpMyAdmin\ResponseRenderer;
1616
use PhpMyAdmin\Template;
1717
use PhpMyAdmin\Url;

‎libraries/classes/Controllers/Server/Status/StatusController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use PhpMyAdmin\DatabaseInterface;
88
use PhpMyAdmin\Http\ServerRequest;
9-
use PhpMyAdmin\ReplicationGui;
9+
use PhpMyAdmin\Replication\ReplicationGui;
1010
use PhpMyAdmin\ResponseRenderer;
1111
use PhpMyAdmin\Server\Status\Data;
1212
use PhpMyAdmin\Template;

libraries/classes/Replication.php renamed to libraries/classes/Replication/Replication.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin;
5+
namespace PhpMyAdmin\Replication;
66

7+
use PhpMyAdmin\Core;
8+
use PhpMyAdmin\DatabaseInterface;
79
use PhpMyAdmin\Dbal\Connection;
810
use PhpMyAdmin\Dbal\ResultInterface;
911

libraries/classes/ReplicationGui.php renamed to libraries/classes/Replication/ReplicationGui.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55

66
declare(strict_types=1);
77

8-
namespace PhpMyAdmin;
8+
namespace PhpMyAdmin\Replication;
99

10+
use PhpMyAdmin\Core;
1011
use PhpMyAdmin\Dbal\Connection;
12+
use PhpMyAdmin\Message;
1113
use PhpMyAdmin\Query\Utilities;
14+
use PhpMyAdmin\ResponseRenderer;
15+
use PhpMyAdmin\Template;
16+
use PhpMyAdmin\Url;
17+
use PhpMyAdmin\Util;
1218

1319
use function __;
1420
use function htmlspecialchars;

libraries/classes/ReplicationInfo.php renamed to libraries/classes/Replication/ReplicationInfo.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace PhpMyAdmin;
5+
namespace PhpMyAdmin\Replication;
6+
7+
use PhpMyAdmin\DatabaseInterface;
68

79
use function count;
810
use function explode;

‎libraries/classes/Server/Status/Data.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use PhpMyAdmin\Config;
1212
use PhpMyAdmin\DatabaseInterface;
13-
use PhpMyAdmin\ReplicationInfo;
13+
use PhpMyAdmin\Replication\ReplicationInfo;
1414
use PhpMyAdmin\Url;
1515

1616
use function __;

‎libraries/services.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@
148148
],
149149
],
150150
'replication' => [
151-
'class' => PhpMyAdmin\Replication::class,
151+
'class' => PhpMyAdmin\Replication\Replication::class,
152152
'arguments' => ['$dbi' => '@dbi'],
153153
],
154154
'replication_gui' => [
155-
'class' => PhpMyAdmin\ReplicationGui::class,
155+
'class' => PhpMyAdmin\Replication\ReplicationGui::class,
156156
'arguments' => [
157157
'$replication' => '@replication',
158158
'$template' => '@template',

‎phpstan-baseline.neon‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ parameters:
15561556
path: libraries/classes/Controllers/Database/StructureController.php
15571557

15581558
-
1559-
message: "#^Parameter \\#1 \\$connection of method PhpMyAdmin\\\\ReplicationInfo\\:\\:load\\(\\) expects string\\|null, mixed given\\.$#"
1559+
message: "#^Parameter \\#1 \\$connection of method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:load\\(\\) expects string\\|null, mixed given\\.$#"
15601560
count: 1
15611561
path: libraries/classes/Controllers/Database/StructureController.php
15621562

@@ -1936,7 +1936,7 @@ parameters:
19361936
path: libraries/classes/Controllers/Server/DatabasesController.php
19371937

19381938
-
1939-
message: "#^Parameter \\#1 \\$connection of method PhpMyAdmin\\\\ReplicationInfo\\:\\:load\\(\\) expects string\\|null, mixed given\\.$#"
1939+
message: "#^Parameter \\#1 \\$connection of method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:load\\(\\) expects string\\|null, mixed given\\.$#"
19401940
count: 1
19411941
path: libraries/classes/Controllers/Server/DatabasesController.php
19421942

@@ -1991,17 +1991,17 @@ parameters:
19911991
path: libraries/classes/Controllers/Server/ReplicationController.php
19921992

19931993
-
1994-
message: "#^Parameter \\#10 \\$hostname of method PhpMyAdmin\\\\ReplicationGui\\:\\:handleControlRequest\\(\\) expects string, mixed given\\.$#"
1994+
message: "#^Parameter \\#10 \\$hostname of method PhpMyAdmin\\\\Replication\\\\ReplicationGui\\:\\:handleControlRequest\\(\\) expects string, mixed given\\.$#"
19951995
count: 1
19961996
path: libraries/classes/Controllers/Server/ReplicationController.php
19971997

19981998
-
1999-
message: "#^Parameter \\#8 \\$username of method PhpMyAdmin\\\\ReplicationGui\\:\\:handleControlRequest\\(\\) expects string, mixed given\\.$#"
1999+
message: "#^Parameter \\#8 \\$username of method PhpMyAdmin\\\\Replication\\\\ReplicationGui\\:\\:handleControlRequest\\(\\) expects string, mixed given\\.$#"
20002000
count: 1
20012001
path: libraries/classes/Controllers/Server/ReplicationController.php
20022002

20032003
-
2004-
message: "#^Parameter \\#9 \\$pmaPassword of method PhpMyAdmin\\\\ReplicationGui\\:\\:handleControlRequest\\(\\) expects string, mixed given\\.$#"
2004+
message: "#^Parameter \\#9 \\$pmaPassword of method PhpMyAdmin\\\\Replication\\\\ReplicationGui\\:\\:handleControlRequest\\(\\) expects string, mixed given\\.$#"
20052005
count: 1
20062006
path: libraries/classes/Controllers/Server/ReplicationController.php
20072007

@@ -2071,7 +2071,7 @@ parameters:
20712071
path: libraries/classes/Controllers/Server/Status/StatusController.php
20722072

20732073
-
2074-
message: "#^Parameter \\#1 \\$connection of method PhpMyAdmin\\\\ReplicationGui\\:\\:getHtmlForReplicationStatusTable\\(\\) expects string\\|null, mixed given\\.$#"
2074+
message: "#^Parameter \\#1 \\$connection of method PhpMyAdmin\\\\Replication\\\\ReplicationGui\\:\\:getHtmlForReplicationStatusTable\\(\\) expects string\\|null, mixed given\\.$#"
20752075
count: 2
20762076
path: libraries/classes/Controllers/Server/Status/StatusController.php
20772077

@@ -7191,84 +7191,84 @@ parameters:
71917191
path: libraries/classes/RecentFavoriteTable.php
71927192

71937193
-
7194-
message: "#^Method PhpMyAdmin\\\\Replication\\:\\:replicaChangePrimary\\(\\) has parameter \\$pos with no value type specified in iterable type array\\.$#"
7194+
message: "#^Method PhpMyAdmin\\\\Replication\\\\Replication\\:\\:replicaChangePrimary\\(\\) has parameter \\$pos with no value type specified in iterable type array\\.$#"
71957195
count: 1
7196-
path: libraries/classes/Replication.php
7196+
path: libraries/classes/Replication/Replication.php
71977197

71987198
-
71997199
message: "#^Parameter \\#1 \\$name of static method PhpMyAdmin\\\\Core\\:\\:sanitizeMySQLHost\\(\\) expects string, string\\|null given\\.$#"
72007200
count: 1
7201-
path: libraries/classes/Replication.php
7201+
path: libraries/classes/Replication/Replication.php
72027202

72037203
-
7204-
message: "#^Method PhpMyAdmin\\\\ReplicationGui\\:\\:getHtmlForReplicaConfiguration\\(\\) has parameter \\$serverReplicaReplication with no value type specified in iterable type array\\.$#"
7204+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationGui\\:\\:getHtmlForReplicaConfiguration\\(\\) has parameter \\$serverReplicaReplication with no value type specified in iterable type array\\.$#"
72057205
count: 1
7206-
path: libraries/classes/ReplicationGui.php
7206+
path: libraries/classes/Replication/ReplicationGui.php
72077207

72087208
-
72097209
message: "#^Only numeric types are allowed in \\+, int\\<0, max\\>\\|false given on the left side\\.$#"
72107210
count: 1
7211-
path: libraries/classes/ReplicationGui.php
7211+
path: libraries/classes/Replication/ReplicationGui.php
72127212

72137213
-
7214-
message: "#^Parameter \\#1 \\$action of method PhpMyAdmin\\\\Replication\\:\\:replicaControl\\(\\) expects string, string\\|null given\\.$#"
7214+
message: "#^Parameter \\#1 \\$action of method PhpMyAdmin\\\\Replication\\\\Replication\\:\\:replicaControl\\(\\) expects string, string\\|null given\\.$#"
72157215
count: 1
7216-
path: libraries/classes/ReplicationGui.php
7216+
path: libraries/classes/Replication/ReplicationGui.php
72177217

72187218
-
7219-
message: "#^Method PhpMyAdmin\\\\ReplicationInfo\\:\\:fill\\(\\) has parameter \\$status with no value type specified in iterable type array\\.$#"
7219+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:fill\\(\\) has parameter \\$status with no value type specified in iterable type array\\.$#"
72207220
count: 1
7221-
path: libraries/classes/ReplicationInfo.php
7221+
path: libraries/classes/Replication/ReplicationInfo.php
72227222

72237223
-
7224-
message: "#^Method PhpMyAdmin\\\\ReplicationInfo\\:\\:fill\\(\\) return type has no value type specified in iterable type array\\.$#"
7224+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:fill\\(\\) return type has no value type specified in iterable type array\\.$#"
72257225
count: 1
7226-
path: libraries/classes/ReplicationInfo.php
7226+
path: libraries/classes/Replication/ReplicationInfo.php
72277227

72287228
-
7229-
message: "#^Method PhpMyAdmin\\\\ReplicationInfo\\:\\:getPrimaryInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
7229+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:getPrimaryInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
72307230
count: 1
7231-
path: libraries/classes/ReplicationInfo.php
7231+
path: libraries/classes/Replication/ReplicationInfo.php
72327232

72337233
-
7234-
message: "#^Method PhpMyAdmin\\\\ReplicationInfo\\:\\:getPrimaryStatus\\(\\) return type has no value type specified in iterable type array\\.$#"
7234+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:getPrimaryStatus\\(\\) return type has no value type specified in iterable type array\\.$#"
72357235
count: 1
7236-
path: libraries/classes/ReplicationInfo.php
7236+
path: libraries/classes/Replication/ReplicationInfo.php
72377237

72387238
-
7239-
message: "#^Method PhpMyAdmin\\\\ReplicationInfo\\:\\:getReplicaInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
7239+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:getReplicaInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
72407240
count: 1
7241-
path: libraries/classes/ReplicationInfo.php
7241+
path: libraries/classes/Replication/ReplicationInfo.php
72427242

72437243
-
7244-
message: "#^Method PhpMyAdmin\\\\ReplicationInfo\\:\\:getReplicaStatus\\(\\) return type has no value type specified in iterable type array\\.$#"
7244+
message: "#^Method PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:getReplicaStatus\\(\\) return type has no value type specified in iterable type array\\.$#"
72457245
count: 1
7246-
path: libraries/classes/ReplicationInfo.php
7246+
path: libraries/classes/Replication/ReplicationInfo.php
72477247

72487248
-
7249-
message: "#^Property PhpMyAdmin\\\\ReplicationInfo\\:\\:\\$multiPrimaryStatus type has no value type specified in iterable type array\\.$#"
7249+
message: "#^Property PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:\\$multiPrimaryStatus type has no value type specified in iterable type array\\.$#"
72507250
count: 1
7251-
path: libraries/classes/ReplicationInfo.php
7251+
path: libraries/classes/Replication/ReplicationInfo.php
72527252

72537253
-
7254-
message: "#^Property PhpMyAdmin\\\\ReplicationInfo\\:\\:\\$primaryInfo type has no value type specified in iterable type array\\.$#"
7254+
message: "#^Property PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:\\$primaryInfo type has no value type specified in iterable type array\\.$#"
72557255
count: 1
7256-
path: libraries/classes/ReplicationInfo.php
7256+
path: libraries/classes/Replication/ReplicationInfo.php
72577257

72587258
-
7259-
message: "#^Property PhpMyAdmin\\\\ReplicationInfo\\:\\:\\$primaryStatus type has no value type specified in iterable type array\\.$#"
7259+
message: "#^Property PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:\\$primaryStatus type has no value type specified in iterable type array\\.$#"
72607260
count: 1
7261-
path: libraries/classes/ReplicationInfo.php
7261+
path: libraries/classes/Replication/ReplicationInfo.php
72627262

72637263
-
7264-
message: "#^Property PhpMyAdmin\\\\ReplicationInfo\\:\\:\\$replicaInfo type has no value type specified in iterable type array\\.$#"
7264+
message: "#^Property PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:\\$replicaInfo type has no value type specified in iterable type array\\.$#"
72657265
count: 1
7266-
path: libraries/classes/ReplicationInfo.php
7266+
path: libraries/classes/Replication/ReplicationInfo.php
72677267

72687268
-
7269-
message: "#^Property PhpMyAdmin\\\\ReplicationInfo\\:\\:\\$replicaStatus type has no value type specified in iterable type array\\.$#"
7269+
message: "#^Property PhpMyAdmin\\\\Replication\\\\ReplicationInfo\\:\\:\\$replicaStatus type has no value type specified in iterable type array\\.$#"
72707270
count: 1
7271-
path: libraries/classes/ReplicationInfo.php
7271+
path: libraries/classes/Replication/ReplicationInfo.php
72727272

72737273
-
72747274
message: "#^Expression on left side of \\?\\? is not nullable\\.$#"

0 commit comments

Comments
 (0)