diff --git a/model/AdminHandler.php b/model/AdminHandler.php
index 9a35294f..25b7753e 100644
--- a/model/AdminHandler.php
+++ b/model/AdminHandler.php
@@ -1,7 +1,8 @@
 <?php
 # $Id$
 
-class AdminHandler extends PFAHandler {
+class AdminHandler extends PFAHandler
+{
     protected $db_table = 'admin';
     protected $id_field = 'username';
 
diff --git a/model/AdminpasswordHandler.php b/model/AdminpasswordHandler.php
index f81ccaf0..d4f7d4c6 100644
--- a/model/AdminpasswordHandler.php
+++ b/model/AdminpasswordHandler.php
@@ -1,7 +1,8 @@
 <?php
 # $Id$
 
-class AdminpasswordHandler extends PFAHandler {
+class AdminpasswordHandler extends PFAHandler
+{
     protected $db_table = 'admin';
     protected $id_field = 'username';
 
diff --git a/model/AliasHandler.php b/model/AliasHandler.php
index d1f69111..5554ca29 100644
--- a/model/AliasHandler.php
+++ b/model/AliasHandler.php
@@ -4,7 +4,8 @@
 /**
  * Handlers User level alias actions - e.g. add alias, get aliases, update etc.
  */
-class AliasHandler extends PFAHandler {
+class AliasHandler extends PFAHandler
+{
     protected $db_table = 'alias';
     protected $id_field = 'address';
     protected $domain_field = 'domain';
diff --git a/model/AliasdomainHandler.php b/model/AliasdomainHandler.php
index 5b419632..d87cce9b 100644
--- a/model/AliasdomainHandler.php
+++ b/model/AliasdomainHandler.php
@@ -4,7 +4,8 @@
 /**
  * Handlers User level alias actions - e.g. add alias, get aliases, update etc.
  */
-class AliasdomainHandler extends PFAHandler {
+class AliasdomainHandler extends PFAHandler
+{
     protected $db_table = 'alias_domain';
     protected $id_field = 'alias_domain';
     protected $domain_field = 'alias_domain';
diff --git a/model/CliDelete.php b/model/CliDelete.php
index f032f3aa..19548c20 100644
--- a/model/CliDelete.php
+++ b/model/CliDelete.php
@@ -4,7 +4,8 @@
  * class to handle 'delete' in Cli
  */
 
-class CliDelete extends Shell {
+class CliDelete extends Shell
+{
 
     /**
      * Execution method always used for tasks
diff --git a/model/CliEdit.php b/model/CliEdit.php
index fae3c252..37562090 100644
--- a/model/CliEdit.php
+++ b/model/CliEdit.php
@@ -6,7 +6,8 @@
  *
  * extends the "Shell" class
  */
-class CliEdit extends Shell {
+class CliEdit extends Shell
+{
     public $handler_to_use = "";
     public $new = 0;
 
diff --git a/model/CliHelp.php b/model/CliHelp.php
index e8f29bfa..7beff060 100644
--- a/model/CliHelp.php
+++ b/model/CliHelp.php
@@ -1,7 +1,8 @@
 <?php
 # $Id$
 
-class CliHelp extends Shell {
+class CliHelp extends Shell
+{
     public $handler_to_use = "__not_set__";
 
     /**
diff --git a/model/CliScheme.php b/model/CliScheme.php
index 878ddeed..e68a0251 100644
--- a/model/CliScheme.php
+++ b/model/CliScheme.php
@@ -6,7 +6,8 @@
  * extends the "Shell" class
  */
 
-class CliScheme extends Shell {
+class CliScheme extends Shell
+{
     public $handler_to_use = "";
     public $new = 0;
 
diff --git a/model/CliView.php b/model/CliView.php
index a3aa3135..9b25cf3d 100644
--- a/model/CliView.php
+++ b/model/CliView.php
@@ -4,7 +4,8 @@
  * class to handle 'view' in Cli
  */
 
-class CliView extends Shell {
+class CliView extends Shell
+{
 
     /**
      * Execution method always used for tasks
diff --git a/model/Config.php b/model/Config.php
index 250d4fe4..30025894 100644
--- a/model/Config.php
+++ b/model/Config.php
@@ -3,7 +3,8 @@
 
 # This class is too static - if you inherit a class from it, it will share the static $instance and all its contents
 # Therefore the class is marked as final to prevent someone accidently does this ;-)
-final class Config {
+final class Config
+{
     private static $instance = null;
 
     /**
diff --git a/model/DomainHandler.php b/model/DomainHandler.php
index 4bdc48ba..15c10e4e 100644
--- a/model/DomainHandler.php
+++ b/model/DomainHandler.php
@@ -4,7 +4,8 @@
 /**
  * Handlers User level alias actions - e.g. add alias, get aliases, update etc.
  */
-class DomainHandler extends PFAHandler {
+class DomainHandler extends PFAHandler
+{
     protected $db_table = 'domain';
     protected $id_field = 'domain';
     protected $domain_field = 'domain';
diff --git a/model/FetchmailHandler.php b/model/FetchmailHandler.php
index 163ecae9..c223e430 100644
--- a/model/FetchmailHandler.php
+++ b/model/FetchmailHandler.php
@@ -4,7 +4,8 @@
 /**
  * Handler for fetchmail jobs
  */
-class FetchmailHandler extends PFAHandler {
+class FetchmailHandler extends PFAHandler
+{
     protected $db_table = 'fetchmail';
     protected $id_field = 'id';
     protected $domain_field = 'domain';
diff --git a/model/Login.php b/model/Login.php
index 2c6b5caf..d14ab6c8 100644
--- a/model/Login.php
+++ b/model/Login.php
@@ -1,6 +1,7 @@
 <?php
 
-class Login {
+class Login
+{
     private $key_table;
     private $table;
 
diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php
index 73be7750..cded14be 100644
--- a/model/MailboxHandler.php
+++ b/model/MailboxHandler.php
@@ -4,7 +4,8 @@
 /**
  * Simple class to represent a user.
  */
-class MailboxHandler extends PFAHandler {
+class MailboxHandler extends PFAHandler
+{
     protected $db_table = 'mailbox';
     protected $id_field = 'username';
     protected $domain_field = 'domain';
diff --git a/model/PFAHandler.php b/model/PFAHandler.php
index 1254e849..04ae346f 100644
--- a/model/PFAHandler.php
+++ b/model/PFAHandler.php
@@ -1,5 +1,6 @@
 <?php
-abstract class PFAHandler {
+abstract class PFAHandler
+{
 
     /**
      * public variables
diff --git a/model/PFASmarty.php b/model/PFASmarty.php
index 735e95f1..9fb394d7 100644
--- a/model/PFASmarty.php
+++ b/model/PFASmarty.php
@@ -3,7 +3,8 @@
 /**
  * Turn on sanitisation of all data by default so it's not possible for XSS flaws to occur in PFA
  */
-class PFASmarty {
+class PFASmarty
+{
     public static $instance = null;
     /**
      * @var Smarty
diff --git a/model/Shell.php b/model/Shell.php
index 4a30f496..fbc18ab6 100644
--- a/model/Shell.php
+++ b/model/Shell.php
@@ -29,7 +29,8 @@
  * @license                     http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 
-class Shell {
+class Shell
+{
     /**
      * An instance of the ShellDispatcher object that loaded this script
      *
diff --git a/model/VacationHandler.php b/model/VacationHandler.php
index 6126daf3..c479f57e 100644
--- a/model/VacationHandler.php
+++ b/model/VacationHandler.php
@@ -1,7 +1,8 @@
 <?php
 # $Id$
 
-class VacationHandler extends PFAHandler {
+class VacationHandler extends PFAHandler
+{
 
     /**
      * @var string
diff --git a/public/list-virtual.php b/public/list-virtual.php
index c837c4da..20aad557 100644
--- a/public/list-virtual.php
+++ b/public/list-virtual.php
@@ -348,7 +348,8 @@ for ($i = 0; $i < sizeof($tMailbox); $i++) {
 
 
 
-class cNav_bar {
+class cNav_bar
+{
     protected $count;
     protected $title;
     protected $limit;
diff --git a/public/xmlrpc.php b/public/xmlrpc.php
index c01e2ec3..c6a3330f 100644
--- a/public/xmlrpc.php
+++ b/public/xmlrpc.php
@@ -66,7 +66,8 @@ if (!isset($_SESSION['authenticated'])) {
 echo $server->handle();
 
 
-class UserProxy {
+class UserProxy
+{
 
     /**
      * @param string $old_password
@@ -105,7 +106,8 @@ class UserProxy {
     }
 }
 
-class VacationProxy {
+class VacationProxy
+{
     /**
      * @return boolean true if the vacation is removed successfully. Else false.
      */
@@ -154,7 +156,8 @@ class VacationProxy {
     }
 }
 
-class AliasProxy {
+class AliasProxy
+{
     /**
      * @return array - array of aliases this user has. Array may be empty.
      */
diff --git a/scripts/postfixadmin-cli.php b/scripts/postfixadmin-cli.php
index 7b609442..2e16ea93 100644
--- a/scripts/postfixadmin-cli.php
+++ b/scripts/postfixadmin-cli.php
@@ -33,7 +33,8 @@
  */
 
 
-class PostfixAdmin {
+class PostfixAdmin
+{
     /**
      * Version
      *
diff --git a/scripts/snippets/crypt.php b/scripts/snippets/crypt.php
index 42b77fcd..31876625 100644
--- a/scripts/snippets/crypt.php
+++ b/scripts/snippets/crypt.php
@@ -1,6 +1,7 @@
 <?php
 
-class Crypt {
+class Crypt
+{
 
   /**
    * @access private
diff --git a/scripts/snippets/dovecot_crypt.php b/scripts/snippets/dovecot_crypt.php
index 4bd429c6..a5a0c63c 100644
--- a/scripts/snippets/dovecot_crypt.php
+++ b/scripts/snippets/dovecot_crypt.php
@@ -9,7 +9,8 @@ define('LM_HASH_SIZE', 16);
 define('NTLMSSP_HASH_SIZE', 16);
 
 
-class DovecotCrypt extends Crypt {
+class DovecotCrypt extends Crypt
+{
     private $errormsg = [];
 
     private $salt_chars = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
diff --git a/tests/AdminHandlerTest.php b/tests/AdminHandlerTest.php
index 17f00dcc..11b41b49 100644
--- a/tests/AdminHandlerTest.php
+++ b/tests/AdminHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class AdminHandlerTest extends \PHPUnit\Framework\TestCase {
+class AdminHandlerTest extends \PHPUnit\Framework\TestCase
+{
     public function setUp() : void {
         parent::setUp();
 
diff --git a/tests/AdminpasswordHandlerTest.php b/tests/AdminpasswordHandlerTest.php
index 7bb5ab5e..da916aa8 100644
--- a/tests/AdminpasswordHandlerTest.php
+++ b/tests/AdminpasswordHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class AdminpasswordHandlerTest extends \PHPUnit\Framework\TestCase {
+class AdminpasswordHandlerTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $x = new AdminpasswordHandler();
 
diff --git a/tests/AliasHandlerTest.php b/tests/AliasHandlerTest.php
index d6861832..a1d099d0 100644
--- a/tests/AliasHandlerTest.php
+++ b/tests/AliasHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class AliasHandlerTest extends \PHPUnit\Framework\TestCase {
+class AliasHandlerTest extends \PHPUnit\Framework\TestCase
+{
     protected function setUp(): void {
         // Fake being an admin.
         $_SESSION = [
diff --git a/tests/AliasdomainHandlerTest.php b/tests/AliasdomainHandlerTest.php
index 3963cfc9..1e677d82 100644
--- a/tests/AliasdomainHandlerTest.php
+++ b/tests/AliasdomainHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class AliasdomainHandlerTest extends \PHPUnit\Framework\TestCase {
+class AliasdomainHandlerTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $x = new AliasdomainHandler();
 
diff --git a/tests/CheckDomainTest.php b/tests/CheckDomainTest.php
index 6bdc5a39..b84c873b 100644
--- a/tests/CheckDomainTest.php
+++ b/tests/CheckDomainTest.php
@@ -4,7 +4,8 @@
 /**
  * Obviously replies on working DNS service
  */
-class CheckDomainTest extends \PHPUnit\Framework\TestCase {
+class CheckDomainTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $this->assertEquals('', check_domain('example.com'));
         $this->assertEquals('', check_domain('google.com'));
diff --git a/tests/CheckEmailTest.php b/tests/CheckEmailTest.php
index c6ad1150..da805709 100644
--- a/tests/CheckEmailTest.php
+++ b/tests/CheckEmailTest.php
@@ -3,7 +3,8 @@
 /**
  * Obviously relies on working DNS service etc.
  */
-class CheckEmailTest extends \PHPUnit\Framework\TestCase {
+class CheckEmailTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $this->assertEquals('', check_email('test@example.com'));
         $this->assertRegExp('/ not discoverable in DNS/', check_email('test@fishbeansblahblahblah' . uniqid() . '.com'));
diff --git a/tests/CheckLanguageTest.php b/tests/CheckLanguageTest.php
index 38efcce7..e2e2ff21 100644
--- a/tests/CheckLanguageTest.php
+++ b/tests/CheckLanguageTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class CheckLanguageTest extends \PHPUnit\Framework\TestCase {
+class CheckLanguageTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         global $supported_languages;
 
diff --git a/tests/CheckOwnerTest.php b/tests/CheckOwnerTest.php
index 0b97c235..64da3e5e 100644
--- a/tests/CheckOwnerTest.php
+++ b/tests/CheckOwnerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class CheckOwnerTest extends \PHPUnit\Framework\TestCase {
+class CheckOwnerTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $check = check_owner('random@example.com', 'test.com');
         $this->assertFalse($check, "there should be no entries in test.com as it's an invalid/non-existant domain");
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 33a84d62..1c3eaea9 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class ConfigTest extends \PHPUnit\Framework\TestCase {
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
     public function setUp() : void {
         $c = Config::getInstance();
 
diff --git a/tests/CreatePageBrowserTest.php b/tests/CreatePageBrowserTest.php
index 2e2beeaf..fa3faa35 100644
--- a/tests/CreatePageBrowserTest.php
+++ b/tests/CreatePageBrowserTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class CreatePageBrowserTest extends \PHPUnit\Framework\TestCase {
+class CreatePageBrowserTest extends \PHPUnit\Framework\TestCase
+{
     public function tearDown() : void {
         $this->cleanup();
     }
diff --git a/tests/DbBasicTest.php b/tests/DbBasicTest.php
index c18fb68e..2d020a8c 100644
--- a/tests/DbBasicTest.php
+++ b/tests/DbBasicTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class DbBasicTest extends \PHPUnit\Framework\TestCase {
+class DbBasicTest extends \PHPUnit\Framework\TestCase
+{
     private $test_domain;
 
     public function setUp() : void {
diff --git a/tests/DomainHandlerTest.php b/tests/DomainHandlerTest.php
index e9601389..b94c1c3f 100644
--- a/tests/DomainHandlerTest.php
+++ b/tests/DomainHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class DomainHandlerTest extends \PHPUnit\Framework\TestCase {
+class DomainHandlerTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $x = new DomainHandler();
 
diff --git a/tests/FetchmailHandlerTest.php b/tests/FetchmailHandlerTest.php
index c3690e29..3c90438f 100644
--- a/tests/FetchmailHandlerTest.php
+++ b/tests/FetchmailHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class FetchmailHandlerTest extends \PHPUnit\Framework\TestCase {
+class FetchmailHandlerTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $x = new FetchmailHandler();
 
diff --git a/tests/GeneratePasswordTest.php b/tests/GeneratePasswordTest.php
index eb838f0a..606dd36b 100644
--- a/tests/GeneratePasswordTest.php
+++ b/tests/GeneratePasswordTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class GeneratePasswordTest extends \PHPUnit\Framework\TestCase {
+class GeneratePasswordTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $one = generate_password();
 
diff --git a/tests/GetSiteUrlTest.php b/tests/GetSiteUrlTest.php
index c195efa5..e8f68ec0 100644
--- a/tests/GetSiteUrlTest.php
+++ b/tests/GetSiteUrlTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class GetSiteUrlTest extends \PHPUnit\Framework\TestCase {
+class GetSiteUrlTest extends \PHPUnit\Framework\TestCase
+{
     public function testControlViaConfig() {
         $server = [];
         $orig = Config::getInstance()->getAll();
diff --git a/tests/ListAdminsTest.php b/tests/ListAdminsTest.php
index 1d74ae8f..37076e1a 100644
--- a/tests/ListAdminsTest.php
+++ b/tests/ListAdminsTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class ListAdminsTest extends \PHPUnit\Framework\TestCase {
+class ListAdminsTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $list= list_admins();
 
diff --git a/tests/ListDomainsForAdminTest.php b/tests/ListDomainsForAdminTest.php
index ee1040ce..9a75e42d 100644
--- a/tests/ListDomainsForAdminTest.php
+++ b/tests/ListDomainsForAdminTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class ListDomainsForAdminTest extends \PHPUnit\Framework\TestCase {
+class ListDomainsForAdminTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $this->assertEquals([], list_domains_for_admin('test@test.com'));
     }
diff --git a/tests/ListDomainsTest.php b/tests/ListDomainsTest.php
index 7e95389a..57978e12 100644
--- a/tests/ListDomainsTest.php
+++ b/tests/ListDomainsTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class ListDomainsTest extends \PHPUnit\Framework\TestCase {
+class ListDomainsTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $domains = list_domains();
 
diff --git a/tests/LoginTest.php b/tests/LoginTest.php
index 942796c3..2b57e67a 100644
--- a/tests/LoginTest.php
+++ b/tests/LoginTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class LoginTest extends \PHPUnit\Framework\TestCase {
+class LoginTest extends \PHPUnit\Framework\TestCase
+{
     public function setUp(): void {
         global $CONF;
 
diff --git a/tests/MailboxHandlerTest.php b/tests/MailboxHandlerTest.php
index f095e029..ee09481f 100644
--- a/tests/MailboxHandlerTest.php
+++ b/tests/MailboxHandlerTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class MailboxHandlerTest extends \PHPUnit\Framework\TestCase {
+class MailboxHandlerTest extends \PHPUnit\Framework\TestCase
+{
     public function tearDown() : void {
         db_query('DELETE FROM mailbox');
         db_query('DELETE FROM alias');
diff --git a/tests/PacryptTest.php b/tests/PacryptTest.php
index 973f9197..245a4a13 100644
--- a/tests/PacryptTest.php
+++ b/tests/PacryptTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class PaCryptTest extends \PHPUnit\Framework\TestCase {
+class PaCryptTest extends \PHPUnit\Framework\TestCase
+{
     public function testMd5Crypt() {
         $hash = _pacrypt_md5crypt('test', '');
 
diff --git a/tests/PasswordValidationCallableTest.php b/tests/PasswordValidationCallableTest.php
index 447d5ad6..a98b8136 100644
--- a/tests/PasswordValidationCallableTest.php
+++ b/tests/PasswordValidationCallableTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class PasswordValidationCallableTEst extends \PHPUnit\Framework\TestCase {
+class PasswordValidationCallableTEst extends \PHPUnit\Framework\TestCase
+{
     public function setUp(): void {
         $c = Config::getInstance();
 
diff --git a/tests/RemoteAliasTest.php b/tests/RemoteAliasTest.php
index 2c7947ec..4f946d5c 100644
--- a/tests/RemoteAliasTest.php
+++ b/tests/RemoteAliasTest.php
@@ -7,7 +7,8 @@
 
 require_once('RemoteTest.php');
 
-class RemoteAliasTest extends RemoteTest {
+class RemoteAliasTest extends RemoteTest
+{
     public function __construct() {
         parent::__construct();
         global $CONF;
diff --git a/tests/RemoteTest.php b/tests/RemoteTest.php
index b95e077b..4783c016 100644
--- a/tests/RemoteTest.php
+++ b/tests/RemoteTest.php
@@ -1,6 +1,7 @@
 <?php
 
-abstract class RemoteTest extends \PHPUnit\Framework\TestCase {
+abstract class RemoteTest extends \PHPUnit\Framework\TestCase
+{
     protected $server_url = 'http://change.me/to/work'; // http://orange/david/postfixadmin/xmlrpc.php';
     protected $username = 'user@example.com';
     protected $password = 'password1';
diff --git a/tests/RemoteUserTest.php b/tests/RemoteUserTest.php
index 7072b256..e971a7a3 100644
--- a/tests/RemoteUserTest.php
+++ b/tests/RemoteUserTest.php
@@ -7,7 +7,8 @@
 
 require_once('RemoteTest.php');
 
-class RemoteUserTest extends RemoteTest {
+class RemoteUserTest extends RemoteTest
+{
     public function testChangePassword() {
         $this->assertTrue($this->user->login($this->username, $this->password));
         $this->assertTrue($this->user->changePassword($this->password, 'foobar'));
diff --git a/tests/RemoteVacationTest.php b/tests/RemoteVacationTest.php
index 3a5f43c3..9de12937 100644
--- a/tests/RemoteVacationTest.php
+++ b/tests/RemoteVacationTest.php
@@ -7,7 +7,8 @@
 
 require_once('RemoteTest.php');
 
-class RemoteVacationTest extends RemoteTest {
+class RemoteVacationTest extends RemoteTest
+{
 
 
     /**
diff --git a/tests/RemoveFromArrayTest.php b/tests/RemoveFromArrayTest.php
index 4b614449..096c73f2 100644
--- a/tests/RemoveFromArrayTest.php
+++ b/tests/RemoveFromArrayTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class RemoveFromArrayTest extends \PHPUnit\Framework\TestCase {
+class RemoveFromArrayTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $list = array('a','b','c','d');
 
diff --git a/tests/ValidatePasswordTest.php b/tests/ValidatePasswordTest.php
index 70b5cb34..efd698f8 100644
--- a/tests/ValidatePasswordTest.php
+++ b/tests/ValidatePasswordTest.php
@@ -1,6 +1,7 @@
 <?php
 
-class ValidatePasswordTest extends \PHPUnit\Framework\TestCase {
+class ValidatePasswordTest extends \PHPUnit\Framework\TestCase
+{
     public function testBasic() {
         $config = Config::getInstance();