#13 new placeholders are overwritten with older versions if the key has been used

Author: malteriesch

lib/TestDbAcle/Commands/SetupTablesCommand.php

@@ -57,7 +57,11 @@ public function execute()
     public function initialise(\TestDbAcle\ServiceLocator $serviceLocator)
     {
         $this->parser       = $serviceLocator->get('parser');
-        $this->filterQueue  = $serviceLocator->createNew('dataInserterFilterQueue');
+
+        /**
+         * We need to use a new copy of the filter, otherwise old placeholders will override new ones.
+         */
+        $this->filterQueue  = clone $serviceLocator->createNew('dataInserterFilterQueue');
         $this->dataInserter = $serviceLocator->get('dataInserter');
         $this->tableList    = $serviceLocator->get('tableList');
         $this->tableFactory = $serviceLocator->get('tableFactory');

lib/TestDbAcle/PhpUnit/AbstractTestCase.php

@@ -65,7 +65,6 @@ protected function setAutoIncrement($table, $nextIncrement)
     protected function setupTables($psvContent, $replace = array())
     {
         $this->getDatabaseTestHelper()->runCommand(new \TestDbAcle\Commands\SetupTablesCommand($psvContent, $replace));
-       // $this->getDatabaseTestHelper()->setupTablesWithPlaceholders($psvContent, $replace);
     }
 
     /**

tests/Functional/tests/Php5_3/SmokeTest.php

@@ -214,7 +214,63 @@ function test_SetupAndAssertWithPlaceholders()
 
 
     }
-    
+
+    /**
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::execute()
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::FilterTableStateByPsvCommand() with placeholders
+     * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::SetAutoIncrementCommand()
+     * @covers \TestDbAcle::getDefaultFactories()
+     */
+
+    function test_SetupAndAssertWithPlaceholders_PlaceholdersAreNotReused()
+    {
+
+        $this->setupTables("
+            [address]
+            address_id  |company   
+            1           |me        
+            3           |you       
+
+            [user]
+            user_id |name
+            1       |mary
+
+        ",array('you'=>'Johnny'));
+
+        $this->setupTables("
+            [address]
+            address_id  |company   
+            1           |me        
+            3           |you       
+
+            [user]
+            user_id |name
+            1       |mary
+
+        ",array('you'=>'John'));
+
+        $exampleService = new ExampleService($this->getPdo());
+
+        $this->setAutoIncrement('address', 1000);
+
+        $exampleService->addEntry("them");
+
+
+        $this->assertTableStateContains("
+            [address]
+            address_id  |company   
+            1           |me        
+            3           |John      
+            1000        |them      
+
+            [user]
+            user_id |name
+            1       |mary
+            ");
+
+
+    }
+
     /**
      * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::execute()
      * @covers \TestDbAcle\Commands\FilterTableStateByPsvCommand::FilterTableStateByPsvCommand() with placeholders