Merge pull request #15867 from niden/T15866-title-separator

T15866 title separator
phalcon · Jan 19, 2022 · 1706073 · 1706073
2 parents 8f4a413 + 03004c0
commit 1706073
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 146 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,4 @@ tests/_output/*
 
 .php_cs.cache
 .env
+zephir
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -2,7 +2,10 @@
 
 ## Fixed
 - Fixed `Phalcon\Logger\AbstractAdapter::getFormattedItem()` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547)
+- Fixed `Phalcon\Html\Helper\Title:__invoke()` to not use the `$separator` as parameter - no need to redefine it in a view [#15866](https://github.com/phalcon/cphalcon/issues/15866)
 
+## Added
+- Added `Phalcon\Html\Helper\Title:setSeparator` to allow setting the separator independently [#15866](https://github.com/phalcon/cphalcon/issues/15866)
 
 # [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06)
 

diff --git a/phalcon/Html/Helper/Title.zep b/phalcon/Html/Helper/Title.zep
@@ -47,20 +47,17 @@ class Title extends AbstractHelper
     /**
      * Sets the separator and returns the object back
      *
-     * @param string      $separator
      * @param string|null $indent
      * @param string|null $delimiter
      *
      * @return Title
      */
     public function __invoke(
-        string separator = "",
         string indent = null,
         string delimiter = null
     ) -> <Title> {
         let this->delimiter = delimiter,
-            this->indent    = indent,
-            this->separator = separator;
+            this->indent    = indent;
 
         return this;
     }
@@ -142,6 +139,21 @@ class Title extends AbstractHelper
         return this;
     }
 
+    /**
+     * Sets the separator
+     *
+     * @param string $separator
+     * @param bool   $raw
+     *
+     * @return Title
+     */
+    public function setSeparator(string separator, bool raw = false) -> <Title>
+    {
+        let this->separator = raw ? separator : this->escaper->html(separator);
+
+        return this;
+    }
+
     /**
      * Prepends text to current document title
      *

diff --git a/tests/_data/fixtures/Security/ExtendedBuilder.php b/tests/_data/fixtures/Security/ExtendedBuilder.php
diff --git a/tests/_data/fixtures/Traits/JWTTrait.php b/tests/_data/fixtures/Traits/JWTTrait.php
@@ -15,7 +15,6 @@
 use Phalcon\Encryption\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Encryption\Security\JWT\Signer\Hmac;
 use Phalcon\Encryption\Security\JWT\Token\Token;
-use Phalcon\Tests\Fixtures\Security\ExtendedBuilder;
 
 trait JWTTrait
 {
@@ -31,18 +30,6 @@ protected function newToken($signerClass = Hmac::class, int $issDrift = 0): Toke
         return $this->generateToken(Builder::class, $signerClass, $issDrift);
     }
 
-    /**
-     * @param string $signerClass
-     * @param int    $issDrift
-     *
-     * @return Token
-     * @throws ValidatorException
-     */
-    protected function newExtendedToken($signerClass = Hmac::class, int $issDrift = 0): Token
-    {
-        return $this->generateToken(ExtendedBuilder::class, $signerClass, $issDrift);
-    }
-
     /**
      * @param string $builderClass
      * @param string $signerClass

diff --git a/tests/integration/Session/Factory/LoadCest.php b/tests/integration/Session/Factory/LoadCest.php
diff --git a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php b/tests/integration/Validation/Validator/Confirmation/ValidateCest.php
@@ -24,7 +24,6 @@
  */
 class ValidateCest
 {
-
     /**
      * Tests Phalcon\Filter\Validation\Validator\Confirmation :: validate() - single
      * field
@@ -51,7 +50,6 @@ public function filterValidationValidatorConfirmationValidateSingleField(Integra
             )
         );
 
-
         $messages = $validation->validate(
             [
                 'name'     => 'SomeValue',

diff --git a/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
@@ -45,46 +45,67 @@ public function htmlHelperTitleUnderscoreInvoke(UnitTester $I, Example $example)
         $escaper = new Escaper();
         $helper  = new Title($escaper);
 
-        $result = $helper($example['separator'], $example['indent'], $example['delimiter']);
+        $indent = $example['indent'];
+        $delimiter = $example['delimiter'];
+        $separator = $example['separator'];
+        $prepend = $example['prepend'];
+        $title    = $example['title'];
+        $titleRaw = $example['titleRaw'];
+        $append   = $example['append'];
 
-        if (!empty($example['prepend'])) {
-            foreach ($example['prepend'] as $text => $raw) {
+        $result = $helper($indent, $delimiter);
+
+        $result->setSeparator($separator);
+
+        if (!empty($prepend)) {
+            foreach ($prepend as $text => $raw) {
                 $result->prepend($text, $raw);
             }
         }
 
-        $result->set($example['title'], $example['titleRaw']);
-
-        if (!empty($example['append'])) {
-            foreach ($example['append'] as $text => $raw) {
+        $result->set($title, $titleRaw);
+        if (!empty($append)) {
+            foreach ($append as $text => $raw) {
                 $result->append($text, $raw);
             }
         }
 
-        $I->assertEquals($example['get'], $result->get());
-        $I->assertEquals($example['render'], (string) $result);
+        $expected = $example['get'];
+        $actual   = $result->get();
+        $I->assertEquals($expected, $actual);
+
+        $expected = $example['render'];
+        $actual   = (string) $result;
+        $I->assertEquals($expected, $actual);
 
         $factory = new TagFactory($escaper);
         $locator = $factory->newInstance('title');
 
-        $result = $locator($example['separator'], $example['indent'], $example['delimiter']);
+        $result = $locator($indent, $delimiter);
 
-        if (!empty($example['prepend'])) {
-            foreach ($example['prepend'] as $text => $raw) {
+        $result->setSeparator($separator);
+        if (!empty($prepend)) {
+            foreach ($prepend as $text => $raw) {
                 $result->prepend($text, $raw);
             }
         }
 
-        $result->set($example['title'], $example['titleRaw']);
+        $result->set($title, $titleRaw);
 
-        if (!empty($example['append'])) {
-            foreach ($example['append'] as $text => $raw) {
+        if (!empty($append)) {
+            foreach ($append as $text => $raw) {
                 $result->append($text, $raw);
             }
         }
 
-        $I->assertEquals($example['get'], $result->get());
-        $I->assertEquals($example['render'], (string) $result);
+
+        $expected = $example['get'];
+        $actual   = $result->get();
+        $I->assertEquals($expected, $actual);
+
+        $expected = $example['render'];
+        $actual   = (string) $result;
+        $I->assertEquals($expected, $actual);
     }
 
     /**