Merge branch 'develop' into trunk

.gitattributes

@@ -1,4 +1,5 @@
 # Directories
+/.git export-ignore
 /.github export-ignore
 /.wordpress-org export-ignore
 
@@ -7,8 +8,8 @@
 /.gitignore export-ignore
 /CHANGELOG.md export-ignore
 /CODE_OF_CONDUCT.md export-ignore
+/composer.json export-ignore
 /CONTRIBUTING.md export-ignore
 /CREDITS.md export-ignore
 /LICENSE.md export-ignore
 /README.md export-ignore
-/composer.json export-ignore

.github/workflows/push-asset-readme-update.yml

@@ -2,15 +2,15 @@ name: Plugin asset/readme update
 on:
   push:
     branches:
-    - master
+    - trunk
 jobs:
-  master:
-    name: Push to master
+  trunk:
+    name: Push to trunk
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: WordPress.org plugin asset/readme update
-      uses: 10up/action-wordpress-plugin-asset-update@master
+      uses: 10up/action-wordpress-plugin-asset-update@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/push-deploy.yml

@@ -8,9 +8,9 @@ jobs:
     name: New tag
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: WordPress Plugin Deploy
-      uses: 10up/action-wordpress-plugin-deploy@master
+      uses: 10up/action-wordpress-plugin-deploy@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

CHANGELOG.md

