Merge branch '2.3' into 2.7

fabpot · fabpot · commit 29e6552c17c8 · 2016-01-21T07:59:09.000+01:00
* 2.3:
  fixed CS
diff --git a/Tests/FinderTest.php b/Tests/FinderTest.php
@@ -526,8 +526,7 @@ public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartF
         $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')
             ->path('/^dir/');
 
-        $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',
-            'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);
+        $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir', 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat');
         $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -526,8 +526,7 @@ public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartF`
`526`	`526`	`$finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')`
`527`	`527`	`->path('/^dir/');`
`528`	`528`
`529`		`- $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',`
`530`		`- 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);`
	`529`	`+ $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir', 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat');`
`531`	`530`	`$this->assertIterator($this->toAbsoluteFixtures($expected), $finder);`
`532`	`531`	`}`
`533`	`532`