Merge remote-tracking branch 'origin/2.7' into 2.8

aitboudad · aitboudad · commit 9ecb7ee21ad2 · 2015-07-01T14:16:54.000Z
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
diff --git a/Tests/GlobTest.php b/Tests/GlobTest.php
@@ -15,11 +15,10 @@
 
 class GlobTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testGlobToRegexDelimiters()
     {
-        $this->assertEquals(Glob::toRegex('.*'), '#^\.[^/]*$#');
-        $this->assertEquals(Glob::toRegex('.*', true, true, ''), '^\.[^/]*$');
-        $this->assertEquals(Glob::toRegex('.*', true, true, '/'), '/^\.[^/]*$/');
+        $this->assertEquals('#^\.[^/]*$#', Glob::toRegex('.*'));
+        $this->assertEquals('^\.[^/]*$', Glob::toRegex('.*', true, true, ''));
+        $this->assertEquals('/^\.[^/]*$/', Glob::toRegex('.*', true, true, '/'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,10 @@`
`15`	`15`
`16`	`16`	`class GlobTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`		`-`
`19`	`18`	`public function testGlobToRegexDelimiters()`
`20`	`19`	`{`
`21`		`- $this->assertEquals(Glob::toRegex('.'), '#^\.[^/]$#');`
`22`		`- $this->assertEquals(Glob::toRegex('.', true, true, ''), '^\.[^/]$');`
`23`		`- $this->assertEquals(Glob::toRegex('.', true, true, '/'), '/^\.[^/]$/');`
	`20`	`+ $this->assertEquals('#^\.[^/]$#', Glob::toRegex('.'));`
	`21`	`+ $this->assertEquals('^\.[^/]$', Glob::toRegex('.', true, true, ''));`
	`22`	`+ $this->assertEquals('/^\.[^/]$/', Glob::toRegex('.', true, true, '/'));`
`24`	`23`	`}`
`25`	`24`	`}`