chore: small changes

Author: esyede

system/foundation/http/cookie.php

@@ -70,13 +70,9 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
     public function __toString()
     {
         $str = urlencode($this->getName()) . '=';
-
-        if ('' === (string) $this->getValue()) {
-            $str .= 'deleted; expires=' . gmdate('D, d-M-Y H:i:s T', time() - 31536001);
-        } else {
-            $str .= urlencode($this->getValue()) . ((0 !== $this->getExpiresTime()) ? '; expires=' . gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime()) : '');
-        }
-
+        $str .= ('' === (string) $this->getValue())
+            ? 'deleted; expires=' . gmdate('D, d-M-Y H:i:s T', time() - 31536001)
+            : urlencode($this->getValue()) . ((0 !== $this->getExpiresTime()) ? '; expires=' . gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime()) : '');
         $str .= ('/' !== $this->path) ? '; path=' . $this->path : '';
         $str .= (null !== $this->getSameSite()) ? '; samesite=' . $this->getSameSite() : '';
         $str .= (null !== $this->getDomain()) ? '; domain=' . $this->getDomain() : '';

system/foundation/http/file.php

@@ -67,12 +67,9 @@ protected function convertFileInformation($file)
         if (is_array($file)) {
             $keys = array_keys($file);
             sort($keys);
-
-            if ($keys === self::$fileKeys) {
-                $file = (UPLOAD_ERR_NO_FILE !== $file['error']) ? new Upload($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']) : null;
-            } else {
-                $file = array_map([$this, 'convertFileInformation'], $file);
-            }
+            $file = ($keys === self::$fileKeys)
+                ? ((UPLOAD_ERR_NO_FILE !== $file['error']) ? new Upload($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']) : null)
+                : array_map([$this, 'convertFileInformation'], $file);
         }
 
         return $file;

system/foundation/http/header.php

@@ -107,12 +107,9 @@ public function add(array $headers)
     public function get($key, $default = null, $first = true)
     {
         $key = $this->standardizeKey($key);
-
-        if (!array_key_exists($key, $this->headers)) {
-            return (null === $default) ? ($first ? null : []) : ($first ? $default : [$default]);
-        }
-
-        return $first ? (count($this->headers[$key]) ? $this->headers[$key][0] : $default) : $this->headers[$key];
+        return array_key_exists($key, $this->headers)
+            ? ($first ? (count($this->headers[$key]) ? $this->headers[$key][0] : $default) : $this->headers[$key])
+            : ((null === $default) ? ($first ? null : []) : ($first ? $default : [$default]));
     }
 
     /**
@@ -142,8 +139,7 @@ public function set($key, $values, $replace = true)
      */
     public function has($key)
     {
-        $key = $this->standardizeKey($key);
-        return array_key_exists($key, $this->headers);
+        return array_key_exists($this->standardizeKey($key), $this->headers);
     }
 
     /**

system/foundation/http/helper.php

@@ -235,11 +235,8 @@ protected function computeCacheControlValue()
         }
 
         $header = $this->getCacheControlHeader();
-
-        if (isset($this->cacheControl['public']) || isset($this->cacheControl['private'])) {
-            return $header;
-        }
-
-        return isset($this->cacheControl['s-maxage']) ? $header : $header . ', private';
+        return (isset($this->cacheControl['public']) || isset($this->cacheControl['private']))
+            ? $header
+            : (isset($this->cacheControl['s-maxage']) ? $header : $header . ', private');
     }
 }

system/foundation/http/request.php

@@ -106,10 +106,8 @@ public static function createFromGlobals()
         $httpType = (string) $request->server->get('HTTP_CONTENT_TYPE');
         $method = (string) $request->server->get('REQUEST_METHOD', 'GET');
 
-        if ((0 === strpos($type, 'application/x-www-form-urlencoded')
-                || (0 === strpos($httpType, 'application/x-www-form-urlencoded')))
-            && in_array(strtoupper($method), ['PUT', 'DELETE', 'PATCH'])
-        ) {
+        if ((0 === strpos($type, 'application/x-www-form-urlencoded') || (0 === strpos($httpType, 'application/x-www-form-urlencoded')))
+        && in_array(strtoupper($method), ['PUT', 'DELETE', 'PATCH'])) {
             parse_str($request->getContent(), $data);
             $request->request = new Parameter($data);
         }
@@ -1305,12 +1303,8 @@ private function setPhpDefaultLocale($locale)
     private function getUrlencodedPrefix($string, $prefix)
     {
         $prefix = (string) $prefix;
-
-        if (!$prefix || 0 !== strpos((string) rawurldecode($string), $prefix)) {
-            return false;
-        }
-
-        $len = mb_strlen($prefix, '8bit');
-        return preg_match('#^(%[[:xdigit:]]{2}|.){' . $len . '}#', $string, $match) ? $match[0] : false;
+        return (!$prefix || 0 !== strpos((string) rawurldecode($string), $prefix))
+            ? false
+            : (preg_match('#^(%[[:xdigit:]]{2}|.){' . mb_strlen($prefix, '8bit') . '}#', $string, $match) ? $match[0] : false);
     }
 }

system/foundation/http/server.php

@@ -30,7 +30,7 @@ public function getHeaders()
             $headers['PHP_AUTH_PW'] = isset($this->parameters['PHP_AUTH_PW']) ? $this->parameters['PHP_AUTH_PW'] : '';
         } else {
             /**
-             * B default, php-cgi under apache eill not pass Basic Auth's user and password
+             * By default, php-cgi under apache eill not pass Basic Auth's user and password
              * To resolve this, add this rules to your .htaccess file:
              *
              * RewriteCond %{HTTP:Authorization} ^(.+)$

system/foundation/http/upload.php

@@ -926,10 +926,9 @@ protected function getTargetFile($directory, $name = null)
      */
     protected function getName($name)
     {
-        $original = str_replace('\\', '/', (string) $name);
-        $position = strrpos($original, '/');
-        $original = (false === $position) ? $original : substr($original, $position + 1);
-        return $original;
+        $name = str_replace('\\', '/', (string) $name);
+        $position = strrpos($name, '/');
+        return (false === $position) ? $name : substr($name, $position + 1);
     }
 
     /**
@@ -1004,7 +1003,6 @@ public function move($directory, $name = null)
                 }
 
                 @chmod($target, 0666 & ~umask());
-
                 return $target;
             } elseif (is_uploaded_file($this->getPathname())) {
                 if (false === @move_uploaded_file($this->getPathname(), $target)) {