Merge pull request #318 from 10up/fix/release-1.8.1-issues-313

Fix issues reported for v1.8.1 release
10up · Sep 20, 2024 · 48bf448 · 48bf448
2 parents 1872aaf + 33d39ae
commit 48bf448
Show file tree

Hide file tree

Showing 13 changed files with 703 additions and 286 deletions.
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -5,9 +5,13 @@ on:
     branches:
       - develop
       - trunk
+    paths:
+      - "**.php"
   pull_request:
     branches:
       - develop
+    paths:
+      - "**.php"
 
 jobs:
   phpcs:
@@ -28,4 +32,4 @@ jobs:
       run: composer install
 
     - name: Test
-      run: ./vendor/bin/phpcs -v
+      run: ./vendor/bin/phpcs --runtime-set testVersion 7.4 .
diff --git a/assets/js/edit.js b/assets/js/edit.js
@@ -436,11 +436,11 @@ function Edit( props ) {
 				{src ? (
 					<>
 						<div className="wp-block-podcasting-podcast__container">
-							{showImage && displayArt && (
+							{displayArt && (featuredImageUrl || showImage) && (
 								<div className="wp-block-podcasting-podcast__show-art">
 									<div className="wp-block-podcasting-podcast__image">
 										<img
-											src={showImage}
+											src={featuredImageUrl ? featuredImageUrl : showImage}
 											alt={showName}
 										/>
 									</div>

diff --git a/composer.json b/composer.json
@@ -17,10 +17,10 @@
     "php": ">=7.3"
   },
   "require-dev": {
-    "10up/phpcs-composer": "dev-master",
+    "10up/phpcs-composer": "^3.0",
     "10up/wp_mock": "^0.4.2",
     "phpunit/phpunit": "^9.5",
-    "phpcompatibility/phpcompatibility-wp": "*"
+    "phpcompatibility/php-compatibility": "dev-develop as 9.99.99"
   },
   "config": {
     "allow-plugins": {