#314: Minor tweak to -is checks

Badgerati · Jul 30, 2019 · 64bc35a · 64bc35a
1 parent 97a9eb7
commit 64bc35a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/Private/Authentication.ps1 b/src/Private/Authentication.ps1
@@ -174,7 +174,7 @@ function Get-PodeAuthMiddlewareScript
             $result = (Invoke-PodeScriptBlock -ScriptBlock $auth.Type.ScriptBlock -Arguments @($e, $auth.Type.Options) -Return -Splat)
 
             # if data is a hashtable, then don't call validator (parser either failed, or forced a success)
-            if ($result -isnot 'hashtable') {
+            if ($result -isnot [hashtable]) {
                 $result += $auth.Options
                 $result = (Invoke-PodeScriptBlock -ScriptBlock $auth.ScriptBlock -Arguments $result -Return -Splat)
             }

diff --git a/src/Public/Responses.ps1 b/src/Public/Responses.ps1
@@ -345,7 +345,7 @@ function Write-PodeCsvResponse
         }
 
         'value' {
-            if ($Value -isnot 'string') {
+            if ($Value -isnot [string]) {
                 $Value = @(foreach ($v in $Value) {
                     New-Object psobject -Property $v
                 })
@@ -411,7 +411,7 @@ function Write-PodeHtmlResponse
         }
 
         'value' {
-            if ($Value -isnot 'string') {
+            if ($Value -isnot [string]) {
                 $Value = ($Value | ConvertTo-Html)
                 $Value = ($Value -join ([environment]::NewLine))
             }
@@ -467,7 +467,7 @@ function Write-PodeJsonResponse
         }
 
         'value' {
-            if ($Value -isnot 'string') {
+            if ($Value -isnot [string]) {
                 $Value = ($Value | ConvertTo-Json -Depth 10 -Compress)
             }
         }
@@ -522,7 +522,7 @@ function Write-PodeXmlResponse
         }
 
         'value' {
-            if ($Value -isnot 'string') {
+            if ($Value -isnot [string]) {
                 $Value = @(foreach ($v in $Value) {
                     New-Object psobject -Property $v
                 })

diff --git a/src/Public/Routes.ps1 b/src/Public/Routes.ps1
@@ -152,17 +152,17 @@ function Add-PodeRoute
     if (!(Test-IsEmpty $Middleware)) {
         @($Middleware) | ForEach-Object {
             # check middleware is a type valid
-            if (($_ -isnot 'scriptblock') -and ($_ -isnot 'hashtable')) {
+            if (($_ -isnot [scriptblock]) -and ($_ -isnot [hashtable])) {
                 throw "One of the Route Middlewares supplied for the '[$($Method)] $($Path)' Route is an invalid type. Expected either ScriptBlock or Hashtable, but got: $($_.GetType().Name)"
             }
 
             # if middleware is hashtable, ensure the keys are valid (logic is a scriptblock)
-            if ($_ -is 'hashtable') {
+            if ($_ -is [hashtable]) {
                 if ($null -eq $_.Logic) {
                     throw "A Hashtable Middleware supplied for the '[$($Method)] $($Path)' Route has no Logic defined"
                 }
 
-                if ($_.Logic -isnot 'scriptblock') {
+                if ($_.Logic -isnot [scriptblock]) {
                     throw "A Hashtable Middleware supplied for the '[$($Method)] $($Path)' Route has has an invalid Logic type. Expected ScriptBlock, but got: $($_.Logic.GetType().Name)"
                 }
             }
@@ -175,7 +175,7 @@ function Add-PodeRoute
         $Middleware = @($Middleware)
 
         for ($i = 0; $i -lt $Middleware.Length; $i++) {
-            if ($Middleware[$i] -is 'scriptblock') {
+            if ($Middleware[$i] -is [scriptblock]) {
                 $Middleware[$i] = @{
                     'Logic' = $Middleware[$i]
                 }

diff --git a/src/Public/Utilities.ps1 b/src/Public/Utilities.ps1
@@ -125,7 +125,7 @@ function Lock-PodeObject
         return
     }
 
-    if ($Object -is 'ValueType') {
+    if ($Object -is [valuetype]) {
         throw 'Cannot lock value types'
     }
 
@@ -657,23 +657,23 @@ function Test-IsEmpty
     }
 
     switch ($Value) {
-        { $_ -is 'string' } {
+        { $_ -is [string] } {
             return [string]::IsNullOrWhiteSpace($Value)
         }
 
-        { $_ -is 'array' } {
+        { $_ -is [array] } {
             return ($Value.Length -eq 0)
         }
 
-        { $_ -is 'hashtable' } {
+        { $_ -is [hashtable] } {
             return ($Value.Count -eq 0)
         }
 
-        { $_ -is 'scriptblock' } {
+        { $_ -is [scriptblock] } {
             return ($null -eq $Value -or [string]::IsNullOrWhiteSpace($Value.ToString()))
         }
 
-        { $_ -is 'valuetype' } {
+        { $_ -is [valuetype] } {
             return $false
         }
     }