[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13248-g64c30e5
The branch, master has been updated via 64c30e51e7c2ac2dc2041510a1c65d923c3d08e1 (commit) from f09d12cb4c343866c7f955f06c75d4cb4eb05307 (commit)
- Log ----------------------------------------------------------------- commit 64c30e51e7c2ac2dc2041510a1c65d923c3d08e1 Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 15:12:08 2011 +0200
Coding style, class definitions
-----------------------------------------------------------------------
Summary of changes: libraries/Theme.class.php | 3 ++- libraries/advisor.lib.php | 3 ++- libraries/sysinfo.lib.php | 6 ++++-- .../libraries/common/PMA_browseUploadFile_test.php | 5 +++-- .../common/PMA_buildActionTitles_test.php | 3 ++- .../PMA_contains_nonprintable_ascii_test.php | 5 +++-- .../common/PMA_convert_bit_default_value_test.php | 5 +++-- .../common/PMA_displayMaximumUploadSize_test.php | 5 +++-- .../PMA_extractValueFromFormattedSize_test.php | 3 ++- test/libraries/common/PMA_formatSql_test.php | 3 ++- .../common/PMA_generateHiddenMaxFileSize_test.php | 3 ++- test/libraries/common/PMA_getIcon_test.php | 3 ++- .../common/PMA_getTitleForTarget_test.php | 7 ++++--- test/libraries/core/PMA_checkPageValidity_test.php | 5 +++-- test/libraries/core/PMA_securePath_test.php | 5 +++-- .../core/PMA_warnMissingExtension_test.php | 3 ++- 16 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 7b01fa8..0347ac8 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -16,7 +16,8 @@ * * @package phpMyAdmin */ -class PMA_Theme { +class PMA_Theme +{ /** * @var string theme version * @access protected diff --git a/libraries/advisor.lib.php b/libraries/advisor.lib.php index 1f00a13..f453097 100644 --- a/libraries/advisor.lib.php +++ b/libraries/advisor.lib.php @@ -1,6 +1,7 @@ <?php
-class Advisor { +class Advisor +{ var $variables; var $parseResult; var $runResult; diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index c687250..bc0192f 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -23,7 +23,8 @@ function getSysInfo() }
-class WINNT { +class WINNT +{ private $_wmi;
public $os = 'WINNT'; @@ -100,7 +101,8 @@ class WINNT { } }
-class Linux { +class Linux +{ public $os = 'Linux';
function loadavg() { diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php index 45b8407..a51a62c 100644 --- a/test/libraries/common/PMA_browseUploadFile_test.php +++ b/test/libraries/common/PMA_browseUploadFile_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_browseUploadFile_test extends PHPUnit_Extensions_OutputTestCase{ +class PMA_browseUploadFile_test extends PHPUnit_Extensions_OutputTestCase +{
/* * Data provider for test @@ -45,4 +46,4 @@ class PMA_browseUploadFile_test extends PHPUnit_Extensions_OutputTestCase{
PMA_browseUploadFile($size); } -} \ No newline at end of file +} diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php index f6579da..97c2be9 100644 --- a/test/libraries/common/PMA_buildActionTitles_test.php +++ b/test/libraries/common/PMA_buildActionTitles_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{ +class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase +{
function setup() { diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php index 8f4059e..a5c04c1 100644 --- a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php +++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase{ +class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase +{
function dataProvider(){ return array( @@ -34,4 +35,4 @@ class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase{
}
-// PMA_contains_nonprintable_ascii \ No newline at end of file +// PMA_contains_nonprintable_ascii diff --git a/test/libraries/common/PMA_convert_bit_default_value_test.php b/test/libraries/common/PMA_convert_bit_default_value_test.php index d54ab2d..333ffac 100644 --- a/test/libraries/common/PMA_convert_bit_default_value_test.php +++ b/test/libraries/common/PMA_convert_bit_default_value_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_convert_bit_default_value_test extends PHPUnit_Framework_TestCase{ +class PMA_convert_bit_default_value_test extends PHPUnit_Framework_TestCase +{
function dataProvider(){ return array( @@ -28,6 +29,6 @@ class PMA_convert_bit_default_value_test extends PHPUnit_Framework_TestCase{ */ function testConvert_bit_default_value_test($bit, $val){ $this->assertEquals($val, PMA_convert_bit_default_value($bit)); - + } } diff --git a/test/libraries/common/PMA_displayMaximumUploadSize_test.php b/test/libraries/common/PMA_displayMaximumUploadSize_test.php index ad93ddb..57af208 100644 --- a/test/libraries/common/PMA_displayMaximumUploadSize_test.php +++ b/test/libraries/common/PMA_displayMaximumUploadSize_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase{ +class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase +{
/* * Data provider for test @@ -38,4 +39,4 @@ class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase{ $this->assertEquals("(" . __('Max: '). $res . $unit .")", PMA_displayMaximumUploadSize($size));
} -} \ No newline at end of file +} diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php index 038a36e..c1e4f20 100644 --- a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php +++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_extractValueFromFormattedSize_test extends PHPUnit_Framework_TestCase{ +class PMA_extractValueFromFormattedSize_test extends PHPUnit_Framework_TestCase +{
function testExtractValueFromFormattedSizeNoFormat(){
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php index df0ddc4..a3683f8 100644 --- a/test/libraries/common/PMA_formatSql_test.php +++ b/test/libraries/common/PMA_formatSql_test.php @@ -14,7 +14,8 @@ require_once 'libraries/common.lib.php'; require_once 'libraries/sqlparser.lib.php';
-class PMA_formatSql_test extends PHPUnit_Framework_TestCase{ +class PMA_formatSql_test extends PHPUnit_Framework_TestCase +{
/** * temporary variable for globals array diff --git a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php index 3cd6810..b759f53 100644 --- a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php +++ b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_generateHiddenMaxFileSize_test extends PHPUnit_Framework_TestCase{ +class PMA_generateHiddenMaxFileSize_test extends PHPUnit_Framework_TestCase +{
/* * Data provider for test diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php index 7567207..883a7b5 100644 --- a/test/libraries/common/PMA_getIcon_test.php +++ b/test/libraries/common/PMA_getIcon_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ +class PMA_getIcon_test extends PHPUnit_Framework_TestCase +{
function testGetIconWithoutPropertiesIconic(){
diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php index 1756681..3b4d4d1 100644 --- a/test/libraries/common/PMA_getTitleForTarget_test.php +++ b/test/libraries/common/PMA_getTitleForTarget_test.php @@ -13,7 +13,8 @@ */ require_once 'libraries/common.lib.php';
-class PMA_getTitleForTarget_test extends PHPUnit_Framework_TestCase{ +class PMA_getTitleForTarget_test extends PHPUnit_Framework_TestCase +{
function dataProvider(){ return array( @@ -39,5 +40,5 @@ class PMA_getTitleForTarget_test extends PHPUnit_Framework_TestCase{ }
} - -//PMA_getTitleForTarget \ No newline at end of file + +//PMA_getTitleForTarget diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php index ebc174d..dae64a2 100644 --- a/test/libraries/core/PMA_checkPageValidity_test.php +++ b/test/libraries/core/PMA_checkPageValidity_test.php @@ -11,7 +11,8 @@ */ require_once 'libraries/core.lib.php';
-class PMA_checkPageValidity_test extends PHPUnit_Framework_TestCase{ +class PMA_checkPageValidity_test extends PHPUnit_Framework_TestCase +{ protected $goto_whitelist = array( 'db_create.php', 'db_datadict.php', @@ -63,4 +64,4 @@ class PMA_checkPageValidity_test extends PHPUnit_Framework_TestCase{ $this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist)); }
-} \ No newline at end of file +} diff --git a/test/libraries/core/PMA_securePath_test.php b/test/libraries/core/PMA_securePath_test.php index 6663264..3b8575c 100644 --- a/test/libraries/core/PMA_securePath_test.php +++ b/test/libraries/core/PMA_securePath_test.php @@ -9,11 +9,12 @@
require_once 'libraries/core.lib.php';
-class PMA_securePath extends PHPUnit_Framework_TestCase{ +class PMA_securePath extends PHPUnit_Framework_TestCase +{ public function testReplaceDots(){ $this->assertEquals(PMA_securePath('../../../etc/passwd'), './././etc/passwd'); $this->assertEquals(PMA_securePath('/var/www/../phpmyadmin'), '/var/www/./phpmyadmin'); $this->assertEquals(PMA_securePath('./path/with..dots/../../file..php'), './path/with.dots/././file.php'); }
-} \ No newline at end of file +} diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php index 4c31db1..a0f1525 100644 --- a/test/libraries/core/PMA_warnMissingExtension_test.php +++ b/test/libraries/core/PMA_warnMissingExtension_test.php @@ -12,7 +12,8 @@ */ require_once 'libraries/core.lib.php';
-class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase{ +class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase +{
function testMissingExtention(){ $ext = 'php_ext';
hooks/post-receive
-
Michal Čihař