[TASK] Minor cleanups
authorBastian Waidelich <bastian@typo3.org>
Thu, 28 Jul 2011 12:04:20 +0000 (14:04 +0200)
committerBastian Waidelich <bastian@typo3.org>
Thu, 28 Jul 2011 12:40:14 +0000 (14:40 +0200)
* removes "F3" from namespace declaration regular expression
* removes api annotation from deprecated form.textbox ViewHelper
* adds unit test for format.raw ViewHelper

Change-Id: I622298e08c3b99ba2c967edf257517f8d9305c31

typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/TextboxViewHelper.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/RawViewHelperTest.php [new file with mode: 0644]

index 89cd5e8..f61c9f7 100644 (file)
@@ -27,7 +27,7 @@
  */
 class Tx_Fluid_Core_Parser_TemplateParser {
 
-       public static $SCAN_PATTERN_NAMESPACEDECLARATION = '/(?<!\\\\){namespace\s*([a-zA-Z]+[a-zA-Z0-9]*)\s*=\s*((?:F3|Tx|t3lib|tslib)(?:FLUID_NAMESPACE_SEPARATOR\w+)+)\s*}/m';
+       public static $SCAN_PATTERN_NAMESPACEDECLARATION = '/(?<!\\\\){namespace\s*([a-zA-Z]+[a-zA-Z0-9]*)\s*=\s*((?:Tx|t3lib|tslib)(?:FLUID_NAMESPACE_SEPARATOR\w+)+)\s*}/m';
 
        /**
         * This regular expression splits the input string at all dynamic tags, AND
index e9618b5..e769d0c 100644 (file)
@@ -35,7 +35,6 @@
  * </output>
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
- * @api
  * @deprecated since Extbase 1.4.0; will be removed in Extbase 1.6.0. Please use the <f:form.textfield> ViewHelper instead.
  */
 class Tx_Fluid_ViewHelpers_Form_TextboxViewHelper extends Tx_Fluid_ViewHelpers_Form_TextfieldViewHelper {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/RawViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/RawViewHelperTest.php
new file mode 100644 (file)
index 0000000..2203314
--- /dev/null
@@ -0,0 +1,66 @@
+<?php
+
+/*                                                                        *
+ * This script belongs to the FLOW3 package "Fluid".                      *
+ *                                                                        *
+ * It is free software; you can redistribute it and/or modify it under    *
+ * the terms of the GNU General Public License as published by the Free   *
+ * Software Foundation, either version 3 of the License, or (at your      *
+ * option) any later version.                                             *
+ *                                                                        *
+ * This script is distributed in the hope that it will be useful, but     *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN-    *
+ * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General      *
+ * Public License for more details.                                       *
+ *                                                                        *
+ * You should have received a copy of the GNU General Public License      *
+ * along with the script.                                                 *
+ * If not, see http://www.gnu.org/licenses/gpl.html                       *
+ *                                                                        *
+ * The TYPO3 project - inspiring people to share!                         *
+ *                                                                        */
+
+/**
+ */
+class Tx_Fluid_Tests_Unit_ViewHelpers_Format_RawViewHelperTest extends Tx_Extbase_Tests_Unit_BaseTestCase {
+
+       /**
+        * @var Tx_Fluid_ViewHelpers_Format_RawViewHelper
+        */
+       protected $viewHelper;
+
+       public function setUp() {
+               $this->viewHelper = $this->getMock('Tx_Fluid_ViewHelpers_Format_RawViewHelper', array('renderChildren'));
+       }
+
+       /**
+        * @test
+        * @author Bastian Waidelich <bastian@typo3.org>
+        */
+       public function viewHelperDeactivatesEscapingInterceptor() {
+               $this->assertFalse($this->viewHelper->isEscapingInterceptorEnabled());
+       }
+
+       /**
+        * @test
+        * @author Bastian Waidelich <bastian@typo3.org>
+        */
+       public function renderReturnsUnmodifiedValueIfSpecified() {
+               $value = 'input value " & äöüß@';
+               $this->viewHelper->expects($this->never())->method('renderChildren');
+               $actualResult = $this->viewHelper->render($value);
+               $this->assertEquals($value, $actualResult);
+       }
+
+       /**
+        * @test
+        * @author Bastian Waidelich <bastian@typo3.org>
+        */
+       public function renderReturnsUnmodifiedChildNodesIfNoValueIsSpecified() {
+               $childNodes = 'input value " & äöüß@';
+               $this->viewHelper->expects($this->once())->method('renderChildren')->will($this->returnValue($childNodes));
+               $actualResult = $this->viewHelper->render();
+               $this->assertEquals($childNodes, $actualResult);
+       }
+}
+?>