Merge branch '2.8' into 3.0

fabpot · fabpot · commit 688fa0416e87 · 2016-01-21T10:38:31.000+01:00
* 2.8:
  fixed CS
  fixed CS
  fixed test
  fixed CS
  Remove default match from AbstractConfigCommand::findExtension
  [FrameworkBundle][Validator] Fix apc cache service deprecation
diff --git a/Tests/FinderTest.php b/Tests/FinderTest.php
@@ -521,8 +521,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
`@@ -521,8 +521,7 @@ public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartF`
`521`	`521`	`$finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')`
`522`	`522`	`->path('/^dir/');`
`523`	`523`
`524`		`- $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',`
`525`		`- 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);`
	`524`	`+ $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');`
`526`	`525`	`$this->assertIterator($this->toAbsoluteFixtures($expected), $finder);`
`527`	`526`	`}`
`528`	`527`