Fix more usage of deprecated methods.

cakephp · Apr 25, 2018 · 15e61cb · 15e61cb
1 parent f076f59
commit 15e61cb
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php
@@ -524,8 +524,8 @@ public function testNoViewClassExtension()
             return $this->Controller->response;
         });
         $this->Controller->render();
-        $this->assertEquals('RequestHandlerTest' . DS . 'csv', $this->Controller->viewBuilder()->templatePath());
-        $this->assertEquals('csv', $this->Controller->viewBuilder()->layoutPath());
+        $this->assertEquals('RequestHandlerTest' . DS . 'csv', $this->Controller->viewBuilder()->getTemplatePath());
+        $this->assertEquals('csv', $this->Controller->viewBuilder()->getLayoutPath());
     }
 
     /**
@@ -851,9 +851,9 @@ public function testRenderAs()
     {
         $this->RequestHandler->renderAs($this->Controller, 'rss');
 
-        $this->Controller->viewBuilder()->templatePath('request_handler_test\\rss');
+        $this->Controller->viewBuilder()->setTemplatePath('request_handler_test\\rss');
         $this->RequestHandler->renderAs($this->Controller, 'js');
-        $this->assertEquals('request_handler_test' . DS . 'js', $this->Controller->viewBuilder()->templatePath());
+        $this->assertEquals('request_handler_test' . DS . 'js', $this->Controller->viewBuilder()->getTemplatePath());
     }
 
     /**
@@ -916,12 +916,12 @@ public function testRenderAsCalledTwice()
         $this->Controller->render();
 
         $this->RequestHandler->renderAs($this->Controller, 'print');
-        $this->assertEquals('RequestHandlerTest' . DS . 'print', $this->Controller->viewBuilder()->templatePath());
-        $this->assertEquals('print', $this->Controller->viewBuilder()->layoutPath());
+        $this->assertEquals('RequestHandlerTest' . DS . 'print', $this->Controller->viewBuilder()->getTemplatePath());
+        $this->assertEquals('print', $this->Controller->viewBuilder()->getLayoutPath());
 
         $this->RequestHandler->renderAs($this->Controller, 'js');
-        $this->assertEquals('RequestHandlerTest' . DS . 'js', $this->Controller->viewBuilder()->templatePath());
-        $this->assertEquals('js', $this->Controller->viewBuilder()->layoutPath());
+        $this->assertEquals('RequestHandlerTest' . DS . 'js', $this->Controller->viewBuilder()->getTemplatePath());
+        $this->assertEquals('js', $this->Controller->viewBuilder()->getLayoutPath());
     }
 
     /**

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -393,12 +393,12 @@ public function testRender()
         ]);
 
         $Controller = new Controller($request, new Response());
-        $Controller->viewBuilder()->templatePath('Posts');
+        $Controller->viewBuilder()->setTemplatePath('Posts');
 
         $result = $Controller->render('index');
         $this->assertRegExp('/posts index/', (string)$result);
 
-        $Controller->viewBuilder()->template('index');
+        $Controller->viewBuilder()->setTemplate('index');
         $result = $Controller->render();
         $this->assertRegExp('/posts index/', (string)$result);
 
@@ -421,7 +421,7 @@ public function testRenderViewChangesResponse()
         ]);
 
         $controller = new Controller($request, new Response());
-        $controller->viewBuilder()->templatePath('Posts');
+        $controller->viewBuilder()->setTemplatePath('Posts');
 
         $result = $controller->render('header');
         $this->assertContains('header template', (string)$result);
@@ -950,7 +950,7 @@ public function testViewPathConventions()
             return $e->getSubject()->response;
         });
         $Controller->render();
-        $this->assertEquals('Admin' . DS . 'Posts', $Controller->viewBuilder()->templatePath());
+        $this->assertEquals('Admin' . DS . 'Posts', $Controller->viewBuilder()->getTemplatePath());
 
         $request = $request->withParam('prefix', 'admin/super');
         $response = $this->getMockBuilder('Cake\Http\Response')->getMock();
@@ -959,7 +959,7 @@ public function testViewPathConventions()
             return $e->getSubject()->response;
         });
         $Controller->render();
-        $this->assertEquals('Admin' . DS . 'Super' . DS . 'Posts', $Controller->viewBuilder()->templatePath());
+        $this->assertEquals('Admin' . DS . 'Super' . DS . 'Posts', $Controller->viewBuilder()->getTemplatePath());
 
         $request = new ServerRequest([
             'url' => 'pages/home',
@@ -972,7 +972,7 @@ public function testViewPathConventions()
             return $e->getSubject()->response;
         });
         $Controller->render();
-        $this->assertEquals('Pages', $Controller->viewBuilder()->templatePath());
+        $this->assertEquals('Pages', $Controller->viewBuilder()->getTemplatePath());
     }
 
     /**

diff --git a/tests/TestCase/Error/ExceptionRendererTest.php b/tests/TestCase/Error/ExceptionRendererTest.php
@@ -763,8 +763,8 @@ function (Event $event) {
         $this->assertEquals('text/html', $response->getType());
         $this->assertContains('Not Found', (string)$response->getBody());
         $this->assertTrue($this->called, 'Listener added was not triggered.');
-        $this->assertEquals('', $ExceptionRenderer->controller->viewBuilder()->layoutPath());
-        $this->assertEquals('Error', $ExceptionRenderer->controller->viewBuilder()->templatePath());
+        $this->assertEquals('', $ExceptionRenderer->controller->viewBuilder()->getLayoutPath());
+        $this->assertEquals('Error', $ExceptionRenderer->controller->viewBuilder()->getTemplatePath());
     }
 
     /**

diff --git a/tests/TestCase/Mailer/EmailTest.php b/tests/TestCase/Mailer/EmailTest.php
@@ -2880,7 +2880,7 @@ public function testJsonSerialize()
 
         $this->Email->viewBuilder()
             ->setTemplate('default')
-            ->layout('test');
+            ->setLayout('test');
 
         $result = json_decode(json_encode($this->Email), true);
         $this->assertContains('test', $result['viewVars']['exception']);

diff --git a/tests/TestCase/Mailer/MailerTest.php b/tests/TestCase/Mailer/MailerTest.php
@@ -195,7 +195,7 @@ public function testDefaultProfileRestoration()
             ->with('foo', 'bar');
 
         $mailer->send('test', ['foo', 'bar']);
-        $this->assertEquals('cakephp', $mailer->viewBuilder()->template());
+        $this->assertEquals('cakephp', $mailer->viewBuilder()->getTemplate());
     }
 
     /**

diff --git a/tests/TestCase/Mailer/Transport/SmtpTransportTest.php b/tests/TestCase/Mailer/Transport/SmtpTransportTest.php
@@ -364,7 +364,7 @@ public function testRcptWithReturnPath()
         $email = new Email();
         $email->setFrom('noreply@cakephp.org', 'CakePHP Test');
         $email->setTo('cake@cakephp.org', 'CakePHP');
-        $email->returnPath('pleasereply@cakephp.org', 'CakePHP Return');
+        $email->setReturnPath('pleasereply@cakephp.org', 'CakePHP Return');
 
         $this->socket->expects($this->at(0))->method('write')->with("MAIL FROM:<pleasereply@cakephp.org>\r\n");
         $this->socket->expects($this->at(1))->method('read')->will($this->returnValue("250 OK\r\n"));

diff --git a/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php b/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php
@@ -23,10 +23,10 @@ protected function _getController()
         $response = new Response();
         try {
             $controller = new TestAppsErrorController($request, $response);
-            $controller->viewBuilder()->layout('banana');
+            $controller->viewBuilder()->setLayout('banana');
         } catch (\Exception $e) {
             $controller = new Controller($request, $response);
-            $controller->viewBuilder()->templatePath('Error');
+            $controller->viewBuilder()->setTemplatePath('Error');
         }
 
         return $controller;

diff --git a/tests/test_app/TestApp/Mailer/TestMailer.php b/tests/test_app/TestApp/Mailer/TestMailer.php
@@ -29,7 +29,7 @@ public function getEmailForAssertion()
 
     public function reset()
     {
-        $this->template = $this->viewBuilder()->template();
+        $this->template = $this->viewBuilder()->getTemplate();
 
         return parent::reset();
     }