Merge branch 'develop' into trunk

# Conflicts: # CHANGELOG.md # readme.txt
10up · Sep 14, 2022 · 3fcce3b · 3fcce3b
2 parents 9a30134 + e2cb88b
commit 3fcce3b
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 72 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         core:
           - {name: 'WP latest', version: 'latest'}
-          - {name: 'WP minimum', version: 'WordPress/WordPress#5.5'}
+          - {name: 'WP minimum', version: 'WordPress/WordPress#5.7'}
 
     steps:
     - name: Checkout

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -50,14 +50,14 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.4'
         coverage: none
-        tools: prestissimo, composer:v2
+        tools: composer:v2
     - name: composer install
       run: composer install --ignore-platform-reqs
     - name: Check PHPCS standard
       run: ./vendor/bin/phpcs -i
     - name: PHPCS check
       uses: chekalsky/phpcs-action@v1
       with:
-        phpcs_bin_path: './vendor/bin/phpcs . --runtime-set testVersion 7.0-'
+        phpcs_bin_path: './vendor/bin/phpcs . --runtime-set testVersion 7.4-'
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   php_compatibility:
-    name: PHP minimum 7.0
+    name: PHP minimum 7.4
     runs-on: ubuntu-latest
 
     steps:
@@ -21,12 +21,12 @@ jobs:
       - name: Set PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.2
+          php-version: 7.4
           tools: composer:v2
           coverage: none
 
       - name: Install dependencies
         run: composer update -W
 
       - name: Check PHP Compatibility
