Release 1.2.1 (#216)

pantheon-systems · Feb 23, 2023 · 846f98a · 846f98a
1 parent 780bca5
commit 846f98a
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 78 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,6 +6,7 @@ updates:
     interval: weekly
     timezone: America/Los_Angeles
     day: tuesday
+  target-branch: "develop"
   open-pull-requests-limit: 99
   ignore:
   - dependency-name: phpunit/phpunit
@@ -22,4 +23,5 @@ updates:
     interval: weekly
     timezone: America/Los_Angeles
     day: tuesday
+  target-branch: "develop"
   open-pull-requests-limit: 99
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 **Tags:** pantheon, cdn, cache  
 **Requires at least:** 4.7  
 **Tested up to:** 6.1
-**Stable tag:** 1.2.0
+**Stable tag:** 1.2.1
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -304,6 +304,11 @@ See [CONTRIBUTING.md](https://github.com/pantheon-systems/pantheon-advanced-page
 
 ## Changelog ##
 
+## 1.2.1 (February 23, 2023) ##
+* Handle models that are not instances of the `WPGraphQL\Model\Model` class [[#212](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/212)].
+* Make dependabot target develop branch [[#209](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/209)].
+* Bump dependencies [[#210](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/210)] [[#214](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/214)].
+
 ## 1.2.0 (November 29, 2022) ##
 * Adds Github Actions for building tag and deploying to wp.org. Add CONTRIBUTING.md. [[#203](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/203)]
 

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "behat/mink-goutte-driver": "^1.2",
     "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
     "wp-coding-standards/wpcs": "^2",
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+    "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
     "phpunit/phpunit": "^7",
     "phpcompatibility/php-compatibility": "^9.3",
     "yoast/phpunit-polyfills": "^1.0"

diff --git a/composer.lock b/composer.lock
diff --git a/inc/class-emitter.php b/inc/class-emitter.php
@@ -382,9 +382,13 @@ function( $a, $b ) {
 	/**
 	 * Inspect the model and get the right surrogate keys.
 	 *
-	 * @param WPGraphQL\Model\Model $model Model object.
+	 * @param WPGraphQL\Model\Model|mixed $model Model object, array, etc.
 	 */
 	public static function filter_graphql_dataloader_get_model( $model ) {
+		if ( ! $model instanceof \WPGraphQL\Model\Model ) {
+			return $model;
+		}
+
 		$reflect              = new \ReflectionClass( $model );
 		$class_short_name     = $reflect->getShortName();
 		$surrogate_key_prefix = strtolower( $class_short_name );

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "pantheon-advanced-page-cache",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "Gruntfile.js",
   "author": "Pantheon",
   "devDependencies": {
-    "grunt": "^1.5.3",
+    "grunt": "^1.6.1",
     "grunt-wp-readme-to-markdown": "~2.1.0"
   }
 }
diff --git a/pantheon-advanced-page-cache.php b/pantheon-advanced-page-cache.php
@@ -7,7 +7,7 @@
  * Author URI:      https://pantheon.io
  * Text Domain:     pantheon-advanced-page-cache
  * Domain Path:     /languages
- * Version:         1.2.0
+ * Version:         1.2.1
  *
  * @package         Pantheon_Advanced_Page_Cache
  */

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: getpantheon, danielbachhuber, kporras07
 Tags: pantheon, cdn, cache
 Requires at least: 4.7
 Tested up to: 6.1
-Stable tag: 1.2.0
+Stable tag: 1.2.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -303,6 +303,11 @@ See [CONTRIBUTING.md](https://github.com/pantheon-systems/wp-saml-auth/blob/mast
 
 == Changelog ==
 
+= 1.2.1 (February 23, 2023) =
+* Handle models that are not instances of the `WPGraphQL\Model\Model` class [[#212](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/212)].
+* Make dependabot target develop branch [[#209](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/209)].
+* Bump dependencies [[#210](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/210)] [[#214](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/214)].
+
 = 1.2.0 (November 29, 2022) =
 * Adds Github Actions for building tag and deploying to wp.org. Add CONTRIBUTING.md. [[#203](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/203)]