diff options
| -rw-r--r-- | browse_foreigners.php | 2 | ||||
| -rw-r--r-- | libraries/Theme_Manager.class.php | 4 | ||||
| -rw-r--r-- | libraries/core.lib.php | 3 | ||||
| -rw-r--r-- | libraries/export/codegen.php | 6 | ||||
| -rw-r--r-- | libraries/export/php_array.php | 2 | ||||
| -rw-r--r-- | libraries/rte/rte_routines.lib.php | 20 | ||||
| -rw-r--r-- | libraries/session.inc.php | 2 | ||||
| -rw-r--r-- | tbl_get_field.php | 2 | ||||
| -rw-r--r-- | tbl_structure.php | 2 | ||||
| -rw-r--r-- | test/PMA_showHint_test.php | 10 | ||||
| -rw-r--r-- | test/classes/PMA_Theme_test.php | 2 | ||||
| -rw-r--r-- | test/libraries/PMA_STR_sub_test.php | 19 | ||||
| -rw-r--r-- | test/libraries/common/PMA_getIcon_test.php | 8 | ||||
| -rw-r--r-- | test/theme.php | 6 |
14 files changed, 51 insertions, 37 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php index bf12f65e47..53871854bd 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -68,7 +68,7 @@ if (is_array($foreignData['disp_row'])) { 20, 10, __('Page number:') - ); + ); } } ?> diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index ddc241ddb4..440374d8fa 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -113,9 +113,9 @@ class PMA_Theme_Manager sprintf( __('Default theme %s not found!'), htmlspecialchars($GLOBALS['cfg']['ThemeDefault']) - ), + ), E_USER_ERROR - ); + ); $GLOBALS['cfg']['ThemeDefault'] = false; } diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 7183dfb7e3..df9f6de93c 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -568,7 +568,8 @@ function PMA_no_cache_header() // rfc2616 - Section 14.21 header('Expires: ' . date(DATE_RFC1123)); // HTTP/1.1 - header('Cache-Control: no-store, no-cache, must-revalidate,' + header( + 'Cache-Control: no-store, no-cache, must-revalidate,' . ' pre-check=0, post-check=0, max-age=0' ); if (PMA_USR_BROWSER_AGENT == 'IE') { diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index abaa422262..f409e19e78 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -320,13 +320,13 @@ if (isset($plugin_list)) { $lines[] = ' #endregion'; $lines[] = ' #region Public Properties'; foreach ($tableProperties as $tablePropertie) { - $lines[] = $tablePropertie->formatCs('' - . ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" + $lines[] = $tablePropertie->formatCs( + ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" . ' {' . "\n" . ' get {return _#name#;}' . "\n" . ' set {_#name#=value;}' . "\n" . ' }' - ); + ); } $lines[] = ' #endregion'; $lines[] = ' }'; diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index bba12d7149..cfb132b770 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -56,7 +56,7 @@ if (isset($plugin_list)) { function PMA_exportHeader() { PMA_exportOutputHandler( - '<?php' . $GLOBALS['crlf'] + '<?php' . $GLOBALS['crlf'] . '/**' . $GLOBALS['crlf'] . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf'] . ' * @version 0.2b' . $GLOBALS['crlf'] diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index d6bf61f1c1..1ee9b31aa3 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -61,11 +61,13 @@ function PMA_RTN_main() */ if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') { trigger_error( - __('You are using PHP\'s deprecated \'mysql\' extension, ' - . 'which is not capable of handling multi queries. ' - . '[strong]The execution of some stored routines may fail![/strong] ' - . 'Please use the improved \'mysqli\' extension to ' - . 'avoid any problems.'), + __( + 'You are using PHP\'s deprecated \'mysql\' extension, ' + . 'which is not capable of handling multi queries. ' + . '[strong]The execution of some stored routines may fail![/strong] ' + . 'Please use the improved \'mysqli\' extension to ' + . 'avoid any problems.' + ), E_USER_WARNING ); } @@ -1257,8 +1259,12 @@ function PMA_RTN_handleExecute() } else { $output = ''; $message = PMA_message::error( - sprintf(__('The following query has failed: "%s"'), $query) . '<br /><br />' - . __('MySQL said: ') . PMA_DBI_getError(null) + sprintf( + __('The following query has failed: "%s"'), + $query + ) + . '<br /><br />' + . __('MySQL said: ') . PMA_DBI_getError(null) ); } // Print/send output diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 2111b36ebe..85758d84e9 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -46,7 +46,7 @@ if (!empty($path)) { // do not force transparent session ids, see bug #3398788 //@ini_set('session.use_trans_sid', true); @ini_set( - 'url_rewriter.tags', + 'url_rewriter.tags', 'a=href,frame=src,input=src,form=fakeentry,fieldset=' ); //ini_set('arg_separator.output', '&'); diff --git a/tbl_get_field.php b/tbl_get_field.php index ab802d7e22..c6d982b89b 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -43,6 +43,6 @@ PMA_download_header( $table . '-' . $transform_key . '.bin', PMA_detectMIME($result), strlen($result) - ); +); echo $result; ?> diff --git a/tbl_structure.php b/tbl_structure.php index a56def33b1..0cf3dbe544 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -614,7 +614,7 @@ if ($tbl_is_view) { ) ), PMA_getIcon('b_edit.png', __('Edit view'), true) - ); + ); } ?> diff --git a/test/PMA_showHint_test.php b/test/PMA_showHint_test.php index ee45d41d60..e99114cb48 100644 --- a/test/PMA_showHint_test.php +++ b/test/PMA_showHint_test.php @@ -167,11 +167,11 @@ class PMA_showHint_test extends PHPUnit_Framework_TestCase $oMock->setNumber($nr); $this->assertEquals( - sprintf( - '<sup class="footnotemarker" id="footnote_sup_%d_%d">%d</sup>', - $nr, $instance, $nr - ), - PMA_showHint($oMock, false) + sprintf( + '<sup class="footnotemarker" id="footnote_sup_%d_%d">%d</sup>', + $nr, $instance, $nr + ), + PMA_showHint($oMock, false) ); $key = $oMock->getHash(); diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index 38a2f68e22..c35480432f 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -200,7 +200,7 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase { // Remove the following lines when you implement this test. $this->markTestIncomplete( - 'This test has not been implemented yet.' + 'This test has not been implemented yet.' ); } } diff --git a/test/libraries/PMA_STR_sub_test.php b/test/libraries/PMA_STR_sub_test.php index 1febef995a..48f9b26ac1 100644 --- a/test/libraries/PMA_STR_sub_test.php +++ b/test/libraries/PMA_STR_sub_test.php @@ -7,8 +7,11 @@ */ $match = array(); -preg_match('@^([0-9]{1,2})(?:.([0-9]{1,2})(?:.([0-9]{1,2}))?)?@', - phpversion(), $match); +preg_match( + '@^([0-9]{1,2})(?:.([0-9]{1,2})(?:.([0-9]{1,2}))?)?@', + phpversion(), + $match +); if (isset($match) && ! empty($match[1])) { if (! isset($match[2])) { $match[2] = 0; @@ -19,8 +22,10 @@ if (isset($match) && ! empty($match[1])) { /** * @ignore */ - define('PMA_PHP_INT_VERSION', - (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3])); + define( + 'PMA_PHP_INT_VERSION', + (int)sprintf('%d%02d%02d', $match[1], $match[2], $match[3]) + ); } else { /** * @ignore @@ -34,8 +39,10 @@ class PMA_STR_sub_test extends PHPUnit_Framework_TestCase { public function testMultiByte() { - $this->assertEquals('čšě', - PMA_substr('čšěčščěš', 0, 3)); + $this->assertEquals( + 'čšě', + PMA_substr('čšěčščěš', 0, 3) + ); } } ?> diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php index 96982cd40d..576e5f0b89 100644 --- a/test/libraries/common/PMA_getIcon_test.php +++ b/test/libraries/common/PMA_getIcon_test.php @@ -27,7 +27,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase $this->assertEquals( '<span class="nowrap"></span>', PMA_getIcon('b_comment.png') - ); + ); } function testGetIconWithPropertiesIconic() @@ -37,7 +37,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase $this->assertEquals( '<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" /></span>', PMA_getIcon('b_comment.png') - ); + ); } function testGetIconAlternate() @@ -49,7 +49,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" /></span>', PMA_getIcon('b_comment.png', $alternate_text) - ); + ); } function testGetIconWithForceText() @@ -61,7 +61,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" /> ' . $alternate_text . '</span>', PMA_getIcon('b_comment.png', $alternate_text, true) - ); + ); } } diff --git a/test/theme.php b/test/theme.php index d0d7f8986e..051b1ed03d 100644 --- a/test/theme.php +++ b/test/theme.php @@ -57,7 +57,7 @@ printf( 'Server', __('Server'), 'ic_s_host' - ); +); echo $separator; printf( @@ -67,7 +67,7 @@ printf( 'Database', __('Database'), 'ic_s_db' - ); +); echo $separator; printf( @@ -81,7 +81,7 @@ printf( (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'ic_b_views' : 'ic_s_tbl') - ); +); echo '<span class="table_comment" id="span_table_comment">' .'"Table comment"</span>' . "\n"; |