1.0.3 Added RedirectResponse::class.

InitPHP · Aug 16, 2022 · 8ad1763 · 8ad1763
1 parent 8ebb91d
commit 8ad1763
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 13 deletions.
diff --git a/src/Emitter.php b/src/Emitter.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/Factory.php b/src/Factory.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/JsonResponse.php b/src/JsonResponse.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0.1
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -16,15 +16,40 @@
 namespace InitPHP\HTTP;
 
 use function json_encode;
+use function json_decode;
+use function is_string;
+use function is_array;
 
 /**
  * @since 1.0.1
  */
 class JsonResponse extends Response
 {
-    public function __construct(array $data, int $status = 200, string $version = '1.1')
+
+    private array $data = [];
+
+    /**
+     * @param string|array $data
+     * @param int $status
+     * @param string $version
+     */
+    public function __construct($data, int $status = 200, string $version = '1.1')
     {
-        $body = new Stream(json_encode($data), null);
+        if(is_array($data)){
+            $this->data = $data;
+            $data = json_encode($data);
+        }elseif(is_string($data)){
+            $this->data = json_decode($data, true);
+        }else{
+            throw new \InvalidArgumentException('The $data parameter must be an array or json string.');
+        }
+        $body = new Stream($data, null);
         parent::__construct($status, ['Content-Type' => 'application/json'], $body, $version, null);
     }
+
+    public function toArray(): array
+    {
+        return $this->data;
+    }
+
 }
diff --git a/src/MessageTrait.php b/src/MessageTrait.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/RedirectResponse.php b/src/RedirectResponse.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * RedirectResponse.php
+ *
+ * This file is part of HTTP.
+ *
+ * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
+ * @copyright  Copyright © 2022 Muhammet ŞAFAK
+ * @license    ./LICENSE  MIT
+ * @version    1.0.3
+ * @link       https://www.muhammetsafak.com.tr
+ */
+
+declare(strict_types=1);
+
+namespace InitPHP\HTTP;
+
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
+
+use function is_string;
+
+/**
+ * @since 1.0.2
+ */
+class RedirectResponse extends Response
+{
+    /**
+     * @param string|UriInterface $url
+     * @param int $status
+     * @param int $second
+     */
+    public function __construct($url, int $status = 200, int $second = 0)
+    {
+        if($url instanceof UriInterface){
+            $url = $url->__toString();
+        }
+        if(!is_string($url)){
+            throw new \InvalidArgumentException('The $url parameter must be an UriInterface or string.');
+        }
+        if($second < 1){
+            $headers = [
+                'Location'  => $url,
+            ];
+        }else{
+            $headers = [
+                'Refresh'   => $second . '; url=' . $url,
+            ];
+        }
+        parent::__construct($status, $headers, new Stream('', null), '1.1');
+    }
+
+}
diff --git a/src/Request.php b/src/Request.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/RequestTrait.php b/src/RequestTrait.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/Response.php b/src/Response.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/ServerRequest.php b/src/ServerRequest.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/Stream.php b/src/Stream.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/UploadedFile.php b/src/UploadedFile.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */
 

diff --git a/src/Uri.php b/src/Uri.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 InitPHP
  * @license    http://initphp.github.com/license.txt  MIT
- * @version    1.0
+ * @version    1.0.3
  * @link       https://www.muhammetsafak.com.tr
  */