Updates to release v1.5.7 fixes #79

kartik-v · May 16, 2022 · 59910c8 · 59910c8
1 parent 9c72cfd
commit 59910c8
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 98 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,13 @@
 Change Log: `yii2-password`
 ===========================
 
+## Version 1.5.7
+
+**Date:** 16-May-2022
+
+- PHP 8.1 enhancements for native functions.
+- (enh #79): Enhancement to input group addons for Bootstrap 5.x.
+
 ## Version 1.5.6
 
 **Date:** 15-Jun-2020

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2020, Kartik Visweswaran  
+Copyright (c) 2014 - 2022, Kartik Visweswaran  
 Krajee.com  
 All rights reserved.  
 

diff --git a/README.md b/README.md
@@ -6,18 +6,22 @@
     yii2-password
     <hr>
     <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DTP3NZQ6G2AYU"
-       title="Donate via Paypal" target="_blank">
-        <img src="http://kartik-v.github.io/bootstrap-fileinput-samples/samples/donate.png" alt="Donate"/>
-    </a>
+       title="Donate via Paypal" target="_blank"><img height="60" src="https://kartik-v.github.io/bootstrap-fileinput-samples/samples/donate.png" alt="Donate"/></a>
+    &nbsp; &nbsp; &nbsp;
+    <a href="https://www.buymeacoffee.com/kartikv" title="Buy me a coffee" ><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" height="60" alt="kartikv" /></a>
 </h1>
 
+<div align="center">
+
 [![Stable Version](https://poser.pugx.org/kartik-v/yii2-password/v/stable)](https://packagist.org/packages/kartik-v/yii2-password)
 [![Untable Version](https://poser.pugx.org/kartik-v/yii2-password/v/unstable)](https://packagist.org/packages/kartik-v/yii2-password)
 [![License](https://poser.pugx.org/kartik-v/yii2-password/license)](https://packagist.org/packages/kartik-v/yii2-password)
 [![Total Downloads](https://poser.pugx.org/kartik-v/yii2-password/downloads)](https://packagist.org/packages/kartik-v/yii2-password)
 [![Monthly Downloads](https://poser.pugx.org/kartik-v/yii2-password/d/monthly)](https://packagist.org/packages/kartik-v/yii2-password)
 [![Daily Downloads](https://poser.pugx.org/kartik-v/yii2-password/d/daily)](https://packagist.org/packages/kartik-v/yii2-password)
 
+</div>
+
 This extension provides a couple of great password management utilities for Yii Framework 2.0. The extension allows password strength validation through your model. In addition, it provides an advanced password input widget, that allows you to display/hide text and show the password strength.
 
 ### Release Changes

diff --git a/composer.json b/composer.json
@@ -1,40 +1,40 @@
 {
-    "name": "kartik-v/yii2-password",
-    "description": "Useful password strength validation utilities for Yii Framework 2.0",
-    "keywords": [
-        "yii",
-        "yii2",
-        "extension",
-        "password",
-        "strength",
-        "auth",
-        "input",
-        "form",
-        "bootstrap",
-        "jquery"
-    ],
-    "homepage": "https://github.com/kartik-v/yii2-password",
-    "type": "yii2-extension",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Kartik Visweswaran",
-            "email": "kartikv2@gmail.com",
-            "homepage": "http://www.krajee.com/"
-        }
-    ],
-    "require": {
-        "kartik-v/strength-meter": "~1.1",
-        "kartik-v/yii2-krajee-base": ">=2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "kartik\\password\\": "src"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.5.x-dev"
-        }
+  "name": "kartik-v/yii2-password",
+  "description": "Useful password strength validation utilities for Yii Framework 2.0",
+  "keywords": [
+    "yii",
+    "yii2",
+    "extension",
+    "password",
+    "strength",
+    "auth",
+    "input",
+    "form",
+    "bootstrap",
+    "jquery"
+  ],
+  "homepage": "https://github.com/kartik-v/yii2-password",
+  "type": "yii2-extension",
+  "license": "BSD-3-Clause",
+  "authors": [
+    {
+      "name": "Kartik Visweswaran",
+      "email": "kartikv2@gmail.com",
+      "homepage": "http://www.krajee.com/"
     }
+  ],
+  "require": {
+    "kartik-v/strength-meter": "~1.1",
+    "kartik-v/yii2-krajee-base": ">=3.0.4"
+  },
+  "autoload": {
+    "psr-4": {
+      "kartik\\password\\": "src"
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.5.x-dev"
+    }
+  }
 }
diff --git a/src/PasswordInput.php b/src/PasswordInput.php
@@ -3,13 +3,15 @@
 /**
  * @package   yii2-password
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
- * @version   1.5.6
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2022
+ * @version   1.5.7
  */
 
 namespace kartik\password;
 
+use Exception;
 use kartik\base\InputWidget;
+use ReflectionException;
 use Yii;
 use yii\helpers\Html;
 use yii\helpers\ArrayHelper;
@@ -19,6 +21,23 @@
  * input into a widget with an advanced strength validation meter and toggle mask to show/hide the password. The
  * password strength is validated as you type.
  *
+ * For example,
+ *
+ * ```php
+ * // add this in your view
+ * use kartik\password\PasswordInput;
+ * use kartik\widgets\ActiveForm; // optional
+ *
+ * $form = ActiveForm::begin(['id' => 'login-form']);
+ * echo $form->field($model,'username');
+ * echo $form->field($model, 'password')->widget(PasswordInput::classname(), [
+ *     'pluginOptions' => [
+ *         'showMeter' => true,
+ *         'toggleMask' => false
+ *     ]
+ * ]);
+ * ```
+ *
  * @author Kartik Visweswaran <kartikv2@gmail.com>
  * @since 1.0
  * @see http://plugins.krajee.com/strength-meter
@@ -50,8 +69,8 @@ class PasswordInput extends InputWidget
 
     /**
      * @inheritdoc
-     * @throws \ReflectionException
-     * @throws \yii\base\InvalidConfigException
+     * @throws ReflectionException
+     * @throws Exception
      */
     public function run()
     {
@@ -76,29 +95,31 @@ public function run()
      * Renders the input template
      *
      * @return string
-     * @throws \yii\base\InvalidConfigException
+     * @throws Exception
      */
     protected function renderInputTemplate()
     {
         $isLeft = $this->togglePlacement === 'left';
-        $css = 'input-group-addon';
+        $css = $this->isBs(5) ? 'input-group-text' : 'input-group-addon';
         $tog = '{toggle}';
-        if ($this->isBs4()) {
+        if ($this->isBs(4)) {
             $css = $isLeft ? 'input-group-prepend' : 'input-group-append';
             $tog = '<span class="input-group-text">{toggle}</span>';
         }
         $groupOptions = ['class' => 'input-group'];
         $toggle = Html::tag('span', $tog, ['class' => $css]);
         if ($this->size === 'lg' || $this->size === 'sm') {
-            Html::addCssClass($groupOptions, 'input-group-' . $this->size);
+            Html::addCssClass($groupOptions, 'input-group-'.$this->size);
         }
-        $content = $isLeft ? $toggle . '{input}' : '{input}' . $toggle;
+        $content = $isLeft ? $toggle.'{input}' : '{input}'.$toggle;
+
         return Html::tag('div', $content, $groupOptions);
     }
 
     /**
      * Registers the needed assets
-     * @throws \ReflectionException
+     *
+     * @throws Exception
      */
     public function registerAssets()
     {

diff --git a/src/PasswordInputAsset.php b/src/PasswordInputAsset.php
@@ -3,16 +3,16 @@
 /**
  * @package   yii2-password
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
- * @version   1.5.6
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2022
+ * @version   1.5.7
  */
 
 namespace kartik\password;
 
 use kartik\base\AssetBundle;
 
 /**
- * Asset bundle for PasswordInput Widget
+ * Asset bundle for the [[PasswordInput]] widget.
  *
  * @author Kartik Visweswaran <kartikv2@gmail.com>
  * @since 1.0