Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 8ef9700b7888 · 2017-07-29T23:28:14.000+02:00
* 3.3:
  fixed CS
  Remove unused constant
  fix merge
  [Form] Add notice to upgrade to PHP v7.0.8+
  Fix passing options with defaultCommand
diff --git a/Extension/DataCollector/FormDataCollector.php b/Extension/DataCollector/FormDataCollector.php
@@ -85,6 +85,9 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
+        if (70000 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70800) {
+            @trigger_error('A bug in PHP 7.0.0 to 7.0.7 is breaking the Form panel, please upgrade to 7.0.8 or higher.', E_USER_DEPRECATED);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ public function __construct(FormDataExtractorInterface $dataExtractor)`
`85`	`85`	`*/`
`86`	`86`	`public function collect(Request $request, Response $response, \Exception $exception = null)`
`87`	`87`	`{`
	`88`	`+ if (70000 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70800) {`
	`89`	`+ @trigger_error('A bug in PHP 7.0.0 to 7.0.7 is breaking the Form panel, please upgrade to 7.0.8 or higher.', E_USER_DEPRECATED);`
	`90`	`+ }`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`/**`