Merge pull request #145 from netniV/Issue-144

Fix string assert() calls which breaks PHP 7.2
howardjones · Jul 23, 2018 · ce885bf · ce885bf
2 parents fab3255 + 19b27be
commit ce885bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/Weathermap/Core/Map.php b/lib/Weathermap/Core/Map.php
@@ -212,10 +212,10 @@ private function reset()
         $this->createDefaultLinks();
         $this->createDefaultNodes();
 
-        assert('is_object($this->nodes[":: DEFAULT ::"])');
-        assert('is_object($this->links[":: DEFAULT ::"])');
-        assert('is_object($this->nodes["DEFAULT"])');
-        assert('is_object($this->links["DEFAULT"])');
+        assert(is_object($this->nodes[":: DEFAULT ::"]));
+        assert(is_object($this->links[":: DEFAULT ::"]));
+        assert(is_object($this->nodes["DEFAULT"]));
+        assert(is_object($this->links["DEFAULT"]));
 
         $this->imap = new HTMLImagemap('weathermap');
 
@@ -424,7 +424,7 @@ public function processString($input, &$context, $includeNotes = true, $multilin
         }
 
 //        $theItem = null;
-//        assert('is_scalar($input)');
+//        assert(is_scalar($input));
 
         $contextType = $this->getProcessStringContextName($context);
 

diff --git a/lib/Weathermap/Core/MapDataItem.php b/lib/Weathermap/Core/MapDataItem.php
@@ -138,7 +138,7 @@ private function resetNormalObject()
     public function copyFrom(&$source)
     {
         MapUtility::debug("Initialising %s $this->name from $source->name\n", $this->myType());
-        assert('is_object($source)');
+        assert(is_object($source));
 
         foreach (array_keys($this->inheritedFieldList) as $fld) {
             if ($fld != 'template') {

diff --git a/lib/Weathermap/Core/MapNode.php b/lib/Weathermap/Core/MapNode.php
@@ -1059,8 +1059,8 @@ private function drawArtificialIconNINK($iconImageRef, $finalInkColour, &$map)
         $col1 = $this->colours[OUT];
         $col2 = $this->colours[IN];
 
-        assert('!is_null($col1)');
-        assert('!is_null($col2)');
+        assert(!is_null($col1));
+        assert(!is_null($col2));
 
         imagefilledarc(
             $iconImageRef,