Merge branch 'develop' into fix/missing_wp_user_type

.github/workflows/integrate.yml

@@ -13,22 +13,23 @@ jobs:
 
     strategy:
       matrix:
-        wordpress: [ '5.7', '6.3' ]
-        php: [ '7.1', '7.4', '8.0', '8.2' ]
-        allowed_failure: [ false ]
         include:
+          # Check lowest supported WP version, with the lowest supported PHP.
+          - wordpress: '5.9'
+            php: '7.4'
+            allowed_failure: false
+          # Check latest WP with the highest supported PHP.
+          - wordpress: 'latest'
+            php: 'latest'
+            allowed_failure: false
           # Check upcoming WP.
-          - php: '8.2'
-            wordpress: 'trunk'
+          - wordpress: 'trunk'
+            php: 'latest'
             allowed_failure: true
-          # Check upcoming PHP.
-          - php: '8.3'
-            wordpress: 'latest'
-            allowed_failure: true
-        exclude:
-          # WordPress 5.7 doesn't support PHP 8.2.
-          - php: '8.2'
-            wordpress: '5.7'
+          # Check upcoming PHP - only needed when a new version has been forked (typically Sep-Nov)
+#          - wordpress: 'trunk'
+#            php: 'nightly'
+#            allowed_failure: true
       fail-fast: false
 
     steps:
@@ -43,11 +44,6 @@ jobs:
           ini-values: ${{ matrix.ini-values }}
           coverage: ${{ matrix.coverage }}
 
-      - name: Install PHPUnit 7.x for WP < 5.9
-        if: ${{ matrix.wordpress < 5.9 }}
-        # Ignore platform requirements, so that PHPUnit 7.5 can be installed on PHP 8.0 (and above).
-        run: composer require --dev phpunit/phpunit:"^7.5" --ignore-platform-req=php+ --no-update --no-scripts --no-interaction
-
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
@@ -67,10 +63,6 @@ jobs:
       - name: Start MySQL service
         run: sudo systemctl start mysql.service
 
-      - name: Setting mysql_native_password for PHP <= 7.3
-        if: ${{ matrix.php <= 7.3 }}
-        run: mysql -u root -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root'";
-
       - name: Install WordPress environment
         run: composer prepare ${{ matrix.wordpress }}
 

CHANGELOG.md

@@ -5,6 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.1] - 2024-04-25
+
+### Fixed
+
+* Fix missing author column in wp-admin Posts table #1038
+
+## [3.6.0] - 2024-04-22
+
+### Added
+* Blocks for Co-Authors #997
+
+### Fixed
+* Improve alignment in author-selection component #990
+* Fix admin notice positions #1002
+* UI: Add capability check to Add New button #1003
+* i18n: set script translations and refresh language files #1007
+
+### Maintenance
+* Docs: Consolidate and refresh README.md #992
+* Refresh package.json #993
+* NPM: Add version-bump-prompt #994
+* Fix/general code tidy #995
+* Composer: Use 4-space tab indentation #999
+* Improve tests structure #1000
+* Extract iterator class from template-tags.php #1005
+* Add supported_post_types() method #1006
+* Tests improvements #1008
+* Bump postcss from 8.4.19 to 8.4.31 #1009
+* Create co-authors-plus-da_DK.po #1013
+* Increase minimum supported PHP version to 7.4 #954
+* Increase minimum supported WordPress version to 5.7 #955
+
 ## [3.5.15] - 2023-08-28
 
 ### Fixed
