@@ -252,7 +252,7 @@ public function __construct(ServerRequest $request = null, Response $response =
252
252
}
253
253
254
254
$ this ->setRequest ($ request ?: new ServerRequest ());
255
- $ this ->setResponse ( $ response ?: new Response () );
255
+ $ this ->response = $ response ?: new Response ();
256
256
257
257
if ($ eventManager !== null ) {
258
258
$ this ->setEventManager ($ eventManager );
@@ -734,7 +734,7 @@ public function redirect($url, $status = 302)
734
734
*/
735
735
public function setAction ($ action , ...$ args )
736
736
{
737
- $ this ->setRequest ($ this ->getRequest () ->withParam ('action ' , $ action ));
737
+ $ this ->setRequest ($ this ->request ->withParam ('action ' , $ action ));
738
738
739
739
return $ this ->$ action (...$ args );
740
740
}
@@ -754,7 +754,7 @@ public function render($view = null, $layout = null)
754
754
$ builder ->setTemplatePath ($ this ->_viewPath ());
755
755
}
756
756
757
- if ($ this ->getRequest () ->getParam ('bare ' )) {
757
+ if ($ this ->request ->getParam ('bare ' )) {
758
758
$ builder ->enableAutoLayout (false );
759
759
}
760
760
$ this ->autoRender = false ;
@@ -764,18 +764,18 @@ public function render($view = null, $layout = null)
764
764
return $ event ->getResult ();
765
765
}
766
766
if ($ event ->isStopped ()) {
767
- return $ this ->getResponse () ;
767
+ return $ this ->response ;
768
768
}
769
769
770
- if ($ builder ->getTemplate () === null && $ this ->getRequest () ->getParam ('action ' )) {
771
- $ builder ->setTemplate ($ this ->getRequest () ->getParam ('action ' ));
770
+ if ($ builder ->getTemplate () === null && $ this ->request ->getParam ('action ' )) {
771
+ $ builder ->setTemplate ($ this ->request ->getParam ('action ' ));
772
772
}
773
773
774
774
$ this ->View = $ this ->createView ();
775
775
$ contents = $ this ->View ->render ($ view , $ layout );
776
- $ this ->setResponse ( $ this ->View ->response ->withStringBody ($ contents) );
776
+ $ this ->response = $ this ->View ->response ->withStringBody ($ contents );
777
777
778
- return $ this ->getResponse () ;
778
+ return $ this ->response ;
779
779
}
780
780
781
781
/**
@@ -786,10 +786,10 @@ public function render($view = null, $layout = null)
786
786
protected function _viewPath ()
787
787
{
788
788
$ viewPath = $ this ->name ;
789
- if ($ this ->getRequest () ->getParam ('prefix ' )) {
789
+ if ($ this ->request ->getParam ('prefix ' )) {
790
790
$ prefixes = array_map (
791
791
'Cake\Utility\Inflector::camelize ' ,
792
- explode ('/ ' , $ this ->getRequest () ->getParam ('prefix ' ))
792
+ explode ('/ ' , $ this ->request ->getParam ('prefix ' ))
793
793
);
794
794
$ viewPath = implode (DIRECTORY_SEPARATOR , $ prefixes ) . DIRECTORY_SEPARATOR . $ viewPath ;
795
795
}
@@ -806,14 +806,14 @@ protected function _viewPath()
806
806
*/
807
807
public function referer ($ default = null , $ local = false )
808
808
{
809
- if (!$ this ->getRequest () ) {
809
+ if (!$ this ->request ) {
810
810
return Router::url ($ default , !$ local );
811
811
}
812
812
813
- $ referer = $ this ->getRequest () ->referer ($ local );
813
+ $ referer = $ this ->request ->referer ($ local );
814
814
if ($ referer === '/ ' && $ default && $ default !== $ referer ) {
815
815
$ url = Router::url ($ default , !$ local );
816
- $ base = $ this ->getRequest () ->getAttribute ('base ' );
816
+ $ base = $ this ->request ->getAttribute ('base ' );
817
817
if ($ local && $ base && strpos ($ url , $ base ) === 0 ) {
818
818
$ url = substr ($ url , strlen ($ base ));
819
819
if ($ url [0 ] !== '/ ' ) {
0 commit comments