Skip to content

Use mysql version from server rather than mysql --version #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javiercasares merged 2 commits into from
Feb 7, 2024
Merged

Use mysql version from server rather than mysql --version #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1a48ad
Use mysql version from server rather than mysql --version
grooverdan Sep 8, 2022
1b1398b
Merge branch 'master' into mysql
grooverdan Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,14 @@ function upload_results( $results, $rev, $message, $env, $api_key ) {
* Get the environmental details
*/
function get_env_details() {
$WPT_DB_HOST = getenv( 'WPT_DB_HOST' ) ? : 'localhost';
$WPT_DB_USER = getenv( 'WPT_DB_USER' );
$WPT_DB_PASSWORD = getenv( 'WPT_DB_PASSWORD' );
$WPT_DB_NAME = getenv( 'WPT_DB_NAME' );
$env = array(
'php_version' => phpversion(),
'php_modules' => array(),
'system_utils' => array(),
'mysql_version' => trim( shell_exec( 'mysql --version' ) ),
'os_name' => trim( shell_exec( 'uname -s' ) ),
'os_version' => trim( shell_exec( 'uname -r' ) ),
);
Expand Down Expand Up @@ -235,6 +238,10 @@ function get_env_details() {
$curl_bits = explode( PHP_EOL, str_replace( 'curl ', '', shell_exec( 'curl --version' ) ) );
$curl = array_shift( $curl_bits );
$env['system_utils']['curl'] = trim( $curl );
$mysqli = new mysqli($WPT_DB_HOST, $WPT_DB_USER, $WPT_DB_PASSWORD, $WPT_DB_NAME);
$env['mysql_version'] = $mysqli->query("SELECT VERSION()")->fetch_row()[0];
$mysqli->close();

if ( class_exists( 'Imagick' ) ) {
$imagick = new Imagick();
$version = $imagick->getVersion();
Expand Down
5 changes: 4 additions & 1 deletion prepare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@
'php_version' => phpversion(),
'php_modules' => array(),
'system_utils' => array(),
'mysql_version' => trim( shell_exec( 'mysql --version' ) ),
'os_name' => trim( shell_exec( 'uname -s' ) ),
'os_version' => trim( shell_exec( 'uname -r' ) ),
);
Expand Down Expand Up @@ -219,6 +218,10 @@
\$env['system_utils']['graphicsmagick'] = \$version[1];
}
\$env['system_utils']['openssl'] = str_replace( 'OpenSSL ', '', trim( shell_exec( 'openssl version' ) ) );

\$mysqli = new mysqli(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
\$env['mysql_version'] = \$mysqli->query("SELECT VERSION()")->fetch_row()[0];
\$mysqli->close();
file_put_contents( __DIR__ . '/tests/phpunit/build/logs/env.json', json_encode( \$env, JSON_PRETTY_PRINT ) );
if ( 'cli' === php_sapi_name() && defined( 'WP_INSTALLING' ) && WP_INSTALLING ) {
echo PHP_EOL;
Expand Down