Merge pull request #17 from wp-oop/task/scan-local-mods-with-psalm

Fix errors reported by Psalm
wp-oop · Mar 10, 2021 · b7f692c · b7f692c
2 parents bdd17f9 + ee8ea3b
commit b7f692c
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 71 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/plugin.iml b/.idea/plugin.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [[*next-version*]] - YYYY-MM-DD
+### Fixed
+- Errors in local modules (#17).
+
+### Changed
+- Depend on WP stubs instead of WP itself (#17).
+- Actually use the stubs in Psalm (#17).
+
+### Added
+- Local modules are now scanned by Psalm (#17).
+- PHPStorm will now use PHPCS via remote interpreter (#17).
 
 ## [0.2.0-alpha1] - 2021-03-10
 ### Added

diff --git a/composer.json b/composer.json
@@ -19,10 +19,10 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0",
-    "johnpbloch/wordpress-core": "^5.0@stable",
     "vimeo/psalm": "^3.11.7 | ^4.0",
     "slevomat/coding-standard": "^6.0",
-    "webmozart/path-util": "^2.3@stable"
+    "webmozart/path-util": "^2.3@stable",
+    "php-stubs/wordpress-stubs": "^5.0@stable"
   },
   "autoload": {
     "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/modules.local/core/module.php b/modules.local/core/module.php
@@ -8,7 +8,9 @@
     $rootDir = dirname($mainFile);
     $moduleDir = dirname(__FILE__);
     $moduleIncDir = "$moduleDir/inc";
+    /** @psalm-suppress UnresolvableInclude */
     $factories = (require "$moduleIncDir/factories.php")($rootDir, $mainFile);
+    /** @psalm-suppress UnresolvableInclude */
     $extensions = (require "$moduleIncDir/extensions.php")($rootDir, $mainFile);
     $provider = new ServiceProvider($factories, $extensions);
     $module = new Module($provider);

diff --git a/modules.local/core/src/FilePathPluginFactory.php b/modules.local/core/src/FilePathPluginFactory.php
@@ -12,6 +12,9 @@
 use WpOop\WordPress\Plugin\FilePathPluginFactoryInterface;
 use WpOop\WordPress\Plugin\PluginInterface;
 
+use function plugin_basename;
+use function get_plugin_data;
+
 /**
  * Creates a plugin from plugin basename.
  */

diff --git a/modules.local/core/src/Plugin.php b/modules.local/core/src/Plugin.php
@@ -43,11 +43,6 @@ class Plugin implements PluginInterface
      */
     protected $textDomain;
 
-    /**
-     * @var string
-     */
-    protected $slug;
-
     /**
      * @var VersionInterface
      */

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -25,12 +25,12 @@
 >
     <projectFiles>
         <directory name="src"/>
+        <directory name="modules.local"/>
     </projectFiles>
 
-    <extraFiles>
-        <directory name="vendor/johnpbloch/wordpress-core/wp-includes" />
-        <directory name="vendor/johnpbloch/wordpress-core/wp-admin/includes" />
-    </extraFiles>
+    <stubs>
+        <file name="vendor/php-stubs/wordpress-stubs/wordpress-stubs.php" />
+    </stubs>
 
 
     <issueHandlers>