@@ -60,15 +60,7 @@ public function clickInstallNow()
60
60
*/
61
61
public function getAdminInfo ()
62
62
{
63
- $ adminData = [];
64
- $ rows = $ this ->_rootElement ->getElements ('#admin-info .row ' );
65
- foreach ($ rows as $ row ) {
66
- $ dataRow = $ row ->getElements ('div ' );
67
- $ key = strtolower (str_replace (' ' , '_ ' , str_replace (': ' , '' , $ dataRow [0 ]->getText ())));
68
- $ adminData [$ key ] = $ dataRow [1 ]->getText ();
69
- }
70
-
71
- return $ adminData ;
63
+ return $ this ->getTableDataByCssLocator ('#admin-info ' );
72
64
}
73
65
74
66
/**
@@ -78,15 +70,26 @@ public function getAdminInfo()
78
70
*/
79
71
public function getDbInfo ()
80
72
{
81
- $ dbData = [];
82
- $ rows = $ this ->_rootElement ->getElements ('#db-info .row ' );
83
- foreach ($ rows as $ row ) {
84
- $ dataRow = $ row ->getElements ('div ' );
85
- $ key = strtolower (str_replace (' ' , '_ ' , str_replace (': ' , '' , $ dataRow [0 ]->getText ())));
86
- $ dbData [$ key ] = $ dataRow [1 ]->getText ();
73
+ return $ this ->getTableDataByCssLocator ('#db-info ' );
74
+ }
75
+
76
+ private function getTableDataByCssLocator ($ locator )
77
+ {
78
+ $ data = [];
79
+ $ keys = [];
80
+ $ definitionTitles = $ this ->_rootElement ->getElements ($ locator . ' dt ' );
81
+ foreach ($ definitionTitles as $ dt ) {
82
+ $ keys [] = strtolower (str_replace (' ' , '_ ' , str_replace (': ' , '' , $ dt ->getText ())));
83
+ }
84
+ reset ($ keys );
85
+
86
+ $ definitionDescriptions = $ this ->_rootElement ->getElements ($ locator . ' dd ' );
87
+ foreach ($ definitionDescriptions as $ dd ) {
88
+ $ data [current ($ keys )] = $ dd ->getText ();
89
+ next ($ keys );
87
90
}
88
91
89
- return $ dbData ;
92
+ return $ data ;
90
93
}
91
94
92
95
/**
0 commit comments