Merge branch '3.2.0-develop' into issue-423

Author: drpayyne

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 3.1.0-develop ]
+    branches: [ master, 3.2.0-develop ]
 
 jobs:
   build-linux:

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). 
 
+## 3.2.0
+
 ## 3.1.0
 
 ### Added

build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '3.1.0'
+version '3.2.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'

resources/.phpstorm.meta.php/di-autocomplete.php

@@ -0,0 +1,123 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PHPSTORM_META {
+
+    override(\Magento\Framework\ObjectManagerInterface::get(0), map(['' => '@']));
+    override(\Magento\Framework\ObjectManagerInterface::create(0), map(['' => '@']));
+
+    override(\Magento\Framework\View\LayoutInterface::createBlock(0), map(['' => '@']));
+    override(\Magento\Framework\View\TemplateEngine\Php::helper(0), map(['' => '@']));
+
+    override(
+        \Magento\Framework\Controller\ResultFactory::create(0),
+        map(
+            [
+                \Magento\Framework\Controller\ResultFactory::TYPE_FORWARD => \Magento\Framework\Controller\Result\Forward::class,
+                \Magento\Framework\Controller\ResultFactory::TYPE_JSON => \Magento\Framework\Controller\Result\Json::class,
+                \Magento\Framework\Controller\ResultFactory::TYPE_LAYOUT => \Magento\Framework\View\Result\Layout::class,
+                \Magento\Framework\Controller\ResultFactory::TYPE_PAGE => \Magento\Framework\View\Result\Page::class,
+                \Magento\Framework\Controller\ResultFactory::TYPE_RAW => \Magento\Framework\Controller\Result\Raw::class,
+                \Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT => \Magento\Framework\Controller\Result\Redirect::class,
+            ]
+        )
+    );
+
+    expectedArguments(
+        \Magento\Framework\Controller\ResultFactory::create(),
+        0,
+        \Magento\Framework\Controller\ResultFactory::TYPE_FORWARD,
+        \Magento\Framework\Controller\ResultFactory::TYPE_JSON,
+        \Magento\Framework\Controller\ResultFactory::TYPE_LAYOUT,
+        \Magento\Framework\Controller\ResultFactory::TYPE_PAGE,
+        \Magento\Framework\Controller\ResultFactory::TYPE_RAW,
+        \Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT
+    );
+
+    registerArgumentsSet(
+        'scope_types',
+        \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+        \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+    );
+    expectedArguments(
+        \Magento\Framework\App\Config\ScopeConfigInterface::getValue(),
+        1,
+        argumentsSet('scope_types')
+    );
+    expectedArguments(
+        \Magento\Framework\App\Config\ScopeConfigInterface::isSetFlag(),
+        1,
+        argumentsSet('scope_types')
+    );
+    expectedArguments(
+        \Magento\Framework\App\Config\MutableScopeConfigInterface::setValue(),
+        2,
+        argumentsSet('scope_types')
+    );
+
+    registerArgumentsSet(
+        'condition_types',
+        'eq',
+        'in',
+        'is',
+        'to',
+        'finset',
+        'from',
+        'gt',
+        'gteq',
+        'like',
+        'lt',
+        'lteq',
+        'moreq',
+        'neq',
+        'nin',
+        'notnull',
+        'null'
+    );
+    expectedArguments(\Magento\Framework\Api\SearchCriteriaBuilder::addFilter(), 2, argumentsSet('condition_types'));
+    expectedArguments(\Magento\Framework\Api\FilterBuilder::setConditionType(), 0, argumentsSet('condition_types'));
+
+    expectedArguments(
+        \Magento\Framework\Api\SearchCriteriaBuilder::addSortOrder(),
+        0,
+        \Magento\Framework\Api\SortOrder::SORT_ASC,
+        \Magento\Framework\Api\SortOrder::SORT_DESC
+    );
+
+    registerArgumentsSet(
+        'field_types',
+        'button',
+        'checkbox',
+        'checkboxes',
+        'column',
+        'date',
+        'editablemultiselect',
+        'editor',
+        'fieldset',
+        'file',
+        'gallery',
+        'hidden',
+        'image',
+        'imagefile',
+        'label',
+        'link',
+        'multiline',
+        'multiselect',
+        'note',
+        'obscure',
+        'password',
+        'radio',
+        'radios',
+        'reset',
+        'select',
+        'submit',
+        'text',
+        'textarea',
+        'time'
+    );
+    expectedArguments(\Magento\Framework\Data\Form\AbstractForm::addField(), 1, argumentsSet('field_types'));
+    expectedArguments(\Magento\Framework\Data\Form\Element\Fieldset::addField(), 1, argumentsSet('field_types'));
+
+}

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin>
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -236,7 +236,7 @@
     <extensions defaultExtensionNs="com.jetbrains.php">
         <frameworkProjectConfigurableProvider implementation="com.magento.idea.magento2plugin.project.ConfigurableProvider"/>
         <frameworkUsageProvider implementation="com.magento.idea.magento2plugin.project.UsagesProvider"/>
-        <libraryRoot id="phpstorm.meta.php" path="/phpstorm.meta.php/" runtime="false"/>
+        <libraryRoot id="phpstorm.meta.php" path="/.phpstorm.meta.php/" runtime="false"/>
     </extensions>
 
 </idea-plugin>