Removing bad array references that broke in PHP 7.4 as a result of ca…

…lling an array offset on a null value/property (#113)
caffeinated · Dec 23, 2019 · c17e3a9 · c17e3a9
1 parent 5990185
commit c17e3a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Item.php b/src/Item.php
@@ -320,7 +320,7 @@ public function checkActiveStatus()
         $path        = ltrim(parse_url($this->url(), PHP_URL_PATH), '/');
         $requestPath = Request::path();
 
-        if ($this->builder->config['rest_base']) {
+        if (isset($this->builder->config) && $this->builder->config['rest_base']) {
             $base = (is_array($this->builder->config['rest_base'])) ? implode('|', $this->builder->config['rest_base']) : $this->builder->conf['rest_base'];
 
             list($path, $requestPath) = preg_replace('@^('.$base.')/@', '', [$path, $requestPath], 1);

diff --git a/src/Menu.php b/src/Menu.php
@@ -63,7 +63,7 @@ public function loadConfig($name)
 			return array_merge($options['default'], $options[$name]);
 		}
 
-		return $options['default'];
+		return $options['default'] ?? null;
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ public function loadConfig($name) @@
     			return array_merge($options['default'], $options[$name]);
     		}
-    		return $options['default'];
+    		return $options['default'] ?? null;
     	}
     	/**
@@ Expand Down @@