Merge branch 'develop'

.gitignore

@@ -1,6 +1,3 @@
 # Composer
 /vendor/
 composer.lock
-
-# PHPUnit
-.phpunit.result.*

app/Contract/Auth.php

@@ -1,21 +1,17 @@
 <?php
 namespace App\Contract;
 
+use App\Definition\Contract;
 use App\Service\Auth as AuthService;
 
 class Auth
 {
+	use Contract;
+
 	protected static function newInstance()
 	{
 		return new AuthService();
 	}
-	protected static $instance;
-	protected static function getInstance() {
-		if (self::$instance === null) {
-			self::$instance = self::newInstance();
-		}
-		return self::$instance;
-	}
 	public static function __callStatic($name, $params)
 	{
 		if (!method_exists(Response::class, $name)) {
@@ -28,4 +24,4 @@ class Auth
 		return call_user_func_array([self, $name], $params);
 	}
 }
-?>
+?>

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "nesbot/carbon": "^2.45"
+      "aldarien/contract": "^1"
     },
     "require-dev": {
       "phpunit/phpunit": "^8"

phpunit.xml

@@ -1,10 +0,0 @@
-<phpunit
-  colors="true"
-  verbose="true"
-  >
-  <testsuites>
-    <testsuite name="Config Tests">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>

tests/ContractTest.php

@@ -1,9 +0,0 @@
-<?php
-use PHPUnit\Framework\TestCase;
-use App\contract\Auth;
-
-class ContractTest extends TestCase {
-  public function testContract() {
-    Auth::logout();
-  }
-}

tests/ServiceTest.php

@@ -1,10 +0,0 @@
-<?php
-use PHPUnit\Framework\TestCase;
-use App\Service\Auth;
-
-class ServiceTest extends TestCase {
-  public function testLoad() {
-    $this->service = new Auth();
-    $this->assertTrue($this->service != false);
-  }
-}