From 92ee25dbf63923faa972227068b8b12496d0e289 Mon Sep 17 00:00:00 2001
From: Synox <synox@users.noreply.github.com>
Date: Fri, 23 Feb 2018 21:46:19 +0100
Subject: [PATCH] cleanup, add type information

---
 src/pages.php | 16 ++++++++--------
 src/user.php  |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages.php b/src/pages.php
index 5a46941..aa5925b 100644
--- a/src/pages.php
+++ b/src/pages.php
@@ -54,17 +54,17 @@ class DownloadEmailPage extends Page {
 class DeleteEmailPage extends Page {
     private $email_id;
     private $address;
-    private $all_domains;
+    private $config_domains;
 
-    public function __construct($email_id, $address, $all_domains) {
+    public function __construct($email_id, $address, $config_domains) {
         $this->email_id = $email_id;
         $this->address = $address;
-        $this->all_domains = $all_domains;
+        $this->config_domains = $config_domains;
     }
 
     function invoke() {
         $user = User::parseDomain($this->address);
-        $this->if_invalid_redirect_to_random($user, $this->all_domains);
+        $this->if_invalid_redirect_to_random($user, $this->config_domains);
 
         $delete_email_id = filter_var($this->email_id, FILTER_SANITIZE_NUMBER_INT);
         delete_email($delete_email_id, $user);
@@ -73,14 +73,14 @@ class DeleteEmailPage extends Page {
 }
 
 class RedirectToRandomAddressPage extends Page {
-    private $all_domains;
+    private $config_domains;
 
-    public function __construct($all_domains) {
-        $this->all_domains = $all_domains;
+    public function __construct($config_domains) {
+        $this->config_domains = $config_domains;
     }
 
     function invoke() {
-        redirect_to_random($this->all_domains);
+        redirect_to_random($this->config_domains);
     }
 
 }
diff --git a/src/user.php b/src/user.php
index 7d17a22..2791c55 100644
--- a/src/user.php
+++ b/src/user.php
@@ -5,7 +5,7 @@ class User {
     public $username;
     public $domain;
 
-    public function isInvalid() {
+    public function isInvalid(): bool {
         global $config;
         if (empty($this->username) || empty($this->domain)) {
             return true;
@@ -16,7 +16,7 @@ class User {
         }
     }
 
-    public static function parseDomain(string $address) {
+    public static function parseDomain(string $address): User {
         $clean_address = _clean_address($address);
         $user = new User();
         $user->username = _clean_username($clean_address);
@@ -25,7 +25,7 @@ class User {
         return $user;
     }
 
-    public static function parseUsernameAndDomain(string $username, string $domain) {
+    public static function parseUsernameAndDomain(string $username, string $domain): User {
         $user = new User();
         $user->username = _clean_username($username);
         $user->domain = _clean_domain($domain);