Fix regex compatibility for PHP < 7.3 (#3)

* Fix regex compatibility for PHP < 7.3 * Bump version
N-Parsons · May 31, 2020 · ec5d7df · ec5d7df
1 parent ac7fe10
commit ec5d7df
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.1.7
+## 2020-05-31
+
+1. [](#bugfix)
+    * Fix regex compatibility issue with PHP < 7.3.
+
 # v0.1.6
 ## 2020-05-23
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Embed Font Awesome
-version: 0.1.6
+version: 0.1.7
 description: "Embed Font Awesome icons into your HTML output as inline SVGs."
 icon: flag
 author:

diff --git a/embed-fontawesome.php b/embed-fontawesome.php
@@ -157,8 +157,14 @@ public function onOutputGenerated()
   private function embedIcons($content)
   {
     // Get all matches for icons
+    if (version_compare($ver = PHP_VERSION, $req = "7.3.0", '<')) {
+      $iconRegex = '/<i (?<preClass>[a-zA-Z0-9 _="\'-]*)(?<= )class=(?<quot>"|\')(?<classPreFA>[a-zA-Z0-9 :_-]*)(?<=["\' ])(?<weightFA>(?:fa[srlbd]?)|(?:icon)) (?<classMidFA>((?!((fa)|(icon)))[a-zA-Z0-9 _-]*)*)(?<= )(?<iconType>fa|icon)-(?<iconFA>[a-z0-9-]+)(?<classPostFA>[a-zA-Z0-9 :_-]*)\k<quot>(?<postClass>[a-zA-Z0-9 _="\'-]*)><\/i>/';
+    } else {
+      $iconRegex = '/<i (?<preClass>[a-zA-Z0-9 _="\'-]*)(?<= )class=(?<quot>"|\')(?<classPreFA>[a-zA-Z0-9 :_-]*)(?<=( |\k<quot>))(?<weightFA>(?:fa[srlbd]?)|(?:icon)) (?<classMidFA>((?!((fa)|(icon)))[a-zA-Z0-9 _-]*)*)(?<= )(?<iconType>fa|icon)-(?<iconFA>[a-z0-9-]+)(?<classPostFA>[a-zA-Z0-9 :_-]*)\k<quot>(?<postClass>[a-zA-Z0-9 _="\'-]*)><\/i>/';
+    }
+
     if (preg_match_all(
-      '/<i (?<preClass>[a-zA-Z0-9 _="\'-]*)(?<= )class=(?<quot>"|\')(?<classPreFA>[a-zA-Z0-9 :_-]*)(?<=( |\k<quot>))(?<weightFA>(?:fa[srlbd]?)|(?:icon)) (?<classMidFA>((?!((fa)|(icon)))[a-zA-Z0-9 _-]*)*)(?<= )(?<iconType>fa|icon)-(?<iconFA>[a-z0-9-]+)(?<classPostFA>[a-zA-Z0-9 :_-]*)\k<quot>(?<postClass>[a-zA-Z0-9 _="\'-]*)><\/i>/',
+      $iconRegex,
       $content,
       $matchesRaw
     )) {