Merge branch '2.7' into 2.8

fabpot · fabpot · commit bf31f2229c4b · 2016-01-21T10:05:51.000+01:00
* 2.7:
  fixed CS
  fixed test
  fixed CS
  Remove default match from AbstractConfigCommand::findExtension
diff --git a/Tests/FinderTest.php b/Tests/FinderTest.php
@@ -527,8 +527,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
`@@ -527,8 +527,7 @@ public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartF`
`527`	`527`	`$finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')`
`528`	`528`	`->path('/^dir/');`
`529`	`529`
`530`		`- $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',`
`531`		`- 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);`
	`530`	`+ $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');`
`532`	`531`	`$this->assertIterator($this->toAbsoluteFixtures($expected), $finder);`
`533`	`532`	`}`
`534`	`533`