Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 3b2e0cb029af · 2019-10-28T18:07:32.000+01:00
* 3.4:
  #30432 fix an error message
  fix paths to detect code owners
  [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4
  Remove unused local variables in tests
  Make sure to collect child forms created on *_SET_DATA events
  do not render errors for checkboxes twice
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -132,9 +132,6 @@ public function testFindProcessInOpenBasedir()
         $this->assertSamePath(PHP_BINARY, $result);
     }
 
-    /**
-     * @requires PHP 5.4
-     */
     public function testFindBatchExecutableOnWindows()
     {
         if (ini_get('open_basedir')) {

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,6 @@ public function testFindProcessInOpenBasedir()`
`132`	`132`	`$this->assertSamePath(PHP_BINARY, $result);`
`133`	`133`	`}`
`134`	`134`
`135`		`- /**`
`136`		`- * @requires PHP 5.4`
`137`		`- */`
`138`	`135`	`public function testFindBatchExecutableOnWindows()`
`139`	`136`	`{`
`140`	`137`	`if (ini_get('open_basedir')) {`