maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

list() is a reserved php keyword, changed ApiCommand::list() to ApiCommand::listing()

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-02 17:22:47 +01:00
parent 594512404f
commit cadb6618ec
18 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Admins/AdminsTest.php
View File

@@ -77,7 +77,7 @@ class AdminsTest extends TestCase
{
global $admin_userdata;
$json_result = Admins::getLocal($admin_userdata)->list();
$json_result = Admins::getLocal($admin_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(2, $result['count']);
}
@@ -114,7 +114,7 @@ class AdminsTest extends TestCase
$this->expectExceptionCode(403);
$this->expectExceptionMessage("Not allowed to execute given command.");
Admins::getLocal($reseller_userdata)->list();
Admins::getLocal($reseller_userdata)->listing();
}
public function testAdminAdminsUnlock()

6
tests/Customers/CustomersTest.php
View File

@@ -88,7 +88,7 @@ class CustomersTest extends TestCase
{
global $admin_userdata;
$json_result = Customers::getLocal($admin_userdata)->list();
$json_result = Customers::getLocal($admin_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
}
@@ -105,7 +105,7 @@ class CustomersTest extends TestCase
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
$json_result = Customers::getLocal($reseller_userdata)->list();
$json_result = Customers::getLocal($reseller_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(0, $result['count']);
}
@@ -125,7 +125,7 @@ class CustomersTest extends TestCase
$this->expectExceptionCode(403);
$this->expectExceptionMessage("Not allowed to execute given command.");
$json_result = Customers::getLocal($customer_userdata)->list();
$json_result = Customers::getLocal($customer_userdata)->listing();
}
/**

4
tests/Domains/DomainsTest.php
View File

@@ -31,7 +31,7 @@ class DomainsTest extends TestCase
public function testAdminDomainsList()
{
global $admin_userdata;
$json_result = Domains::getLocal($admin_userdata)->list();
$json_result = Domains::getLocal($admin_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
$this->assertEquals('test.local', $result['list'][0]['domain']);
@@ -49,7 +49,7 @@ class DomainsTest extends TestCase
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
$json_result = Domains::getLocal($reseller_userdata)->list();
$json_result = Domains::getLocal($reseller_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(0, $result['count']);
}

8
tests/Ftps/FtpsTest.php
View File

@@ -77,7 +77,7 @@ class FtpsTest extends TestCase
{
global $admin_userdata;
$json_result = Ftps::getLocal($admin_userdata)->list();
$json_result = Ftps::getLocal($admin_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
}
@@ -86,7 +86,7 @@ class FtpsTest extends TestCase
{
global $admin_userdata;
$json_result = Ftps::getLocal($admin_userdata, array('loginname' => 'test1'))->list();
$json_result = Ftps::getLocal($admin_userdata, array('loginname' => 'test1'))->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
$this->assertEquals('test1', $result['list'][0]['username']);
@@ -101,7 +101,7 @@ class FtpsTest extends TestCase
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
$json_result = Ftps::getLocal($reseller_userdata)->list();
$json_result = Ftps::getLocal($reseller_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
$this->assertEquals('test1', $result['list'][0]['username']);
@@ -115,7 +115,7 @@ class FtpsTest extends TestCase
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$json_result = Ftps::getLocal($customer_userdata)->list();
$json_result = Ftps::getLocal($customer_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
$this->assertEquals('test1', $result['list'][0]['username']);

6
tests/IpsAndPorts/IpsAndPortsTest.php
View File

@@ -11,7 +11,7 @@ class IpsAndPortsTest extends TestCase
public function testAdminIpsAndPortsList()
{
global $admin_userdata;
$json_result = IpsAndPorts::getLocal($admin_userdata)->list();
$json_result = IpsAndPorts::getLocal($admin_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
$this->assertEquals('82.149.225.46', $result['list'][0]['ip']);
@@ -29,7 +29,7 @@ class IpsAndPortsTest extends TestCase
$reseller_userdata['adminsession'] = 1;
$this->expectExceptionCode(403);
$this->expectExceptionMessage("Not allowed to execute given command.");
$json_result = IpsAndPorts::getLocal($reseller_userdata)->list();
$json_result = IpsAndPorts::getLocal($reseller_userdata)->listing();
}
public function testAdminIpsAndPortsAdd()
@@ -91,7 +91,7 @@ class IpsAndPortsTest extends TestCase
))->update();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
$json_result = IpsAndPorts::getLocal($reseller_userdata)->list();
$json_result = IpsAndPorts::getLocal($reseller_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['count']);
$this->assertEquals('82.149.225.47', $result['list'][0]['ip']);

6
tests/SubDomains/SubDomainsTest.php
View File

@@ -132,7 +132,7 @@ class SubDomainsTest extends TestCase
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$json_result = SubDomains::getLocal($customer_userdata)->list();
$json_result = SubDomains::getLocal($customer_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(3, $result['count']);
}
@@ -146,7 +146,7 @@ class SubDomainsTest extends TestCase
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
$json_result = SubDomains::getLocal($reseller_userdata)->list();
$json_result = SubDomains::getLocal($reseller_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(3, $result['count']);
}
@@ -154,7 +154,7 @@ class SubDomainsTest extends TestCase
public function testAdminSubDomainsListWithCustomer()
{
global $admin_userdata;
$json_result = SubDomains::getLocal($admin_userdata, ['loginname' => 'test1'])->list();
$json_result = SubDomains::getLocal($admin_userdata, ['loginname' => 'test1'])->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(3, $result['count']);
}