Добавлен файл для автокомплита в проекте, обновлены обращения к di для лучшего статического анализа

api/controllers/OauthController.php

@@ -48,9 +48,7 @@ class OauthController extends Controller {
      * @return \League\OAuth2\Server\AuthorizationServer
      */
     protected function getServer() {
-        /** @var \common\components\oauth\Component $oauth */
+        return Yii::$app->oauth->authServer;
-        $oauth = Yii::$app->get('oauth');
-        return $oauth->authServer;
     }
 
     /**

autocompletion.php

@@ -0,0 +1,42 @@
+<?php
+/**
+* Yii bootstrap file.
+* Used for enhanced IDE code autocompletion.
+* Note: To avoid "Multiple Implementations" PHPStorm warning and make autocomplete faster
+* exclude or "Mark as Plain Text" vendor/yiisoft/yii2/Yii.php file
+*/
+class Yii extends \yii\BaseYii {
+    /**
+    * @var BaseApplication|WebApplication|ConsoleApplication the application instance
+    */
+    public static $app;
+}
+
+/**
+ * Class BaseApplication
+ * Used for properties that are identical for both WebApplication and ConsoleApplication
+ *
+ * @property \yii\swiftmailer\Mailer $mailer
+ * @property \yii\redis\Connection $redis
+ * @property \common\components\RabbitMQ\Component $amqp
+ */
+abstract class BaseApplication extends yii\base\Application {
+}
+
+/**
+ * Class WebApplication
+ * Include only Web application related components here
+ *
+ * @property \api\components\User\Component $user User component.
+ * @property \api\components\ReCaptcha\Component $reCaptcha
+ * @property \common\components\oauth\Component $oauth
+ */
+class WebApplication extends yii\web\Application {
+}
+
+/**
+ * Class ConsoleApplication
+ * Include only Console application related components here
+ */
+class ConsoleApplication extends yii\console\Application {
+}

common/components/RabbitMQ/Controller.php

@@ -43,7 +43,7 @@ abstract class Controller extends \yii\console\Controller {
      * @return Component
      */
     protected function getAmqp() {
-        return Yii::$app->get('amqp');
+        return Yii::$app->amqp;
     }
 
     /**

common/components/RabbitMQ/Helper.php

@@ -9,7 +9,7 @@ class Helper {
      * @return Component $amqp
      */
     public static function getInstance() {
-        return Yii::$app->get('amqp');
+        return Yii::$app->amqp;
     }
 
     public static function sendToExchange($exchange, $routingKey, $message, $exchangeArgs = []) {

common/components/redis/Key.php

@@ -12,7 +12,7 @@ class Key {
      * @return \yii\redis\Connection
      */
     public function getRedis() {
-        return Yii::$app->get('redis');
+        return Yii::$app->redis;
     }
 
     public function getKey() {

common/components/redis/Set.php

@@ -10,7 +10,7 @@ class Set extends Key implements IteratorAggregate {
      * @return \yii\redis\Connection
      */
     public static function getDb() {
-        return Yii::$app->get('redis');
+        return Yii::$app->redis;
     }
 
     public function add($value) {

common/config/main.php

@@ -3,21 +3,21 @@ return [
     'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
     'components' => [
         'cache' => [
-            'class' => 'yii\caching\FileCache',
+            'class' => yii\caching\FileCache::class,
         ],
         'db' => [
-            'class' => 'yii\db\Connection',
+            'class' => yii\db\Connection::class,
             'charset' => 'utf8',
         ],
         'mailer' => [
-            'class' => 'yii\swiftmailer\Mailer',
+            'class' => yii\swiftmailer\Mailer::class,
             'viewPath' => '@common/mail',
         ],
         'security' => [
             'passwordHashStrategy' => 'password_hash',
         ],
         'redis' => [
-            'class' => 'yii\redis\Connection',
+            'class' => yii\redis\Connection::class,
         ],
         'amqp' => [
             'class' => \common\components\RabbitMQ\Component::class,