-        run: vendor/bin/phpcs -p publisher-media-kit.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.0
+        run: vendor/bin/phpcs -p publisher-media-kit.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,47 +4,56 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
-## [1.2.1] - 2022-07-19
+## [1.3.0] - 2022-09-14
+**Note that this release bumps the minimum required version of WordPress from 5.5 to 5.7 and PHP from 7.0 to 7.4.**
+
+### Changed
+- Bump minimum required version of WordPress from 5.5 to 5.7 (props [@vikrampm1](https://github.com/vikrampm1), [@faisal-alvi](https://github.com/faisal-alvi), [@Sidsector9](https://github.com/Sidsector9) via [#96](https://github.com/10up/publisher-media-kit/pull/96)).
+- Bump minimum required version of PHP from 7.0 to 7.4 (props [@vikrampm1](https://github.com/vikrampm1), [@faisal-alvi](https://github.com/faisal-alvi), [@Sidsector9](https://github.com/Sidsector9) via [#96](https://github.com/10up/publisher-media-kit/pull/96)).
 
+### Security
+- Bump `terser` from 5.14.0 to 5.14.2 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi) via [#95](https://github.com/10up/publisher-media-kit/pull/95)).
+
+## [1.2.1] - 2022-07-19
 ### Changed
-- Updated the `CONTRIBUTING.md` file (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#89](https://github.com/10up/publisher-media-kit/pull/89))
+- Updated the `CONTRIBUTING.md` file (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#89](https://github.com/10up/publisher-media-kit/pull/89)).
 
 ### Fixed
-- Bring back the `/assets/images` directory to avoid broken images (props [@dkotter](https://github.com/dkotter), [@kmwilkerson](https://github.com/kmwilkerson), [@faisal-alvi](https://github.com/faisal-alvi) via [#91](https://github.com/10up/publisher-media-kit/pull/91))
+- Bring back the `/assets/images` directory to avoid broken images (props [@dkotter](https://github.com/dkotter), [@kmwilkerson](https://github.com/kmwilkerson), [@faisal-alvi](https://github.com/faisal-alvi) via [#91](https://github.com/10up/publisher-media-kit/pull/91)).
 
 ## [1.2.0] - 2022-06-27
 ### Added
-- Dependency security scanning. (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#84](https://github.com/10up/publisher-media-kit/pull/84))
+- Dependency security scanning. (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#84](https://github.com/10up/publisher-media-kit/pull/84)).
 
 ### Changed
-- Bump WordPress "tested up to" version 6.0. (props [@ajmaurya99](https://github.com/ajmaurya99), [@faisal-alvi](https://github.com/faisal-alvi), [@vikrampm1](https://github.com/vikrampm1) via [#83](https://github.com/10up/publisher-media-kit/pull/83))
+- Bump WordPress "tested up to" version 6.0. (props [@ajmaurya99](https://github.com/ajmaurya99), [@faisal-alvi](https://github.com/faisal-alvi), [@vikrampm1](https://github.com/vikrampm1) via [#83](https://github.com/10up/publisher-media-kit/pull/83)).
 
 ### Security
-- Upgrade 10up-toolkit to v4 (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@Sidsector9](https://github.com/Sidsector9) via [#85](https://github.com/10up/publisher-media-kit/pull/85))
-- Bump eventsource from 1.1.0 to 1.1.1 (props [@dependabot](https://github.com/apps/dependabot), [@jeffpaul](https://github.com/jeffpaul) via [#86](https://github.com/10up/publisher-media-kit/pull/86))
+- Upgrade `10up-toolkit` from 1.0.13 to 4.0.0 (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@Sidsector9](https://github.com/Sidsector9) via [#85](https://github.com/10up/publisher-media-kit/pull/85)).
+- Bump `eventsource` from 1.1.0 to 1.1.1 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@jeffpaul](https://github.com/jeffpaul) via [#86](https://github.com/10up/publisher-media-kit/pull/86)).
 
 ## [1.1.0] - 2022-04-20
 ### Added
-- Added mobile styling and fixed linting errors (props [@cldhmmr](https://github.com/cldhmmr), [@treykane](https://github.com/treykane), [@faisal-alvi](https://github.com/faisal-alvi), [@sudip-10up](https://github.com/sudip-10up), [@jeffpaul](https://github.com/jeffpaul) via [#72](https://github.com/10up/publisher-media-kit/pull/72))
+- Added mobile styling and fixed linting errors (props [@cldhmmr](https://github.com/cldhmmr), [@treykane](https://github.com/treykane), [@faisal-alvi](https://github.com/faisal-alvi), [@sudip-10up](https://github.com/sudip-10up), [@jeffpaul](https://github.com/jeffpaul) via [#72](https://github.com/10up/publisher-media-kit/pull/72)).
 
 ### Changed
-- WP Version bump to 5.9 (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@sudip-10up](https://github.com/sudip-10up), [@ankitguptaindia](https://github.com/ankitguptaindia) via [#64](https://github.com/10up/publisher-media-kit/pull/64))
-- Compatible tabs with the upstream version 1.0.2 (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#81](https://github.com/10up/publisher-media-kit/pull/81))
+- WP Version bump to 5.9 (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@sudip-10up](https://github.com/sudip-10up), [@ankitguptaindia](https://github.com/ankitguptaindia) via [#64](https://github.com/10up/publisher-media-kit/pull/64)).
+- Compatible tabs with the upstream version 1.0.2 (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#81](https://github.com/10up/publisher-media-kit/pull/81)).
 
 ### Fixed
-- Fix responsive issues of media kit page (props [@mehidi258](https://github.com/mehidi258), [@sudip-10up](https://github.com/sudip-10up) [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#52](https://github.com/10up/publisher-media-kit/pull/52))
-- Fix eslint errors (props [@mehidi258](https://github.com/mehidi258), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#61](https://github.com/10up/publisher-media-kit/pull/61))
-- Fix editor styles to match frontend design (props [@mehidi258](https://github.com/mehidi258), [@ankitguptaindia](https://github.com/ankitguptaindia), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#58](https://github.com/10up/publisher-media-kit/pull/58))
-- Fix audience profiles border width (props [@mehidi258](https://github.com/mehidi258), [@Sidsector9](https://github.com/Sidsector9), [@ankitguptaindia](https://github.com/ankitguptaindia), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#59](https://github.com/10up/publisher-media-kit/pull/59))
-- Tab Title is editable from below the tab (props [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc), [@kdo](https://github.com/kdo), [@jeffpaul](https://github.com/jeffpaul) via [#63](https://github.com/10up/publisher-media-kit/pull/63))
+- Fix responsive issues of media kit page (props [@mehidi258](https://github.com/mehidi258), [@sudip-10up](https://github.com/sudip-10up) [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#52](https://github.com/10up/publisher-media-kit/pull/52)).
+- Fix eslint errors (props [@mehidi258](https://github.com/mehidi258), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#61](https://github.com/10up/publisher-media-kit/pull/61)).
+- Fix editor styles to match frontend design (props [@mehidi258](https://github.com/mehidi258), [@ankitguptaindia](https://github.com/ankitguptaindia), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#58](https://github.com/10up/publisher-media-kit/pull/58)).
+- Fix audience profiles border width (props [@mehidi258](https://github.com/mehidi258), [@Sidsector9](https://github.com/Sidsector9), [@ankitguptaindia](https://github.com/ankitguptaindia), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#59](https://github.com/10up/publisher-media-kit/pull/59)).
+- Tab Title is editable from below the tab (props [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc), [@kdo](https://github.com/kdo), [@jeffpaul](https://github.com/jeffpaul) via [#63](https://github.com/10up/publisher-media-kit/pull/63)).
 
 ### Removed
-- The Orientation Options are removed (props [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#65](https://github.com/10up/publisher-media-kit/pull/65))
+- The Orientation Options are removed (props [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#65](https://github.com/10up/publisher-media-kit/pull/65)).
 
 ### Security
-- Bump `nanoid` from 3.1.25 to 3.2.0 (props [@dependabot](https://github.com/apps/dependabot) via [#67](https://github.com/10up/publisher-media-kit/pull/67))
-- Bump `follow-redirects` from 1.14.4 to 1.14.8 (props [@dependabot](https://github.com/apps/dependabot) via [#68](https://github.com/10up/publisher-media-kit/pull/68) & [#69](https://github.com/10up/publisher-media-kit/pull/69))
-- Bump `url-parse` from 1.5.3 to 1.5.10 (props [@dependabot](https://github.com/apps/dependabot) via [#70](https://github.com/10up/publisher-media-kit/pull/70) & [#71](https://github.com/10up/publisher-media-kit/pull/71))
+- Bump `nanoid` from 3.1.25 to 3.2.0 (props [@dependabot](https://github.com/apps/dependabot) via [#67](https://github.com/10up/publisher-media-kit/pull/67)).
+- Bump `follow-redirects` from 1.14.4 to 1.14.8 (props [@dependabot](https://github.com/apps/dependabot) via [#68](https://github.com/10up/publisher-media-kit/pull/68) & [#69](https://github.com/10up/publisher-media-kit/pull/69)).
+- Bump `url-parse` from 1.5.3 to 1.5.10 (props [@dependabot](https://github.com/apps/dependabot) via [#70](https://github.com/10up/publisher-media-kit/pull/70) & [#71](https://github.com/10up/publisher-media-kit/pull/71)).
 
 ## [1.0.0] - 2021-12-10
 - Initial public plugin release 🎉
@@ -53,6 +62,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial private plugin release 🎉
 
 [Unreleased]: https://github.com/10up/publisher-media-kit/compare/trunk...develop
+[1.3.0]: https://github.com/10up/publisher-media-kit/compare/1.2.1...1.3.0
 [1.2.1]: https://github.com/10up/publisher-media-kit/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/10up/publisher-media-kit/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/10up/publisher-media-kit/compare/1.0.0...1.1.0

diff --git a/CREDITS.md b/CREDITS.md
@@ -10,7 +10,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.
 
-[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [@cldhmmr](https://github.com/cldhmmr), [Trey Kane @treykane](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [@sudip-10up](https://github.com/sudip-10up), [Karine (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1).
+[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [David Godleman (@cldhmmr)](https://github.com/cldhmmr), [Trey Kane (@treykane)](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Karine Do (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1).
 
 ## Libraries
 

diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ Twenty Twenty One default theme | Newspack base theme
 
 ## Requirements
 
-* PHP Requires: 7.0
-* WordPress Requires at least: 5.5
+* PHP Requires: 7.4
+* WordPress Requires at least: 5.7
 
 ## Theme Compatibility
 
@@ -51,10 +51,6 @@ Click the block inserter (`+` button) in the top left of the block editor, click
 
 Click the block inserter (`+` button) in the top left of the block editor, click the `Patterns` tab, select `Publisher Media Kit` in the dropdown, and select the specific Block Pattern that you want to add to your post/page.
 
-### Why do you require WordPress 5.4 and above?  Why not 5.0 and above?
-
-We require WordPress 5.4 and above as this is when Block Patterns became available in WordPress core and they are of the main components of the Publisher Media Kit plugin.  In fact, we recommend that you utilize the latest major version of WordPress and commit to testing and ensuring that Publisher Media Kit works on the latest WordPress version.
-
 ## Support Level
 
 **Active:** 10up is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress.  Bug reports, feature requests, questions, and pull requests are welcome.

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     }
   ],
   "require": {
-    "php": ">=7.0"
+    "php": ">=7.4"
   },
   "autoload": {
     "psr-4": {
@@ -21,7 +21,7 @@
     "10up/phpcs-composer": "dev-master"
   },
   "scripts": {
-    "lint": "phpcs . --runtime-set testVersion 7.0-",
+    "lint": "phpcs . --runtime-set testVersion 7.4-",
     "lint-fix": "phpcbf ."
   }
 }
diff --git a/includes/blocks/block-editor/tabs-item/register.php b/includes/blocks/block-editor/tabs-item/register.php
@@ -28,8 +28,6 @@ function register() {
 /**
  * Render callback method for the block
  *
- * @todo Need to handle back compat for pre 5.5 and passing args to locate_template
- *
  * @param array  $attributes The blocks attributes
  * @param string $content    Data returned from InnerBlocks.Content
  * @param array  $block      Block information such as context.

diff --git a/includes/blocks/block-editor/tabs/register.php b/includes/blocks/block-editor/tabs/register.php
@@ -28,8 +28,6 @@ function register() {
 /**
  * Render callback method for the block
  *
- * @todo Need to handle back compat for pre 5.5 and passing args to locate_template
- *
  * @param array  $attributes The blocks attributes
  * @param string $content    Data returned from InnerBlocks.Content
  * @param array  $block      Block information such as context.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "publisher-media-kit",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "scripts": {
     "start": "10up-toolkit start",
     "watch": "10up-toolkit watch",

diff --git a/publisher-media-kit.php b/publisher-media-kit.php
@@ -3,9 +3,9 @@
  * Plugin Name:       Publisher Media Kit
  * Plugin URI:        https://github.com/10up/publisher-media-kit
  * Description:       Pre-configured Media Kit Page using Gutenberg Block Patterns.
- * Version:           1.2.1
- * Requires at least: 5.5
- * Requires PHP:      7.0
+ * Version:           1.3.0
+ * Requires at least: 5.7
+ * Requires PHP:      7.4
  * Author:            10up
  * Author URI:        https://10up.com
  * License:           GPL v2 or later
@@ -17,7 +17,7 @@
  */
 
 // Useful global constants.
-define( 'PUBLISHER_MEDIA_KIT_VERSION', '1.2.1' );
+define( 'PUBLISHER_MEDIA_KIT_VERSION', '1.3.0' );
 define( 'PUBLISHER_MEDIA_KIT_URL', plugin_dir_url( __FILE__ ) );
 define( 'PUBLISHER_MEDIA_KIT_PATH', plugin_dir_path( __FILE__ ) );
 define( 'PUBLISHER_MEDIA_KIT_BLOCKS_PATH', plugin_dir_path( __FILE__ ) . 'includes/blocks/block-editor/' );