Merge pull request #43 from php-translation/merge

Nyholm · web-flow · commit c4b6eec734fd · 2017-08-12T18:35:40.000+02:00
Fixed merge issue
diff --git a/tests/Functional/Visitor/Php/Symfony/FormTypePlaceholderTest.php b/tests/Functional/Visitor/Php/Symfony/FormTypePlaceholderTest.php
@@ -51,11 +51,13 @@ public function testChildVisitationNotBlocked()
             Resources\Php\Symfony\ContainerAwareTrans::class
         );
 
-        $this->assertCount(4, $collection);
+        $this->assertCount(6, $collection);
 
         $this->assertEquals('trans0', $collection->get(0)->getMessage());
         $this->assertEquals('trans1', $collection->get(1)->getMessage());
         $this->assertEquals('trans_line', $collection->get(2)->getMessage());
         $this->assertEquals('variable', $collection->get(3)->getMessage());
+        $this->assertEquals('my.pdf', $collection->get(4)->getMessage());
+        $this->assertEquals('bar', $collection->get(5)->getMessage());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,13 @@ public function testChildVisitationNotBlocked()`
`51`	`51`	`Resources\Php\Symfony\ContainerAwareTrans::class`
`52`	`52`	`);`
`53`	`53`
`54`		`- $this->assertCount(4, $collection);`
	`54`	`+ $this->assertCount(6, $collection);`
`55`	`55`
`56`	`56`	`$this->assertEquals('trans0', $collection->get(0)->getMessage());`
`57`	`57`	`$this->assertEquals('trans1', $collection->get(1)->getMessage());`
`58`	`58`	`$this->assertEquals('trans_line', $collection->get(2)->getMessage());`
`59`	`59`	`$this->assertEquals('variable', $collection->get(3)->getMessage());`
	`60`	`+ $this->assertEquals('my.pdf', $collection->get(4)->getMessage());`
	`61`	`+ $this->assertEquals('bar', $collection->get(5)->getMessage());`
`60`	`62`	`}`
`61`	`63`	`}`