closes #746

luyadev · Jun 7, 2023 · 05223cd · 05223cd
1 parent 4124b97
commit 05223cd
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE
 
 ## 4.9.1
 
++ [#746](https://github.com/luyadev/luya-module-admin/issues/746) Remove WhichBrowser/Parser because of missing PHP 8.2 support.
 + [#745](https://github.com/luyadev/luya-module-admin/pull/745) Fixed bug in exception when image could not find the file.
 
 ## 4.9.0 (8. March 2023)

diff --git a/composer.json b/composer.json
@@ -34,7 +34,6 @@
  "yiisoft/yii2-queue": "^2.0",
  "flowjs/flow-php-server": "^1.0",
  "bizley/jwt": "^3.3",
- "whichbrowser/parser": "^2.0",
  "robthree/twofactorauth": "^1.7"
  },
  "require-dev": {

diff --git a/src/models/User.php b/src/models/User.php
@@ -14,7 +14,6 @@
 use luya\helpers\Html;
 use luya\helpers\Url;
 use luya\validators\StrengthValidator;
-use WhichBrowser\Parser;
 use Yii;
 use yii\base\InvalidArgumentException;
 use yii\helpers\Json;
@@ -436,23 +435,21 @@ public function getDevices()
  */
  public static function generateTokenEmail($token, $title, $text)
  {
- $result = new Parser(Yii::$app->request->userAgent);
  return Yii::$app->view->render('@admin/views/mail/_token.php', [
  'url' => Url::domain(Url::base(true)),
  'token' => $token,
- 'browser' => $result->toString(),
+ 'browser' => "-",
  'title' => $title,
  'text' => $text,
  ]);
  }
 
  public static function generateResetEmail($url, $title, $text)
  {
- $result = new Parser(Yii::$app->request->userAgent);
  return Yii::$app->view->render('@admin/views/mail/_reset.php', [
  'url' => Url::domain(Url::base(true)),
  'token' => Html::a(Module::t('reset_email_btn_label'), $url),
- 'browser' => $result->toString(),
+ 'browser' => "-",
  'title' => $title,
  'text' => $text,
  ]);

diff --git a/src/models/UserDevice.php b/src/models/UserDevice.php
@@ -2,7 +2,6 @@
 
 namespace luya\admin\models;
 
-use WhichBrowser\Parser;
 use Yii;
 use yii\behaviors\TimestampBehavior;
 
@@ -44,7 +43,7 @@ public static function generateUserAgentChecksum($userAgent)
 
  public function getUserAgentName()
  {
- return (new Parser($this->user_agent))->toString();
+ return '-';
  }
 
  public function getIsCurrentDevice()

diff --git a/src/views/aws/userhistorysummary/index.php b/src/views/aws/userhistorysummary/index.php
@@ -3,7 +3,6 @@
 use luya\admin\models\StorageFile;
 use luya\admin\Module;
 use luya\helpers\Html;
-use WhichBrowser\Parser;
 use yii\helpers\VarDumper;
 
 /**
@@ -104,9 +103,6 @@
  <td><?= Yii::$app->formatter->asRelativeTime($login->timestamp_create); ?></td>
  <td class="text-right">
  <?= $login->ip; ?>
- <?php if (!empty($login->user_agent)): ?>
- <span class="badge badge-secondary"><?= (new Parser($login->user_agent))->toString(); ?></span>
- <?php endif; ?>
  </td>
  <?php ?>
  </tr>