Merge branch 'develop' into trunk

10up · Oct 19, 2022 · 925080c · 925080c
2 parents 56fc27f + 06935f0
commit 925080c
Show file tree

Hide file tree

Showing 26 changed files with 25,081 additions and 3,895 deletions.
diff --git a/.distignore b/.distignore
@@ -14,8 +14,11 @@
 /.eslintignore
 /.eslintrc
 /.gitignore
+/.nvmrc
 /.phpcs.xml.dist
+/.phpunit.result.cache
 /.prettierrc
+/.wp-env.json
 /CHANGELOG.md
 /CODE_OF_CONDUCT.md
 /composer.json

diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
@@ -17,10 +17,6 @@ jobs:
   php_compatibility:
     name: PHP ${{ matrix.php }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [ '7.0', '7.4', '8.0', '8.1' ]
 
     steps:
     - name: Checkout
@@ -49,4 +45,4 @@ jobs:
       run: composer install
 
     - name: Check PHP Compatibility
-      run: ./vendor/bin/phpcs -p simple-podcasting.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion ${{ matrix.php }}
+      run: ./vendor/bin/phpcs -p simple-podcasting.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
+        php-version: '7.4'
         coverage: none
         tools: composer:v2
 

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -19,6 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         php:
           - {name: 'PHP 7.4', version: '7.4'}

diff --git a/.github/workflows/push-asset-readme-update.yml b/.github/workflows/push-asset-readme-update.yml
@@ -9,13 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: install node v10
-      uses: actions/setup-node@v1
+    - name: install node
+      uses: actions/setup-node@v3
       with:
-        node-version: 10
+        node-version-file: .nvmrc
     - name: Build
       run: |
-        npm install
+        npm ci
         npm run build
     - name: WordPress.org plugin asset/readme update
       uses: 10up/action-wordpress-plugin-asset-update@stable

diff --git a/.github/workflows/push-deploy.yml b/.github/workflows/push-deploy.yml
@@ -10,12 +10,12 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
     - name: install node v12
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version-file: .nvmrc
     - name: Build
       run: |
-        npm install
+        npm ci
         npm run build
     - name: WordPress Plugin Deploy
       id: deploy

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -14,18 +14,24 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         core:
-          - {name: 'WP latest', version: 'latest', hasBlockEditor: true}
-          - {name: 'WP trunk', version: 'WordPress/WordPress#master', hasBlockEditor: true}
-          - {name: 'WP minimum', version: 'WordPress/WordPress#4.6', hasBlockEditor: false}
+          - {name: 'WP latest', version: 'latest'}
+          - {name: 'WP trunk', version: 'WordPress/WordPress#master'}
+          - {name: 'WP minimum', version: 'WordPress/WordPress#5.7'}
 
     steps:
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: install node
+      uses: actions/setup-node@v3
+      with:
+        node-version-file: .nvmrc
+
     - name: Install dependencies
-      run: npm i
+      run: npm ci
 
     - name: Build asset
       run: npm run build
@@ -35,10 +41,11 @@ jobs:
 
     - name: Set up WP environment
       run: npm run wp-env start
+      continue-on-error: ${{ matrix.core.name == 'WP trunk' }}
 
     - name: Test
-      run: npm run cypress:run -- --env HAS_BLOCK_EDITOR=${{ matrix.core.hasBlockEditor }}
-
+      run: npm run cypress:run
+      continue-on-error: ${{ matrix.core.name == 'WP trunk' }}
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v2

diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@ bower_components
 languages
 release
 vendor
-composer.lock
 phpunit.xml
 .idea
 .phpunit.result.cache
@@ -34,6 +33,7 @@ Thumbs.db
 Desktop.ini
 
 # E2E testing
+.wp-env.json
 artifacts
 tests/cypress/downloads
 tests/cypress/screenshots

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v16.18.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.3.0] - 2022-10-18
+**Note that this version bumps the minimum PHP version from 7.0 to 7.4 and the minimum WordPress version from 4.6 to 5.7.**
+
+### Added
+- Podcasts Taxonomy term(s) added in block settings (props [@helen](https://github.com/helen), [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic) via [#183](https://github.com/10up/simple-podcasting/pull/183)).
+- Type of show setting for the podcast (props [@cadic](https://github.com/cadic), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#188](https://github.com/10up/simple-podcasting/pull/188)).
+
+### Changed
+- Podcasting Categories and Sub-Categories (props [@zamanq](https://github.com/zamanq), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@cadic](https://github.com/cadic), [@dchucks](https://github.com/dchucks) via [#179](https://github.com/10up/simple-podcasting/pull/179)).
+- Bumped minimum PHP version required from 7.0 to 7.4 (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic), [@jeffpaul](https://github.com/jeffpaul), [@vikrampm1](https://github.com/vikrampm1) via [#184](https://github.com/10up/simple-podcasting/pull/184)).
+- Bumped minimum WordPress version required from 4.6 to 5.7 (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic), [@jeffpaul](https://github.com/jeffpaul), [@vikrampm1](https://github.com/vikrampm1) via [#184](https://github.com/10up/simple-podcasting/pull/184)).
+- Upgrade dependencies (props [@cadic](https://github.com/cadic), [@faisal-alvi](https://github.com/faisal-alvi) via [#187](https://github.com/10up/simple-podcasting/pull/187)).
+
+### Fixed
+- Saving podcast enclosure with Classic Editor (props [@cadic](https://github.com/cadic), [@faisal-alvi](https://github.com/faisal-alvi) via [#186](https://github.com/10up/simple-podcasting/pull/186)).
+
+### Security
+- Bump `got` from 10.7.0 to 11.8.5 (props [@faisal-alvi](https://github.com/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#185](https://github.com/10up/simple-podcasting/pull/185)).
+- Bump `@wordpress/env` from 4.5.0 to 5.2.0 (props [@faisal-alvi](https://github.com/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#185](https://github.com/10up/simple-podcasting/pull/185)).
+
 ## [1.2.4] - 2022-07-27
 ### Added
 - Season number, episode number and episode type attributes can now be stored with a Podcast (props [@zamanq](https://github.com/zamanq), [@dchucks](https://github.com/dchucks), [@cadic](https://github.com/cadic) via [#175](https://github.com/10up/simple-podcasting/pull/175)).

diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ Podcasting is a method to distribute audio messages through a feed to which list
 
 ## Requirements
 
-* PHP 7.0+
-* [WordPress](http://wordpress.org) 4.6+
+* PHP 7.4+
+* [WordPress](http://wordpress.org) 5.7+
 * RSS feeds must not be disabled
 
 ## Installation

diff --git a/assets/js/edit.js b/assets/js/edit.js
@@ -20,6 +20,13 @@ const { Fragment } = wp.element;
 const { apiFetch } = wp;
 const ALLOWED_MEDIA_TYPES = [ 'audio' ];
 
+/*
+ * Import hierarchical term selector.
+ *
+ * @TODO Import from `@wordpress/editor` once minimum WP version is 6.0.
+ */
+import HierarchicalTermSelector from './term-selector/hierarchical-term-selector';
+
 class Edit extends Component {
 	constructor( { className } ) {
 		super( ...arguments );
@@ -133,6 +140,11 @@ class Edit extends Component {
 					<PanelBody
 						title={ __( 'Podcast Settings', 'simple-podcasting' ) }
 					>
+						<PanelRow>
+							<div id="hierar-podcasting_podcasts">
+								<HierarchicalTermSelector slug="podcasting_podcasts" />
+							</div>
+						</PanelRow>
 						<PanelRow>
 							<label
 								htmlFor="podcast-captioned-form-toggle"