Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 60804d88691e · 2016-07-26T10:02:44.000+02:00
* 2.7:
  [Console] Application update PHPDoc of add and register methods
  [Config] Extra tests for Config component
  Fixed bugs in names of classes and methods.
  [DoctrineBridge] Fixed php doc
  [FrameworkBundle] Fixed parameters number mismatch declaration
  [BrowserKit] Added test for followRedirect method (POST method)
  Fix the money form type render with Bootstrap3
  [BrowserKit] Uppercase the "GET" method in redirects
  [WebProfilerBundle] Fixed  JSDoc parameter definition
  [HttpFoundation] HttpCache refresh stale responses containing an ETag

Conflicts:
	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
	src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php
diff --git a/Tests/Shell/CommandTest.php b/Tests/Shell/CommandTest.php
@@ -151,7 +151,7 @@ public function testExecute()
 
         $this->assertInternalType('array', $result);
         $this->assertNotEmpty($result);
-        $this->assertRegexp('/PHP|HipHop/', $result[0]);
+        $this->assertRegExp('/PHP|HipHop/', $result[0]);
     }
 
     public function testCastToString()

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function testExecute()`
`151`	`151`
`152`	`152`	`$this->assertInternalType('array', $result);`
`153`	`153`	`$this->assertNotEmpty($result);`
`154`		`- $this->assertRegexp('/PHP\|HipHop/', $result[0]);`
	`154`	`+ $this->assertRegExp('/PHP\|HipHop/', $result[0]);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`public function testCastToString()`