Deprecated: Assigning the return value of new by reference is deprecated in /home/bluestat/public_html/source/index.php on line 477
From cd8880927988e28f46be731f1c1e32fb601dfd44 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 1 May 2009 17:05:23 -0400 Subject: [PATCH] BSFunctions::swap_css_classes() now returns the value rather than storing it in a static member variable * Functions.php: (BSFunctions::swap_css_classes) * UnitTest/FunctionsTest.php: (FunctionsTest::testSwapCssClasses) --- CHANGES | 1 + Functions.php | 10 +--------- UnitTest/FunctionsTest.php | 14 ++++++-------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/CHANGES b/CHANGES index 41e1161..82f880e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ 3.3.0 =================== - Change: BSFunctions::cookie() does not use static member values, but only parameters +- Change: BSFunctions::swap_css_classes() does not use static member values, now returns the value 3.2.3 =================== diff --git a/Functions.php b/Functions.php index 6b9fdbb..fcd14f9 100644 --- a/Functions.php +++ b/Functions.php @@ -39,12 +39,6 @@ class BSFunctions { /** - * Current swapped CSS class - * @var string - */ - public static $cssClass = ''; - - /** * Make class static */ private function __construct() @@ -95,9 +89,7 @@ class BSFunctions public static function swap_css_classes($class1 = 'alt1', $class2 = 'alt2') { static $count; - - self::$cssClass = ($count % 2) ? $class1 : $class2; - $count++; + return ($count++ % 2) ? $class1 : $class2; } /** diff --git a/UnitTest/FunctionsTest.php b/UnitTest/FunctionsTest.php index 5a96c4b..c5ad41e 100644 --- a/UnitTest/FunctionsTest.php +++ b/UnitTest/FunctionsTest.php @@ -19,16 +19,14 @@ class FunctionsTest extends PHPUnit_Framework_TestCase public function testSwapCssClasses() { - $this->assertEquals('', BSFunctions::$cssClass); + $result = BSFunctions::swap_css_classes('1', '2'); + $this->assertEquals('2', $result); - BSFunctions::swap_css_classes('1', '2'); - $this->assertEquals('2', BSFunctions::$cssClass); + $result = BSFunctions::swap_css_classes('1', '2'); + $this->assertEquals('1', $result); - BSFunctions::swap_css_classes('1', '2'); - $this->assertEquals('1', BSFunctions::$cssClass); - - BSFunctions::swap_css_classes('1', '2'); - $this->assertEquals('2', BSFunctions::$cssClass); + $result = BSFunctions::swap_css_classes('1', '2'); + $this->assertEquals('2', $result); } public function testFetchSourcePath() -- 1.7.11.3