Extbase:

* Done some remaining renaming from pluginKey to pluginName

diff --git a/typo3/sysext/extbase/Classes/MVC/Request.php b/typo3/sysext/extbase/Classes/MVC/Request.php
index e1992f0..e96c6c1 100644 (file)
--- a/typo3/sysext/extbase/Classes/MVC/Request.php
+++ b/typo3/sysext/extbase/Classes/MVC/Request.php
@@ -182,12 +182,12 @@ class Tx_Extbase_MVC_Request {
        }
 
        /**
-        * Sets the plugin key.
+        * Sets the plugin name.
         *
-        * @param string $extensionName The plugin key.
+        * @param string $extensionName The plugin name.
         * @return void
         */
-       public function setPluginKey($pluginName = NULL) {
+       public function setPluginName($pluginName = NULL) {
                if ($pluginName !== NULL) {
                        $this->pluginName = $pluginName;
                }
@@ -198,7 +198,7 @@ class Tx_Extbase_MVC_Request {
         *
         * @return string The plugin key
         */
-       public function getPluginKey() {
+       public function getPluginName() {
                return $this->pluginName;
        }
 

diff --git a/typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php b/typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php
index 7fa540e..7580a83 100644 (file)
--- a/typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php
+++ b/typo3/sysext/extbase/Tests/MVC/Web/RequestBuilder_testcase.php
@@ -57,7 +57,7 @@ class Tx_Extbase_MVC_Web_RequestBuilder_testcase extends Tx_Extbase_Base_testcas
                $this->builder->initialize($this->configuration);
                $request = $this->builder->build();
                $this->assertEquals('Tx_Extbase_MVC_Web_Request', get_class($request));
-               $this->assertEquals('pi1', $request->getPluginKey());
+               $this->assertEquals('pi1', $request->getPluginName());
                $this->assertEquals('MyExtension', $request->getControllerExtensionName());
                $this->assertEquals('TheFirstController', $request->getControllerName());
                $this->assertEquals('show', $request->getControllerActionName());
@@ -65,7 +65,7 @@ class Tx_Extbase_MVC_Web_RequestBuilder_testcase extends Tx_Extbase_Base_testcas
        
        public function test_BuildWithoutConfigurationReturnsAWebRequestObjectWithDefaultSettings() {
                $request = $this->builder->build();
-               $this->assertEquals('plugin', $request->getPluginKey());
+               $this->assertEquals('plugin', $request->getPluginName());
                $this->assertEquals('Extbase', $request->getControllerExtensionName());
                $this->assertEquals('Default', $request->getControllerName());
                $this->assertEquals('index', $request->getControllerActionName());
@@ -78,7 +78,7 @@ class Tx_Extbase_MVC_Web_RequestBuilder_testcase extends Tx_Extbase_Base_testcas
                unset($configuration['switchableControllerActions.']);
                $this->builder->initialize($configuration);
                $request = $this->builder->build();
-               $this->assertEquals('pi1', $request->getPluginKey());
+               $this->assertEquals('pi1', $request->getPluginName());
                $this->assertEquals('MyExtension', $request->getControllerExtensionName());
                $this->assertEquals('Default', $request->getControllerName());
                $this->assertEquals('index', $request->getControllerActionName());
@@ -90,7 +90,7 @@ class Tx_Extbase_MVC_Web_RequestBuilder_testcase extends Tx_Extbase_Base_testcas
                unset($configuration['action']);
                $this->builder->initialize($configuration);
                $request = $this->builder->build();
-               $this->assertEquals('pi1', $request->getPluginKey());
+               $this->assertEquals('pi1', $request->getPluginName());
                $this->assertEquals('MyExtension', $request->getControllerExtensionName());
                $this->assertEquals('TheFirstController', $request->getControllerName());
                $this->assertEquals('show', $request->getControllerActionName());