diff --git a/bs_play_media.php b/bs_play_media.php index fe6f574250..d9ba62ae90 100644 --- a/bs_play_media.php +++ b/bs_play_media.php @@ -12,7 +12,7 @@ /* * @var string contains media type of BLOB reference */ - $mediaType = isset($_REQUEST['media_type']) ? $_REQUEST['media_type'] : NULL; + $mediaType = isset($_REQUEST['media_type']) ? $_REQUEST['media_type'] : null; /* * @var string indicates whether media type is of custom type @@ -22,7 +22,7 @@ /* * @var string contains BLOB reference */ - $bsReference = isset($_REQUEST['bs_reference']) ? $_REQUEST['bs_reference'] : NULL; + $bsReference = isset($_REQUEST['bs_reference']) ? $_REQUEST['bs_reference'] : null; // if media type and BS reference are specified if (isset($mediaType) && isset($bsReference)) { diff --git a/db_create.php b/db_create.php index 27bf279e54..3548f8fc00 100644 --- a/db_create.php +++ b/db_create.php @@ -69,16 +69,16 @@ if (! $result) { /** * String containing the SQL Query formatted in pretty HTML * @global array $GLOBALS['extra_data'] - * @name $extra_data + * @name $extra_data */ - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success'); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query, 'success'); //Construct the html for the new database, so that it can be appended to the list of databases on server_databases.php /** * Build the array to be passed to {@link PMA_generate_common_url} to generate the links * @global array $GLOBALS['db_url_params'] - * @name $db_url_params + * @name $db_url_params */ $db_url_params['db'] = $new_db; diff --git a/db_operations.php b/db_operations.php index b364d8134c..0bfedb0629 100644 --- a/db_operations.php +++ b/db_operations.php @@ -304,7 +304,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { */ if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['newname'] = $newname; - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); }; } @@ -442,7 +442,7 @@ echo __('Remove database'); 'reload' => '1', 'purge' => '1', 'message_to_show' => sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db))), - 'db' => NULL, + 'db' => null, ); ?>
  • > diff --git a/import.php b/import.php index d3c4b79313..fab1d3f3b2 100644 --- a/import.php +++ b/import.php @@ -395,7 +395,7 @@ if (!$error) { } } -if (! $error && false !== $import_handle && NULL !== $import_handle) { +if (! $error && false !== $import_handle && null !== $import_handle) { fclose($import_handle); } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index d745f1ba81..57cb7ff621 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -99,17 +99,17 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } if (!$server) { - $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, $password, empty($client_flags) ? NULL : $client_flags); + $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, $password, empty($client_flags) ? null : $client_flags); // Retry with empty password if we're allowed to if (empty($link) && $cfg['Server']['nopassword'] && !$is_controluser) { - $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? NULL : $client_flags); + $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? null : $client_flags); } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL); + $link = PMA_DBI_real_connect($server_socket, $user, $password, null); } else { - $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL); + $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, null); } } if (empty($link)) { diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 1e84820a4d..ad10478b3b 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -209,7 +209,7 @@ if (isset($plugin_list)) { $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf; if (isset($GLOBALS['latex_caption'])) { $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\'; + . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], null, array('table' => $table, 'database' => $db)) . '} \\\\'; } if (!PMA_exportOutputHandler($buffer)) { return false; @@ -372,7 +372,7 @@ if (isset($plugin_list)) { // Table caption for first page and label if (isset($GLOBALS['latex_caption'])) { $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db)) + . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], null, array('table' => $table, 'database' => $db)) . '} \\\\' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf; diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 55298767c2..4c42c5760e 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -75,7 +75,7 @@ function get_tab_info() PMA_DBI_select_db($GLOBALS['db']); $tab_column = array(); for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) { - $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), NULL, PMA_DBI_QUERY_STORE); + $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), null, PMA_DBI_QUERY_STORE); $j = 0; while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j] = $j; @@ -98,7 +98,7 @@ function get_script_contr() PMA_DBI_select_db($GLOBALS['db']); $con["C_NAME"] = array(); $i = 0; - $alltab_rs = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($GLOBALS['db']), NULL, PMA_DBI_QUERY_STORE); + $alltab_rs = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($GLOBALS['db']), null, PMA_DBI_QUERY_STORE); while ($val = @PMA_DBI_fetch_row($alltab_rs)) { $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal'); //echo "
    internal ".$GLOBALS['db']." - ".$val[0]." - "; diff --git a/server_status.php b/server_status.php index bbac0c383a..4a8a37f8a6 100644 --- a/server_status.php +++ b/server_status.php @@ -1486,7 +1486,7 @@ function printVariablesTable() } if ('%' === substr($name, -1, 1)) { echo htmlspecialchars(PMA_formatNumber($value, 0, 2)) . ' %'; - } elseif (strpos($name, 'Uptime')!==FALSE) { + } elseif (strpos($name, 'Uptime') !== false) { echo htmlspecialchars(PMA_timespanFormat($value)); } elseif (is_numeric($value) && $value == (int) $value && $value > 1000) { echo htmlspecialchars(PMA_formatNumber($value, 3, 1)); diff --git a/sql.php b/sql.php index 53d9759ade..42a9ac1c85 100644 --- a/sql.php +++ b/sql.php @@ -104,7 +104,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value } $extra_data['dropdown'] = $dropdown; - PMA_ajaxResponse(NULL, true, $extra_data); + PMA_ajaxResponse(null, true, $extra_data); } /** @@ -133,7 +133,7 @@ if (isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) $dropdown = ''; $extra_data['dropdown'] = $dropdown; - PMA_ajaxResponse(NULL, true, $extra_data); + PMA_ajaxResponse(null, true, $extra_data); } /** @@ -162,7 +162,7 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { $select = ''; $extra_data['select'] = $select; - PMA_ajaxResponse(NULL, true, $extra_data); + PMA_ajaxResponse(null, true, $extra_data); } /** @@ -191,7 +191,7 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { } } - PMA_ajaxResponse(NULL, ($retval == true)); + PMA_ajaxResponse(null, ($retval == true)); } // Default to browse if no query set and we have table @@ -766,7 +766,7 @@ else { $row = PMA_DBI_fetch_row($result); $extra_data = array(); $extra_data['value'] = $row[0]; - PMA_ajaxResponse(NULL, true, $extra_data); + PMA_ajaxResponse(null, true, $extra_data); } if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) { diff --git a/tbl_addfield.php b/tbl_addfield.php index f9324fe9f3..c2a2e9687c 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -186,7 +186,7 @@ if (isset($_REQUEST['do_save_data'])) { $message->addParam($table); if( $GLOBALS['is_ajax_request'] == true) { - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } diff --git a/tbl_alter.php b/tbl_alter.php index dcde6019f0..a2688662d1 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -131,7 +131,7 @@ if (isset($_REQUEST['do_save_data'])) { } if ( $_REQUEST['ajax_request'] == true) { - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } diff --git a/tbl_indexes.php b/tbl_indexes.php index 70afb942ac..1d678dbd63 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -100,7 +100,7 @@ if (isset($_REQUEST['do_save_data'])) { if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['index_table'] = PMA_Index::getView($table, $db); - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 58d90f347f..e25cf69c76 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -65,13 +65,13 @@ if (PMA_isValid($_REQUEST['new_name'])) { $db = $_REQUEST['target_db']; $table = $_REQUEST['new_name']; } - + if ( $_REQUEST['ajax_request'] == true) { - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); $extra_data['db'] = $GLOBALS['db']; PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } - + $reload = 1; } } else { diff --git a/tbl_operations.php b/tbl_operations.php index 95b602e208..d859a52028 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -230,7 +230,7 @@ if (isset($result) && empty($message_to_show)) { // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error'; if ( $_REQUEST['ajax_request'] == true) { - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); PMA_ajaxResponse($_message, $_message->isSuccess(), $extra_data); } } diff --git a/tbl_replace.php b/tbl_replace.php index b6da1ba655..b5c43dc255 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -231,8 +231,8 @@ foreach ($loop_array as $rownumber => $where_clause) { // for blobstreaming if ($blob_streaming_active) { - $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL; - $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL; + $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : null; + $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : null; // checks if an existing blob repository reference should be removed if (isset($remove_blob_repo) && ! isset($upload_blob_repo)) { diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index 42fab56033..edcc6aa466 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -19,7 +19,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase /** * Turn off backup globals */ - protected $backupGlobals = FALSE; + protected $backupGlobals = false; /** * @var PMA_Config diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php index 0eea3630da..8fc63fbaee 100644 --- a/test/libraries/core/PMA_array_test.php +++ b/test/libraries/core/PMA_array_test.php @@ -94,7 +94,7 @@ class PMA_array_test extends PHPUnit_Framework_TestCase PMA_array_write('sarr/not_existing/1', $arr, 'some_val'); $this->assertEquals($arr['sarr']['not_existing'][1], 'some_val'); - PMA_array_write('sarr/0/2', $arr, NULL); + PMA_array_write('sarr/0/2', $arr, null); $this->assertNull($arr['sarr'][0][2]); } diff --git a/test/libraries/core/PMA_headerLocation_test_disabled.php b/test/libraries/core/PMA_headerLocation_test_disabled.php index a303d24f54..089064bee7 100644 --- a/test/libraries/core/PMA_headerLocation_test_disabled.php +++ b/test/libraries/core/PMA_headerLocation_test_disabled.php @@ -104,9 +104,9 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase if (defined('PMA_IS_IIS')) { $this->oldIISvalue = PMA_IS_IIS; - runkit_constant_redefine('PMA_IS_IIS', NULL); + runkit_constant_redefine('PMA_IS_IIS', null); } else { - runkit_constant_add('PMA_IS_IIS', NULL); + runkit_constant_add('PMA_IS_IIS', null); } @@ -114,9 +114,9 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase if (defined('SID')) { $this->oldSIDvalue = SID; - runkit_constant_redefine('SID', NULL); + runkit_constant_redefine('SID', null); } else { - runkit_constant_add('SID', NULL); + runkit_constant_add('SID', null); } } diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php index 1a5d22d622..bde93bf922 100644 --- a/test/selenium/PmaSeleniumLoginTest.php +++ b/test/selenium/PmaSeleniumLoginTest.php @@ -10,9 +10,9 @@ require_once 'PmaSeleniumTestCase.php'; -class PmaSeleniumLoginTest extends PmaSeleniumTestCase +class PmaSeleniumLoginTest extends PmaSeleniumTestCase { - protected $captureScreenshotOnFailure = TRUE; + protected $captureScreenshotOnFailure = true; protected $screenshotPath = '/var/www/screenshots'; protected $screenshotUrl = 'http://localhost/screenshots'; diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php index 90da6428e1..1b33ff022a 100644 --- a/test/selenium/PmaSeleniumTestCase.php +++ b/test/selenium/PmaSeleniumTestCase.php @@ -21,7 +21,7 @@ class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase protected $selenium; protected $cfg; - protected $captureScreenshotOnFailure = TRUE; + protected $captureScreenshotOnFailure = true; protected $screenshotPath = '/var/www/screenshots'; protected $screenshotUrl = 'http://localhost/screenshots';