From a496eeaf83a506b7224362a77a03ba2b186e3e3e Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergey.predvoditelev@gmail.com>
Date: Tue, 4 Aug 2020 12:27:35 +0300
Subject: [PATCH] Fix #18205: Add `.phpstorm.meta.php` file for better
 auto-completion in PhpStorm

---
 framework/.phpstorm.meta.php | 26 ++++++++++++++++++++++++++
 framework/CHANGELOG.md       |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 framework/.phpstorm.meta.php

diff --git a/framework/.phpstorm.meta.php b/framework/.phpstorm.meta.php
new file mode 100644
index 0000000..c6663ce
--- /dev/null
+++ b/framework/.phpstorm.meta.php
@@ -0,0 +1,26 @@
+<?php
+// .phpstorm.meta.php
+
+namespace PHPSTORM_META {
+
+    override(
+        \yii\di\Container::get(0),
+        map([
+            '' => '@',
+        ])
+    );
+
+    override(
+        \yii\di\Instance::ensure(0),
+        map([
+            '' => '@',
+        ])
+    );
+
+    override(
+        \Yii::createObject(0),
+        map([
+            '' => '@',
+        ])
+    );
+}
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 9cf2436..da4957d 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
 - Bug #18170: Fix 2.0.36 regression in passing extra console command arguments to the action (darkdef)
 - Bug #18182: `yii\db\Expression` was not supported as condition in `ActiveRecord::findOne()` and `ActiveRecord::findAll()` (rhertogh)
 - Bug #18189: Fix "Invalid parameter number" in `yii\rbac\DbManager::removeItem()` (samdark)
+- Enh #18205: Add `.phpstorm.meta.php` file for better auto-completion in PhpStorm (vjik)
 
 
 2.0.36 July 07, 2020