Finish TablePress 2.2.1.

TablePress · Nov 2, 2023 · 060af4b · 060af4b
1 parent 55ee0b4
commit 060af4b
Show file tree

Hide file tree

Showing 12 changed files with 170 additions and 165 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -62,7 +62,7 @@ jobs:
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2.26.0
+        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
         with:
           php-version: 'latest'
           coverage: none

diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2.26.0
+        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
         with:
           php-version: '8.2'
           coverage: none

diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2.26.0
+        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
         with:
           php-version: ${{ matrix.php }}
           coverage: none

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -60,7 +60,7 @@ jobs:
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2.26.0
+        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2.27.0
         with:
           php-version: 'latest'
           coverage: none

diff --git a/blocks/table/block.json b/blocks/table/block.json
@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "tablepress/table",
-	"version": "2.2",
+	"version": "2.2.1",
 	"title": "TablePress table",
 	"category": "media",
 	"icon": "list-view",

diff --git a/classes/class-admin-page-helper.php b/classes/class-admin-page-helper.php
@@ -98,14 +98,21 @@ public function add_admin_footer_text(): void {
 	}
 
 	/**
-	 * Add a TablePress "Thank You" message to the admin footer content.
+	 * Adds a TablePress "Thank You" message to the admin footer content.
 	 *
 	 * @since 1.0.0
 	 *
 	 * @param string $content Current admin footer content.
 	 * @return string New admin footer content.
 	 */
-	public function _admin_footer_text( string $content ): string {
+	public function _admin_footer_text( /* string */ $content ): string {
+		// Don't use a type hint in the method declaration as many WordPress plugins use the `admin_footer_text` filter in the wrong way.
+
+		// Protect against other plugins not returning a string in their filter callbacks.
+		if ( ! is_string( $content ) ) {
+			$content = '';
+		}
+
 		$content .= ' &bull; ' . sprintf( __( 'Thank you for using <a href="%s">TablePress</a>.', 'tablepress' ), 'https://tablepress.org/' );
 		if ( tb_tp_fs()->is_free_plan() ) {
 			$content .= ' ' . sprintf( __( 'Take a look at the <a href="%s">Premium features</a>!', 'tablepress' ), 'https://tablepress.org/premium/?utm_source=plugin&utm_medium=textlink&utm_content=admin-footer' );

diff --git a/classes/class-tablepress.php b/classes/class-tablepress.php
@@ -27,7 +27,7 @@ abstract class TablePress {
 	 * @since 1.0.0
 	 * @const string
 	 */
-	public const version = '2.2'; // phpcs:ignore Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
+	public const version = '2.2.1'; // phpcs:ignore Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
 
 	/**
 	 * TablePress internal plugin version ("options scheme" version).
@@ -37,7 +37,7 @@ abstract class TablePress {
 	 * @since 1.0.0
 	 * @const int
 	 */
-	public const db_version = 66; // phpcs:ignore Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
+	public const db_version = 67; // phpcs:ignore Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
 
 	/**
 	 * TablePress "table scheme" (data format structure) version.