Wordpress: Fixing deprecations

gantry · Oct 23, 2023 · 278e9ce · 278e9ce
1 parent caafa29
commit 278e9ce
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 41 deletions.
diff --git a/platforms/wordpress/gantry5/composer.json b/platforms/wordpress/gantry5/composer.json
@@ -11,10 +11,10 @@
         "filp/whoops": "~2.5",
         "rockettheme/toolbox": "~1.5",
         "erusev/parsedown-extra": "~0.7",
-        "timber/timber": "^1.14",
+        "timber/timber": "1.23",
 
-        "twig/twig": "~1.42",
-        "scssphp/scssphp": "1.6.0",
+        "twig/twig": "1.44.7",
+        "scssphp/scssphp": "1.10",
         "leafo/scssphp": "0.8.4"
     },
     "require-dev": {
@@ -36,7 +36,7 @@
             "composer/installers": true
         },
         "platform": {
-            "php": "5.6.20"
+            "php": "7.2.5"
         }
     }
 }
diff --git a/platforms/wordpress/gantry5/composer.lock b/platforms/wordpress/gantry5/composer.lock
diff --git a/src/classes/Gantry/Component/Stylesheet/Scss/LegacyCompiler.php b/src/classes/Gantry/Component/Stylesheet/Scss/LegacyCompiler.php
@@ -383,13 +383,13 @@ protected function handleImportLoop($name)
     {
         for ($env = $this->env; $env; $env = $env->parent) {
             $file = $this->streamNames[$env->block->sourceIndex];
-
-            if (realpath($file) === $name) {
+    
+            if ($file !== null && realpath($file) === $name) {
                 $this->throwError('An @import loop has been found: %s imports %s', $file, Gantry::basename($file));
                 break;
             }
         }
-    }
+    }    
 
     /**
      * Override function to improve the logic.