From e259091170c5e16bf191b6c52f85ccded8f8da04 Mon Sep 17 00:00:00 2001
From: Olivier Lafleur <olafleur@godaddy.com>
Date: Tue, 2 Apr 2024 11:25:33 -0400
Subject: [PATCH 1/3] Tested Up to 6.5

---
 .github/workflows/test-wp-next.yml | 2 +-
 class-coblocks.php                 | 4 ++--
 package.json                       | 4 ++--
 readme.txt                         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-wp-next.yml b/.github/workflows/test-wp-next.yml
index 422c4b65abb..52ad52aff99 100644
--- a/.github/workflows/test-wp-next.yml
+++ b/.github/workflows/test-wp-next.yml
@@ -13,7 +13,7 @@ jobs:
     uses: ./.github/workflows/date-checker.yml
     with:
       # WP Next scheduled release date. Should be based on `https://make.wordpress.org/core/6-4/` or later.
-      scheduled_release_date: "2024-03-26"
+      scheduled_release_date: "2024-04-02"
 
   # Create WP NEXT Version Constant
   set_constant:
diff --git a/class-coblocks.php b/class-coblocks.php
index b2333299fe4..02132c1352a 100644
--- a/class-coblocks.php
+++ b/class-coblocks.php
@@ -7,8 +7,8 @@
  * Version: 3.1.7
  * Text Domain: coblocks
  * Domain Path: /languages
- * Tested up to: 6.4
- * Requires at least: 6.2
+ * Tested up to: 6.5
+ * Requires at least: 6.3
  *
  * CoBlocks is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/package.json b/package.json
index ec6d5e0ddc4..960c81c921a 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
 	"title": "CoBlocks",
 	"description": "CoBlocks is a suite of professional page building blocks for the WordPress Gutenberg block editor.",
 	"version": "3.1.7",
-	"tested_up_to": "6.4",
-	"requires_at_least": "6.2",
+	"tested_up_to": "6.5",
+	"requires_at_least": "6.3",
 	"author": "GoDaddy",
 	"license": "GPL-2.0",
 	"repository": "godaddy-wordpress/coblocks",
diff --git a/readme.txt b/readme.txt
index d1509f0388e..36707f5eb5f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Author URI: https://www.godaddy.com
 Contributors: godaddy, richtabor, eherman24, jonathanbardo, jrtashjian, paranoia1906, fjarrett, olivierlafleur, jasonlemay, snovosel
 Tags: page builder, Gutenberg blocks, WordPress blocks, gutenberg, blocks
-Requires at least: 6.2
-Tested up to: 6.4
+Requires at least: 6.3
+Tested up to: 6.5
 Requires PHP: 7.4
 Stable tag: 3.1.7
 License: GPL-2.0

From b019b2d6e70b5cfbb925a07a6504d08848d17876 Mon Sep 17 00:00:00 2001
From: Olivier Lafleur <olafleur@godaddy.com>
Date: Thu, 25 Apr 2024 09:41:46 -0400
Subject: [PATCH 2/3] Test is the post is null before getting the id

---
 src/blocks/post-carousel/index.php | 2 +-
 src/blocks/posts/index.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blocks/post-carousel/index.php b/src/blocks/post-carousel/index.php
index dde7a4fdf6e..f926d0aa7f5 100755
--- a/src/blocks/post-carousel/index.php
+++ b/src/blocks/post-carousel/index.php
@@ -22,7 +22,7 @@ function coblocks_render_coblocks_post_carousel_block( $attributes ) {
 		'order'            => $attributes['order'],
 		'orderby'          => $attributes['orderBy'],
 		'suppress_filters' => false,
-		'post__not_in'     => array( $post->ID ),
+		'post__not_in'     => !is_null($post) ? array( $post ->ID ) : array(),
 	);
 
 	if ( isset( $attributes['categories'] ) ) {
diff --git a/src/blocks/posts/index.php b/src/blocks/posts/index.php
index 40a34c604d3..fbc3d824f40 100755
--- a/src/blocks/posts/index.php
+++ b/src/blocks/posts/index.php
@@ -22,7 +22,7 @@ function coblocks_render_coblocks_posts_block( $attributes ) {
 		'order'            => $attributes['order'],
 		'orderby'          => $attributes['orderBy'],
 		'suppress_filters' => false,
-		'post__not_in'     => array( $post->ID ),
+		'post__not_in'     => !is_null($post) ? array( $post ->ID ) : array(),
 	);
 
 	if ( isset( $attributes['categories'] ) ) {

From 9faa2b5ca5bad215636bc3925c56713e3e9ee9ef Mon Sep 17 00:00:00 2001
From: Olivier Lafleur <olafleur@godaddy.com>
Date: Thu, 25 Apr 2024 09:46:20 -0400
Subject: [PATCH 3/3] linting

---
 src/blocks/post-carousel/index.php | 2 +-
 src/blocks/posts/index.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blocks/post-carousel/index.php b/src/blocks/post-carousel/index.php
index f926d0aa7f5..f878dfd19a1 100755
--- a/src/blocks/post-carousel/index.php
+++ b/src/blocks/post-carousel/index.php
@@ -22,7 +22,7 @@ function coblocks_render_coblocks_post_carousel_block( $attributes ) {
 		'order'            => $attributes['order'],
 		'orderby'          => $attributes['orderBy'],
 		'suppress_filters' => false,
-		'post__not_in'     => !is_null($post) ? array( $post ->ID ) : array(),
+		'post__not_in'     => ! is_null( $post ) ? array( $post->ID ) : array(),
 	);
 
 	if ( isset( $attributes['categories'] ) ) {
diff --git a/src/blocks/posts/index.php b/src/blocks/posts/index.php
index fbc3d824f40..d83c5cc9290 100755
--- a/src/blocks/posts/index.php
+++ b/src/blocks/posts/index.php
@@ -22,7 +22,7 @@ function coblocks_render_coblocks_posts_block( $attributes ) {
 		'order'            => $attributes['order'],
 		'orderby'          => $attributes['orderBy'],
 		'suppress_filters' => false,
-		'post__not_in'     => !is_null($post) ? array( $post ->ID ) : array(),
+		'post__not_in'     => ! is_null( $post ) ? array( $post->ID ) : array(),
 	);
 
 	if ( isset( $attributes['categories'] ) ) {