The branch, master has been updated
via 41b23ebf4ad737ac894c09f09aa7f9507c8c587f (commit)
via 08d83ae4d5a014afd786c7a7869de88eb3f85d04 (commit)
from ca92366d91e8f3336aee09285a806673ee3ae1a2 (commit)
- Log -----------------------------------------------------------------
commit 41b23ebf4ad737ac894c09f09aa7f9507c8c587f
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 16:50:12 2011 +0200
Wrap long lines
commit 08d83ae4d5a014afd786c7a7869de88eb3f85d04
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 16:47:11 2011 +0200
Coding style
-----------------------------------------------------------------------
Summary of changes:
test/libraries/common/PMA_getIcon_test.php | 36 +++++++++++++++--------
test/libraries/common/PMA_showPHPDocu_test.php | 7 +++-
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/test/libraries/common/PMA_getIcon_test.php
b/test/libraries/common/PMA_getIcon_test.php
index 1feba0c..ab21651 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -19,16 +19,20 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
$GLOBALS['cfg']['PropertiesIconic'] = false;
- $this->assertEquals('<span class="nowrap"></span>',
- PMA_getIcon('b_comment.png') );
+ $this->assertEquals(
+ '<span class="nowrap"></span>',
+ PMA_getIcon('b_comment.png')
+ );
}
function testGetIconWithPropertiesIconic(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
- $this->assertEquals('<span class="nowrap"><img src="themes/dot.gif"
title="" alt="" class="icon ic_b_comment" /></span>',
- PMA_getIcon('b_comment.png') );
+ $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(){
@@ -36,9 +40,11 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
$GLOBALS['cfg']['PropertiesIconic'] = true;
$alternate_text = 'alt_str';
- $this->assertEquals('<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) );
+ $this->assertEquals(
+ '<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 testGetIconWithContainer(){
@@ -46,9 +52,11 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
$GLOBALS['cfg']['PropertiesIconic'] = true;
$alternate_text = 'alt_str';
- $this->assertEquals('<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, true)
);
+ $this->assertEquals(
+ '<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, true)
+ );
}
@@ -57,9 +65,11 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
$GLOBALS['cfg']['PropertiesIconic'] = true;
$alternate_text = 'alt_str';
- $this->assertEquals('<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,
true) );
+ $this->assertEquals(
+ '<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, true)
+ );
}
}
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php
b/test/libraries/common/PMA_showPHPDocu_test.php
index a66601d..e2364d2 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -21,7 +21,9 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
$target = "docu";
$lang = _pgettext('PHP documentation language', 'en');
- $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target
. '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif"
alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+ $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target
+ . '" target="documentation"><img class="icon ic_b_help_s"
src="themes/dot.gif" alt="'
+ . __('Documentation') . '" title="' . __('Documentation') . '"
/></a>';
$this->assertEquals($expected, PMA_showPHPDocu($target));
}
@@ -32,7 +34,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
$target = "docu";
$lang = _pgettext('PHP documentation language', 'en');
- $expected = '[<a href="http://php.net/manual/' . $lang . '/' . $target
. '" target="documentation">' . __('Documentation') . '</a>]';
+ $expected = '[<a href="http://php.net/manual/' . $lang . '/' . $target
+ . '" target="documentation">' . __('Documentation') . '</a>]';
$this->assertEquals($expected, PMA_showPHPDocu($target));
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
