BSFunctions::swap_css_classes() now returns the value rather than storing it in a...

* Functions.php:
(BSFunctions::swap_css_classes)
* UnitTest/FunctionsTest.php:
(FunctionsTest::testSwapCssClasses)

diff --git a/CHANGES b/CHANGES
index 41e11614e0a9c2e37991dce16cf1333a865d4722..82f880e1c7efccd5ac55441aac8aaf96fe302b5c 100644 (file)
--- 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 6b9fdbb19d9e254914ecd1559e9b56c5a25e2cd2..fcd14f9ac8360e60ce7bfd3e01087e9878ccadbd 100644 (file)
--- a/Functions.php
+++ b/Functions.php
@@ -38,12 +38,6 @@
  */
 class BSFunctions
 {
-       /**
-        * Current swapped CSS class
-        * @var string
-        */
-       public static $cssClass = '';
-       
        /**
         * Make class static
         */
@@ -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 5a96c4ba738eb9c8bda3bd2b9f2afc1e1266a66e..c5ad41ef74709624fa136afe680306efe914408d 100644 (file)
--- 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()