完善 8.0支持

iwillhappy1314 · Feb 13, 2023 · 4fb0982 · 4fb0982
1 parent 3e776b2
commit 4fb0982
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Controls/DatePickerInput.php b/src/Controls/DatePickerInput.php
@@ -68,6 +68,6 @@ public function getControl(): Html
 		        });
 		    </script>";
 
-        return $el . $script;
+        return $el->addHtml($script);
     }
 }
diff --git a/src/Renders/AdminFormRender.php b/src/Renders/AdminFormRender.php
@@ -11,7 +11,7 @@ class AdminFormRender extends BaseFormRender
 {
     use Nette\SmartObject;
 
-    var $type = 'post_meta';
+    var mixed $type = 'post_meta';
 
     public function __construct($type = 'post_meta')
     {
@@ -44,11 +44,11 @@ public function __construct($type = 'post_meta')
     /**
      * 渲染一行
      *
-     * @param \Nette\Forms\IControl $control
+     * @param \Nette\Forms\Control $control
      *
      * @return string
      */
-    public function renderPair(Nette\Forms\IControl $control)
+    public function renderPair(Nette\Forms\Control $control): string
     {
         $pair = $this->getWrapper('pair container');
         $pair->addHtml($this->renderLabel($control));

diff --git a/src/Renders/BaseFormRender.php b/src/Renders/BaseFormRender.php
@@ -97,7 +97,7 @@ public function renderPairMulti(array $controls): string
     {
         $s = [];
         foreach ($controls as $control) {
-            if ( ! $control instanceof Nette\Forms\IControl) {
+            if ( ! $control instanceof Nette\Forms\Control) {
                 throw new Nette\InvalidArgumentException('Argument must be array of Nette\Forms\IControl instances.');
             }
 
@@ -161,7 +161,7 @@ public function renderPairMulti(array $controls): string
      *
      * @return \Nette\Utils\Html|string
      */
-    public function renderControlGroup($control)
+    public function renderControlGroup($control): Html|string
     {
         $html = '';
 

diff --git a/src/Renders/FormRender.php b/src/Renders/FormRender.php
@@ -4,7 +4,7 @@
 
 use Nette;
 use Nette\Utils\Html;
-use Nette\Utils\IHtmlString;
+use Nette\HtmlStringable;
 
 /**
  * 转到表单到 HTML 输出
@@ -119,7 +119,7 @@ class FormRender extends Nette\Forms\Rendering\DefaultFormRenderer
      *
      * @return string
      */
-    public function renderControls($parent)
+    public function renderControls($parent): string
     {
         if ( ! ($parent instanceof Nette\Forms\Container || $parent instanceof Nette\Forms\ControlGroup)) {
             throw new Nette\InvalidArgumentException('Argument must be Nette\Forms\Container or Nette\Forms\ControlGroup instance.');
@@ -249,7 +249,7 @@ public function renderPair(Nette\Forms\Control $control): string
      *
      * @return string
      */
-    public function renderPairMulti(array $controls) :string
+    public function renderPairMulti(array $controls): string
     {
         $s = [];
         foreach ($controls as $control) {
@@ -259,7 +259,7 @@ public function renderPairMulti(array $controls) :string
 
             $description = $control->getOption('description');
 
-            if ($description instanceof IHtmlString) {
+            if ($description instanceof HtmlStringable) {
 
                 $description = ' ' . $description;