Merge pull request #399 from gotoeveryone/fix/celltest-request-response

Using \Cake\Http\ServerRequest|Response instead of \Cake\Network\*

Author: markstory

src/Shell/Task/BakeTemplateTask.php

@@ -19,8 +19,8 @@
 use Cake\Core\ConventionsTrait;
 use Cake\Event\Event;
 use Cake\Event\EventManager;
-use Cake\Network\Request;
-use Cake\Network\Response;
+use Cake\Http\Response;
+use Cake\Http\ServerRequest as Request;
 use Cake\View\Exception\MissingTemplateException;
 use Cake\View\ViewVarsTrait;
 

src/Shell/Task/TestTask.php

@@ -20,8 +20,8 @@
 use Cake\Core\Exception\Exception;
 use Cake\Core\Plugin;
 use Cake\Filesystem\Folder;
-use Cake\Network\Request;
-use Cake\Network\Response;
+use Cake\Http\Response;
+use Cake\Http\ServerRequest as Request;
 use Cake\ORM\Association;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
@@ -551,8 +551,8 @@ public function generateConstructor($type, $fullClassName)
             $construct .= "            ->getMock();";
         }
         if ($type === 'cell') {
-            $pre = "\$this->request = \$this->getMockBuilder('Cake\Network\Request')->getMock();\n";
-            $pre .= "        \$this->response = \$this->getMockBuilder('Cake\Network\Response')->getMock();";
+            $pre = "\$this->request = \$this->getMockBuilder('Cake\Http\ServerRequest')->getMock();\n";
+            $pre .= "        \$this->response = \$this->getMockBuilder('Cake\Http\Response')->getMock();";
             $construct = "new {$className}(\$this->request, \$this->response);";
         }
         if ($type === 'shell_helper') {
@@ -588,7 +588,7 @@ public function generateProperties($type, $subject, $fullClassName)
             case 'cell':
                 $properties[] = [
                     'description' => 'Request mock',
-                    'type' => '\Cake\Network\Request|\PHPUnit_Framework_MockObject_MockObject',
+                    'type' => '\Cake\Http\ServerRequest|\PHPUnit_Framework_MockObject_MockObject',
                     'name' => 'request'
                 ];
                 $properties[] = [

tests/TestCase/Shell/Task/TestTaskTest.php

@@ -21,8 +21,8 @@
 use Bake\Test\TestCase\TestCase;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
-use Cake\Network\Request;
-use Cake\Network\Response;
+use Cake\Http\Response;
+use Cake\Http\ServerRequest as Request;
 use Cake\ORM\TableRegistry;
 
 /**

tests/TestCase/View/BakeViewTest.php

@@ -18,8 +18,8 @@
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\Event;
-use Cake\Network\Request;
-use Cake\Network\Response;
+use Cake\Http\Response;
+use Cake\Http\ServerRequest as Request;
 use Cake\TestSuite\StringCompareTrait;
 use Cake\TestSuite\TestCase;
 

tests/TestCase/View/Helper/BakeHelperTest.php

@@ -16,7 +16,7 @@
 
 use Bake\View\BakeView;
 use Bake\View\Helper\BakeHelper;
-use Cake\Network\Request;
+use Cake\Http\ServerRequest as Request;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\Stub\Response;
 use Cake\TestSuite\TestCase;

tests/comparisons/Test/testBakeCellTest.php

@@ -13,7 +13,7 @@ class ArticlesCellTest extends TestCase
     /**
      * Request mock
      *
-     * @var \Cake\Network\Request|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Cake\Http\ServerRequest|\PHPUnit_Framework_MockObject_MockObject
      */
     public $request;
 
@@ -39,8 +39,8 @@ class ArticlesCellTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->request = $this->getMockBuilder('Cake\Network\Request')->getMock();
-        $this->response = $this->getMockBuilder('Cake\Network\Response')->getMock();
+        $this->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock();
+        $this->response = $this->getMockBuilder('Cake\Http\Response')->getMock();
         $this->Articles = new ArticlesCell($this->request, $this->response);
     }