Align with changes in plaisio/flash-message.

Author: prwater

composer.json

@@ -12,7 +12,7 @@
     "plaisio-ts/helper-cast": "^1.0.2",
     "plaisio/cgi": "^1.2.0",
     "plaisio/exception": "^1.1.0",
-    "plaisio/flash-message": "dev-master",
+    "plaisio/flash-message": "1.0.0",
     "plaisio/helper-html": "^4.0.0",
     "plaisio/kernel": "^3.1.1",
     "plaisio/page-core": "^1.4.2",

src/CoreFlashMessage.php

@@ -66,43 +66,41 @@ public function __construct(string $message, bool $isHtml = false)
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Returns the HTML code of the flash message.
-   *
-   * @return string
+   * @inheritDoc
    */
-  public function getHtml(): string
+  public function getWeight1(): int
   {
-    $walker = new RenderWalker('flash-message');
-    $this->setAttrData('auto-dismiss', ($this->autoDismiss) ? '1' : null);
-    $this->addClasses($walker->getClasses('wrapper'));
-
-    $struct = ['tag'   => 'div',
-               'attr'  => $this->attributes,
-               'inner' => [['html' => $this->message],
-                           ['tag'  => 'button',
-                            'attr' => ['class' => $walker->getClasses('close'),
-                                       'type'  => 'button'],
-                            'html' => '×']]];
-
-    return Html::htmlNested($struct);
+    return $this->weight1;
   }
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * @inheritDoc
    */
-  public function getWeight1(): int
+  public function getWeight2(): int
   {
-    return $this->weight1;
+    return $this->weight2;
   }
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * @inheritDoc
+   * @inheritdoc
    */
-  public function getWeight2(): int
+  public function htmlFlashMessage(): string
   {
-    return $this->weight2;
+    $walker = new RenderWalker('flash-message');
+    $this->setAttrData('auto-dismiss', ($this->autoDismiss) ? '1' : null);
+    $this->addClasses($walker->getClasses('wrapper'));
+
+    $struct = ['tag'   => 'div',
+               'attr'  => $this->attributes,
+               'inner' => [['html' => $this->message],
+                           ['tag'  => 'button',
+                            'attr' => ['class' => $walker->getClasses('close'),
+                                       'type'  => 'button'],
+                            'html' => '×']]];
+
+    return Html::htmlNested($struct);
   }
 
   //--------------------------------------------------------------------------------------------------------------------

src/CoreFlashMessageCollection.php

@@ -129,7 +129,7 @@ public function create(string $type, string $message, bool $isHtml = false): Fla
   /**
    * @inheritDoc
    */
-  public function getHtml(): string
+  public function htmlFlashMessages(): string
   {
     $this->sortFlashMessages();
 
@@ -138,7 +138,7 @@ public function getHtml(): string
     {
       foreach ($this->flashMessages as $flashMessage)
       {
-        $inner .= $flashMessage->getHtml();
+        $inner .= $flashMessage->htmlFlashMessage();
       }
     }
 

test/CoreFlashMessageTest.php

@@ -37,7 +37,7 @@ public function testGetHtml1(): void
     $flashMessage = new CoreFlashMessage('Hello & world!');
     $html         = $flashMessage->setAttrId('123456')
                                  ->addClass('first')
-                                 ->getHtml();
+                                 ->htmlFlashMessage();
     $expected     = '<div id="123456" class="first flash-message-wrapper">Hello &amp; world!<button class="flash-message-close" type="button">&times;</button></div>';
     self::assertSame($expected, $html);
   }
@@ -51,7 +51,7 @@ public function testGetHtml2(): void
     $flashMessage = new CoreFlashMessage('Hello<br/>world!', true);
     $html         = $flashMessage->setAttrId('123456')
                                  ->addClass('first')
-                                 ->getHtml();
+                                 ->htmlFlashMessage();
     $expected     = '<div id="123456" class="first flash-message-wrapper">Hello<br/>world!<button class="flash-message-close" type="button">&times;</button></div>';
     self::assertSame($expected, $html);
   }