@@ -4,47 +4,56 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.3.2] - 2022-06-28
+### Changed
+- Bump WordPress version "tested up to" 6.0 (props [@lukecav](https://github.com/lukecav), [@burhandodhy](https://github.com/burhandodhy), [@jeffpaul](https://github.com/jeffpaul) via [#45](https://github.com/10up/wp-newrelic/pull/45), [#49](https://github.com/10up/wp-newrelic/pull/49)).
+
 ## [1.3.1] - 2020-01-31
 ### Added
-- Check for New Relic functions before attempting to use them (props [@msaggiorato](https://github.com/msaggiorato) via [#31](https://github.com/10up/wp-newrelic/pull/31))
-- Plugin banner and icon images (props [@sncampbell](https://github.com/sncampbell) via [#40](https://github.com/10up/wp-newrelic/pull/40))
-- Documentation on PHP version conflict (props [@jeffpaul](https://github.com/jeffpaul) via [#41](https://github.com/10up/wp-newrelic/pull/41))
+- Check for New Relic functions before attempting to use them (props [@msaggiorato](https://github.com/msaggiorato) via [#31](https://github.com/10up/wp-newrelic/pull/31)).
+- Plugin banner and icon images (props [@sncampbell](https://github.com/sncampbell) via [#40](https://github.com/10up/wp-newrelic/pull/40)).
+- Documentation on PHP version conflict (props [@jeffpaul](https://github.com/jeffpaul) via [#41](https://github.com/10up/wp-newrelic/pull/41)).
+- GitHub Actions for plugin and asset deploys to WordPress.org (props [@jeffpaul](https://github.com/jeffpaul) via [#34](https://github.com/10up/wp-newrelic/pull/34)).
+
+### Changed
+- Bump WordPress version "tested up to" 5.3 (props [@jeffpaul](https://github.com/jeffpaul) via [#35](https://github.com/10up/wp-newrelic/pull/35)).
 
 ### Fixed
-- Sitemap check failures where global `wp_query` was undefined (props [@msaggiorato](https://github.com/msaggiorato) via [#30](https://github.com/10up/wp-newrelic/pull/30))
+- Sitemap check failures where global `wp_query` was undefined (props [@msaggiorato](https://github.com/msaggiorato) via [#30](https://github.com/10up/wp-newrelic/pull/30)).
 
 ## [1.3] - 2018-08-30
 ### Added
-- Support for Yoast SEO Sitemaps (props [@allan23](https://github.com/allan23) via [#26](https://github.com/10up/wp-newrelic/pull/26))
-- Issue with Beaver Builder (props [@oscarssanchez](https://github.com/oscarssanchez) via [#27](https://github.com/10up/wp-newrelic/pull/27))
+- Support for Yoast SEO Sitemaps (props [@allan23](https://github.com/allan23) via [#26](https://github.com/10up/wp-newrelic/pull/26)).
+- Issue with Beaver Builder (props [@oscarssanchez](https://github.com/oscarssanchez) via [#27](https://github.com/10up/wp-newrelic/pull/27)).
 
 ## [1.2] - 2018-05-03
 ### Added
-- Support for REST API requests (props [@Rahe](https://github.com/Rahe) via [#21](https://github.com/10up/wp-newrelic/pull/21))
-- composer.json (props [@herewithme](https://github.com/herewithme) via [#22](https://github.com/10up/wp-newrelic/pull/22))
+- Support for REST API requests (props [@Rahe](https://github.com/Rahe) via [#21](https://github.com/10up/wp-newrelic/pull/21)).
+- composer.json (props [@herewithme](https://github.com/herewithme) via [#22](https://github.com/10up/wp-newrelic/pull/22)).
 
 ### Changed
-- Better naming for transactions (props [@eugene-manuilov](https://github.com/eugene-manuilov) via [#19](https://github.com/10up/wp-newrelic/pull/19))
+- Better naming for transactions (props [@eugene-manuilov](https://github.com/eugene-manuilov) via [#19](https://github.com/10up/wp-newrelic/pull/19)).
 
 ### Fixed
-- PHP warning (props [@ninnypants](https://github.com/ninnypants) via [#18](https://github.com/10up/wp-newrelic/pull/18))
+- PHP warning (props [@ninnypants](https://github.com/ninnypants) via [#18](https://github.com/10up/wp-newrelic/pull/18)).
 
 ## [1.1] - 2017-04-25
 ### Added
-- Transaction grouping (props [@nicholasio](https://github.com/nicholasio) via [#6](https://github.com/10up/wp-newrelic/pull/6))
-- Constant to allow disabling of installation notice (props [@tott](https://github.com/tott) via [#15](https://github.com/10up/wp-newrelic/pull/15))
+- Transaction grouping (props [@nicholasio](https://github.com/nicholasio) via [#6](https://github.com/10up/wp-newrelic/pull/6)).
+- Constant to allow disabling of installation notice (props [@tott](https://github.com/tott) via [#15](https://github.com/10up/wp-newrelic/pull/15)).
 
 ### Changed
-- Disabling NREUM on AMP pages (props [@goldenapples](https://github.com/goldenapples) via [#11](https://github.com/10up/wp-newrelic/pull/11))
+- Disabling NREUM on AMP pages (props [@goldenapples](https://github.com/goldenapples) via [#11](https://github.com/10up/wp-newrelic/pull/11)).
 
 ### Fixed
-- PHP warning (props [@allan23](https://github.com/allan23) via [#13](https://github.com/10up/wp-newrelic/pull/13))
+- PHP warning (props [@allan23](https://github.com/allan23) via [#13](https://github.com/10up/wp-newrelic/pull/13)).
 
 ## [1.0] - 2017-01-09
 ### Added
 - First release of WP New Relic plugin 🎉
 
-[Unreleased]: https://github.com/10up/wp-newrelic/compare/master...develop
+[Unreleased]: https://github.com/10up/wp-newrelic/compare/trunk...develop
+[1.3.2]: https://github.com/10up/wp-newrelic/compare/1.3.1...1.3.2
 [1.3.1]: https://github.com/10up/wp-newrelic/compare/1.3...1.3.1
 [1.3]: https://github.com/10up/wp-newrelic/compare/d70cf93...1.3
 [1.2]: https://github.com/10up/wp-newrelic/compare/49f4e79...d70cf93

CONTRIBUTING.md

@@ -24,20 +24,21 @@ For more on how 10up writes and manages code, check out our [10up Engineering Be
 
 ## Workflow
 
-The `develop` branch is the development branch which means it contains the next version to be released. `stable` contains the current latest release and `master` contains the corresponding stable development version. Always work on the `develop` branch and open up PRs against `develop`.
+The `develop` branch is the development branch which means it contains the next version to be released. `stable` contains the current latest release and `trunk` contains the corresponding stable development version. Always work on the `develop` branch and open up PRs against `develop`.
 
 ## Release instructions
 
 1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
 2. Version bump: Bump the version number in `newrelic-reporting-for-wordpress.php` and `readme.txt` if it does not already reflect the version being released.
-3. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`
-4. Props: update CREDITS.md file with any new contributors, confirm maintainers are accurate
+3. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`.
+4. Props: update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
 5. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
-6. Readme updates: Make any other readme changes as necessary. `CHANGELOG.md` and `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different.
-7. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `master` (`git checkout master && git merge --no-ff develop`). `master` contains the stable development version.
-8. Push: Push your master branch to GitHub, e.g. `git push origin master`.
-9. Release: Create a [new release](https://github.com/10up/wp-newrelic/releases/new), naming the tag and the release with the new version number, and targeting the `master` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the `X.Y.Z` milestone (e.g. `https://github.com/10up/wp-newrelic/milestone/2?closed=1`).
-10. SVN: Wait for the [GitHub Action](https://github.com/10up/wp-newrelic/actions) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
-11. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-newrelic/. This may take a few minutes.
-12. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/wp-newrelic/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close `X.Y.Z` milestone.
-13. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
+6. Readme updates: Make any other readme changes as necessary. `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different.
+7. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`). `trunk` contains the stable development version.
+8. Test: While still on the `trunk` branch, test for functionality locally.
+9. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
+10. Release: Create a [new release](https://github.com/10up/wp-newrelic/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the [X.Y.Z milestone](https://github.com/10up/wp-newrelic/milestone/1?closed=1).
+11. SVN: Wait for the [GitHub Action](https://github.com/10up/wp-newrelic/actions) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
+12. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-newrelic/. This may take a few minutes.
+13. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/wp-newrelic/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
+14. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.

CREDITS.md

@@ -1,3 +1,5 @@
+# Credits
+
 The following acknowledges the Maintainers for this repository, those who have Contributed to this repository (via bug reports, code, design, ideas, project management, translation, testing, etc.), and any Libraries utilized.
 
 ## Maintainers
@@ -10,7 +12,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Thorsten Ott (@tott)](https://github.com/tott), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle), [John Eckman (@jeckman)](https://github.com/jeckman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Nathaniel Taintor (@goldenapples)](https://github.com/goldenapples), [Allan Collins (@allan23)](https://github.com/allan23), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Nicolas Juen (@Rahe)](https://github.com/Rahe), [Amaury Balmer (@herewithme)](https://github.com/herewithme), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matias Saggiorato (@msaggiorato)](https://github.com/msaggiorato), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell).
+[Thorsten Ott (@tott)](https://github.com/tott), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle), [John Eckman (@jeckman)](https://github.com/jeckman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Nathaniel Taintor (@goldenapples)](https://github.com/goldenapples), [Allan Collins (@allan23)](https://github.com/allan23), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Nicolas Juen (@Rahe)](https://github.com/Rahe), [Amaury Balmer (@herewithme)](https://github.com/herewithme), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matias Saggiorato (@msaggiorato)](https://github.com/msaggiorato), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell), [Luke Cavanagh (@lukecav)](https://github.com/lukecav), [Burhan Nasir (@burhandodhy)](https://github.com/burhandodhy).
 
 ## Libraries
 

README.md

@@ -2,7 +2,7 @@
 
 > New Relic APM reports for WordPress.
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/wp-newrelic.svg)](https://github.com/10up/wp-newrelic/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.3%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/wp-newrelic.svg)](https://github.com/10up/wp-newrelic/blob/develop/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/wp-newrelic.svg)](https://github.com/10up/wp-newrelic/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/wp-newrelic?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/wp-newrelic.svg)](https://github.com/10up/wp-newrelic/blob/develop/LICENSE.md)
 
 ## Table of Contents
 
@@ -142,5 +142,5 @@ If you identify any errors or have an idea for improving the plugin, please open
 ## Like what you see?
 
 <p align="center">
-<a href="http://10up.com/contact/"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
+<a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
 </p>

newrelic-reporting-for-wordpress.php

@@ -1,13 +1,17 @@
 <?php
 
 /**
- * Plugin Name: New Relic Reporting for WordPress
- * Description: New Relic APM reports for WordPress
- * Version:     1.3.1
- * Author:      10up
- * Author URI:  https://10up.com
- * License:     GPLv2 or later
- * Text Domain: wp-newrelic
+ * Plugin Name:       New Relic Reporting for WordPress
+ * Plugin URI:        https://wordpress.org/plugins/wp-newrelic
+ * Description:       New Relic APM reports for WordPress
+ * Version:           1.3.2
+ * Requires at least: 4.0
+ * Requires PHP:      7.3.11
+ * Author:            10up
+ * Author URI:        https://10up.com
+ * License:           GPL v2 or later
+ * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
+ * Text Domain:       wp-newrelic
  */
 
 if ( ! defined( 'ABSPATH' ) ) {