Merge pull request #25 from WebFiori/dev

Fix to Small bug + Improvements

Author: usernane

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
- Copyright 2019 Ibrahim BinAlshikh, restEasy library.
+ Copyright 2019 Ibrahim BinAlshikh, WebFiori HTTP.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -12,7 +12,7 @@ It includes inputs feltering and data validation in addion to creating user-defi
   <a href="https://sonarcloud.io/dashboard?id=WebFiori_http">
       <img src="https://sonarcloud.io/api/project_badges/measure?project=WebFiori_http&metric=alert_status" />
   </a>
-  <a href="https://github.com/WebFiori/restEasy/releases">
+  <a href="https://github.com/WebFiori/http/releases">
       <img src="https://img.shields.io/github/release/WebFiori/http.svg?label=latest" />
   </a>
   <a href="https://packagist.org/packages/webfiori/http">

tests/webfiori/tests/http/HttpCookieTest.php

@@ -39,7 +39,7 @@ public function testConstructor01() {
         $this->assertEquals('/b/a/m', $cookie->getPath());
         $this->assertEquals('', $cookie->getLifetime());
         $cookie->setExpires(10);
-        $expires = date(DATE_COOKIE, time() + 10);
+        $expires = date(DATE_COOKIE, time() + 10*60);
         $this->assertTrue($cookie->isPersistent());
         $this->assertEquals($expires, $cookie->getLifetime());
         $this->assertEquals('Lax', $cookie->getSameSite());
@@ -52,8 +52,8 @@ public function testConstructor01() {
         $this->assertTrue($cookie->isHttpOnly());
         $this->assertTrue($cookie->isSecure());
         $cookie->setExpires(-1);
-        $expires = date(DATE_COOKIE, time() - 1);
-        $this->assertEquals(time() - 1, $cookie->getExpires());
+        $expires = date(DATE_COOKIE, time() - 1*60);
+        $this->assertEquals(time() - 1*60, $cookie->getExpires());
         $this->assertEquals($expires, $cookie->getLifetime());
         $this->assertEquals('super=cool; expires='.$expires.'; path=/b/a/m; Secure; HttpOnly; SameSite=None', $cookie->getHeaderString());
         $cookie->setExpires(0);
@@ -87,4 +87,25 @@ public function testConstructor03() {
         $cookie->kill();
         $this->assertEquals(date(DATE_COOKIE, time() - 60*60*24), $cookie->getLifetime());
     }
+    /**
+     * @test
+     */
+    public function testRemainingTime00() {
+        $cookie = new HttpCookie();
+        $this->assertEquals(0, $cookie->getRemainingTime());
+        $cookie->setExpires(1);
+        $this->assertEquals(60, $cookie->getRemainingTime());
+        sleep(3);
+        $this->assertEquals(57, $cookie->getRemainingTime());
+    }
+    /**
+     * @test
+     */
+    public function testRemainingTime01() {
+        $cookie = new HttpCookie();
+        $cookie->setExpires(0.1);
+        $this->assertEquals(6, $cookie->getRemainingTime());
+        sleep(8);
+        $this->assertEquals(0, $cookie->getRemainingTime());
+    }
 }

tests/webfiori/tests/http/RequestParameterTest.php

@@ -3,6 +3,7 @@
 
 use PHPUnit\Framework\TestCase;
 use webfiori\http\RequestParameter;
+use webfiori\http\APIFilter;
 /**
  * Description of RequestParameterTest
  *
@@ -36,7 +37,7 @@ public function testCreateParameter02() {
             'min' => 33,
             'max' => 100,
             'custom-filter' => function ($original, $basicFilterResult, $param) {
-                if ($basicFilterResult != \restEasy\APIFilter::INVALID) {
+                if ($basicFilterResult != APIFilter::INVALID) {
                     return $basicFilterResult * 100;
                 }
             }

tests/webfiori/tests/http/UriTest.php

@@ -83,6 +83,7 @@ public function testParams01() {
         $uri->setParameterValue('first-var', '1009');
         $this->assertEquals(['first-var'], $uri->getParametersNames());
         $this->assertEquals('1009', $uri->getParameter('first-var')->getValue());
+        $this->assertFalse($uri->setParameterValue('not-exist', 'hello'));
     }
     /**
      * @test

tests/webfiori/tests/http/WebServiceTest.php

@@ -16,6 +16,7 @@ public function testGetAuthHeaders00() {
             'scheme' => '',
             'credentials' => ''
         ],$service->getAuthHeader());
+        $this->assertNull($service->isAuthorized());
     }
     /**
      * 

tests/webfiori/tests/http/testServices/TestServiceObj.php

@@ -14,7 +14,7 @@ public function __construct($name) {
     }
     //put your code here
     public function isAuthorized() {
-        
+        return parent::isAuthorized();
     }
 
     public function processRequest() {

webfiori/http/APIFilter.php

@@ -3,7 +3,7 @@
 /* 
  * The MIT License
  *
- * Copyright 2019 Ibrahim BinAlshikh, restEasy library.
+ * Copyright 2019 Ibrahim BinAlshikh, WebFiori HTTP.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

webfiori/http/AbstractWebService.php

@@ -3,7 +3,7 @@
 /* 
  * The MIT License
  *
- * Copyright 2019 Ibrahim BinAlshikh, restEasy library.
+ * Copyright 2019 Ibrahim BinAlshikh, WebFiori HTTP.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

webfiori/http/HttpCookie.php

@@ -25,6 +25,18 @@ class HttpCookie {
     private $val;
     /**
      * Creates new instance of the class with default properties.
+     * 
+     * A newly created cookie will have following properties by default:
+     * <ul>
+     * <li>name: new-cookie</li>
+     * <li>path: /</li>
+     * <li>secure: true</li>
+     * <li>http only: true</li>
+     * <li>domain: The domain at which the library is operating from.</li>
+     * <li>same site: Lax</li>
+     * <li>expires: 0</li>
+     * <li>value: sha256 hash</li>
+     * </ul>
      */
     public function __construct() {
         $this->httpOnly = true;
@@ -133,6 +145,26 @@ public function getName() : string {
     public function getPath() : string {
         return $this->path;
     }
+    /**
+     * Returns number of seconds before the cookie expires.
+     * 
+     * @return int If the cookie is non-persistent or the cookie has expired,
+     * the method will always return 0. Other than that, the method will return
+     * number of seconds remaining before the cookie dies.
+     */
+    public function getRemainingTime() : int {
+        $expiresAt = $this->getExpires();
+        
+        if ($expiresAt == 0) {
+            return 0;
+        }
+        $remaining = $expiresAt - time();
+        
+        if ($remaining < 0) {
+            return 0;
+        }
+        return $remaining;
+    }
     /**
      * Returns the value of the attribute 'SameSite'.
      * 
@@ -231,7 +263,7 @@ public function setExpires(float $expireAfter) {
 
             return;
         }
-        $this->expires = time() + $expireAfter;
+        $this->expires = time() + $expireAfter*60;
     }
     /**
      * Sets the attribute 'HttpOnly'.