Merge pull request #7193 from pods-framework/release/3.0.6

changelog.txt

@@ -2,6 +2,11 @@ Found a bug? Have a great feature idea? Get on GitHub and tell us about it and w
 
 Our GitHub has the full list of all prior releases of Pods: https://github.com/pods-framework/pods/releases
 
+= 3.0.6 - October 2nd, 2023 =
+
+* Fixed: Resolved a plugin conflict with The Events Calendar / Event Tickets plugins that was introduced in 3.0.5. (@sc0ttkclark)
+* Fixed: PHP deprecated notices resolved for return types in PHP 8+ (@sc0ttkclark)
+
 = 3.0.5 - October 2nd, 2023 =
 
 * Tweak: Added the "full" image size to the reference list in the Pods Template editor. #7183 #7184 (@JoryHogeveen) 
@@ -11,7 +16,7 @@ Our GitHub has the full list of all prior releases of Pods: https://github.com/p
 * Fixed: Normalize numbers when doing conditional logic comparisons. (@sc0ttkclark)
 * Fixed: Add new options to trim content of fields by removing empty p tags, trimming whitespace at the end of lines, and removing extra lines. Default those to off (previously they were just always on). (@sc0ttkclark)
 * Fixed: Add `tribe()` backward compatibilty function for Pods add-ons that still call that function. This only gets included by Pods when Tribe Common is not detected on the site. (@sc0ttkclark)
-* Fixed: Resolve file/relationship lookups for settings pages that are DB vs file-based configs. (@sc0ttkclark)  
+* Fixed: Resolve file/relationship lookups for settings pages that are DB vs file-based configs. (@sc0ttkclark)
 
 = 3.0.4 - September 25th, 2023 =
 

classes/PodsInit.php

@@ -2438,6 +2438,8 @@ public function run() {
 
 		// Compatibility for Query Monitor conditionals
 		add_filter( 'query_monitor_conditionals', array( $this, 'filter_query_monitor_conditionals' ) );
+
+		require_once PODS_DIR . 'includes/compatibility.php';
 	}
 
 	/**

includes/compatibility.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @package Pods\Global\Functions\Compatibility
+ */
+
+// Add backwards compatibility for tribe() for old add-ons that may still call it.
+if (
+	! function_exists( 'tribe_is_not_min_php_version' )
+	&& ! function_exists( 'tribe' )
+	&& ! doing_action( 'activate_plugin' )
+	&& ! did_action( 'activate_plugin' )
+	&& (
+		! defined( 'WP_SANDBOX_SCRAPING' )
+		|| ! WP_SANDBOX_SCRAPING
+	)
+	&& 'activate' !== pods_v( 'action' )
+) {
+	/**
+	 * Compatibility function for Pods 2.x add-ons that may still call tribe().
+	 *
+	 * @since 3.0.5
+	 *
+	 * @param string|null $slug_or_class  Either the slug of a binding previously registered using singleton or
+	 *                                    register or the full class name that should be automagically created or
+	 *                                    `null` to get the container instance itself.
+	 *
+	 * @return mixed|null The pods_container() object or null if the function does not exist yet.
+	 */
+	function tribe( $slug_or_class = null ) {
+		_doing_it_wrong( 'tribe', 'tribe() is no longer included in Pods Framework directly. Please use pods_container() instead.', '3.0' );
+
+		return pods_container( $slug_or_class );
+	}
+}

includes/general.php

@@ -4570,26 +4570,3 @@ function pods_container_register_service_provider( $provider_class ) {
 
 	$container->register( $provider_class );
 }
-
-// Add backwards compatibility for tribe() for old add-ons that may still call it.
-if (
-	! function_exists( 'tribe_is_not_min_php_version' )
-	&& ! function_exists( 'tribe' )
-) {
-	/**
-	 * Compatibility function for Pods 2.x add-ons that may still call tribe().
-	 *
-	 * @since 3.0.5
-	 *
-	 * @param string|null $slug_or_class  Either the slug of a binding previously registered using singleton or
-	 *                                    register or the full class name that should be automagically created or
-	 *                                    `null` to get the container instance itself.
-	 *
-	 * @return mixed|null The pods_container() object or null if the function does not exist yet.
-	 */
-	function tribe( $slug_or_class = null ) {
-		_doing_it_wrong( 'tribe', 'tribe() is no longer included in Pods Framework directly. Please use pods_container() instead.', '3.0' );
-
-		return pods_container( $slug_or_class );
-	}
-}

init.php

@@ -10,7 +10,7 @@
  * Plugin Name:       Pods - Custom Content Types and Fields
  * Plugin URI:        https://pods.io/
  * Description:       Pods is a framework for creating, managing, and deploying customized content types and fields
- * Version:           3.0.5
+ * Version:           3.0.6
  * Author:            Pods Framework Team
  * Author URI:        https://pods.io/about/
  * Text Domain:       pods
@@ -43,7 +43,7 @@
 	add_action( 'init', 'pods_deactivate_pods_ui' );
 } else {
 	// Current version.
-	define( 'PODS_VERSION', '3.0.5' );
+	define( 'PODS_VERSION', '3.0.6' );
 
 	// Current database version, this is the last version the database changed.
 	define( 'PODS_DB_VERSION', '2.3.5' );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pods",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "Pods is a development framework for creating, extending, managing, and deploying customized content types in WordPress.",
   "author": "Pods Foundation, Inc",
   "homepage": "https://pods.io/",

readme.txt

@@ -5,7 +5,7 @@ Tags: pods, custom post types, custom taxonomies, content types, custom fields,
 Requires at least: 6.0
 Tested up to: 6.3
 Requires PHP: 7.2
-Stable tag: 3.0.5
+Stable tag: 3.0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -177,6 +177,11 @@ Pods really wouldn't be where it is without all the contributions from our [dono
 
 == Changelog ==
 
+= 3.0.6 - October 2nd, 2023 =
+
+* Fixed: Resolved a plugin conflict with The Events Calendar / Event Tickets plugins that was introduced in 3.0.5. (@sc0ttkclark)
+* Fixed: PHP deprecated notices resolved for return types in PHP 8+ (@sc0ttkclark)
+
 = 3.0.5 - October 2nd, 2023 =
 
 * Tweak: Added the "full" image size to the reference list in the Pods Template editor. #7183 #7184 (@JoryHogeveen) 
@@ -186,7 +191,7 @@ Pods really wouldn't be where it is without all the contributions from our [dono
 * Fixed: Normalize numbers when doing conditional logic comparisons. (@sc0ttkclark)
 * Fixed: Add new options to trim content of fields by removing empty p tags, trimming whitespace at the end of lines, and removing extra lines. Default those to off (previously they were just always on). (@sc0ttkclark)
 * Fixed: Add `tribe()` backward compatibilty function for Pods add-ons that still call that function. This only gets included by Pods when Tribe Common is not detected on the site. (@sc0ttkclark)
-* Fixed: Resolve file/relationship lookups for settings pages that are DB vs file-based configs. (@sc0ttkclark)  
+* Fixed: Resolve file/relationship lookups for settings pages that are DB vs file-based configs. (@sc0ttkclark)
 
 = 3.0.4 - September 25th, 2023 =