hfw / site

src/Site/Request.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
                         $info['tmp_name'][$i]
                     );
                 }
-            }
-            else {
+            } else {
                 $this->files[$name] = new Upload(
                     $info['error_code'],
                     $info['name'],

Spacing +22 added lines, -22 removed lines

@@ -48,7 +48,7 @@ 
      */
     protected $proxies = [];
 
-    public function __construct () {
+    public function __construct() {
         $this->path = Util::path(urldecode(strtok($_SERVER['REQUEST_URI'], '?')));
         $this->headers = array_change_key_case(getallheaders()); // phpstorm bug submitted, ext-apache isn't needed.
         foreach ($_FILES as $name => $info) {
@@ -75,7 +75,7 @@ 
     /**
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->path;
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return array
      */
-    public function getArgs (): array {
+    public function getArgs(): array {
         return array_merge($_GET, $_POST);
     }
 
@@ -93,7 +93,7 @@ 
      *
      * @return string
      */
-    public function getClient () {
+    public function getClient() {
         if (in_array($_SERVER['REMOTE_ADDR'], $this->proxies)) {
             return $this['X-Forwarded-For'] ?? $_SERVER['REMOTE_ADDR'];
         }
@@ -104,7 +104,7 @@ 
      * @param string $name
      * @return null|Upload
      */
-    final public function getFile (string $name) {
+    final public function getFile(string $name) {
         return $this->files[$name] ?? null;
     }
 
@@ -112,70 +112,70 @@ 
      * @param string $name
      * @return Upload[]
      */
-    final public function getFileGroup (string $name) {
+    final public function getFileGroup(string $name) {
         return $this->fileGroups[$name] ?? [];
     }
 
     /**
      * @return Upload[][]
      */
-    final public function getFileGroups () {
+    final public function getFileGroups() {
         return $this->fileGroups;
     }
 
     /**
      * @return Upload[]
      */
-    final public function getFiles () {
+    final public function getFiles() {
         return $this->files;
     }
 
     /**
      * @return string[]
      */
-    public function getHeaders (): array {
+    public function getHeaders(): array {
         return $this->headers;
     }
 
     /**
      * @return string
      */
-    final public function getMethod (): string {
+    final public function getMethod(): string {
         return $_SERVER['REQUEST_METHOD'];
     }
 
     /**
      * @return string
      */
-    final public function getPath (): string {
+    final public function getPath(): string {
         return $this->path;
     }
 
     /**
      * @return string[]
      */
-    public function getProxies (): array {
+    public function getProxies(): array {
         return $this->proxies;
     }
 
     /**
      * @return bool
      */
-    final public function isDelete (): bool {
+    final public function isDelete(): bool {
         return $_SERVER['REQUEST_METHOD'] === 'DELETE';
     }
 
     /**
      * @return bool
      */
-    final public function isGet (): bool {
+    final public function isGet(): bool {
         return $_SERVER['REQUEST_METHOD'] === 'GET';
     }
 
     /**
      * @return bool
      */
-    final public function isHead (): bool {
+    final public function isHead(): bool {
         return $_SERVER['REQUEST_METHOD'] === 'HEAD';
     }
 
@@ -184,14 +184,14 @@ 
      *
      * @return bool
      */
-    final public function isMuting (): bool {
+    final public function isMuting(): bool {
         return !$this->isGet() and !$this->isHead();
     }
 
     /**
      * @return bool
      */
-    final public function isPost (): bool {
+    final public function isPost(): bool {
         return $_SERVER['REQUEST_METHOD'] === 'POST';
     }
 
@@ -201,7 +201,7 @@ 
      * @param string $key
      * @return bool
      */
-    public function offsetExists ($key) {
+    public function offsetExists($key) {
         return isset($this->headers[strtolower($key)]);
     }
 
@@ -211,7 +211,7 @@ 
      * @param string $key
      * @return null|string
      */
-    public function offsetGet ($key) {
+    public function offsetGet($key) {
         return $this->headers[strtolower($key)] ?? null;
     }
 
@@ -221,7 +221,7 @@ 
      * @param mixed $key
      * @param mixed $value
      */
-    public function offsetSet ($key, $value) {
+    public function offsetSet($key, $value) {
         return;
     }
 
@@ -230,7 +230,7 @@ 
      *
      * @param mixed $key
      */
-    public function offsetUnset ($key) {
+    public function offsetUnset($key) {
         return;
     }
 
@@ -238,7 +238,7 @@ 
      * @param string[] $proxies
      * @return $this
      */
-    public function setProxies (array $proxies) {
+    public function setProxies(array $proxies) {
         $this->proxies = $proxies;
         return $this;
     }

src/Site/Auth.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
      *
      * @param Site $site
      */
-    public function __construct (Site $site) {
+    public function __construct(Site $site) {
         $this->site = $site;
         session_set_cookie_params(0, '/', null, !$site->isDev(), true);
         session_start();
@@ -37,7 +37,7 @@ 
     /**
      * @return string
      */
-    public function getToken (): string {
+    public function getToken(): string {
         return $_SESSION['_token'];
     }
 
@@ -46,14 +46,14 @@ 
      *
      * @return mixed
      */
-    public function getUser () {
+    public function getUser() {
         return $_SESSION['_user'] ?? null;
     }
 
     /**
      * Wipes the session.
      */
-    public function logout () {
+    public function logout() {
         setcookie(session_name(), null, 1);
         session_destroy();
     }
@@ -64,7 +64,7 @@ 
      * @param mixed $user
      * @return $this
      */
-    public function setUser ($user) {
+    public function setUser($user) {
         $_SESSION['_user'] = $user;
         return $this;
     }
@@ -77,7 +77,7 @@ 
      * @return $this
      * @throws Error
      */
-    public function verify ($token) {
+    public function verify($token) {
         if ($token !== $this->getToken()) {
             $this->site->log(403, 'Invalid token.');
             throw new Error(403, 'Invalid token.');

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
         if (!isset($_SESSION['_token'])) {
             try {
                 $_SESSION['_token'] = bin2hex(random_bytes(8));
-            }
-            catch (Exception $exception) {
+            } catch (Exception $exception) {
                 $_SESSION['_token'] = bin2hex(openssl_random_pseudo_bytes(8));
             }
         }

src/Site/Error.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * @param string $message Defaults to the standard description.
      * @param Throwable|null $previous
      */
-    public function __construct (int $code, string $message = null, Throwable $previous = null) {
+    public function __construct(int $code, string $message = null, Throwable $previous = null) {
         $message = $message ?? self::MESSAGES[$code] ?? '';
         parent::__construct($message, $code, $previous);
     }

src/Site/Util.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
      * @param string[] $args
      * @return string
      */
-    public static function path (...$args): string {
+    public static function path(...$args): string {
         $path = trim(implode('/', $args), '/');
         $path = preg_replace('/\/+/', '/', $path);
         return '/' . $path;
@@ -25,7 +25,7 @@ 
      * @param string[] $args
      * @return string
      */
-    public static function slug (...$args): string {
+    public static function slug(...$args): string {
         $slug = strtolower(implode('-', $args));
         $slug = preg_replace('/([^a-z0-9]+)/', '-', $slug);
         $slug = preg_replace('/-+/', '-', $slug);

src/Site/Upload.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
      * @param string $remoteName
      * @param string $path
      */
-    public function __construct (int $status, string $remoteName, string $path) {
+    public function __construct(int $status, string $remoteName, string $path) {
         $this->status = $status;
         $this->remoteName = $remoteName;
         $this->path = $path;
@@ -44,7 +44,7 @@ 
      *
      * @return null|Error
      */
-    public function getError () {
+    public function getError() {
         switch ($this->status) {
             case UPLOAD_ERR_INI_SIZE:
             case UPLOAD_ERR_FORM_SIZE:
@@ -67,35 +67,35 @@ 
     /**
      * @return string
      */
-    final public function getPath (): string {
+    final public function getPath(): string {
         return $this->path;
     }
 
     /**
      * @return string
      */
-    final public function getRemoteName (): string {
+    final public function getRemoteName(): string {
         return $this->remoteName;
     }
 
     /**
      * @return int
      */
-    final public function getSize (): int {
+    final public function getSize(): int {
         return filesize($this->path);
     }
 
     /**
      * @return int
      */
-    final public function getStatus (): int {
+    final public function getStatus(): int {
         return $this->status;
     }
 
     /**
      * @return string
      */
-    final public function getType (): string {
+    final public function getType(): string {
         return mime_content_type($this->path);
     }
 
@@ -103,7 +103,7 @@ 
      * @param string $path
      * @return $this
      */
-    public function move (string $path) {
+    public function move(string $path) {
         move_uploaded_file($this->path, $path);
         return $this;
     }

src/Site/View.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
      */
     protected $template;
 
-    public function __construct (string $template, array $data = []) {
+    public function __construct(string $template, array $data = []) {
         $this->template = $template;
         $this->data = $data;
     }
@@ -29,14 +29,14 @@ 
     /**
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         return $this->template;
     }
 
     /**
      * @return string
      */
-    public function getContent (): string {
+    public function getContent(): string {
         ob_start();
         $this->render();
         return ob_end_clean();
@@ -46,7 +46,7 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists ($offset): bool {
+    public function offsetExists($offset): bool {
         return isset($this->data[$offset]);
     }
 
@@ -54,7 +54,7 @@ 
      * @param mixed $key
      * @return mixed
      */
-    public function offsetGet ($key) {
+    public function offsetGet($key) {
         return $this->data[$key] ?? null;
     }
 
@@ -62,14 +62,14 @@ 
      * @param mixed $key
      * @param mixed $value
      */
-    public function offsetSet ($key, $value): void {
+    public function offsetSet($key, $value): void {
         $this->data[$key] = $value;
     }
 
     /**
      * @param mixed $key
      */
-    public function offsetUnset ($key): void {
+    public function offsetUnset($key): void {
         unset($this->data[$key]);
     }
 
@@ -79,7 +79,7 @@ 
      *
      * @return void
      */
-    public function render (): void {
+    public function render(): void {
         extract($this->data);
         include "{$this->template}";
     }

src/Site/ViewableInterface.php

Spacing +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
      *
      * @return string
      */
-    public function getContent (): string;
+    public function getContent(): string;
 
     /**
      * Directly outputs content.
      */
-    public function render (): void;
+    public function render(): void;
 }
\ No newline at end of file

src/Site/Response.php

Spacing +20 added lines, -20 removed lines

@@ -53,7 +53,7 @@ 
     /**
      * @param Site $site
      */
-    public function __construct (Site $site) {
+    public function __construct(Site $site) {
         $this->site = $site;
         $this->request = $site->getRequest();
         $this->id = uniqid();
@@ -71,7 +71,7 @@ 
      *
      * @return void
      */
-    public function _onRender (): void {
+    public function _onRender(): void {
         header_remove('X-Powered-By');
         $this['X-Response-Id'] = $this->id;
         ksort($this->headers);
@@ -96,7 +96,7 @@ 
      *
      * @return void
      */
-    public function _onShutdown (): void {
+    public function _onShutdown(): void {
         if ($this->site->isDev()) {
             $ip = $this->request->getClient();
             $method = $this->request->getMethod();
@@ -114,7 +114,7 @@ 
      *
      * @param Throwable $error Defaults to an `Error` with the current response code.
      */
-    public function error (Throwable $error = null): void {
+    public function error(Throwable $error = null): void {
         $error = $error ?? new Error($this->code);
         $code = 500;
         if ($error instanceof Error) {
@@ -141,7 +141,7 @@ 
      * @param string $path
      * @param bool $download
      */
-    public function file (string $path, bool $download = false): void {
+    public function file(string $path, bool $download = false): void {
         clearstatcache(true, $path);
         if (!file_exists($path)) {
             $this->setCode(404)->error() and exit;
@@ -196,21 +196,21 @@ 
     /**
      * @return int
      */
-    final public function getCode (): int {
+    final public function getCode(): int {
         return $this->code;
     }
 
     /**
      * @return string
      */
-    final public function getId (): string {
+    final public function getId(): string {
         return $this->id;
     }
 
     /**
      * @return int
      */
-    public function getTimestamp (): int {
+    public function getTimestamp(): int {
         return $this->timestamp;
     }
 
@@ -219,7 +219,7 @@ 
      *
      * @return bool
      */
-    public function isEmpty (): bool {
+    public function isEmpty(): bool {
         return $this->request->isHead() or in_array($this->code, [204, 205, 304]);
     }
 
@@ -228,7 +228,7 @@ 
      *
      * @return bool
      */
-    public function isModified (): bool {
+    public function isModified(): bool {
         // Explicit 304 takes precedence over all.
         if ($this->code === 304) {
             return false;
@@ -248,7 +248,7 @@ 
      *
      * @param mixed $content
      */
-    public function mixed ($content): void {
+    public function mixed($content): void {
         if ($content instanceof ViewableInterface) {
             $this->view($content) and exit;
         }
@@ -264,7 +264,7 @@ 
      * @param mixed $key
      * @return bool
      */
-    public function offsetExists ($key) {
+    public function offsetExists($key) {
         return isset($this->headers[$key]);
     }
 
@@ -272,7 +272,7 @@ 
      * @param mixed $key
      * @return null|string
      */
-    public function offsetGet ($key) {
+    public function offsetGet($key) {
         return $this->headers[$key] ?? null;
     }
 
@@ -280,14 +280,14 @@ 
      * @param mixed $key
      * @param string $value
      */
-    public function offsetSet ($key, $value) {
+    public function offsetSet($key, $value) {
         $this->headers[$key] = $value;
     }
 
     /**
      * @param mixed $key
      */
-    public function offsetUnset ($key) {
+    public function offsetUnset($key) {
         unset($this->headers[$key]);
     }
 
@@ -297,7 +297,7 @@ 
      * @param string $location
      * @param int $code
      */
-    public function redirect (string $location, $code = 302) {
+    public function redirect(string $location, $code = 302) {
         $this->setCode($code);
         $this['Location'] = $location;
         flush();
@@ -308,7 +308,7 @@ 
      * @param int $code
      * @return $this
      */
-    public function setCode (int $code) {
+    public function setCode(int $code) {
         $this->code = $code;
         return $this;
     }
@@ -319,7 +319,7 @@ 
      * @param int $timestamp
      * @return $this
      */
-    public function setTimestamp (int $timestamp) {
+    public function setTimestamp(int $timestamp) {
         if ($timestamp) {
             $this['Last-Modified'] = gmdate('D, d M Y H:i:s T', $timestamp);
         }
@@ -336,7 +336,7 @@ 
      * @param int $timestamp
      * @return $this
      */
-    public function touch (int $timestamp) {
+    public function touch(int $timestamp) {
         if ($timestamp > $this->timestamp) {
             $this->setTimestamp($timestamp);
         }
@@ -348,7 +348,7 @@ 
      *
      * @param ViewableInterface $view
      */
-    public function view (ViewableInterface $view): void {
+    public function view(ViewableInterface $view): void {
         $view->render();
         flush();
         exit;

Braces +2 added lines, -4 removed lines

@@ -124,8 +124,7 @@ 
         $template = __DIR__ . '/error.phtml';
         if (file_exists("view/{$code}.phtml")) {
             $template = "view/{$code}.phtml";
-        }
-        elseif (file_exists('view/error.phtml')) {
+        } elseif (file_exists('view/error.phtml')) {
             $template = 'view/error.phtml';
         }
         $this->view(new View($template, [
@@ -322,8 +321,7 @@ 
     public function setTimestamp (int $timestamp) {
         if ($timestamp) {
             $this['Last-Modified'] = gmdate('D, d M Y H:i:s T', $timestamp);
-        }
-        else {
+        } else {
             unset($this['Last-Modified']);
         }
         $this->timestamp = $timestamp;

src/Site.php

Spacing +14 added lines, -14 removed lines

@@ -37,7 +37,7 @@ 
     /**
      * Initializes the system for routing, error handling, and output.
      */
-    public function __construct () {
+    public function __construct() {
         error_reporting(E_ALL);
         set_error_handler([$this, '_onRaise']);
         $this->request = new Request();
@@ -53,7 +53,7 @@ 
      * @param Throwable $error
      * @return void
      */
-    public function _onException (Throwable $error): void {
+    public function _onException(Throwable $error): void {
         if (!$error instanceof Error) {
             $this->log(500, "[{$error->getCode()}] {$error}");
         }
@@ -73,7 +73,7 @@ 
      * @param int $line
      * @throws ErrorException
      */
-    public function _onRaise (int $code, string $message, string $file, int $line) {
+    public function _onRaise(int $code, string $message, string $file, int $line) {
         $type = [
             E_DEPRECATED => 'E_DEPRECATED',
             E_NOTICE => 'E_NOTICE',
@@ -97,7 +97,7 @@ 
      * @param callable $controller
      * @return void
      */
-    public function delete (string $path, callable $controller): void {
+    public function delete(string $path, callable $controller): void {
         $this->route(['DELETE'], $path, $controller);
     }
 
@@ -108,35 +108,35 @@ 
      * @param callable $controller
      * @return void
      */
-    public function get (string $path, callable $controller): void {
+    public function get(string $path, callable $controller): void {
         $this->route(['GET', 'HEAD'], $path, $controller);
     }
 
     /**
      * @return Auth
      */
-    final public function getAuth () {
+    final public function getAuth() {
         return $this->auth ?? $this->auth = new Auth($this);
     }
 
     /**
      * @return Request
      */
-    final public function getRequest () {
+    final public function getRequest() {
         return $this->request;
     }
 
     /**
      * @return Response
      */
-    final public function getResponse () {
+    final public function getResponse() {
         return $this->response;
     }
 
     /**
      * @return bool
      */
-    final public function isDev (): bool {
+    final public function isDev(): bool {
         return $this->dev;
     }
 
@@ -145,7 +145,7 @@ 
      * @param string $message
      * @return $this
      */
-    public function log ($code, string $message) {
+    public function log($code, string $message) {
         $now = date('Y-m-d H:i:s');
         $id = $this->response->getId();
         $ip = $this->request->getClient();
@@ -162,7 +162,7 @@ 
      * @param string $path
      * @param callable $controller
      */
-    public function post (string $path, callable $controller): void {
+    public function post(string $path, callable $controller): void {
         $this->route(['POST'], $path, $controller);
     }
 
@@ -173,7 +173,7 @@ 
      * @param callable $controller
      * @return void
      */
-    public function put (string $path, callable $controller): void {
+    public function put(string $path, callable $controller): void {
         $this->route(['PUT'], $path, $controller);
     }
 
@@ -186,7 +186,7 @@ 
      * @param callable $controller `(string[] $match, Site $site):mixed`
      * @return void
      */
-    protected function route (array $methods, string $path, callable $controller): void {
+    protected function route(array $methods, string $path, callable $controller): void {
         $match = [];
         if ($path[0] !== '/') {
             preg_match($path, $this->request->getPath(), $match);
@@ -208,7 +208,7 @@ 
      * @param bool $dev
      * @return $this
      */
-    public function setDev (bool $dev) {
+    public function setDev(bool $dev) {
         $this->dev = $dev;
         return $this;
     }

Braces +2 added lines, -4 removed lines

@@ -56,8 +56,7 @@ 
     public function _onException (Throwable $error): void {
         if (!$error instanceof Error) {
             $this->log(500, "[{$error->getCode()}] {$error}");
-        }
-        elseif ($error->getCode() >= 500) {
+        } elseif ($error->getCode() >= 500) {
             $this->log($error->getCode(), $error);
         }
         $this->response->error($error) and exit;
@@ -190,8 +189,7 @@ 
         $match = [];
         if ($path[0] !== '/') {
             preg_match($path, $this->request->getPath(), $match);
-        }
-        elseif ($path === $this->request->getPath()) {
+        } elseif ($path === $this->request->getPath()) {
             $match = [$path];
         }
         if ($match) {