@@ -462,6 +494,8 @@ Props to the many people who helped make this release possible: [catchmyfame](ht
 **1.1.0 (Apr. 14, 2009)**
 * Initial beta release.
 
+[3.6.1]: https://github.com/automattic/co-authors-plus/compare/3.6.0..3.6.1
+[3.6.0]: https://github.com/automattic/co-authors-plus/compare/3.5.15...3.6.0
 [3.5.15]: https://github.com/automattic/co-authors-plus/compare/3.5.14...3.5.15
 [3.5.14]: https://github.com/automattic/co-authors-plus/compare/3.5.13...3.5.14
 [3.5.13]: https://github.com/automattic/co-authors-plus/compare/3.5.12...3.5.13

README.md

@@ -1,9 +1,9 @@
 # Co-Authors Plus
 
-Stable tag: 3.5.15  
+Stable tag: 3.6.1  
 Requires at least: 4.1  
-Tested up to: 6.3  
-Requires PHP: 5.6  
+Tested up to: 6.5  
+Requires PHP: 7.4  
 License: GPLv2 or later  
 License URI: https://www.gnu.org/licenses/gpl-2.0.html  
 Tags: authors, users, multiple authors, co-authors, multi-author, publishing  
@@ -68,3 +68,87 @@ Yes! Guest authors can be disabled entirely through a filter. Having the followi
 ## Change Log
 
 [View the change log](https://github.com/Automattic/Co-Authors-Plus/blob/master/CHANGELOG.md).
+
+## Blocks
+
+### Co-Authors
+
+Use this block to create a repeating template that displays the co-authors of a post. By default it contains the Co-Author Name block, but you can add any other block you want to the template. If you choose another Co-Author block like avatar, biography or image it will automatically be supplied the author `context` that it needs. This works similarly to creating a Post Template in a Query Loop block.
+
+The Co-Authors Block supports two layouts:
+
+#### Inline Layout
+
+Use the inline layout to display co-authors in a list on a single wrapping line.
+
+You can control the characters displayed before, between and after co-authors in the list using the block settings, or change the defaults using the following server-side filters:
+
+```
+coauthors_default_before
+coauthors_default_between
+coauthors_default_between_last
+coauthors_default_after
+```
+
+#### Block Layout
+
+Use the block layout to display co-authors in a vertical stack. While using the block layout you can use block spacing settings to control the vertical space between co-authors.
+
+Then you can create your own layout using blocks like group, row or stack and it will be applied to each co-author, similar to applying a layout to each post in a query loop.
+
+### Co-Author Name
+
+This block displays a co-author's `Display Name` and optionally turns it into a link to their author archive.
+
+Using the block's advanced settings you can select which HTML element is used to output the name. This is useful in contexts such as an author archive where you might want their name to be a heading.
+
+### Co-Author Avatar
+
+Like the post author avatar, or comment author avatar, this block displays a small scale square image of a co-author and utilizes the Gravatar default avatars as configured in your site's discussion options.
+
+To customize the available sizes, use the [rest_avatar_sizes](https://developer.wordpress.org/reference/hooks/rest_avatar_sizes/) filter.
+
+### Co-Author Biography
+
+This block outputs the biographical information for a co-author based on either their user or guest author data.
+
+The content is wrapped in paragraph elements using `wpautop` and is escaped using `wp_kses_post`.
+
+### Co-Author Featured Image
+
+This block requires the use of Guest Authors. Because guest author avatars are uploaded to the WordPress media library, there are more options for displaying these images.
+
+This block utilizes the image sizes configured in your theme and your site's media settings to present a guest author's avatar at a larger scale or higher resolution. It does not support Gravatars.
+
+## Block Context
+
+### Post, Page, Query Loop
+
+By default, all blocks receive the post context. The job of the Co-Authors Block is to use this context to find the relevant authors and provide context to its inner blocks.
+
+### Author Archive
+
+If you want to display data about the author on their own archive, use the individual co-author blocks directly without wrapping them in the Co-Authors Block. During requests for an author archive the correct context is derived from the `author_name` query variable and provided to all blocks that declare their use of the context `co-authors-plus/author`.
+
+### Extending
+
+If you make a custom block and want to use the author context, add `co-authors-plus/author` to the `usesContext` property in your block.json file.
+
+Example:
+```json
+{
+	"usesContext": ["co-authors-plus/author"]
+}
+```
+
+## Block Example Data
+
+When working with Full Site Editing, or in the post editor before the authors are loaded, example data is used. The example data provided with the co-author blocks resembles a response to the `/coauthors/v1/coauthors/:user-nicename` REST API endpoint.
+
+### Extending
+
+If you have written a plugin that modifies the REST API response, you can similarly modify the example data either on the server-side using the filter `coauthors_blocks_store_data` or the client-side using the filter `co-authors-plus.author-placeholder`.
+
+## Block Non-support
+
+To declare a lack of support for Co-Author Plus blocks on your site, use the filter `coauthors_plus_support_blocks` to return `false`.

build/blocks-store/index.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-data', 'wp-hooks'), 'version' => '82f1cda3f1d3fbb0136c');

build/blocks/block-coauthor-avatar/block.json

@@ -0,0 +1,61 @@
+{
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "name": "co-authors-plus/avatar",
+  "version": "1.0.0",
+  "title": "Co-Author Avatar",
+  "category": "theme",
+  "description": "Displays a small scale version of a co-author's avatar. Utilizes fallbacks from Gravatar so everyone has an avatar.",
+  "keywords": [
+    "coauthors"
+  ],
+  "supports": {
+    "html": false,
+    "__experimentalBorder": {
+      "color": true,
+      "radius": true,
+      "width": true,
+      "__experimentalSelector": "img, .block-editor-media-placeholder",
+      "__experimentalSkipSerialization": true,
+      "__experimentalDefaultControls": {
+        "color": false,
+        "radius": false,
+        "width": false
+      }
+    },
+    "spacing": {
+      "margin": true,
+      "padding": true,
+      "__experimentalDefaultControls": {
+        "margin": false,
+        "padding": false
+      }
+    }
+  },
+  "usesContext": [
+    "co-authors-plus/author",
+    "co-authors-plus/layout"
+  ],
+  "attributes": {
+    "size": {
+      "type": "number",
+      "default": 24
+    },
+    "isLink": {
+      "type": "boolean",
+      "default": false
+    },
+    "rel": {
+      "type": "string"
+    },
+    "verticalAlign": {
+      "type": "string"
+    },
+    "align": {
+      "type": "string"
+    }
+  },
+  "textdomain": "co-authors-plus",
+  "editorScript": "file:./index.js",
+  "style": "file:./style-index.css"
+}

build/blocks/block-coauthor-avatar/index.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'b6b841ac8f86f7358245');

build/blocks/block-coauthor-description/block.json

@@ -0,0 +1,54 @@
+{
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "name": "co-authors-plus/description",
+  "version": "1.0.0",
+  "title": "Co-Author Biography",
+  "category": "theme",
+  "description": "Displays a co-author's biographical description.",
+  "keywords": [
+    "coauthors",
+    "description",
+    "bio",
+    "biography"
+  ],
+  "supports": {
+    "html": false,
+    "color": {
+      "link": true,
+      "text": true,
+      "background": true,
+      "__experimentalDefaultControls": {}
+    },
+    "typography": {
+      "fontSize": true,
+      "lineHeight": true,
+      "__experimentalFontFamily": true,
+      "__experimentalTextDecoration": true,
+      "__experimentalFontStyle": true,
+      "__experimentalFontWeight": true,
+      "__experimentalLetterSpacing": true,
+      "__experimentalTextTransform": true,
+      "__experimentalDefaultControls": {}
+    },
+    "spacing": {
+      "margin": true,
+      "padding": true,
+      "__experimentalDefaultControls": {
+        "margin": false,
+        "padding": false
+      }
+    }
+  },
+  "usesContext": [
+    "co-authors-plus/author"
+  ],
+  "attributes": {
+    "textAlign": {
+      "type": "string"
+    }
+  },
+  "textdomain": "co-authors-plus",
+  "editorScript": "file:./index.js",
+  "editorStyle": "file:./index.css"
+}

build/blocks/block-coauthor-description/index.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'd61297f0bd62592218f0');

build/blocks/block-coauthor-description/index.css

@@ -0,0 +1 @@
+.wp-block-co-authors-plus-description a{pointer-events:none}