Move/rename configuration option.

src/Http/ServerRequestFactory.php

@@ -54,7 +54,7 @@ abstract class ServerRequestFactory extends BaseFactory
             'webroot' => $uri->webroot,
             'base' => $uri->base,
             'session' => $session,
-            'mergeFilesAsObjects' => Configure::read('ServerRequest.mergeFilesAsObjects'),
+            'mergeFilesAsObjects' => Configure::read('App.uploadedFilesAsObjects'),
         ]);
 
         return $request;

tests/TestCase/Http/ServerRequestFactoryTest.php

@@ -289,7 +289,7 @@ class ServerRequestFactoryTest extends TestCase
      */
     public function testFromGlobalsWithFilesAsObjectsDefault()
     {
-        $this->assertNull(Configure::read('ServerRequest.mergeFilesAsObjects'));
+        $this->assertNull(Configure::read('App.uploadedFilesAsObjects'));
 
         $files = [
             'file' => [
@@ -321,7 +321,7 @@ class ServerRequestFactoryTest extends TestCase
      */
     public function testFromGlobalsWithFilesAsObjectsDisabled()
     {
-        Configure::write('ServerRequest.mergeFilesAsObjects', false);
+        Configure::write('App.uploadedFilesAsObjects', false);
 
         $files = [
             'file' => [
@@ -353,7 +353,7 @@ class ServerRequestFactoryTest extends TestCase
      */
     public function testFromGlobalsWithFilesAsObjectsEnabled()
     {
-        Configure::write('ServerRequest.mergeFilesAsObjects', true);
+        Configure::write('App.uploadedFilesAsObjects', true);
 
         $files = [
             'file' => [