Skip to content

Commit dc47921

Browse files
committed
fix faulty null coalesce usage
Signed-off-by: Travis Glenn Hansen <[email protected]>
1 parent 9cfd823 commit dc47921

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/KubernetesPfSenseController/Plugin/KubernetesUtils.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static function getResourceByNamespaceName($resources, $namespace, $name)
7575
*/
7676
public static function getResourceApiVersion($resource)
7777
{
78-
return isset($resource['apiVersion']) ?? $resource['apiVersion'];
78+
return $resource['apiVersion'] ?? "";
7979
}
8080

8181
/**
@@ -86,7 +86,7 @@ public static function getResourceApiVersion($resource)
8686
*/
8787
public static function getResourceKind($resource)
8888
{
89-
return isset($resource['kind']) ?? $resource['kind'];
89+
return $resource['kind'] ?? "";
9090
}
9191

9292
/**
@@ -97,7 +97,7 @@ public static function getResourceKind($resource)
9797
*/
9898
public static function getResourceNamespace($resource)
9999
{
100-
return (isset($resource['metadata']) && isset($resource['metadata']['namespace'])) ?? $resource['metadata']['namespace'];
100+
return (isset($resource['metadata']) && isset($resource['metadata']['namespace'])) ? $resource['metadata']['namespace'] : "";
101101
}
102102

103103
/**
@@ -108,7 +108,7 @@ public static function getResourceNamespace($resource)
108108
*/
109109
public static function getResourceName($resource)
110110
{
111-
return (isset($resource['metadata']) && isset($resource['metadata']['name'])) ?? $resource['metadata']['name'];
111+
return (isset($resource['metadata']) && isset($resource['metadata']['name'])) ? $resource['metadata']['name'] : "";
112112
}
113113

114114
public static function getResourceNamespaceHyphenName($resource)
@@ -141,7 +141,7 @@ public static function getNodeIp($node)
141141
* @param $namespace
142142
* @return array
143143
*/
144-
public static function findListItem($list, $name, $namespace = null)
144+
public static function findListItem(&$list, $name, $namespace = null)
145145
{
146146
$itemKey = null;
147147
$item = null;

0 commit comments

Comments
 (0)