Minor clean up

Author: wazabii8

.gitignore

@@ -1,4 +1,6 @@
 ._*
 .DS_Store
 .sass-cache
-vendor
+composer.lock
+vendor
+.idea/

Stream.php

@@ -35,8 +35,9 @@ class Stream implements StreamInterface
 
     /**
      * PSR-7 Stream
-     * @param mixed  $stream
-     * @param string    $permission Default stream permission is r+
+     *
+     * @param mixed $stream
+     * @param string $permission The default stream permission is r+
      */
     public function __construct(mixed $stream = null, string $permission = "r+")
     {

composer.json

@@ -39,5 +39,8 @@
       "MaplePHP\\Http\\": ""
     }
   },
-  "minimum-stability": "dev"
+  "minimum-stability": "dev",
+  "scripts": {
+    "unitary": "php vendor/bin/unitary"
+  }
 }

tests/unitary-request.php

@@ -1,20 +1,16 @@
 <?php
 
-use MaplePHP\Http\Environment;
 use MaplePHP\Http\Request;
-use MaplePHP\Http\ServerRequest;
-use MaplePHP\Http\ServerRequestTest;
 use MaplePHP\Http\Uri;
-use MaplePHP\Http\UriTest;
-use MaplePHP\Unitary\Mocker\MethodRegistry;
+use MaplePHP\Unitary\Expect;
 use MaplePHP\Unitary\TestCase;
 
 $unit = new MaplePHP\Unitary\Unit();
 
 // If you build your library right it will become very easy to mock, like I have below.
 
 // Begin by adding a test
-$unit->case("MaplePHP Request URI path test", function(TestCase $inst) {
+$unit->case("MaplePHP Request URI path test", function(TestCase $case) {
 
     $request = new Request(
         "POST", // The HTTP Method (GET, POST, PUT, DELETE, PATCH)
@@ -23,19 +19,19 @@
         ["email" => "john.doe@example.com"] // Post data
     );
 
-    $inst->add($request->getMethod(), function() {
-        return $this->equal("GET");
+    $case
+        ->error("HTTP Request method is not POST")
+        ->validate($request->getMethod(), function(Expect $inst) {
+            $inst->isEqualTo("POST");
+            //assert($inst->isEqualTo("GET")->isValid(), "wdqwwdqw dwq wqdwq");
+        });
 
-    }, "HTTP Request method Type is not POST");
-    // Adding an error message is not required, but it is highly recommended
-
-    $this->add($request->getUri()->getPort(), [
-        "isInt" => [], // Has no arguments = empty array
-        "min" => [1], // Strict way is to pass each argument to array
-        "max" => 65535, // But if its only one argument then this it is acceptable
-        "length" => [1, 5]
-
-    ], "Is not a valid port number");
+    $case->validate($request->getUri()->getPort(), function(Expect $inst) {
+        $inst->isInt();
+        $inst->min(1);
+        $inst->max(65535);
+        $inst->length(1, 5);
+    });
 
     $this->add($request->getUri()->getUserInfo(), [
         "isString" => [],
@@ -46,7 +42,7 @@
 
     ], "Is not a valid port number");
 
-    $this->add((string)$request->withUri(new \MaplePHP\Http\Uri("https://example.se"))->getUri(), [
+    $this->add((string)$request->withUri(new Uri("https://example.se"))->getUri(), [
         "equal" => ["https://example.se"],
     ], "GetUri expects https://example.se as result");
 });

tests/unitaryRequest.php

@@ -0,0 +1,52 @@
+<?php
+
+use MaplePHP\Http\Environment;
+use MaplePHP\Http\Request;
+use MaplePHP\Http\ServerRequest;
+use MaplePHP\Http\ServerRequestTest;
+use MaplePHP\Http\Uri;
+use MaplePHP\Http\UriTest;
+use MaplePHP\Unitary\Mocker\MethodRegistry;
+use MaplePHP\Unitary\TestCase;
+
+$unit = new MaplePHP\Unitary\Unit();
+
+// If you build your library right it will become very easy to mock, like I have below.
+
+// Begin by adding a test
+$unit->case("MaplePHP Request URI path test", function(TestCase $inst) {
+
+    $request = new Request(
+        "POST", // The HTTP Method (GET, POST, PUT, DELETE, PATCH)
+        "https://admin:mypass@example.com:65535/test.php?id=5221&place=stockholm", // The Request URI
+        ["Content-Type" => "application/x-www-form-urlencoded"], // Add Headers, empty array is allowed
+        ["email" => "john.doe@example.com"] // Post data
+    );
+
+    $inst->add($request->getMethod(), function() {
+        return $this->equal("GET");
+
+    }, "HTTP Request method Type is not POST");
+    // Adding an error message is not required, but it is highly recommended
+
+    $this->add($request->getUri()->getPort(), [
+        "isInt" => [], // Has no arguments = empty array
+        "min" => [1], // Strict way is to pass each argument to array
+        "max" => 65535, // But if its only one argument then this it is acceptable
+        "length" => [1, 5]
+
+    ], "Is not a valid port number");
+
+    $this->add($request->getUri()->getUserInfo(), [
+        "isString" => [],
+        "User validation" => function($value) {
+            $arr = explode(":", $value);
+            return ($this->withValue($arr[0])->equal("admin") && $this->withValue($arr[1])->equal("mypass"));
+        }
+
+    ], "Is not a valid port number");
+
+    $this->add((string)$request->withUri(new \MaplePHP\Http\Uri("https://example.se"))->getUri(), [
+        "equal" => ["https://example.se"],
+    ], "GetUri expects https://example.se as result");
+});