chore: bump PHPStan to v2.0.x (#118)

* chore: bump PHPStan to v2.0.x

* chore: scan `seo-by-rank-math/includes`

* chore: more PHPStan fixes

Author: justlevine

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- chore: bump PHPStan to v2.0.x
+
 ## [0.3.3]
 
 This _minor_ release adds a GraphQL Debug message to the response when attempting to use `Page.seo` for the Posts Archive. It also tests compatibility with WordPress 6.7.2 and WPGraphQL 2.0.0.

composer.json

@@ -31,7 +31,8 @@
 		"axepress/wp-graphql-plugin-boilerplate": "^0.1.0"
 	},
 	"require-dev": {
-		"lucatume/wp-browser": "<3.5",
+		"axepress/wp-graphql-cs": "^2.0.0-beta",
+		"axepress/wp-graphql-stubs": "^2.0.0",
 		"codeception/lib-innerbrowser": "^1.0",
 		"codeception/module-asserts": "^1.0",
 		"codeception/module-cli": "^1.0",
@@ -42,16 +43,15 @@
 		"codeception/module-webdriver": "^1.0",
 		"codeception/phpunit-wrapper": "^9.0",
 		"codeception/util-universalframework": "^1.0",
-		"phpunit/phpunit": "^9.5",
-		"wp-graphql/wp-graphql-testcase": "~3.4.0",
-		"phpstan/phpstan": "^1.2",
-		"phpstan/extension-installer": "^1.1",
-		"szepeviktor/phpstan-wordpress": "^1.0",
-		"axepress/wp-graphql-stubs": "^1.22.1",
-		"axepress/wp-graphql-cs": "^2.0.0-beta",
+		"lucatume/wp-browser": "<3.5",
+		"php-coveralls/php-coveralls": "^2.5",
 		"phpcompatibility/php-compatibility": "dev-develop as 9.9.9",
+		"phpstan/extension-installer": "^1.1",
+		"phpstan/phpstan": "^2.1.5",
+		"phpunit/phpunit": "^9.5",
+		"szepeviktor/phpstan-wordpress": "^2.0.1",
 		"wp-cli/wp-cli-bundle": "^2.8.1",
-		"php-coveralls/php-coveralls": "^2.5"
+		"wp-graphql/wp-graphql-testcase": "~3.4.0"
 	},
 	"config": {
 		"allow-plugins": {

composer.lock

@@ -2,35 +2,31 @@ parameters:
 		level: 8
 		treatPhpDocTypesAsCertain: false
 		inferPrivatePropertyTypeFromConstructor: true
-		checkAlwaysTrueCheckTypeFunctionCall: true
-		checkAlwaysTrueInstanceof: true
-		checkAlwaysTrueStrictComparison: true
 		checkExplicitMixedMissingReturn: true
 		checkFunctionNameCase: true
 		checkInternalClassCaseSensitivity: true
-		checkMissingIterableValueType: true
 		checkTooWideReturnTypesInProtectedAndPublicMethods: true
 		polluteScopeWithAlwaysIterableForeach: false
 		polluteScopeWithLoopInitialAssignments: false
 		reportAlwaysTrueInLastCondition: true
 		reportStaticMethodSignatures: true
 		reportWrongPhpDocTypeInVarTag: true
-		featureToggles:
-			disableRuntimeReflectionProvider: true
+		bootstrapFiles:
+			- phpstan/constants.php
 		dynamicConstantNames:
 			- WPGRAPHQL_SEO_AUTOLOAD
 		stubFiles:
 			# Simulate added properties
-			- phpstan/rank-math.stub
 			- phpstan/class-breadcrumbs.stub
 			- phpstan/class-choices.stub
-			- phpstan/class-singular.stub
+			- phpstan/class-database.stub
 			- phpstan/class-helpers.stub
+			- phpstan/class-singular.stub
+			- phpstan/namespace-rank-math.stub
+			- phpstan/rank-math.stub
 			- vendor/axepress/wp-graphql-plugin-boilerplate/phpstan/class-wp-post-type.stub
 			- vendor/axepress/wp-graphql-plugin-boilerplate/phpstan/class-wp-taxonomy.stub
 			- vendor/axepress/wp-graphql-plugin-boilerplate/phpstan/Model.stub
-		bootstrapFiles:
-			- phpstan/constants.php
 		paths:
 			- wp-graphql-rank-math.php
 			- access-functions.php
@@ -39,10 +35,11 @@ parameters:
 			- src/
 		excludePaths:
 			analyse:
-				- vendor-prefixed
+				- vendor-prefixed/
 		scanFiles:
 			- vendor/axepress/wp-graphql-stubs/wp-graphql-stubs.php
 		scanDirectories:
-			- ../seo-by-rank-math
-			- ../wp-graphql-woocommerce
+			- ../seo-by-rank-math/
+			- ../seo-by-rank-math/includes/
+			- ../wp-graphql-woocommerce/includes/
 			- vendor-prefixed/axepress/wp-graphql-plugin-boilerplate/src/

phpstan.neon.dist

@@ -0,0 +1,30 @@
+<?php
+/**
+ * The Database.
+ *
+ * @since      1.0.0
+ * @package    MyThemeShop
+ * @subpackage MyThemeShop\Database
+ * @author     MyThemeShop <[email protected]>
+ */
+
+namespace MyThemeShop\Database;
+
+/**
+ * Database class.
+ */
+class Database {
+	/**
+	 * Retrieve a Database instance by table name.
+	 *
+	 * @param string $table_name A Database instance id.
+	 *
+	 * @return \MyThemeShop\Database\Query_Builder
+	 */
+	public static function table( $table_name ) {}
+}
+
+/**
+ * Query_Builder class.
+ */
+class Query_Builder {}

phpstan/class-database.stub

@@ -0,0 +1,16 @@
+<?php
+
+namespace RankMath;
+
+class Frontend_SEO_Score {}
+
+class Settings {}
+
+namespace RankMath\Replace_Variables;
+
+class Manager {}
+
+namespace RankMath\Module;
+
+class Manager {}
+

phpstan/namespace-rank-math.stub

@@ -32,7 +32,6 @@ protected static function type_name(): string {
 	 * {@inheritDoc}
 	 */
 	public static function register(): void {
-		/** @var array<string,mixed> $config */
 		$config = self::get_connection_config(
 			[
 				'fromType'       => 'RootQuery',

src/Modules/Redirection/Connection/RedirectionConnection.php

@@ -16,19 +16,19 @@
 /**
  * Class - Redirection
  *
- * @property ?int $databaseId The redirection database ID.
- * @property ?string $dateCreated The date the redirection was created.
+ * @property ?int                 $databaseId The redirection database ID.
+ * @property ?string              $dateCreated The date the redirection was created.
  * @property ?string $dateCreatedGmt The GMT date the redirection was created.
- * @property ?string $dateModified The date the redirection was last modified.
- * @property ?string $dateModifiedGmt The GMT date the redirection was last modified.
- * @property ?string $dateLastAccessed The date the redirection was last accessed.
- * @property ?string $dateLastAccessedGmt The GMT date the redirection was last accessed.
- * @property ?int $hits The number of hits for this redirection.
- * @property string $id The global ID of the redirection.
- * @property ?string $redirectToUrl The URL to redirect to.
- * @property ?array $sources The sources for this redirection.
- * @property ?string $status The status of the redirection.
- * @property ?int $type The type of redirection.
+ * @property ?string              $dateModified The date the redirection was last modified.
+ * @property ?string              $dateModifiedGmt The GMT date the redirection was last modified.
+ * @property ?string              $dateLastAccessed The date the redirection was last accessed.
+ * @property ?string              $dateLastAccessedGmt The GMT date the redirection was last accessed.
+ * @property ?int                 $hits The number of hits for this redirection.
+ * @property string               $id The global ID of the redirection.
+ * @property ?string              $redirectToUrl The URL to redirect to.
+ * @property ?array<string,mixed> $sources The sources for this redirection.
+ * @property ?string              $status The status of the redirection.
+ * @property ?int                 $type The type of redirection.
  */
 class Redirection extends Model {
 	/**

src/Modules/Redirection/Model/Redirection.php

@@ -54,11 +54,6 @@ public static function has_cap( string $capability ): bool {
 	 * @return \MyThemeShop\Database\Query_Builder
 	 */
 	public static function get_redirections_table() {
-		/**
-		 * Query_Builder gives us the methods we need to interact with.
-		 *
-		 * @var \MyThemeShop\Database\Query_Builder
-		 */
 		return Database::table( 'rank_math_redirections' );
 	}
 

src/Utils/RMUtils.php

@@ -3,7 +3,7 @@
         'name' => 'axepress/wp-graphql-rank-math',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '1cf41e140fb2c8b810cdb4dc93f6befec9bf482a',
+        'reference' => '191148867d74f25ed7ae2ffd3fef88dd8c1f77a1',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -22,7 +22,7 @@
         'axepress/wp-graphql-rank-math' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '1cf41e140fb2c8b810cdb4dc93f6befec9bf482a',
+            'reference' => '191148867d74f25ed7ae2ffd3fef88dd8c1f77a1',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),