From 88fe7b7a0307f428ca3bcce7eddca5ad36b93e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sun, 31 May 2020 20:41:16 +0200
Subject: [PATCH] MAPG-86 refactor view-controller

---
 src/Interfaces/Controller/IController.php     |  8 ----
 .../{View/IView.php => Response/IContent.php} |  4 +-
 src/Interfaces/Response/IRedirect.php         | 12 ++++++
 .../ViewBase.php => Response/ContentBase.php} |  6 +--
 .../HtmlView.php => Response/HtmlContent.php} |  4 +-
 .../JsonView.php => Response/JsonContent.php} |  4 +-
 src/Response/Redirect.php                     | 41 +++++++++++++++++++
 7 files changed, 62 insertions(+), 17 deletions(-)
 delete mode 100644 src/Interfaces/Controller/IController.php
 rename src/Interfaces/{View/IView.php => Response/IContent.php} (66%)
 create mode 100644 src/Interfaces/Response/IRedirect.php
 rename src/{View/ViewBase.php => Response/ContentBase.php} (62%)
 rename src/{View/HtmlView.php => Response/HtmlContent.php} (87%)
 rename src/{View/JsonView.php => Response/JsonContent.php} (80%)
 create mode 100644 src/Response/Redirect.php

diff --git a/src/Interfaces/Controller/IController.php b/src/Interfaces/Controller/IController.php
deleted file mode 100644
index 07caeeb..0000000
--- a/src/Interfaces/Controller/IController.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Controller;
-
-use MapGuesser\Interfaces\View\IView;
-
-interface IController
-{
-    public function run(): IView;
-}
diff --git a/src/Interfaces/View/IView.php b/src/Interfaces/Response/IContent.php
similarity index 66%
rename from src/Interfaces/View/IView.php
rename to src/Interfaces/Response/IContent.php
index 7cedc29..446a4ab 100644
--- a/src/Interfaces/View/IView.php
+++ b/src/Interfaces/Response/IContent.php
@@ -1,6 +1,6 @@
-<?php namespace MapGuesser\Interfaces\View;
+<?php namespace MapGuesser\Interfaces\Response;
 
-interface IView
+interface IContent
 {
     public function &getData(): array;
 
diff --git a/src/Interfaces/Response/IRedirect.php b/src/Interfaces/Response/IRedirect.php
new file mode 100644
index 0000000..319dbf8
--- /dev/null
+++ b/src/Interfaces/Response/IRedirect.php
@@ -0,0 +1,12 @@
+<?php namespace MapGuesser\Interfaces\Response;
+
+interface IRedirect
+{
+    const PERMANENT = 1;
+
+    const TEMPORARY = 2;
+
+    public function getUrl(): string;
+
+    public function getHttpCode(): int;
+}
diff --git a/src/View/ViewBase.php b/src/Response/ContentBase.php
similarity index 62%
rename from src/View/ViewBase.php
rename to src/Response/ContentBase.php
index 89a6eee..359cbdb 100644
--- a/src/View/ViewBase.php
+++ b/src/Response/ContentBase.php
@@ -1,8 +1,8 @@
-<?php namespace MapGuesser\View;
+<?php namespace MapGuesser\Response;
 
-use MapGuesser\Interfaces\View\IView;
+use MapGuesser\Interfaces\Response\IContent;
 
-abstract class ViewBase implements IView
+abstract class ContentBase implements IContent
 {
     protected array $data;
 
diff --git a/src/View/HtmlView.php b/src/Response/HtmlContent.php
similarity index 87%
rename from src/View/HtmlView.php
rename to src/Response/HtmlContent.php
index 35f5e9a..0ad813a 100644
--- a/src/View/HtmlView.php
+++ b/src/Response/HtmlContent.php
@@ -1,6 +1,6 @@
-<?php namespace MapGuesser\View;
+<?php namespace MapGuesser\Response;
 
-class HtmlView extends ViewBase
+class HtmlContent extends ContentBase
 {
     private string $template;
 
diff --git a/src/View/JsonView.php b/src/Response/JsonContent.php
similarity index 80%
rename from src/View/JsonView.php
rename to src/Response/JsonContent.php
index 78eb90f..f4c0d38 100644
--- a/src/View/JsonView.php
+++ b/src/Response/JsonContent.php
@@ -1,6 +1,6 @@
-<?php namespace MapGuesser\View;
+<?php namespace MapGuesser\Response;
 
-class JsonView extends ViewBase
+class JsonContent extends ContentBase
 {
     public function __construct(array &$data = [])
     {
diff --git a/src/Response/Redirect.php b/src/Response/Redirect.php
new file mode 100644
index 0000000..de5ab39
--- /dev/null
+++ b/src/Response/Redirect.php
@@ -0,0 +1,41 @@
+<?php namespace MapGuesser\Response;
+
+use MapGuesser\Interfaces\Response\IRedirect;
+
+class Redirect implements IRedirect
+{
+    private $target;
+
+    private int $type;
+
+    public function __construct($target, int $type = IRedirect::TEMPORARY)
+    {
+        $this->target = $target;
+        $this->type = $type;
+    }
+
+    public function getUrl(): string
+    {
+        if (is_array($this->target)) {
+            $link = $this->target[0]->generateLink($this->target[1]);
+        } else {
+            $link = $this->target;
+        }
+
+        return $link;
+    }
+
+    public function getHttpCode(): int
+    {
+        switch ($this->type) {
+            case IRedirect::PERMANENT:
+                return 301;
+
+            case IRedirect::TEMPORARY:
+                return 302;
+
+            default:
+                return 302;
+        }
+    }
+}