Cleanup code, improve typings

common/models/AccountQuery.php

@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace common\models;
+
+use yii\db\ActiveQuery;
+
+/**
+ * @see Account
+ */
+class AccountQuery extends ActiveQuery {
+
+    public function andWhereLogin(string $login): self {
+        return $this->andWhere([$this->getLoginAttribute($login) => $login]);
+    }
+
+    private function getLoginAttribute(string $login): string {
+        return strpos($login, '@') ? 'email' : 'username';
+    }
+
+}