Fix deprecation warning text in ViewVarsTrait.

Don't suggest method names that will fail. Refs #7468
cakephp · Sep 29, 2015 · 4ec895b · 4ec895b
1 parent c9642e6
commit 4ec895b
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/View/ViewVarsTrait.php b/src/View/ViewVarsTrait.php
@@ -86,15 +86,22 @@ public function createView($viewClass = null)
                 $viewOptions[$option] = $this->{$option};
             }
         }
-        $deprecatedOptions = ['layout', 'view', 'theme', 'autoLayout', 'viewPath', 'layoutPath'];
-        foreach ($deprecatedOptions as $option) {
-            if (property_exists($this, $option)) {
-                $method = $option === 'viewPath' ? 'templatePath' : $option;
-                $builder->{$method}($this->{$option});
+
+        $deprecatedOptions = [
+            'layout' => 'layout',
+            'view' => 'template',
+            'theme' => 'theme',
+            'autoLayout' => 'autoLayout',
+            'viewPath' => 'templatePath',
+            'layoutPath' => 'layoutPath',
+        ];
+        foreach ($deprecatedOptions as $old => $new) {
+            if (property_exists($this, $old)) {
+                $builder->{$new}($this->{$old});
                 trigger_error(sprintf(
                     'Property $%s is deprecated. Use $this->viewBuilder()->%s() instead in beforeRender().',
-                    $option,
-                    $method
+                    $old,
+                    $new
                 ), E_USER_DEPRECATED);
             }
         }