Strict compare

lulco · lulco · commit 4d2bac1bfdb1 · 2019-04-12T23:38:45.000+02:00
diff --git a/src/ApiDecider.php b/src/ApiDecider.php
@@ -30,15 +30,18 @@ class ApiDecider
      */
     public function getApi(string $method, int $version, string $package, ?string $apiAction = null)
     {
+        $method = strtoupper($method);
+        $apiAction = $apiAction === '' ? null : $apiAction;
+
         foreach ($this->apis as $api) {
             $identifier = $api->getEndpoint();
-            if ($method == $identifier->getMethod() && $identifier->getVersion() == $version && $identifier->getPackage() == $package && $identifier->getApiAction() == $apiAction) {
+            if ($method === $identifier->getMethod() && $identifier->getVersion() === $version && $identifier->getPackage() === $package && $identifier->getApiAction() === $apiAction) {
                 $endpointIdentifier = new EndpointIdentifier($method, $version, $package, $apiAction);
                 $api->getHandler()->setEndpointIdentifier($endpointIdentifier);
                 return $api;
             }
-            if ($method == 'OPTIONS' && $this->globalPreflightHandler && $identifier->getVersion() == $version && $identifier->getPackage() == $package && $identifier->getApiAction() == $apiAction) {
-                return new Api(new EndpointIdentifier('OPTION', $version, $package, $apiAction), $this->globalPreflightHandler, new NoAuthorization());
+            if ($method === 'OPTIONS' && $this->globalPreflightHandler && $identifier->getVersion() === $version && $identifier->getPackage() === $package && $identifier->getApiAction() === $apiAction) {
+                return new Api(new EndpointIdentifier('OPTIONS', $version, $package, $apiAction), $this->globalPreflightHandler, new NoAuthorization());
             }
         }
         return new Api(new EndpointIdentifier($method, $version, $package, $apiAction), new DefaultHandler(), new NoAuthorization());
diff --git a/src/Authorization/BearerTokenAuthorization.php b/src/Authorization/BearerTokenAuthorization.php
@@ -90,7 +90,7 @@ private function isValidIp(?string $ipRestrictions): bool
         $ipWhiteList = str_replace([',', ' ', "\n"], '#', $ipRestrictions);
         $ipWhiteList = explode('#', $ipWhiteList);
         foreach ($ipWhiteList as $whiteIp) {
-            if ($whiteIp == $ip) {
+            if ($whiteIp === $ip) {
                 return true;
             }
             if (strpos($whiteIp, '/') !== false) {
@@ -115,7 +115,7 @@ private function ipInRange(string $ip, string $range): bool
         $ipDecimal = ip2long($ip);
         $wildcard_decimal = pow(2, (32 - (int)$netmask)) - 1;
         $netmask_decimal = ~ $wildcard_decimal;
-        return (($ipDecimal & $netmask_decimal) == ($range_decimal & $netmask_decimal));
+        return (($ipDecimal & $netmask_decimal) === ($range_decimal & $netmask_decimal));
     }
 
     /**
diff --git a/src/Component/ApiConsoleControl.php b/src/Component/ApiConsoleControl.php
@@ -53,7 +53,7 @@ protected function createComponentConsoleForm(): Form
             $scheme = $_SERVER['HTTP_X_FORWARDED_PROTO'];
         }
         $port = '';
-        if ($uri->scheme == 'http' && $uri->port != 80) {
+        if ($uri->scheme === 'http' && $uri->port !== 80) {
             $port = ':' . $uri->port;
         }
         $url = $scheme . '://' . $uri->host . $port . '/api/' . $this->endpoint->getUrl();
diff --git a/src/Component/console.latte b/src/Component/console.latte
@@ -19,7 +19,7 @@
                     <b>POST FIELDS:</b>
                     <pre>{foreach $response->getPostFields() as $key => $field}
                         {spaceless}
-                        {if is_object($field) && get_class($field) == 'CURLFile'}
+                        {if is_object($field) && get_class($field) === 'CURLFile'}
                             {$key}=@{$field->getFilename()} ({$field->getMimeType()}) [{$field->getPostFilename()}] (file)
                         {else}
                             {$key}={$field}
diff --git a/src/Handlers/ApiListingHandler.php b/src/Handlers/ApiListingHandler.php
@@ -54,7 +54,7 @@ public function handle(array $params): ResponseInterface
     private function getApiList(int $version): array
     {
         $versionApis = array_filter($this->apiDecider->getApis(), function (Api $api) use ($version) {
-            return $version == $api->getEndpoint()->getVersion();
+            return $version === $api->getEndpoint()->getVersion();
         });
 
         return array_map(function (Api $api) {
diff --git a/src/Misc/ConsoleRequest.php b/src/Misc/ConsoleRequest.php
@@ -140,19 +140,19 @@ private function processValues(array $values): array
                 if ($param->isMulti()) {
                     if (in_array($param->getType(), [InputParam::TYPE_POST, InputParam::TYPE_FILE])) {
                         $postFields[$key][] = $valueData;
-                    } elseif ($param->getType() == InputParam::TYPE_PUT) {
+                    } elseif ($param->getType() === InputParam::TYPE_PUT) {
                         $putFields[$key][] = $valueData;
-                    } elseif ($param->getType() == InputParam::TYPE_COOKIE) {
+                    } elseif ($param->getType() === InputParam::TYPE_COOKIE) {
                         $cookieFields[$key][] = $valueData;
                     } else {
                         $getFields[$key][] = $valueData;
                     }
                 } else {
                     if (in_array($param->getType(), [InputParam::TYPE_POST, InputParam::TYPE_FILE])) {
                         $postFields[$key] = $valueData;
-                    } elseif ($param->getType() == InputParam::TYPE_PUT) {
+                    } elseif ($param->getType() === InputParam::TYPE_PUT) {
                         $putFields[$key] = $valueData;
-                    } elseif ($param->getType() == InputParam::TYPE_COOKIE) {
+                    } elseif ($param->getType() === InputParam::TYPE_COOKIE) {
                         $cookieFields[$key] = $valueData;
                     } else {
                         $getFields[$key] = $valueData;
@@ -175,7 +175,7 @@ private function processValues(array $values): array
      */
     private function processParam(ParamInterface $param, string $key, $value): ?string
     {
-        if ($param->getKey() == $key) {
+        if ($param->getKey() === $key) {
             $valueData = $value;
 
             if ($param->getType() === InputParam::TYPE_FILE) {
@@ -202,7 +202,7 @@ private function normalizeValues(array $values): array
             if (is_array($value)) {
                 $counter = 0;
                 foreach ($value as $innerValue) {
-                    if ($innerValue != null) {
+                    if ($innerValue !== null) {
                         $result[$key . "[".$counter++."]"] = $innerValue;
                     }
                 }
diff --git a/src/Misc/IpDetector.php b/src/Misc/IpDetector.php
@@ -11,7 +11,7 @@ public function getRequestIp(): string
     {
         if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
             $ip = $_SERVER['HTTP_CLIENT_IP'];
-        } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != '127.0.0.1') {
+        } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] !== '127.0.0.1') {
             $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
         } elseif (!empty($_SERVER['REMOTE_ADDR'])) {
             $ip = $_SERVER['REMOTE_ADDR'];
diff --git a/src/Params/InputParam.php b/src/Params/InputParam.php
@@ -191,11 +191,11 @@ protected function getParamLabel(): string
     public function isValid(): bool
     {
         $value = $this->getValue();
-        if ($this->required === self::OPTIONAL && ($value === null || $value == '')) {
+        if ($this->required === self::OPTIONAL && ($value === null || $value === '')) {
             return true;
         }
 
-        if ($this->required && ($value === null || $value == '')) {
+        if ($this->required && ($value === null || $value === '')) {
             $this->errors[] = 'Field is required';
             return false;
         }
diff --git a/src/Presenters/ApiPresenter.php b/src/Presenters/ApiPresenter.php
@@ -145,7 +145,7 @@ private function logRequest(ApiLoggerInterface $logger, int $code, float $elapse
             $headers = getallheaders();
         } else {
             foreach ($_SERVER as $name => $value) {
-                if (substr($name, 0, 5) == 'HTTP_') {
+                if (substr($name, 0, 5) === 'HTTP_') {
                     $key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$key] = $value;
                 }
@@ -173,7 +173,7 @@ protected function sendCorsHeaders(): void
     {
         $this->getHttpResponse()->addHeader('Access-Control-Allow-Methods', 'POST, DELETE, PUT, GET, OPTIONS');
 
-        if ($this->corsHeader == 'auto') {
+        if ($this->corsHeader === 'auto') {
             $domain = $this->getRequestDomain();
             if ($domain !== null) {
                 $this->getHttpResponse()->addHeader('Access-Control-Allow-Origin', $domain);
@@ -182,12 +182,12 @@ protected function sendCorsHeaders(): void
             return;
         }
 
-        if ($this->corsHeader == '*') {
+        if ($this->corsHeader === '*') {
             $this->getHttpResponse()->addHeader('Access-Control-Allow-Origin', '*');
             return;
         }
 
-        if ($this->corsHeader != 'off') {
+        if ($this->corsHeader !== 'off') {
             $this->getHttpResponse()->addHeader('Access-Control-Allow-Origin', $this->corsHeader);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,18 @@ class ApiDecider`
`30`	`30`	`*/`
`31`	`31`	`public function getApi(string $method, int $version, string $package, ?string $apiAction = null)`
`32`	`32`	`{`
	`33`	`+ $method = strtoupper($method);`
	`34`	`+ $apiAction = $apiAction === '' ? null : $apiAction;`
	`35`	`+`
`33`	`36`	`foreach ($this->apis as $api) {`
`34`	`37`	`$identifier = $api->getEndpoint();`
`35`		`- if ($method == $identifier->getMethod() && $identifier->getVersion() == $version && $identifier->getPackage() == $package && $identifier->getApiAction() == $apiAction) {`
	`38`	`+ if ($method === $identifier->getMethod() && $identifier->getVersion() === $version && $identifier->getPackage() === $package && $identifier->getApiAction() === $apiAction) {`
`36`	`39`	`$endpointIdentifier = new EndpointIdentifier($method, $version, $package, $apiAction);`
`37`	`40`	`$api->getHandler()->setEndpointIdentifier($endpointIdentifier);`
`38`	`41`	`return $api;`
`39`	`42`	`}`
`40`		`- if ($method == 'OPTIONS' && $this->globalPreflightHandler && $identifier->getVersion() == $version && $identifier->getPackage() == $package && $identifier->getApiAction() == $apiAction) {`
`41`		`- return new Api(new EndpointIdentifier('OPTION', $version, $package, $apiAction), $this->globalPreflightHandler, new NoAuthorization());`
	`43`	`+ if ($method === 'OPTIONS' && $this->globalPreflightHandler && $identifier->getVersion() === $version && $identifier->getPackage() === $package && $identifier->getApiAction() === $apiAction) {`
	`44`	`+ return new Api(new EndpointIdentifier('OPTIONS', $version, $package, $apiAction), $this->globalPreflightHandler, new NoAuthorization());`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`	`return new Api(new EndpointIdentifier($method, $version, $package, $apiAction), new DefaultHandler(), new NoAuthorization());`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function createComponentConsoleForm(): Form`
`53`	`53`	`$scheme = $_SERVER['HTTP_X_FORWARDED_PROTO'];`
`54`	`54`	`}`
`55`	`55`	`$port = '';`
`56`		`- if ($uri->scheme == 'http' && $uri->port != 80) {`
	`56`	`+ if ($uri->scheme === 'http' && $uri->port !== 80) {`
`57`	`57`	`$port = ':' . $uri->port;`
`58`	`58`	`}`
`59`	`59`	`$url = $scheme . '://' . $uri->host . $port . '/api/' . $this->endpoint->getUrl();`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function handle(array $params): ResponseInterface`
`54`	`54`	`private function getApiList(int $version): array`
`55`	`55`	`{`
`56`	`56`	`$versionApis = array_filter($this->apiDecider->getApis(), function (Api $api) use ($version) {`
`57`		`- return $version == $api->getEndpoint()->getVersion();`
	`57`	`+ return $version === $api->getEndpoint()->getVersion();`
`58`	`58`	`});`
`59`	`59`
`60`	`60`	`return array_map(function (Api $api) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public function getRequestIp(): string`
`11`	`11`	`{`
`12`	`12`	`if (!empty($_SERVER['HTTP_CLIENT_IP'])) {`
`13`	`13`	`$ip = $_SERVER['HTTP_CLIENT_IP'];`
`14`		`- } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != '127.0.0.1') {`
	`14`	`+ } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] !== '127.0.0.1') {`
`15`	`15`	`$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];`
`16`	`16`	`} elseif (!empty($_SERVER['REMOTE_ADDR'])) {`
`17`	`17`	`$ip = $_SERVER['REMOTE_ADDR'];`
Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,11 @@ protected function getParamLabel(): string`
`191`	`191`	`public function isValid(): bool`
`192`	`192`	`{`
`193`	`193`	`$value = $this->getValue();`
`194`		`- if ($this->required === self::OPTIONAL && ($value === null \|\| $value == '')) {`
	`194`	`+ if ($this->required === self::OPTIONAL && ($value === null \|\| $value === '')) {`
`195`	`195`	`return true;`
`196`	`196`	`}`
`197`	`197`
`198`		`- if ($this->required && ($value === null \|\| $value == '')) {`
	`198`	`+ if ($this->required && ($value === null \|\| $value === '')) {`
`199`	`199`	`$this->errors[] = 'Field is required';`
`200`	`200`	`return false;`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ private function logRequest(ApiLoggerInterface $logger, int $code, float $elapse`
`145`	`145`	`$headers = getallheaders();`
`146`	`146`	`} else {`
`147`	`147`	`foreach ($_SERVER as $name => $value) {`
`148`		`- if (substr($name, 0, 5) == 'HTTP_') {`
	`148`	`+ if (substr($name, 0, 5) === 'HTTP_') {`
`149`	`149`	`$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));`
`150`	`150`	`$headers[$key] = $value;`
`151`	`151`	`}`
`@@ -173,7 +173,7 @@ protected function sendCorsHeaders(): void`
`173`	`173`	`{`
`174`	`174`	`$this->getHttpResponse()->addHeader('Access-Control-Allow-Methods', 'POST, DELETE, PUT, GET, OPTIONS');`
`175`	`175`
`176`		`- if ($this->corsHeader == 'auto') {`
	`176`	`+ if ($this->corsHeader === 'auto') {`
`177`	`177`	`$domain = $this->getRequestDomain();`
`178`	`178`	`if ($domain !== null) {`
`179`	`179`	`$this->getHttpResponse()->addHeader('Access-Control-Allow-Origin', $domain);`
`@@ -182,12 +182,12 @@ protected function sendCorsHeaders(): void`
`182`	`182`	`return;`
`183`	`183`	`}`
`184`	`184`
`185`		`- if ($this->corsHeader == '*') {`
	`185`	`+ if ($this->corsHeader === '*') {`
`186`	`186`	`$this->getHttpResponse()->addHeader('Access-Control-Allow-Origin', '*');`
`187`	`187`	`return;`
`188`	`188`	`}`
`189`	`189`
`190`		`- if ($this->corsHeader != 'off') {`
	`190`	`+ if ($this->corsHeader !== 'off') {`
`191`	`191`	`$this->getHttpResponse()->addHeader('Access-Control-Allow-Origin', $this->corsHeader);`
`192`	`192`	`}`
`193`	`193`	`}`