From 9f331bf77bf2a7bc7b90a6413a2a18a7a0793621 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Sun, 25 Feb 2024 19:35:13 +0200
Subject: [PATCH] Fix
 PHPCompatibility.TextStrings.RemovedDollarBraceStringEmbeds.DeprecatedVariableSyntax

---
 CHANGELOG.md                 | 5 +++--
 README.md                    | 2 +-
 bin/tasks/additions.sh       | 4 ++--
 functions.php                | 2 +-
 inc/hooks/scripts-styles.php | 2 +-
 package-lock.json            | 6 +++---
 package.json                 | 2 +-
 phpcs.xml                    | 4 ++++
 readme.txt                   | 2 +-
 style.css                    | 4 ++--
 10 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bdcd1d2..f90202f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 9.4.0rc: 2024-02-14
+### 9.4.0rc: 2024-02-25
 
 * Update unit tests for WordPress Coding Standards 3.0.1
 * Prepare for PHP version 8.3
@@ -7,8 +7,9 @@
 * Merge pull request #212 from digitoimistodude/dependabot/npm_and_yarn/ip-2.0.1
 * Add unit tests for PHPCompatibility
 * Upgrade PHP version in use to PHP 8.3
-* Require PHP 8.3
 * Unit tests: Separately test for PHP 8.3 support
+* Fix PHPCompatibility.TextStrings.RemovedDollarBraceStringEmbeds.DeprecatedVariableSyntax
+* Bump WordPress to 6.4.2
 
 ### 9.3.6: 2024-01-10
 
diff --git a/README.md b/README.md
index ba112cbd..2a3dd851 100644
--- a/README.md
+++ b/README.md
@@ -255,7 +255,7 @@ Starting from v2.6.0 WooCommerce support comes with [Air helper](https://github.
 
 * PHP >= 7.4
 * Requires at least: WordPress 4.7.1
-* Tested up to WordPress 6.4.2
+* Tested up to WordPress 6.4.3
 
 ### Recommendations for development
 
diff --git a/bin/tasks/additions.sh b/bin/tasks/additions.sh
index 26d76d4f..ebdf4027 100644
--- a/bin/tasks/additions.sh
+++ b/bin/tasks/additions.sh
@@ -10,8 +10,8 @@ chmod 777 ${PROJECT_PATH}/media
 
 echo "${YELLOW}Generating default README.md...${TXTRESET}"
 
-NEWEST_AIR_VERSION="9.3.6"
-NEWEST_WORDPRESS_VERSION="6.4.2"
+NEWEST_AIR_VERSION="9.4.0"
+NEWEST_WORDPRESS_VERSION="6.4.3"
 NEWEST_PHP_VERSION="8.3"
 CURRENT_DATE=$(LC_TIME=en_US date '+%d %b %Y' |tr ' ' '_');
 echo "# ${PROJECT_NAME}
diff --git a/functions.php b/functions.php
index 18efe74b..c045685a 100644
--- a/functions.php
+++ b/functions.php
@@ -17,7 +17,7 @@
 /**
  * The current version of the theme.
  */
-define( 'AIR_LIGHT_VERSION', '9.3.6' );
+define( 'AIR_LIGHT_VERSION', '9.4.0' );
 
 // We need to have some defaults as comments or empties so let's allow this:
 // phpcs:disable Squiz.Commenting.InlineComment.SpacingBefore, WordPress.Arrays.ArrayDeclarationSpacing.SpaceInEmptyArray
diff --git a/inc/hooks/scripts-styles.php b/inc/hooks/scripts-styles.php
index c9dd603a..bf409594 100644
--- a/inc/hooks/scripts-styles.php
+++ b/inc/hooks/scripts-styles.php
@@ -106,5 +106,5 @@ function get_asset_file( $filename ) {
 
   $filetype = pathinfo( $filename )['extension'];
 
-  return "${filetype}/${env}/${filename}";
+  return "{$filetype}/{$env}/{$filename}";
 } // end get_asset_file
diff --git a/package-lock.json b/package-lock.json
index d2375566..a6b210a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "air-light",
-  "version": "9.3.6",
+  "version": "9.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "air-light",
-      "version": "9.3.6",
+      "version": "9.4.0",
       "dependencies": {
         "airbnb-browser-shims": "^3.3.0",
         "moveto": "^1.8.2",
@@ -24294,4 +24294,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 0c881049..5750aa5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "air-light",
-  "version": "9.3.6",
+  "version": "9.4.0",
   "description": "A minimalist WordPress starter theme.",
   "author": "Digitoimisto Dude Oy (moro@dude.fi)",
   "devDependencies": {
diff --git a/phpcs.xml b/phpcs.xml
index 3ee69c68..ba5f5c36 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -126,4 +126,8 @@
             <property name="is_theme" value="true" />
         </properties>
     </rule>
+
+    <!-- Include sniffs for PHP cross-version compatibility. -->
+    <config name="testVersion" value="8.3"/>
+    <rule ref="PHPCompatibility"/>
 </ruleset>
diff --git a/readme.txt b/readme.txt
index ad577038..b61677ec 100644
--- a/readme.txt
+++ b/readme.txt
@@ -11,7 +11,7 @@ Contributors: Digitoimisto Dude Oy
 Tags: one-column, accessibility-ready, translation-ready
 
 Requires at least: 5.0
-Tested up to: 6.4.2
+Tested up to: 6.4.3
 Stable tag: 9.3.5
 License: MIT License
 License URI: https://opensource.org/licenses/MIT
diff --git a/style.css b/style.css
index 2ddc6616..c2e9a735 100644
--- a/style.css
+++ b/style.css
@@ -23,8 +23,8 @@ If you see this, contact the site admin.
 @version 2024-01-10
 @since 2016-01-28
 
-Tested up to: 6.4.2
-Requires PHP: 8.3
+Tested up to: 6.4.3
+Requires PHP: 7.4
 License: MIT License
 License URI: LICENSE
 Text Domain: air-light