[ZF-7544] Zend_Filter_Inflector:

- fixed addFilterRule when first single static rule was set

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17697 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Filter/Inflector.php

@@ -374,12 +374,21 @@ class Zend_Filter_Inflector implements Zend_Filter_Interface
         if (!isset($this->_rules[$spec])) {
             $this->_rules[$spec] = array();
         }
+
         if (!is_array($ruleSet)) {
             $ruleSet = array($ruleSet);
         }
+
+        if (is_string($this->_rules)) {
+            $temp = $this->_rules[$spec];
+            $this->_rules[$spec] = array();
+            $this->_rules[$spec][] = $temp;
+        }
+
         foreach ($ruleSet as $rule) {
             $this->_rules[$spec][] = $this->_getRule($rule);
         }
+
         return $this;
     }
 

tests/Zend/Filter/InflectorTest.php

@@ -429,15 +429,15 @@ class Zend_Filter_InflectorTest extends PHPUnit_Framework_TestCase
         $inflector->setConfig($config);
         $this->_testOptions($inflector);
     }
-    
+
     /**
      * Added str_replace('\\', '\\\\', ..) to all processedParts values to disable backreferences
-     * 
+     *
      * @issue ZF-2538 Zend_Filter_Inflector::filter() fails with all numeric folder on Windows
      */
     public function testCheckInflectorWithPregBackreferenceLikeParts()
     {
-        
+
         $this->inflector = new Zend_Filter_Inflector(
             ':moduleDir' . DIRECTORY_SEPARATOR . ':controller' . DIRECTORY_SEPARATOR . ':action.:suffix',
             array(
@@ -450,10 +450,10 @@ class Zend_Filter_InflectorTest extends PHPUnit_Framework_TestCase
             );
 
         $this->inflector->setStaticRule('moduleDir', 'C:\htdocs\public\cache\00\01\42\app\modules');
-        
+
         try {
             $filtered = $this->inflector->filter(array(
-                'controller' => 'FooBar', 
+                'controller' => 'FooBar',
                 'action' => 'MooToo'
                 ));
             $this->assertEquals($filtered, 'C:\htdocs\public\cache\00\01\42\app\modules' . DIRECTORY_SEPARATOR . 'foo-bar' . DIRECTORY_SEPARATOR . 'Moo-Too.phtml');
@@ -461,7 +461,7 @@ class Zend_Filter_InflectorTest extends PHPUnit_Framework_TestCase
             $this->fail($e->getMessage());
         }
     }
-    
+
     /**
      * @issue ZF-2522
      */
@@ -473,7 +473,7 @@ class Zend_Filter_InflectorTest extends PHPUnit_Framework_TestCase
         $inflector = new Zend_Filter_Inflector('something', array(), false, '#');
         $this->assertEquals($inflector->getTargetReplacementIdentifier(), '#');
     }
-    
+
     /**
      * @issue ZF-2964
      */
@@ -483,7 +483,27 @@ class Zend_Filter_InflectorTest extends PHPUnit_Framework_TestCase
         $inflector->addRules(array(':foo' => array()));
         $this->assertEquals($inflector->filter(array('fo' => 'bar')), 'abc');
     }
-    
+
+    /**
+     * @issue ZF-7544
+     */
+    public function testAddFilterRuleMultipleTimes()
+    {
+        $rules = $this->inflector->getRules();
+        $this->assertEquals(0, count($rules));
+        $this->inflector->setFilterRule('controller', 'PregReplace');
+        $rules = $this->inflector->getRules('controller');
+        $this->assertEquals(1, count($rules));
+        $this->inflector->addFilterRule('controller', array('Alpha', 'StringToLower'));
+        $rules = $this->inflector->getRules('controller');
+        $this->assertEquals(3, count($rules));
+        $this->_context = 'StringToLower';
+        $this->inflector->setStaticRuleReference('context' , $this->_context);
+        $this->inflector->addFilterRule('controller', array('Alpha', 'StringToLower'));
+        $rules = $this->inflector->getRules('controller');
+        $this->assertEquals(5, count($rules));
+    }
+
 }
 
 // Call Zend_Filter_InflectorTest::main() if this source file is executed directly.