Browse Source

remove hasRendered methods from view

saeid 7 years ago
parent
commit
fccfaf2e64

+ 1 - 1
src/Mailer/Email.php

@@ -2749,7 +2749,7 @@ class Email implements JsonSerializable, Serializable
         }
 
         foreach ($types as $type) {
-            $View->resetHasRendered();
+            $View->hasRendered = false;
             $View->setTemplatePath('Email' . DIRECTORY_SEPARATOR . $type);
             $View->setLayoutPath('Email' . DIRECTORY_SEPARATOR . $type);
 

+ 2 - 26
src/View/View.php

@@ -191,8 +191,9 @@ class View implements EventDispatcherInterface
      * True when the view has been rendered.
      *
      * @var bool
+     * @deprecated 3.7.0 The property is deprecated and will be removed in 4.0.0.
      */
-    protected $hasRendered = false;
+    public $hasRendered = false;
 
     /**
      * List of generated DOM UUIDs.
@@ -1292,7 +1293,6 @@ class View implements EventDispatcherInterface
             'plugin' => 'setPlugin',
             'name' => 'setName',
             'elementCache' => 'setElementCache',
-            'hasRendered' => 'resetHasRendered',
         ];
         if (isset($protected[$name])) {
             $method = $protected[$name];
@@ -1432,30 +1432,6 @@ class View implements EventDispatcherInterface
     }
 
     /**
-     * Check whether the view has been rendered.
-     *
-     * @return bool
-     * @since 3.7.0
-     */
-    public function hasRendered()
-    {
-        return $this->hasRendered;
-    }
-
-    /**
-     * Reset $hadRendered property to false to allow running render() again.
-     *
-     * @return $this
-     * @since 3.7.0
-     */
-    public function resetHasRendered()
-    {
-        $this->hasRendered = false;
-
-        return $this;
-    }
-
-    /**
      * Set sub-directory for this template files.
      *
      * @param string $subDir Sub-directory name.

+ 1 - 1
tests/TestCase/Error/DebuggerTest.php

@@ -357,6 +357,7 @@ class DebuggerTest extends TestCase
         $expected = <<<TEXT
 object(Cake\View\View) {
 	passedArgs => []
+	hasRendered => false
 	uuids => []
 	viewClass => null
 	viewVars => []
@@ -381,7 +382,6 @@ object(Cake\View\View) {
 	[protected] _ext => '.ctp'
 	[protected] subDir => ''
 	[protected] theme => null
-	[protected] hasRendered => false
 	[protected] request => object(Cake\Http\ServerRequest) {}
 	[protected] response => object(Cake\Http\Response) {}
 	[protected] elementCache => 'default'

+ 3 - 3
tests/TestCase/View/ViewTest.php

@@ -2136,16 +2136,16 @@ TEXT;
     }
 
     /**
-     * Test testHasRendered()
+     * Test testHasRendered property
      *
      * @return void
      */
     public function testHasRendered()
     {
-        $this->assertFalse($this->View->hasRendered());
+        $this->assertFalse($this->View->hasRendered);
 
         $this->View->render('index');
-        $this->assertTrue($this->View->hasRendered());
+        $this->assertTrue($this->View->hasRendered);
     }
 
     /**