Remove Helper::$theme/$plugin.

They can be got/set from view instance instead.
cakephp · Jun 8, 2018 · 754559d · 754559d
1 parent a03a6ae
commit 754559d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 22 deletions.
diff --git a/src/View/Helper.php b/src/View/Helper.php
@@ -64,27 +64,13 @@ class Helper implements EventListenerInterface
      */
     protected $_helperMap = [];
 
-    /**
-     * The current theme name if any.
-     *
-     * @var string
-     */
-    public $theme;
-
     /**
      * Request object
      *
      * @var \Cake\Http\ServerRequest
      */
     public $request;
 
-    /**
-     * Plugin path
-     *
-     * @var string
-     */
-    public $plugin;
-
     /**
      * Holds the fields ['field_name' => ['type' => 'string', 'length' => 100]],
      * primaryKey and validates ['field_name']
@@ -153,6 +139,49 @@ public function __get($name)
 
             return $this->{$name};
         }
+
+        $removed = [
+            'theme' => 'getTheme',
+            'plugin' => 'getPlugin',
+        ];
+        if (isset($removed[$name])) {
+            $method = $removed[$name];
+            deprecationWarning(sprintf(
+                'Helper::$%s is deprecated. Use $view->%s() instead.',
+                $name,
+                $method
+            ));
+
+            return $this->_View->{$method}();
+        }
+    }
+
+    /**
+     * Magic setter for removed properties.
+     *
+     * @param string $name Property name.
+     * @param mixed $value Value to set.
+     * @return void
+     */
+    public function __set($name, $value)
+    {
+        $removed = [
+            'template' => 'setTemplate',
+            'plugin' => 'setPlugin',
+        ];
+        if (isset($removed[$name])) {
+            $method = $removed[$name];
+            deprecationWarning(sprintf(
+                'Helper::$%s is deprecated. Use $view->%s() instead.',
+                $name,
+                $method
+            ));
+            $this->_View->{$method}($value);
+
+            return;
+        }
+
+        $this->{$name} = $value;
     }
 
     /**
@@ -273,8 +302,6 @@ public function __debugInfo()
     {
         return [
             'helpers' => $this->helpers,
-            'theme' => $this->theme,
-            'plugin' => $this->plugin,
             'fieldset' => $this->fieldset,
             'tags' => $this->tags,
             'implementedEvents' => $this->implementedEvents(),

diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -544,7 +544,7 @@ protected function _formUrl($context, $options)
         }
 
         $actionDefaults = [
-            'plugin' => $this->plugin,
+            'plugin' => $this->_View->getPlugin(),
             'controller' => $this->request->getParam('controller'),
             'action' => $this->request->getParam('action'),
         ];

diff --git a/src/View/HelperRegistry.php b/src/View/HelperRegistry.php
@@ -145,9 +145,6 @@ protected function _create($class, $alias, $settings)
     {
         $instance = new $class($this->_View, $settings);
 
-        $instance->theme = $this->_View->getTheme();
-        $instance->plugin = $this->_View->getRequest()->getParam('Plugin');
-
         $enable = isset($settings['enabled']) ? $settings['enabled'] : true;
         if ($enable) {
             $this->getEventManager()->on($instance);

diff --git a/tests/TestCase/View/HelperTest.php b/tests/TestCase/View/HelperTest.php
@@ -174,8 +174,6 @@ public function testDebugInfo()
                 'Html',
                 'TestPlugin.OtherHelper'
             ],
-            'theme' => null,
-            'plugin' => null,
             'fieldset' => [],
             'tags' => [],
             'implementedEvents' => [