diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b239b33..aba119d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,8 @@ jobs: name: Run unit tests strategy: matrix: - php: [ "8.1", "8.2", "8.3" ] - phpunit: [ "9.6.20" ] + php: [ "8.1", "8.2", "8.3", "8.4" ] + phpunit: [ "10.5.40" ] steps: - uses: actions/checkout@v2 @@ -37,5 +37,4 @@ jobs: php_version: ${{ matrix.php }} version: ${{ matrix.phpunit }} php_extensions: ldap mbstring - configuration: phpunit.xml - args: --coverage-text --verbose \ No newline at end of file + configuration: phpunit.xml \ No newline at end of file diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index af9ce4d..02fc833 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -4,14 +4,16 @@ on: tags-ignore: - '[2-3].[0-9]+.[0-9]+' + + jobs: testing: runs-on: ubuntu-latest name: Run unit tests strategy: matrix: - php: [ "8.1", "8.2", "8.3" ] - phpunit: [ "9.6.20" ] + php: [ "8.1", "8.2", "8.3", "8.4" ] + phpunit: [ "10.5.40" ] steps: - uses: actions/checkout@v2 @@ -36,7 +38,6 @@ jobs: version: ${{ matrix.phpunit }} php_extensions: ldap mbstring configuration: phpunit.xml - args: --coverage-text --verbose prerelease: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1004073..c643bbe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,14 +5,15 @@ on: # only when an official tag is defined for v3 - '3.[0-9]+.[0-9]+' + jobs: testing: runs-on: ubuntu-latest name: Run unit tests strategy: matrix: - php: [ "8.1", "8.2", "8.3" ] - phpunit: [ "9.6.20" ] + php: [ "8.1", "8.2", "8.3", "8.4" ] + phpunit: [ "10.5.40" ] steps: - uses: actions/checkout@v2 @@ -37,7 +38,6 @@ jobs: version: ${{ matrix.phpunit }} php_extensions: ldap mbstring configuration: phpunit.xml - args: --coverage-text --verbose release: runs-on: ubuntu-latest diff --git a/composer.json b/composer.json index 4be3761..410a0f1 100644 --- a/composer.json +++ b/composer.json @@ -1,39 +1,39 @@ { - "require-dev": { - "10up/wp_mock": "1.0.1", - "phpunit/phpunit": "9.6.20", - "overtrue/phplint": "^2.3", - "brianhenryie/strauss": "^0.11.1", - "php-mock/php-mock-phpunit": "^2.10" - }, - "require": { - "twig/twig": "3.18.0", - "symfony/polyfill-mbstring": "1.20", - "defuse/php-encryption": "2.0.3", - "monolog/monolog": "^2.8.0" - }, - "scripts": { - "strauss": [ - "vendor/bin/strauss" - ], - "twig-patcher": [ - "php twig-patcher.php" - ], - "post-install-cmd": [ - "@strauss", - "@twig-patcher" - ], - "post-update-cmd": [ - "@strauss", - "@twig-patcher" - ] - }, - "extra": { - "strauss": { - "target_directory": "vendor-repackaged", - "namespace_prefix": "Dreitier\\Nadi\\Vendor", - "classmap_prefix": "Dreitier_Nadi_Vendor_", - "constant_prefix": "DREITIER_NADI_VENDOR_" + "require-dev": { + "10up/wp_mock": "1.0.1", + "phpunit/phpunit": "10.5.40 as 9.6.20", + "overtrue/phplint": "^2.3", + "brianhenryie/strauss": "^0.11.1", + "php-mock/php-mock-phpunit": "^2.10" + }, + "require": { + "twig/twig": "3.18.0", + "symfony/polyfill-mbstring": "1.20", + "defuse/php-encryption": "2.0.3", + "monolog/monolog": "^2.8.0" + }, + "scripts": { + "strauss": [ + "vendor/bin/strauss" + ], + "twig-patcher": [ + "php twig-patcher.php" + ], + "post-install-cmd": [ + "@strauss", + "@twig-patcher" + ], + "post-update-cmd": [ + "@strauss", + "@twig-patcher" + ] + }, + "extra": { + "strauss": { + "target_directory": "vendor-repackaged", + "namespace_prefix": "Dreitier\\Nadi\\Vendor", + "classmap_prefix": "Dreitier_Nadi_Vendor_", + "constant_prefix": "DREITIER_NADI_VENDOR_" + } } - } } diff --git a/test/ActiveDirectory/ContextTest.php b/test/ActiveDirectory/ContextTest.php index e36e8db..61d4aad 100644 --- a/test/ActiveDirectory/ContextTest.php +++ b/test/ActiveDirectory/ContextTest.php @@ -2,13 +2,13 @@ namespace Dreitier\ActiveDirectory; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Christopher Klein * @access private */ -class ContextTest extends BasicTest +class ContextTest extends BasicTestCase { public function setUp(): void { diff --git a/test/ActiveDirectory/SidTest.php b/test/ActiveDirectory/SidTest.php index 39bae46..7187002 100644 --- a/test/ActiveDirectory/SidTest.php +++ b/test/ActiveDirectory/SidTest.php @@ -2,13 +2,13 @@ namespace Dreitier\ActiveDirectory; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Christopher Klein * @access private */ -class SidTest extends BasicTest +class SidTest extends BasicTestCase { public function setUp(): void diff --git a/test/AdLdap/AdLdapTest.php b/test/AdLdap/AdLdapTest.php index 46afcb8..4ba6d7e 100644 --- a/test/AdLdap/AdLdapTest.php +++ b/test/AdLdap/AdLdapTest.php @@ -1,6 +1,7 @@ getMockBuilder(AdLdapTestAdapter::class) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); if (!empty($options)) { @@ -48,12 +51,12 @@ public function GH_153_inADForestTheUpperDNsAreSearched_whenResolvingTheConfigur $sut->expects($this->atLeast(2)) ->method('_ldap_search') - ->withConsecutive( + ->with(...self::withConsecutive( // first call is on deepest level [adLDAP::PARTITIONS_PREFIX . $baseDn, adLDAP::NETBIOS_MATCHER, []], // second call is on top level [adLDAP::PARTITIONS_PREFIX . $topDn, adLDAP::NETBIOS_MATCHER, []] - ) + )) ->willReturnOnConsecutiveCalls( // on deepest level, we don't find anything FALSE, @@ -63,10 +66,10 @@ public function GH_153_inADForestTheUpperDNsAreSearched_whenResolvingTheConfigur $sut->expects($this->once()) ->method('_ldap_get_entries') - ->withConsecutive( + ->with(...self::withConsecutive( // with the first call, we don't do any further search as we simulate error code 32 - [TRUE] - ) + [true] + )) ->willReturnOnConsecutiveCalls( // on DC=test,DC=ad we'll find the partition [ @@ -97,9 +100,9 @@ public function GH_153_inSingleDomain_theNetbiosConfigurationIsReturned() $sut->expects($this->once()) ->method('_ldap_search') - ->withConsecutive( + ->with(...self::withConsecutive( [adLDAP::PARTITIONS_PREFIX . $baseDn, adLDAP::NETBIOS_MATCHER, []], - ) + )) ->willReturnOnConsecutiveCalls( // on deepest level, we don't find anything TRUE, @@ -107,10 +110,10 @@ public function GH_153_inSingleDomain_theNetbiosConfigurationIsReturned() $sut->expects($this->once()) ->method('_ldap_get_entries') - ->withConsecutive( + ->with(...self::withConsecutive( // find something on top level [TRUE] - ) + )) ->willReturnOnConsecutiveCalls( // on DC=test,DC=ad we'll find the partition [ diff --git a/test/BasicIntegrationTest.php b/test/BasicIntegrationTestCase.php similarity index 99% rename from test/BasicIntegrationTest.php rename to test/BasicIntegrationTestCase.php index 2003a7f..dd07798 100644 --- a/test/BasicIntegrationTest.php +++ b/test/BasicIntegrationTestCase.php @@ -11,7 +11,7 @@ * @author Danny Meißner * @access */ -abstract class BasicIntegrationTest extends BasicTest +class BasicIntegrationTestCase extends BasicTestCase { // AD Connection Details /* @var Connection $connectionDetails */ @@ -268,7 +268,7 @@ protected function rollbackAdAfterConnectionIt($adLDAP) */ protected function createSyncToWordpressItUsersAttributes($numberOfUsers) { - $attributeCollector = array(); + $attributeCollector = []; for ($i = 0; $i < $numberOfUsers; $i++) { $attributes = $this->attributes; diff --git a/test/BasicTest.php b/test/BasicTestCase.php similarity index 96% rename from test/BasicTest.php rename to test/BasicTestCase.php index 76a948b..c5228cc 100644 --- a/test/BasicTest.php +++ b/test/BasicTestCase.php @@ -16,8 +16,10 @@ * @author Tobias Hellmann * @access private */ -abstract class BasicTest extends TestCase +class BasicTestCase extends TestCase { + use PHPUnitHelper; + public static function setUpBeforeClass(): void { NadiLog::$isTestmode = true; @@ -73,7 +75,7 @@ public function createMockWithMethods($className, $methods) return $this->getMockBuilder($className) ->disableOriginalConstructor() ->disableProxyingToOriginalMethods() - ->setMethods($methods) + ->addMethods($methods) ->getMock(); } @@ -130,7 +132,7 @@ public function expects($class, $time, $method, $with, $will) public function createAnonymousMock($methods) { return $this->getMockBuilder('stdClass') - ->setMethods($methods) + ->addMethods($methods) ->getMock(); } @@ -147,7 +149,7 @@ public function createMockedObject($class, $constructor, $methods) { return $this->getMockBuilder($class) ->setConstructorArgs($constructor) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -160,7 +162,7 @@ public function createMockedObject($class, $constructor, $methods) * * @return mixed */ - protected function invokeMethod(&$object, $methodName, $parameters = array()) + protected function invokeMethod(&$object, $methodName, $parameters = []) { $reflector = new \ReflectionClass(get_class($object)); $method = $reflector->getMethod($methodName); @@ -175,7 +177,7 @@ protected function invokeMethod(&$object, $methodName, $parameters = array()) * @param $name * @param array $parameters */ - protected function mockWordpressFunction($name, $parameters = array()) + protected function mockWordpressFunction($name, $parameters = []) { \WP_Mock::userFunction($name, $parameters); } diff --git a/test/Bootstrap.php b/test/Bootstrap.php index 1a94248..df5d085 100644 --- a/test/Bootstrap.php +++ b/test/Bootstrap.php @@ -26,7 +26,7 @@ class WP_Error public function __construct() { $this->value = func_get_args(); - $this->errors = array(); + $this->errors = []; } public function getConstructorArgs() @@ -138,13 +138,6 @@ class WP_MS_Sites_List_Table { } - - // now we can mock this empty class instead of creating a mock from an non existing class - // this is a workaround for a bug https://github.com/sebastianbergmann/phpunit-mock-objects/issues/321 - class BlueprintClass - { - - } } // these three functions are copied from wp-includes/formatting.php @@ -181,5 +174,7 @@ function map_deep($value, $callback) require_once __DIR__ . '/../autoload.php'; require_once __DIR__ . '/../vendor/autoload.php'; -require_once NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH . "/test/BasicTest.php"; -require_once NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH . "/test/BasicIntegrationTest.php"; +require_once NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH . "/test/PHPUnitHelper.php"; +require_once NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH . "/test/CallableMock.php"; +require_once NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH . "/test/BasicTestCase.php"; +require_once NEXT_ACTIVE_DIRECTORY_INTEGRATION_PLUGIN_PATH . "/test/BasicIntegrationTestCase.php"; diff --git a/test/CallableMock.php b/test/CallableMock.php new file mode 100644 index 0000000..6c799a1 --- /dev/null +++ b/test/CallableMock.php @@ -0,0 +1,20 @@ + * @access private */ -class ConverterTest extends BasicTest +class ConverterTest extends BasicTestCase { public function setUp() : void { diff --git a/test/Ldap/Attribute/DescriptionTest.php b/test/Ldap/Attribute/DescriptionTest.php index e449f5d..aa666ed 100644 --- a/test/Ldap/Attribute/DescriptionTest.php +++ b/test/Ldap/Attribute/DescriptionTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Ldap\Attribute; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann @@ -10,7 +10,7 @@ * @author Danny Meißner * @access private */ -class DescriptionTest extends BasicTest +class DescriptionTest extends BasicTestCase { public function setUp(): void { diff --git a/test/Ldap/Attribute/RepositoryTest.php b/test/Ldap/Attribute/RepositoryTest.php index 3ba9b66..55d5177 100644 --- a/test/Ldap/Attribute/RepositoryTest.php +++ b/test/Ldap/Attribute/RepositoryTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Ldap\Attribute; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; use Dreitier\WordPress\Multisite\Configuration\Service; @@ -11,7 +11,7 @@ * @author Tobias Hellmann * @access private */ -class RepositoryTest extends BasicTest +class RepositoryTest extends BasicTestCase { /* @var Service|MockObject $configuration */ private $configuration; @@ -22,7 +22,7 @@ public function setUp(): void $this->configuration = $this->getMockBuilder(Service::class) ->disableOriginalConstructor() - ->setMethods(array('getOptionValue')) + ->onlyMethods(array('getOptionValue')) ->getMock(); } @@ -31,11 +31,11 @@ public function tearDown(): void \WP_Mock::tearDown(); } - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Repository::class) ->setConstructorArgs(array($this->configuration)) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -44,7 +44,7 @@ public function sut($methods = null) */ public function getCustomAttributeDefinitions_withCorrectString_returnParsedArray() { - $sut = $this->sut(null); + $sut = $this->sut(); $string = 'attributeName1:string:next_ad_int_lastName:description:true:true:true' . ";" . 'attributeName2:string:next_ad_int_lastName:description:true:true:true'; @@ -81,7 +81,7 @@ public function getCustomAttributeDefinitions_withCorrectString_returnParsedArra */ public function getCustomAttributeDefinitions_withInvalidString_returnEmptyArray() { - $sut = $this->sut(null); + $sut = $this->sut(); $string = ''; $this->configuration->expects($this->once()) @@ -90,7 +90,7 @@ public function getCustomAttributeDefinitions_withInvalidString_returnEmptyArray ->willReturn($string); $actual = $sut->getCustomAttributeDefinitions(); - $this->assertEquals(array(), $actual); + $this->assertEquals([], $actual); } /** @@ -98,7 +98,7 @@ public function getCustomAttributeDefinitions_withInvalidString_returnEmptyArray */ public function getCustomAttributeDefinitions_calledMethodTwice_returnParsedArrayFromCache() { - $sut = $this->sut(null); + $sut = $this->sut(); $string = 'attributeName1:string:next_ad_int_lastName:description:true:true:true'; $this->configuration->expects($this->once()) @@ -163,7 +163,7 @@ public function getWhitelistedAttributes_callOnce_checkDelegatedMethods() $sut->expects($this->once()) ->method('createDefaultAttributes') - ->with(array()) + ->with([]) ->willReturn($default); $sut->expects($this->once()) @@ -193,7 +193,7 @@ public function getWhitelistedAttributes_callTwice_returnValueFromCache() $sut->expects($this->once()) ->method('createDefaultAttributes') - ->with(array()) + ->with([]) ->willReturn($default); $sut->expects($this->once()) @@ -371,7 +371,7 @@ public function createDefaultAttributes_delegateToMethod_returnExpectedResult() $sut->expects($this->any()) ->method('createAttribute') - ->withConsecutive( + ->with(...self::withConsecutive( array(null, 'cn'), array(null, 'givenname'), array(null, 'sn'), @@ -384,7 +384,7 @@ public function createDefaultAttributes_delegateToMethod_returnExpectedResult() array(null, 'objectguid'), array(null, 'domainsid'), array(null, 'objectsid'), - ) + )) ->will( $this->onConsecutiveCalls( new Attribute(), @@ -432,7 +432,7 @@ public function createDefaultAttributes_withNonEmptyArray_returnArrayWithValues( $sut->expects($this->any()) ->method('createAttribute') - ->withConsecutive( + ->with(...self::withConsecutive( array(null, 'cn'), array(null, 'givenname'), array(null, 'sn'), @@ -445,7 +445,7 @@ public function createDefaultAttributes_withNonEmptyArray_returnArrayWithValues( array(null, 'objectguid'), array(null, 'domainsid'), array(null, 'objectsid') - ) + )) ->will( $this->onConsecutiveCalls( new Attribute(), @@ -492,7 +492,7 @@ public function createDefaultAttributes_withNonEmptyArray_returnArrayWithValues( */ public function createAttribute_returnObject() { - $sut = $this->sut(array('getViewableAttributeDefinitions')); + $sut = $this->sut(); $this->mockFunction__(); $attribute = array( @@ -520,7 +520,7 @@ public function createAttribute_withEmptyAttribute_returnsMetaKeyWithPrefixAndAt $sut = $this->sut(); $this->mockFunction__(); - $result = $sut->createAttribute(array(), 'objectguid'); + $result = $sut->createAttribute([], 'objectguid'); $this->assertEquals('next_ad_int_objectguid', $result->getMetakey()); } @@ -620,7 +620,7 @@ public function resolveViewInUserProfile_returnTrue() */ public function convertAttributeMapping_returnArray() { - $sut = $this->sut(null); + $sut = $this->sut(); $attributeString = "testAdAttribute:string:testWordPressMetakey:description:true:true:true;"; diff --git a/test/Ldap/Attribute/ServiceTest.php b/test/Ldap/Attribute/ServiceTest.php index e716104..80ae890 100644 --- a/test/Ldap/Attribute/ServiceTest.php +++ b/test/Ldap/Attribute/ServiceTest.php @@ -7,7 +7,7 @@ use Dreitier\Ldap\Connection; use Dreitier\Ldap\UserQuery; use Dreitier\Nadi\Authentication\PrincipalResolver; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** @@ -16,7 +16,7 @@ * @author Danny Meißner * @access private */ -class ServiceTest extends BasicTest +class ServiceTest extends BasicTestCase { /* @var Repository|MockObject $configuration */ private $attributeRepository; @@ -51,7 +51,7 @@ public function tearDown(): void * * @return Service|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { return $this->getMockBuilder(Service::class) ->setConstructorArgs( @@ -60,7 +60,7 @@ public function sut($methods) $this->attributeRepository, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -69,7 +69,7 @@ public function sut($methods) */ public function parseLdapResponse_adResponseContainsNameAndValue_returnArrayWithNameAndValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $attributeNames = array( 'cn', @@ -109,7 +109,7 @@ public function resolveLdapAttributes_triggersNecessaryMethods() $sut->expects($this->exactly(3)) ->method('findLdapAttributesOfUser') - ->withConsecutive( + ->with(...self::withConsecutive( array($this->callback(function (UserQuery $q) use ($userQuery) { return $q->getPrincipal() == 'guid' && $q->isGuid(); })), @@ -119,7 +119,7 @@ public function resolveLdapAttributes_triggersNecessaryMethods() array($this->callback(function (UserQuery $q) use ($userQuery) { return $q->getPrincipal() == 'sam' && !$q->isGuid(); })), - ) + )) ->willReturn($expected); $actual = $sut->resolveLdapAttributes($userQuery); @@ -295,7 +295,7 @@ public function resolveLdapCustomAttribute_whenUserPrincipalNameReturnsNothing_i $sut->expects($this->exactly(2)) ->method('findLdapCustomAttributeOfUser') - ->withConsecutive( + ->with(...self::withConsecutive( // TODO array($this->callback(function (UserQuery $userQuery) use ($upn) { return $userQuery->getPrincipal() == $upn; @@ -303,7 +303,7 @@ public function resolveLdapCustomAttribute_whenUserPrincipalNameReturnsNothing_i array($this->callback(function (UserQuery $userQuery) use ($sAMAccountName) { return $userQuery->getPrincipal() == $sAMAccountName; }), $attribute) - ) + )) ->will( $this->onConsecutiveCalls( false, diff --git a/test/Ldap/ConnectionIT.php b/test/Ldap/ConnectionIT.php index 10f1740..d4cb25d 100644 --- a/test/Ldap/ConnectionIT.php +++ b/test/Ldap/ConnectionIT.php @@ -12,7 +12,7 @@ * @author Danny Meißner * @access private */ -class ConnectionIT extends \Dreitier\Test\BasicIntegrationTest +class ConnectionIT extends \Dreitier\Test\BasicIntegrationTestCase { /* @var Service | MockObject */ private $configuration; diff --git a/test/Ldap/ConnectionTest.php b/test/Ldap/ConnectionTest.php index 52580c2..6c809cf 100644 --- a/test/Ldap/ConnectionTest.php +++ b/test/Ldap/ConnectionTest.php @@ -5,7 +5,7 @@ use Dreitier\ActiveDirectory\Context; use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\User\Persistence\Repository; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Util; use Dreitier\WordPress\Multisite\Configuration\Service; @@ -17,7 +17,7 @@ * @author Tobias Hellmann * @access private */ -class ConnectionTest extends BasicTest +class ConnectionTest extends BasicTestCase { /* @var Service|MockObject $attributes */ private $configuration; @@ -56,11 +56,11 @@ public function tearDown(): void * * @return Connection|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { return $this->getMockBuilder(Connection::class) ->setConstructorArgs(array($this->configuration, $this->activeDirectoryContext)) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -153,7 +153,7 @@ public function createConfiguration_returnsConfiguration() */ public function ADI_713_register_userInfo_hookIsRegistered() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectFilterAdded(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'ldap_map_userinfo', array($sut, 'mapUserInfo'), 10, 5); $sut->register(); @@ -164,7 +164,7 @@ public function ADI_713_register_userInfo_hookIsRegistered() */ public function getBaseDn_withCustomValue_returnCustomValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); $connectionDetails->setBaseDn('custom'); @@ -178,7 +178,7 @@ public function getBaseDn_withCustomValue_returnCustomValue() */ public function getBaseDn_withoutCustomValue_returnDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); @@ -196,7 +196,7 @@ public function getBaseDn_withoutCustomValue_returnDefaultValue() */ public function getDomainControllers_withCustomValue_returnCustomValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); $connectionDetails->setDomainControllers('custom;custom2'); @@ -210,7 +210,7 @@ public function getDomainControllers_withCustomValue_returnCustomValue() */ public function getDomainControllers_withoutCustomValue_returnDefaultValue() { - $sut = $this->sut(array('getDomainControllersWithEncryption')); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); @@ -228,7 +228,7 @@ public function getDomainControllers_withoutCustomValue_returnDefaultValue() */ public function getAdPort_withCustomValue_returnCustomValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); $connectionDetails->setPort('custom'); @@ -242,7 +242,7 @@ public function getAdPort_withCustomValue_returnCustomValue() */ public function getAdPort_withoutCustomValue_returnDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); @@ -260,7 +260,7 @@ public function getAdPort_withoutCustomValue_returnDefaultValue() */ public function getUseTls_withCustomValue_returnCustomValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); $connectionDetails->setEncryption(Encryption::LDAPS); @@ -289,7 +289,7 @@ public function getUseTls_withoutCustomValue_returnDefaultValue() */ public function getNetworkTimeout_withCustomValue_returnCustomValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); $connectionDetails->setNetworkTimeout(5); @@ -303,7 +303,7 @@ public function getNetworkTimeout_withCustomValue_returnCustomValue() */ public function getNetworkTimeout_withoutCustomValue_returnDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $connectionDetails = new ConnectionDetails(); @@ -321,9 +321,9 @@ public function getNetworkTimeout_withoutCustomValue_returnDefaultValue() */ public function getAdLDAP_withAdLdap() { - $sut = $this->sut(null); + $sut = $this->sut(); - $sut->createAdLdap(array()); + $sut->createAdLdap([]); $actual = $sut->getAdLdap(); $this->assertTrue($actual instanceof adLDAP); @@ -334,9 +334,9 @@ public function getAdLDAP_withAdLdap() */ public function isConnected_noConnectionEstablished_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); - $sut->createAdLdap(array()); + $sut->createAdLdap([]); $actual = $sut->isConnected(); $this->assertEquals(true, $actual); } @@ -346,7 +346,7 @@ public function isConnected_noConnectionEstablished_returnFalse() */ public function isConnected_connectionEstablished_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isConnected(); $this->assertEquals(false, $actual); @@ -441,8 +441,8 @@ public function ADI_713_mapUserInfo_returnsFirstMatch_ifOneIsFound() $userQuery = UserQuery::forPrincipal("username"); $matchesFromLdap = array(array('FIRST')); - $sut = $this->sut(null); - $actual = $sut->mapUserInfo(false, $matchesFromLdap, sizeof($matchesFromLdap), $userQuery, array()); + $sut = $this->sut(); + $actual = $sut->mapUserInfo(false, $matchesFromLdap, sizeof($matchesFromLdap), $userQuery, []); $this->assertEquals($matchesFromLdap[0], $actual); } @@ -457,8 +457,8 @@ public function ADI_713_mapUserInfo_returnsFalse_ifMultipleAreFound() $userQuery = UserQuery::forPrincipal("username"); $matchesFromLdap = array(array('FIRST'), array('SECOND')); - $sut = $this->sut(null); - $actual = $sut->mapUserInfo(false, $matchesFromLdap, sizeof($matchesFromLdap), $userQuery, array()); + $sut = $this->sut(); + $actual = $sut->mapUserInfo(false, $matchesFromLdap, sizeof($matchesFromLdap), $userQuery, []); $this->assertEquals(false, $actual); } @@ -468,7 +468,7 @@ public function ADI_713_mapUserInfo_returnsFalse_ifMultipleAreFound() */ public function modifyUserWithoutSchema_emptyAttributes_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = new \WP_User(); $wpUser->user_login = 'testUsername'; @@ -477,10 +477,10 @@ public function modifyUserWithoutSchema_emptyAttributes_returnFalse() \WP_Mock::userFunction('get_user_meta', array( 'args' => array($wpUser->ID,NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . Repository::META_KEY_OBJECT_GUID, true), 'times' => 1, - 'return' => array()) + 'return' => []) ); - $actual = $sut->modifyUserWithoutSchema($wpUser, array()); + $actual = $sut->modifyUserWithoutSchema($wpUser, []); $this->assertFalse($actual); } @@ -580,7 +580,7 @@ public function modifyUserWithoutSchema_successfulChange_returnTrue() */ public function checkPorts_fsockopenIsDeactivated_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->internalNative->expects($this->once()) ->method('isFunctionAvailable') @@ -605,10 +605,10 @@ public function checkPorts_fsockopenIsAvailable_delegateToMethod() $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::DOMAIN_CONTROLLERS), array(Options::PORT) - ) + )) ->will( $this->onConsecutiveCalls( '127.0.0.1;localhost', @@ -618,10 +618,10 @@ public function checkPorts_fsockopenIsAvailable_delegateToMethod() $sut->expects($this->exactly(2)) ->method('checkPort') - ->withConsecutive( + ->with(...self::withConsecutive( array('127.0.0.1', 80, 2), array('localhost', 80, 2) - ) + )) ->will( $this->onConsecutiveCalls( false, @@ -637,7 +637,7 @@ public function checkPorts_fsockopenIsAvailable_delegateToMethod() */ public function checkPort_fsockopenNotAvailable_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->internalNative->expects($this->once()) ->method('isFunctionAvailable') @@ -654,7 +654,7 @@ public function checkPort_fsockopenNotAvailable_returnFalse() */ public function checkPort_unsuccessfulResponse_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->internalNative->expects($this->once()) ->method('isFunctionAvailable') @@ -675,7 +675,7 @@ public function checkPort_unsuccessfulResponse_returnFalse() */ public function checkPort_successfulResponse_returnTrue() { - $sut = $this->sut(array('isFsockopenAvailable')); + $sut = $this->sut(); $this->internalNative->expects($this->once()) ->method('isFunctionAvailable') @@ -738,10 +738,10 @@ public function findAllMembersOfGroups_delegateToMethod_returnMembers() $sut->expects($this->exactly(2)) ->method('findAllMembersOfGroup') - ->withConsecutive( + ->with(...self::withConsecutive( array('groupA'), array('groupB') - ) + )) ->will( $this->onConsecutiveCalls( $groupA, @@ -751,10 +751,10 @@ public function findAllMembersOfGroups_delegateToMethod_returnMembers() $sut->expects($this->exactly(2)) ->method('filterDomainMembers') - ->withConsecutive( + ->with(...self::withConsecutive( array($groupA), array($groupB) - ) + )) ->will( $this->onConsecutiveCalls( $groupA, @@ -795,10 +795,10 @@ public function filterDomainMembers_itConvertsArrayIntoAssociativeArray() $this->adLDAP->expects($this->exactly(2)) ->method('user_info') - ->withConsecutive( + ->with(...self::withConsecutive( array('a'), array('b') - ) + )) ->will( $this->onConsecutiveCalls( $userInfoA, @@ -808,14 +808,14 @@ public function filterDomainMembers_itConvertsArrayIntoAssociativeArray() $this->activeDirectoryContext->expects($this->exactly(2)) ->method('isMember') - ->withConsecutive( + ->with(...self::withConsecutive( array($this->callback(function ($sid) { return $sid->getFormatted() == 'S-1-5-21-3623811015-3361044348-30300820-555'; }), false), array($this->callback(function ($sid) { return $sid->getFormatted() == 'S-1-5-21-3623811015-3361044348-30300820-666'; }), false), - ) + )) ->will( $this->onConsecutiveCalls( true, @@ -850,9 +850,9 @@ public function GH_186_filterDomainMembers_canDealWithNullSids() $this->adLDAP->expects($this->exactly(1)) ->method('user_info') - ->withConsecutive( + ->with(...self::withConsecutive( array('a'), - ) + )) ->will( $this->onConsecutiveCalls( $userInfoA @@ -861,11 +861,11 @@ public function GH_186_filterDomainMembers_canDealWithNullSids() $this->activeDirectoryContext->expects($this->exactly(1)) ->method('isMember') - ->withConsecutive( + ->with(...self::withConsecutive( array($this->callback(function ($sid) { return $sid == null; }), false) - ) + )) ->will( $this->onConsecutiveCalls( true @@ -882,7 +882,7 @@ public function GH_186_filterDomainMembers_canDealWithNullSids() */ public function findAllMembersOfGroup_getMembersOfPrimaryGroupId_returnMembers() { - $sut = $this->sut(array('getAdLdap', 'getDomainSid')); + $sut = $this->sut(array('getAdLdap')); $sut->expects($this->once()) ->method('getAdLdap') @@ -906,7 +906,7 @@ public function findAllMembersOfGroup_getMembersOfPrimaryGroupId_returnMembers() */ public function findAllMembersOfGroup_getMembersOfGroupName_returnMembers() { - $sut = $this->sut(array('getAdLdap', 'getDomainSid')); + $sut = $this->sut(array('getAdLdap')); $sut->expects($this->once()) ->method('getAdLdap') diff --git a/test/Nadi/Authentication/CredentialsTest.php b/test/Nadi/Authentication/CredentialsTest.php index 1e45668..5ae0cbe 100644 --- a/test/Nadi/Authentication/CredentialsTest.php +++ b/test/Nadi/Authentication/CredentialsTest.php @@ -2,13 +2,13 @@ namespace Dreitier\Nadi\Authentication; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Christopher Klein * @access private */ -class CredentialsTest extends BasicTest +class CredentialsTest extends BasicTestCase { public function setUp(): void diff --git a/test/Nadi/Authentication/LoginServiceTest.php b/test/Nadi/Authentication/LoginServiceTest.php index 672a3e1..a0a87c4 100644 --- a/test/Nadi/Authentication/LoginServiceTest.php +++ b/test/Nadi/Authentication/LoginServiceTest.php @@ -11,7 +11,7 @@ use Dreitier\Nadi\Role\Mapping; use Dreitier\Nadi\User\LoginSucceededService; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -19,7 +19,7 @@ * @author Tobias Hellmann * @access private */ -class LoginServiceTest extends BasicTest +class LoginServiceTest extends BasicTestCase { /* @var Service|MockObject $configuration */ private $configuration; @@ -59,7 +59,7 @@ public function tearDown(): void /** * @return LoginService|MockObject */ - public function sut($methods = null, $simulated = false) + public function sut(array $methods = [], bool $simulated = false) { return $this->getMockBuilder(LoginService::class) ->setConstructorArgs( @@ -72,7 +72,7 @@ public function sut($methods = null, $simulated = false) $this->loginSucceededService ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -148,7 +148,7 @@ public function tryAuthenticatableSuffixes_itReturnsFalse_ifNoSuffixIsGiven() $sut->expects($this->never()) ->method('authenticateAtActiveDirectory'); - $actual = $sut->tryAuthenticatableSuffixes($credentials, array()); + $actual = $sut->tryAuthenticatableSuffixes($credentials, []); $this->assertFalse($actual); } @@ -206,7 +206,7 @@ public function updateCredentials_setsRelevantPrincipals() */ public function createAuthentication_itCreatesANewInstance() { - $sut = $this->sut(null); + $sut = $this->sut(); $credentials = $sut->buildCredentials('username', 'password'); @@ -218,7 +218,7 @@ public function createAuthentication_itCreatesANewInstance() */ public function requiresActiveDirectoryAuthentication_returnsFalse_ifEmpty() { - $sut = $this->sut(null); + $sut = $this->sut(); $returnedValue = $sut->requiresActiveDirectoryAuthentication(''); $this->assertFalse($returnedValue); @@ -407,7 +407,7 @@ public function detectAuthenticatableSuffixes_itReturnsDefaultSuffixes_whenSuffi */ public function authenticateAtActiveDirectory_itReturnsFalse_whenAuthenticationFails() { - $sut = $this->sut(array('bruteForceProtection', 'refreshBruteForceProtectionStatusForUser')); + $sut = $this->sut(); $username = 'testUser'; $suffix = "@company.it"; @@ -432,7 +432,7 @@ public function authenticateAtActiveDirectory_itReturnsFalse_whenAuthenticationF */ public function authenticateAtActiveDirectory_itReturnsTrue_whenAuthenticationSucceeds() { - $sut = $this->sut(array('bruteForceProtection', 'refreshBruteForceProtectionStatusForUser')); + $sut = $this->sut(); $username = 'testUser'; $suffix = "@company.it"; @@ -440,7 +440,7 @@ public function authenticateAtActiveDirectory_itReturnsTrue_whenAuthenticationSu $userGuid = 'e16d5d9c-xxxx-xxxx-9b8b-969fdf4b2702'; $roleMapping = new Mapping("username"); - $attributes = new Attributes(array(), array('objectguid' => $userGuid)); + $attributes = new Attributes([], array('objectguid' => $userGuid)); $this->ldapConnection->expects($this->once()) ->method('connect') @@ -585,7 +585,7 @@ public function postAuthentication_withValidCredentials_authenticationSuccess_re $objectguid = 'cc07cacc-5d9d-fa40-a9fb-3a4d50a172b0'; $credentials = new Credentials($samaccountName, 'secret'); $filteredAttributes = array('samaccountname' => $samaccountName, 'objectguid' => $objectguid); - $expectedLdapAttributes = new Attributes(array(), $filteredAttributes); + $expectedLdapAttributes = new Attributes([], $filteredAttributes); $sut = $this->sut(array('updateCredentials')); diff --git a/test/Nadi/Authentication/PasswordValidationServiceTest.php b/test/Nadi/Authentication/PasswordValidationServiceTest.php index da50672..d076310 100644 --- a/test/Nadi/Authentication/PasswordValidationServiceTest.php +++ b/test/Nadi/Authentication/PasswordValidationServiceTest.php @@ -4,7 +4,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\LoginState; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Tobias Hellmann * @access private */ -class PasswordValidationServiceTest extends BasicTest +class PasswordValidationServiceTest extends BasicTestCase { /* @var Service|MockObject */ private $configuration; @@ -38,7 +38,7 @@ public function tearDown(): void */ public function overridePasswordCheck_isAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); $check = 'isAdmin'; $password = null; $hash = null; @@ -53,7 +53,7 @@ public function overridePasswordCheck_isAdmin() /** * @return PasswordValidationService| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(PasswordValidationService::class) ->setConstructorArgs( @@ -62,7 +62,7 @@ public function sut($methods = null) $this->configuration ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -71,7 +71,7 @@ public function sut($methods = null) */ public function overridePasswordCheck_isAuthorized() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = '2'; $this->loginState->setAuthenticationSucceeded(); @@ -85,7 +85,7 @@ public function overridePasswordCheck_isAuthorized() */ public function overridePasswordCheck_localPasswordCheckFallbackActivated() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = '2'; $check = true; @@ -110,7 +110,7 @@ public function overridePasswordCheck_localPasswordCheckFallbackActivated() */ public function overridePasswordCheck_localPasswordCheckFallbackDeactivated() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = '2'; \WP_Mock::userFunction('get_user_meta', array( @@ -133,7 +133,7 @@ public function overridePasswordCheck_localPasswordCheckFallbackDeactivated() */ public function overridePasswordCheck_LocalPasswordCheck() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = '2'; $check = true; diff --git a/test/Nadi/Authentication/PrincipalResolverTest.php b/test/Nadi/Authentication/PrincipalResolverTest.php index 5334dcc..91bab30 100644 --- a/test/Nadi/Authentication/PrincipalResolverTest.php +++ b/test/Nadi/Authentication/PrincipalResolverTest.php @@ -2,14 +2,14 @@ namespace Dreitier\Nadi\Authentication; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Christopher Klein * @access private * @since ADI-620 */ -class PrincipalResolverTest extends BasicTest +class PrincipalResolverTest extends BasicTestCase { public function setUp(): void diff --git a/test/Nadi/Authentication/SingleSignOn/Profile/LocatorTest.php b/test/Nadi/Authentication/SingleSignOn/Profile/LocatorTest.php index 1b67890..b1ddccb 100644 --- a/test/Nadi/Authentication/SingleSignOn/Profile/LocatorTest.php +++ b/test/Nadi/Authentication/SingleSignOn/Profile/LocatorTest.php @@ -4,13 +4,13 @@ use Dreitier\Nadi\Authentication\Credentials; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Util; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; -class LocatorTest extends BasicTest +class LocatorTest extends BasicTestCase { /* @var Service|MockObject $configuration */ private $configuration; @@ -40,7 +40,7 @@ public function tearDown(): void * * @return Locator|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Locator::class) ->setConstructorArgs( @@ -48,7 +48,7 @@ public function sut($methods = null) $this->configuration ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -112,10 +112,10 @@ public function locate_delegatesToUserPrincipalName_ifKerberosNotFound() $sut->expects($this->exactly(2)) ->method('findBestConfigurationMatchForProfile') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::KERBEROS_REALM_MAPPINGS, $credentials->getUpnSuffix(), false], [Options::ACCOUNT_SUFFIX, '@' . $credentials->getUpnSuffix(), true] - ) + )) ->willReturnOnConsecutiveCalls( null, $profileMatch @@ -135,7 +135,7 @@ public function findBestConfigurationMatchForProfile_withoutProfile_itReturnsNul $sut = $this->sut(array('findSsoEnabledProfiles')); $suffix = '@test'; - $this->behave($sut, 'findSsoEnabledProfiles', array()); + $this->behave($sut, 'findSsoEnabledProfiles', []); $actual = $sut->findBestConfigurationMatchForProfile(Options::ACCOUNT_SUFFIX, $suffix); @@ -309,7 +309,7 @@ public function findSsoEnabledProfiles_noProfilesFound_returnsEmpty() ), ); - $profiles = array(); + $profiles = []; $this->configuration->expects($this->once()) ->method('findAllProfiles') diff --git a/test/Nadi/Authentication/SingleSignOn/ServiceTest.php b/test/Nadi/Authentication/SingleSignOn/ServiceTest.php index 6075010..a5a1223 100644 --- a/test/Nadi/Authentication/SingleSignOn/ServiceTest.php +++ b/test/Nadi/Authentication/SingleSignOn/ServiceTest.php @@ -15,13 +15,13 @@ use Dreitier\Nadi\LoginState; use Dreitier\Nadi\User\LoginSucceededService; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Session\SessionHandler; use Dreitier\Util\Util; use PHPUnit\Framework\MockObject\MockObject; -class ServiceTest extends BasicTest +class ServiceTest extends BasicTestCase { /* @var \Dreitier\WordPress\Multisite\Configuration\Service|MockObject $configuration */ private $configuration; @@ -89,7 +89,7 @@ public function tearDown(): void * * @return Service|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Service::class) ->setConstructorArgs( @@ -104,7 +104,7 @@ public function sut($methods = null) $this->ssoProfileLocator ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -153,10 +153,10 @@ public function clearAuthenticationState_withGetParameter_doesClearSessionValues $sessionHandler->expects($this->exactly(2)) ->method('clearValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Service::FAILED_SSO_PRINCIPAL), array(Service::USER_LOGGED_OUT) - ); + )); $sut->expects($this->exactly(2)) ->method('getSessionHandler') @@ -175,10 +175,10 @@ public function clearAuthenticationState_withoutGetParameter_doesNotClearSession $sessionHandler->expects($this->never()) ->method('clearValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Service::FAILED_SSO_PRINCIPAL), array(Service::USER_LOGGED_OUT) - ); + )); $sut->expects($this->never()) ->method('getSessionHandler') @@ -232,7 +232,7 @@ public function findUsername_withDownLevelLogonName_unescapeEscapedUsername() */ public function openLdapConnection_withValidConnection_doesNotThrowException() { - $profile = array(); + $profile = []; $connectionDetails = $this->createMock(ConnectionDetails::class); $sut = $this->sut(array('createConnectionDetailsFromProfile')); @@ -250,7 +250,7 @@ public function openLdapConnection_withValidConnection_doesNotThrowException() */ public function openLdapConnection_withoutConnection_throwsException() { - $profile = array(); + $profile = []; $connectionDetails = $this->createMock(ConnectionDetails::class); $sut = $this->sut(array('createConnectionDetailsFromProfile')); @@ -325,7 +325,7 @@ public function detectAuthenticatableSuffixes_validSuffixes_returnsSuffixITself( { $suffix = 'test.ad'; - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->detectAuthenticatableSuffixes($suffix); @@ -610,7 +610,7 @@ public function authenticate_withExceptionDuringLogout_itReturnFalse() )); $sut = $this->sut( - array('findUsername', 'openLdapConnection', 'getSessionHandler', 'findCorrespondingConfiguration', + array('findUsername', 'openLdapConnection', 'getSessionHandler', 'loginUser', 'requiresActiveDirectoryAuthentication', 'detectAuthenticatableSuffixes', 'tryAuthenticatableSuffixes') ); @@ -649,7 +649,7 @@ public function authenticate_withExceptionDuringAuthentication_itReturnFalse() )); $sut = $this->sut( - array('findUsername', 'openLdapConnection', 'getSessionHandler', 'findCorrespondingConfiguration', + array('findUsername', 'openLdapConnection', 'getSessionHandler', 'loginUser', 'requiresActiveDirectoryAuthentication', 'detectAuthenticatableSuffixes', 'tryAuthenticatableSuffixes') ); @@ -686,7 +686,7 @@ public function ADI_418_createRedirectUri_itUsesEnvironmentVar_REDIRECT_URL_asDe $_SERVER['REQUEST_URI'] = '/my-redirect-url'; $sut = $this->sut(); - $r = $this->invokeMethod($sut, 'createRedirectUri', array()); + $r = $this->invokeMethod($sut, 'createRedirectUri', []); $this->assertEquals($r, $_SERVER['REQUEST_URI']); } @@ -703,7 +703,7 @@ public function ADI_418_createRedirectUri_itUsesWordPressVar_redirect_to_over_RE $_REQUEST['redirect_to'] = '/expected-url'; $sut = $this->sut(); - $r = $this->invokeMethod($sut, 'createRedirectUri', array()); + $r = $this->invokeMethod($sut, 'createRedirectUri', []); $this->assertEquals($_REQUEST['redirect_to'], $r); } diff --git a/test/Nadi/Authentication/SingleSignOn/ValidatorTest.php b/test/Nadi/Authentication/SingleSignOn/ValidatorTest.php index 0466f11..5eaf876 100644 --- a/test/Nadi/Authentication/SingleSignOn/ValidatorTest.php +++ b/test/Nadi/Authentication/SingleSignOn/ValidatorTest.php @@ -6,7 +6,7 @@ use Dreitier\Nadi\Authentication\AuthenticationException; use Dreitier\Nadi\Authentication\LogoutException; use Dreitier\Nadi\Authentication\PrincipalResolver; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Session\SessionHandler; use Dreitier\Util\Util; @@ -19,7 +19,7 @@ * * @access */ -class ValidatorTest extends BasicTest +class ValidatorTest extends BasicTestCase { /* @var SessionHandler|MockObject $sessionHandler */ private $sessionHandler; @@ -49,11 +49,11 @@ public function tearDown(): void * * @return Validator|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Validator::class) - ->setConstructorArgs(array()) - ->setMethods($methods) + ->setConstructorArgs([]) + ->onlyMethods($methods) ->getMock(); } @@ -116,7 +116,7 @@ public function validateUser_withInvalidUser_throwsException() public function validateProfile_withProfile_doesNotThrowException() { $sut = $this->sut(array('getSessionHandler')); - $profile = array(); + $profile = []; $sut->validateProfile($profile); } diff --git a/test/Nadi/Authentication/SingleSignOn/VariableTest.php b/test/Nadi/Authentication/SingleSignOn/VariableTest.php index 8d7b9af..3542e22 100644 --- a/test/Nadi/Authentication/SingleSignOn/VariableTest.php +++ b/test/Nadi/Authentication/SingleSignOn/VariableTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\Authentication\SingleSignOn; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @@ -14,7 +14,7 @@ * * @access */ -class VariableTest extends BasicTest +class VariableTest extends BasicTestCase { /** * @test diff --git a/test/Nadi/Authentication/VerificationServiceTest.php b/test/Nadi/Authentication/VerificationServiceTest.php index f140bbb..08b600f 100644 --- a/test/Nadi/Authentication/VerificationServiceTest.php +++ b/test/Nadi/Authentication/VerificationServiceTest.php @@ -6,14 +6,14 @@ use Dreitier\Ldap\Attribute\Service; use Dreitier\Ldap\Connection; use Dreitier\Ldap\ConnectionDetails; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Danny Meissner * @access private */ -class VerificationServiceTest extends BasicTest +class VerificationServiceTest extends BasicTestCase { /* @var Connection|MockObject $ldapConnection */ private $ldapConnection; @@ -33,7 +33,7 @@ public function setUp(): void $this->attributeRepository = $this->createMock(Repository::class); $this->attributeService = $this->getMockBuilder(Service::class) ->disableOriginalConstructor() - ->setMethods(array('getObjectSid')) + ->onlyMethods(array('getObjectSid')) ->getMock(); } @@ -46,7 +46,7 @@ public function tearDown(): void /** * @return VerificationService|MockObject */ - public function sut($methods = null, $simulated = false) + public function sut(array $methods = [], bool $simulated = false) { return $this->getMockBuilder(VerificationService::class) ->setConstructorArgs( @@ -55,7 +55,7 @@ public function sut($methods = null, $simulated = false) $this->attributeRepository ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } diff --git a/test/Nadi/Authorization/ServiceTest.php b/test/Nadi/Authorization/ServiceTest.php index b1c9c8e..cc2bd3c 100644 --- a/test/Nadi/Authorization/ServiceTest.php +++ b/test/Nadi/Authorization/ServiceTest.php @@ -6,14 +6,14 @@ use Dreitier\Nadi\LoginState; use Dreitier\Nadi\Role\Mapping; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Christopher Klein * @access private */ -class ServiceTest extends BasicTest +class ServiceTest extends BasicTestCase { /* @var \Dreitier\WordPress\Multisite\Configuration\Service| MockObject */ private $multisiteConfigurationService; @@ -48,7 +48,7 @@ public function tearDown(): void * * @return Service|MockObject */ - public function sut($methods = null, $simulated = false) + public function sut(array $methods = [], bool $simulated = false) { return $this->getMockBuilder(Service::class) ->setConstructorArgs( @@ -58,7 +58,7 @@ public function sut($methods = null, $simulated = false) $this->roleManager, $this->loginState ) - )->setMethods($methods) + )->onlyMethods($methods) ->getMock(); } diff --git a/test/Nadi/Configuration/OptionsTest.php b/test/Nadi/Configuration/OptionsTest.php index 271d2b2..ae9198d 100644 --- a/test/Nadi/Configuration/OptionsTest.php +++ b/test/Nadi/Configuration/OptionsTest.php @@ -4,13 +4,13 @@ use Dreitier\Ldap\Attribute\Description; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann * @access private */ -class OptionsTest extends BasicTest +class OptionsTest extends BasicTestCase { /* @var Description */ diff --git a/test/Nadi/Configuration/Ui/LayoutTest.php b/test/Nadi/Configuration/Ui/LayoutTest.php index 6e8dd40..e6d58eb 100644 --- a/test/Nadi/Configuration/Ui/LayoutTest.php +++ b/test/Nadi/Configuration/Ui/LayoutTest.php @@ -3,13 +3,13 @@ namespace Dreitier\Nadi\Configuration\Ui; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann * @access private */ -class LayoutTest extends BasicTest +class LayoutTest extends BasicTestCase { public function setUp(): void diff --git a/test/Nadi/Cron/UrlTriggerTest.php b/test/Nadi/Cron/UrlTriggerTest.php index dd605b5..91a172e 100644 --- a/test/Nadi/Cron/UrlTriggerTest.php +++ b/test/Nadi/Cron/UrlTriggerTest.php @@ -5,7 +5,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Synchronization\ActiveDirectorySynchronizationService; use Dreitier\Nadi\Synchronization\WordPressSynchronizationService; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -15,7 +15,7 @@ * @author Danny Meißner * @access private */ -class UrlTriggerTest extends BasicTest +class UrlTriggerTest extends BasicTestCase { /* @var Service|MockObject $configuration */ @@ -45,7 +45,7 @@ public function tearDown(): void * * @return UrlTrigger|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { $class = UrlTrigger::class; $constructor = array( @@ -62,7 +62,7 @@ public function sut($methods) */ public function register_registerMethod_checkMethodIsRegistered() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectActionAdded('init', array($sut, 'httpRequestEntryPoint')); @@ -174,7 +174,7 @@ public function processHttpRequest_withCorrectAuthCode_dispatchMethod() */ public function getSyncMode_wrongTask_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array('adi-taska' => ''); @@ -187,7 +187,7 @@ public function getSyncMode_wrongTask_returnFalse() */ public function getSyncMode_syncToWordpressTask_return1() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array('next_ad_int-task' => 'sync-to-wordpress'); @@ -200,7 +200,7 @@ public function getSyncMode_syncToWordpressTask_return1() */ public function getSyncMode_syncToAd_return2() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array('next_ad_int-task' => 'sync-to-ad'); @@ -245,7 +245,7 @@ public function validateAuthCode_withCorrectAuthCode_returnTrue() */ public function dispatchAction_withBulkMode1_dispatchTosyncToWordpress() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->syncToWordPress->expects($this->once()) ->method('synchronize') @@ -262,7 +262,7 @@ public function dispatchAction_withBulkMode1_dispatchTosyncToWordpress() */ public function dispatchAction_withBulkMode2_dispatchToSyncBack() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->syncToWordPress->expects($this->never()) ->method('synchronize'); diff --git a/test/Nadi/DependenciesTest.php b/test/Nadi/DependenciesTest.php index d14bbcd..3c6edc8 100644 --- a/test/Nadi/DependenciesTest.php +++ b/test/Nadi/DependenciesTest.php @@ -8,14 +8,14 @@ use Dreitier\Nadi\Multisite\Site\Ui\ExtendSiteList; use Dreitier\Nadi\Multisite\Ui\MultisiteMenu; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Christopher Klein * @access private */ -class DependenciesTest extends BasicTest +class DependenciesTest extends BasicTestCase { /** * @test diff --git a/test/Nadi/InitTest.php b/test/Nadi/InitTest.php index 93959e5..d4ec4b3 100644 --- a/test/Nadi/InitTest.php +++ b/test/Nadi/InitTest.php @@ -7,14 +7,14 @@ use Dreitier\Nadi\Multisite\Site\Ui\ExtendSiteList; use Dreitier\Nadi\Multisite\Ui\MultisiteMenu; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Christopher Klein * @access private */ -class InitTest extends BasicTest +class InitTest extends BasicTestCase { public function setUp(): void { @@ -330,7 +330,7 @@ public function run_itRegisterCore_whenActive() */ public function registerHooks_addsAllActions() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectActionAdded(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'register_form_login_services', array($sut, 'registerFormLoginServices'), 10, 0); @@ -432,7 +432,7 @@ public function runMultisite_itReturns_whenNotViewingNetworkDashboard() public function runMultisite_itRegistersTheSharedAdministrationHooks_whenInMultisiteEnvironment() { $sut = $this->sut(array('dc', 'isOnNetworkDashboard', 'initialize', 'registerSharedAdministrationHooks', - 'registerMigrationHook', 'finishRegistration')); + 'finishRegistration')); $dc = $this->mockDependencyContainer($sut); $this->loginUser($sut, null, null); @@ -466,7 +466,7 @@ public function runMultisite_itRegistersTheSharedAdministrationHooks_whenInMulti public function runMultisite_itRegistersTheMultisiteAdministrationHooks_whenInMultisiteEnvironment() { $sut = $this->sut(array('dc', 'isOnNetworkDashboard', 'initialize', 'registerSharedAdministrationHooks', - 'registerMigrationHook', 'finishRegistration')); + 'finishRegistration')); $dc = $this->mockDependencyContainer($sut); $this->loginUser($sut, null, null); @@ -734,9 +734,10 @@ public function GH_154_isNotOnCustomLoginPage_whenDefinedInUIButUriDoesNotMatch( $definedCustomLoginPage = '/my-custom-login-page'; $configurationService->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::CUSTOM_LOGIN_PAGE_ENABLED], [Options::CUSTOM_LOGIN_PAGE_URI]) + ) ->willReturnOnConsecutiveCalls( // enable custom login page true, @@ -773,9 +774,10 @@ public function GH_154_isOnCustomLoginPage_whenDefinedInUI() $definedCustomLoginPage = '/my-custom-login-page'; $configurationService->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::CUSTOM_LOGIN_PAGE_ENABLED], [Options::CUSTOM_LOGIN_PAGE_URI]) + ) ->willReturnOnConsecutiveCalls( // enable custom login page true, @@ -796,13 +798,13 @@ public function GH_154_isOnCustomLoginPage_whenDefinedInUI() * * @return Init|MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(Init::class) ->setConstructorArgs( - array() + [] ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } diff --git a/test/Nadi/Multisite/Site/Ui/ExtendSiteListTest.php b/test/Nadi/Multisite/Site/Ui/ExtendSiteListTest.php index 7475215..bd4cae1 100644 --- a/test/Nadi/Multisite/Site/Ui/ExtendSiteListTest.php +++ b/test/Nadi/Multisite/Site/Ui/ExtendSiteListTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Nadi\Multisite\Site\Ui; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\BlogConfigurationRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileRepository; use PHPUnit\Framework\MockObject\MockObject; @@ -11,7 +11,7 @@ * @author Christopher Klein * @access private */ -class ExtendSiteListTest extends BasicTest +class ExtendSiteListTest extends BasicTestCase { /* @var BlogConfigurationRepository | MockObject */ private $blogConfigurationRepository; @@ -36,7 +36,7 @@ public function tearDown(): void * * @return ExtendSiteList | MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ExtendSiteList::class) ->setConstructorArgs( @@ -45,7 +45,7 @@ public function sut($methods = null) $this->profileRepository, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -54,7 +54,7 @@ public function sut($methods = null) */ public function register_itAddsFilter() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectFilterAdded('wpmu_blogs_columns', array($sut, 'addColumns'), 10, 1); \WP_Mock::expectActionAdded('manage_sites_custom_column', array($sut, 'addContent'), 1, 2); @@ -67,10 +67,10 @@ public function register_itAddsFilter() */ public function addColumn_itAddsTheAdiProfileColumn() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); - $actual = $sut->addColumns(array()); + $actual = $sut->addColumns([]); $this->assertTrue(isset($actual[ExtendSiteList::ADI_PROFILE_COLUMN])); } @@ -81,7 +81,7 @@ public function addColumn_itAddsTheAdiProfileColumn() */ public function addContent_outputsProfileName() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->blogConfigurationRepository->expects($this->once()) ->method('isDefaultProfileUsed') @@ -109,7 +109,7 @@ public function addContent_outputsProfileName() */ public function addContent_withDefaultProfileUsage_outputsDefaultProfileMessage() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $this->blogConfigurationRepository->expects($this->once()) @@ -138,7 +138,7 @@ public function addContent_withDefaultProfileUsage_outputsDefaultProfileMessage( */ public function addContent_withNoProfile_outputsNone() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $this->blogConfigurationRepository->expects($this->once()) diff --git a/test/Nadi/Multisite/Ui/MultisiteMenuTest.php b/test/Nadi/Multisite/Ui/MultisiteMenuTest.php index b8ccc41..87bd751 100644 --- a/test/Nadi/Multisite/Ui/MultisiteMenuTest.php +++ b/test/Nadi/Multisite/Ui/MultisiteMenuTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\Multisite\Ui; use Dreitier\Nadi\Ui\NadiMultisiteConfigurationPage; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Option\Provider; use Dreitier\WordPress\Multisite\Ui\BlogProfileRelationshipPage; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Christopher Klein * @access private */ -class MultisiteMenuTest extends BasicTest +class MultisiteMenuTest extends BasicTestCase { /* @var BlogProfileRelationshipPage | MockObject */ private $blogProfileRelationshipPage; @@ -39,7 +39,7 @@ public function tearDown(): void * * @return MultisiteMenu|MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(MultisiteMenu::class) ->setConstructorArgs( @@ -49,7 +49,7 @@ private function sut($methods = null) $this->nadiMultisiteConfigurationPage, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -58,7 +58,7 @@ private function sut($methods = null) */ public function register_itAddsTheMenus() { - $sut = $this->sut(array('addAjaxListeners')); + $sut = $this->sut(); \WP_Mock::expectActionAdded('network_admin_menu', array($sut, 'registerMenu')); @@ -74,10 +74,10 @@ public function register_itAddsTheAjaxListeners() $sut->expects($this->exactly(2)) ->method('addAjaxListener') - ->withConsecutive( + ->with(...self::withConsecutive( [$this->blogProfileRelationshipPage], [$this->nadiMultisiteConfigurationPage] - ); + )); $sut->register(); } @@ -104,10 +104,10 @@ public function registerMenu_addsMenusToWordPress() $sut->expects($this->exactly(2)) ->method('addSubMenu') - ->withConsecutive( + ->with(...self::withConsecutive( array('next_ad_int_slug', 'manage_network', $this->blogProfileRelationshipPage, 'renderNetwork'), array('next_ad_int_slug', 'manage_network', $this->nadiMultisiteConfigurationPage, 'renderNetwork') - ) + )) ->willReturn('next_ad_int_page', '', '', ''); \WP_Mock::expectActionAdded('admin_enqueue_scripts', array($sut, 'loadScriptsAndStyle')); diff --git a/test/Nadi/RequirementsTest.php b/test/Nadi/RequirementsTest.php index 3b8943e..995041f 100644 --- a/test/Nadi/RequirementsTest.php +++ b/test/Nadi/RequirementsTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Nadi; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Util; use Dreitier\WordPress\Multisite\Ui\Actions; @@ -13,7 +13,7 @@ * @author Tobias Hellmann * @access private */ -class RequirementsTest extends BasicTest +class RequirementsTest extends BasicTestCase { /* @var Native|\Mockery\MockInterface */ private $internalNative; @@ -436,13 +436,13 @@ public function GH_179_ifPhpVersionIsNotAvailable_pluginIsDeactivated() * * @return Requirements|MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(Requirements::class) ->setConstructorArgs( - array() + [] ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } } \ No newline at end of file diff --git a/test/Nadi/Role/ManagerIT.php b/test/Nadi/Role/ManagerIT.php index ffed4c5..07e71af 100644 --- a/test/Nadi/Role/ManagerIT.php +++ b/test/Nadi/Role/ManagerIT.php @@ -5,7 +5,7 @@ use Dreitier\ActiveDirectory\Context; use Dreitier\Ldap\Connection; use Dreitier\Ldap\ConnectionDetails; -use Dreitier\Test\BasicIntegrationTest; +use Dreitier\Test\BasicIntegrationTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Mockery; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * @author Christopher Klein * @access public */ -class ManagerIT extends BasicIntegrationTest +class ManagerIT extends BasicIntegrationTestCase { /* @var Service | MockObject */ private $configuration; diff --git a/test/Nadi/Role/ManagerTest.php b/test/Nadi/Role/ManagerTest.php index 2a21d43..1ea1d4e 100644 --- a/test/Nadi/Role/ManagerTest.php +++ b/test/Nadi/Role/ManagerTest.php @@ -6,7 +6,7 @@ use Dreitier\AdLdap\AdLdap; use Dreitier\Ldap\Connection; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Util; use Dreitier\WordPress\Multisite\Configuration\Service; @@ -16,7 +16,7 @@ * @author Christopher Klein * @access private */ -class ManagerTest extends BasicTest +class ManagerTest extends BasicTestCase { /* @var Service|MockObject $configuration */ private $configuration; @@ -44,8 +44,7 @@ public function setUp(): void $this->ldapConnection = $this->getMockBuilder(Connection::class) ->setConstructorArgs(array($this->configuration, $this->activeDirectoryContext)) ->getMock(); - - $this->ldapConnection->method('getAdLdap')->willReturn($this->adLdap); + $this->behave($this->ldapConnection, 'getAdLdap', $this->adLdap); // mock away our internal php calls $this->native = $this->createMockedNative(); @@ -63,11 +62,11 @@ public function tearDown(): void * * @return Manager|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { return $this->getMockBuilder(Manager::class) ->setConstructorArgs(array($this->configuration, $this->ldapConnection)) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -76,7 +75,7 @@ public function sut($methods) */ public function createRoleMapping_looksupSecurityGroups() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->adLdap->expects($this->once()) ->method("user_groups") @@ -92,7 +91,7 @@ public function createRoleMapping_looksupSecurityGroups() */ public function isInAuthorizationGroup_itReturnsFalse_ifHeIsNotMemberOfAuthorizationGroup() { - $sut = $this->sut(array('getAdLdap', 'isUserInGroup')); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -112,7 +111,7 @@ public function isInAuthorizationGroup_itReturnsFalse_ifHeIsNotMemberOfAuthoriza */ public function isInAuthorizationGroup_itReturnsTrue_ifHeIsMemberOfOneAuthorizationGroup() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -133,7 +132,7 @@ public function isInAuthorizationGroup_itReturnsTrue_ifHeIsMemberOfOneAuthorizat */ public function ADI248_whenAuthorizationGroupIsEmpty_itIsNotPossibleToAuthorize() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -156,9 +155,9 @@ public function synchronizeRoles_loadsWordPressRoles() $sut = $this->sut(array('getRoleEquivalentGroups', 'updateRoles', 'loadWordPressRoles')); $roleMapping = new Mapping("username"); - $roleMapping->setWordPressRoles(array()); + $roleMapping->setWordPressRoles([]); - $wpUser = $this->createAnonymousMock(array()); + $wpUser = $this->createAnonymousMock([]); $wpUser->ID = 1; $sut->expects($this->once()) @@ -175,7 +174,7 @@ public function synchronizeRoles_onUserCreation_withoutREGsTheDefaultRoleSubscri { $sut = $this->sut(array('getRoleEquivalentGroups', 'updateRoles', 'loadWordPressRoles', 'isMemberOfRoleEquivalentGroups')); - $wpUser = $this->createAnonymousMock(array()); + $wpUser = $this->createAnonymousMock([]); $wpUser->ID = 1; $sut->expects($this->once()) @@ -192,7 +191,7 @@ public function synchronizeRoles_onUserCreation_withoutREGsTheDefaultRoleSubscri ->willReturn(false); $roleMapping = new Mapping("username"); - $roleMapping->setWordPressRoles(array()); + $roleMapping->setWordPressRoles([]); $sut->expects($this->once()) ->method('updateRoles') @@ -209,7 +208,7 @@ public function synchronizeRoles_onUserCreation_withREGs_assignRoles() { $sut = $this->sut(array('getRoleEquivalentGroups', 'updateRoles', 'loadWordPressRoles')); - $wpUser = $this->createAnonymousMock(array()); + $wpUser = $this->createAnonymousMock([]); $wpUser->ID = 1; $wpUser->roles = array('subscriber'); $wpUser->user_login = 'username'; @@ -248,9 +247,9 @@ public function synchronizeRoles_onUserUpdate_withREGsAndUserHasNoRole_noRolesAr ->willReturn(array('security-group' => 'wordpress-role')); $roleMapping = new Mapping("username"); - $roleMapping->setWordPressRoles(array()); + $roleMapping->setWordPressRoles([]); - $wpUser = $this->createAnonymousMock(array()); + $wpUser = $this->createAnonymousMock([]); $wpUser->ID = 1; $wpUser->user_login = 'username'; @@ -261,7 +260,7 @@ public function synchronizeRoles_onUserUpdate_withREGsAndUserHasNoRole_noRolesAr $sut->expects($this->once()) ->method('updateRoles') - ->with($wpUser, array(), true); + ->with($wpUser, [], true); $sut->synchronizeRoles($wpUser, $roleMapping, false); } @@ -275,17 +274,17 @@ public function synchronizeRoles_onUserUpdate_withoutREGs_allOldRolesArePreserve $sut->expects($this->once()) ->method('getRoleEquivalentGroups') - ->willReturn(array()); + ->willReturn([]); $roleMapping = new Mapping("username"); - $roleMapping->setWordPressRoles(array()); + $roleMapping->setWordPressRoles([]); - $wpUser = $this->createAnonymousMock(array()); + $wpUser = $this->createAnonymousMock([]); $wpUser->ID = 1; $sut->expects($this->once()) ->method('updateRoles') - ->with($wpUser, array(), false); + ->with($wpUser, [], false); $sut->synchronizeRoles($wpUser, $roleMapping, false); } @@ -306,7 +305,7 @@ public function synchronizeRoles_setRolesIfPresent() $roleMapping = new Mapping("username"); $roleMapping->setWordPressRoles(array('wordpress-role', 'wordpress-role2')); - $wpUser = $this->createAnonymousMock(array()); + $wpUser = $this->createAnonymousMock([]); $wpUser->ID = 1; $this->configuration->expects($this->once()) @@ -326,7 +325,7 @@ public function synchronizeRoles_setRolesIfPresent() */ public function updateRoles_itDoesNotSetRole_ifCleanExistingRolesIsDisabled() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = $this->createAnonymousMock(array('set_role', 'add_role')); $wpUser->user_login = 'username'; @@ -346,7 +345,7 @@ public function updateRoles_itDoesNotSetRole_ifCleanExistingRolesIsDisabled() */ public function updateRoles_itReleasesExistingRoles_ifCleanExistingRolesIsEnabled() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = $this->createAnonymousMock(array('set_role', 'add_role')); $wpUser->user_login = 'username'; @@ -366,7 +365,7 @@ public function updateRoles_itReleasesExistingRoles_ifCleanExistingRolesIsEnable */ public function getRoleEquivalentGrous_returnsTheMapping() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -459,7 +458,7 @@ public function loadMultisiteFunctions_withFunctionAvailable_returns() $this->native->expects($this->never()) ->method('isFileAvailable'); - $sut = $this->sut(null); + $sut = $this->sut(); $this->invokeMethod($sut, 'loadMultisiteFunctions'); } @@ -483,7 +482,7 @@ public function loadMultisiteFunctions_withoutFunctionAvailable_checksForFileAnd ->method('includeOnce') ->with(ABSPATH . 'wp-admin/includes/ms.php'); - $sut = $this->sut(null); + $sut = $this->sut(); $this->invokeMethod($sut, 'loadMultisiteFunctions'); } diff --git a/test/Nadi/Synchronization/AbstractSynchronizationServiceTest.php b/test/Nadi/Synchronization/AbstractSynchronizationServiceTest.php index d1dd2a0..b4c790e 100644 --- a/test/Nadi/Synchronization/AbstractSynchronizationServiceTest.php +++ b/test/Nadi/Synchronization/AbstractSynchronizationServiceTest.php @@ -7,7 +7,7 @@ use Dreitier\Ldap\Connection; use Dreitier\Ldap\ConnectionDetails; use Dreitier\Nadi\User\Persistence\Repository; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Util; use Dreitier\WordPress\Multisite\Configuration\Service; @@ -30,7 +30,7 @@ public function __construct(Service $configuration, * @author Danny Meißner * @access private */ -class AbstractSynchronizationServiceTest extends BasicTest +class AbstractSynchronizationServiceTest extends BasicTestCase { /* @var Service | MockObject */ private $configuration; @@ -72,7 +72,7 @@ public function tearDown(): void * * @return AbstractSynchronizationServiceStub|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(AbstractSynchronizationServiceStub::class) ->setConstructorArgs( @@ -82,7 +82,7 @@ public function sut($methods = null) $this->attributeService ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -95,10 +95,10 @@ public function increaseExecutionTime_whenSettingIsInsufficient_itSetsMaxExecuti $this->internalNative->expects($this->exactly(2)) ->method('iniGet') - ->withConsecutive( + ->with(...self::withConsecutive( array('max_execution_time'), array('max_execution_time') - ) + )) ->will($this->onConsecutiveCalls( "5000", '18000' @@ -161,7 +161,7 @@ public function findActiveDirectoryUsernames_itReturnsDomainMember() $domainSid = 'S-1-5-21-3623811015-3361044348-30300820'; $context = new Context([$domainSid]); - $sut = $this->sut(array('isVerifiedDomainMember', 'findActiveDirectoryUsers')); + $sut = $this->sut(array('findActiveDirectoryUsers')); $users = array( 0 => new \WP_User() @@ -198,7 +198,7 @@ public function findActiveDirectoryUsers_itOnlyReturnsDomainMembers() $domainSid = 'S-1-5-21-3623811015-3361044348-30300820'; $context = new Context([$domainSid]); - $sut = $this->sut(array('isVerifiedDomainMember')); + $sut = $this->sut(); $users = array( 0 => new \WP_User(), @@ -271,7 +271,7 @@ public function isUsernameInDomain_itReturnsTrue_whenUserIsVerifiedDomainMember( $domainSid = 'S-1-5-21-3623811015-3361044348-30300820'; $context = new Context([$domainSid]); - $sut = $this->sut(array('isVerifiedDomainMember')); + $sut = $this->sut(); $binarySid = array( 0 => array( @@ -307,7 +307,7 @@ public function isUsernameInDomain_itReturnsFalse_whenUserIsNotInDomain() $domainSid = 'S-1-5-21-3623811015-3361044348-30300820'; $context = new Context([$domainSid]); - $sut = $this->sut(array('isVerifiedDomainMember')); + $sut = $this->sut(); $binarySid = array( 0 => array( @@ -344,7 +344,7 @@ public function findActiveDirectoryUsers_breaksWhenDomainSidIsEmtpy_gh138() $domainSid = 'S-1-5-21-3623811015-3361044348-30300820'; $context = new Context([$domainSid]); - $sut = $this->sut(array('isVerifiedDomainMember')); + $sut = $this->sut(); $users = array( 0 => new \WP_User(), diff --git a/test/Nadi/Synchronization/ActiveDirectorySynchronizationServiceTest.php b/test/Nadi/Synchronization/ActiveDirectorySynchronizationServiceTest.php index 451aac7..c859ad2 100644 --- a/test/Nadi/Synchronization/ActiveDirectorySynchronizationServiceTest.php +++ b/test/Nadi/Synchronization/ActiveDirectorySynchronizationServiceTest.php @@ -6,7 +6,7 @@ use Dreitier\Ldap\Attribute\Repository; use Dreitier\Ldap\Connection; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -16,7 +16,7 @@ * @author Danny Meißner * @access private */ -class ActiveDirectorySynchronizationServiceTest extends BasicTest +class ActiveDirectorySynchronizationServiceTest extends BasicTestCase { /* @var Service | MockObject */ private $configuration; @@ -49,7 +49,7 @@ public function tearDown(): void * * @return ActiveDirectorySynchronizationService|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ActiveDirectorySynchronizationService::class) ->setConstructorArgs( @@ -59,7 +59,7 @@ public function sut($methods = null) $this->ldapConnection ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -68,7 +68,7 @@ public function sut($methods = null) */ public function synchronize_succeeds() { - $sut = $this->sut(array('prepareForSync', 'getSyncableAttributes', 'getUsers', 'synchronizeUser', 'finishSynchronization')); + $sut = $this->sut(array('prepareForSync', 'getUsers', 'synchronizeUser', 'finishSynchronization')); $attributes = array('cn' => new Attribute()); $users = array((object)array('ID' => 1)); @@ -104,7 +104,7 @@ public function synchronize_succeeds() */ public function ADI_145_synchronize_itCallsFilter_next_ad_int_sync_wp2ad_filter_synchronizable_users() { - $sut = $this->sut(array('prepareForSync', 'getSyncableAttributes', 'getUsers', 'synchronizeUser', 'finishSynchronization')); + $sut = $this->sut(array('prepareForSync', 'getUsers', 'synchronizeUser', 'finishSynchronization')); $attributes = array('cn' => new Attribute()); $users = array((object)array('ID' => 1)); @@ -148,7 +148,7 @@ public function prepareForSync_syncToAdIsDisabled_returnFalse() ->willReturn(false); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(false, $actual); } @@ -181,7 +181,7 @@ public function prepareForSync_whenUsernameIsNotInDomain_itReturnFalse() ->with("username") ->willReturn(false); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(false, $actual); } @@ -243,7 +243,7 @@ public function prepareForSync_syncToAdIsEnabled_returnTrue() ->method('isUsernameInDomain') ->willReturn(true); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(true, $actual); } @@ -257,7 +257,7 @@ public function getUsers_withEmptyArray_returnFalse() $sut->expects($this->once()) ->method('findActiveDirectoryUsers') ->with(66) - ->willReturn(array()); + ->willReturn([]); $actual = $this->invokeMethod($sut, 'getUsers', array(66)); $this->assertEquals(0, sizeof($actual)); @@ -325,7 +325,7 @@ public function synchronizeUser_withAttributeValueEmpty_syncUser() 'user_login' => 'User', 'ID' => 97 ); - $expectedAttributesToSync = array('metakey_mail' => array()); + $expectedAttributesToSync = array('metakey_mail' => []); $sut->expects($this->once()) @@ -413,7 +413,7 @@ public function ADI_145_synchronizeUser_itCallsAction_nextadi_sync_wp2ad_after_u */ public function findAttributesOfUser_onlyReturnsAttributesAvailableInWordPress() { - $sut = $this->sut(null); + $sut = $this->sut(); $meta = new Attribute(); $meta->setMetakey('next_ad_int_mail'); @@ -462,7 +462,7 @@ public function isSynchronizable_delegatesToFindActiveDirectoryUsers() */ public function hasActiveDirectoryAttributeEditPermission_itReturnTrue_ifOwnProfileShouldBeEdited() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->assertTrue($sut->hasActiveDirectoryAttributeEditPermission(true)); } @@ -472,7 +472,7 @@ public function hasActiveDirectoryAttributeEditPermission_itReturnTrue_ifOwnProf */ public function hasActiveDirectoryAttributeEditPermission_itReturnTrue_ifAnotherProfileShouldBeEdited_andUserIsAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('current_user_can', array( 'args' => 'edit_users', @@ -488,7 +488,7 @@ public function hasActiveDirectoryAttributeEditPermission_itReturnTrue_ifAnother */ public function isEnabled_delegatesToConfiguration() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -503,7 +503,7 @@ public function isEnabled_delegatesToConfiguration() */ public function getServiceAccountUsername_delegatesToConfiguration() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -518,7 +518,7 @@ public function getServiceAccountUsername_delegatesToConfiguration() */ public function getServiceAccountPassword_delegatesToConfiguration() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') diff --git a/test/Nadi/Synchronization/Ui/SyncToActiveDirectoryPageTest.php b/test/Nadi/Synchronization/Ui/SyncToActiveDirectoryPageTest.php index 7166b9c..51344ce 100644 --- a/test/Nadi/Synchronization/Ui/SyncToActiveDirectoryPageTest.php +++ b/test/Nadi/Synchronization/Ui/SyncToActiveDirectoryPageTest.php @@ -5,7 +5,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Synchronization\ActiveDirectorySynchronizationService; use Dreitier\Nadi\Ui\NadiSingleSiteConfigurationPage; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\Multisite\Ui; use Dreitier\WordPress\Multisite\View\TwigContainer; @@ -17,7 +17,7 @@ * @author Danny Meißner * @access private */ -class SyncToActiveDirectoryPageTest extends BasicTest +class SyncToActiveDirectoryPageTest extends BasicTestCase { /* @var TwigContainer | MockObject */ private $twigContainer; @@ -46,7 +46,7 @@ public function tearDown(): void * * @return SyncToActiveDirectoryPage | MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(SyncToActiveDirectoryPage::class) ->setConstructorArgs( @@ -56,7 +56,7 @@ public function sut($methods = null) $this->configuration ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -65,7 +65,7 @@ public function sut($methods = null) */ public function getTitle_escapeTitle_returnTitle() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunctionEsc_html__(); $returnedTitle = $sut->getTitle(); @@ -77,7 +77,7 @@ public function getTitle_escapeTitle_returnTitle() */ public function getSlug_concat_returnSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $returnedValue = $sut->getSlug(); $this->assertEquals(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . SyncToActiveDirectoryPage::SLUG, $returnedValue); @@ -88,7 +88,7 @@ public function getSlug_concat_returnSlug() */ public function wpAjaxSlug_findSlug_returnNull() { - $sut = $this->sut(null); + $sut = $this->sut(); $returnedValue = $sut->wpAjaxSlug(); $this->assertEquals(SyncToActiveDirectoryPage::AJAX_SLUG, $returnedValue); @@ -99,9 +99,9 @@ public function wpAjaxSlug_findSlug_returnNull() */ public function getCapability_getValueFromConstant_returnCapability() { - $sut = $this->sut(null); + $sut = $this->sut(); - $returnedValue = $this->invokeMethod($sut, 'getCapability', array()); + $returnedValue = $this->invokeMethod($sut, 'getCapability', []); $this->assertEquals(SyncToActiveDirectoryPage::CAPABILITY, $returnedValue); } @@ -133,13 +133,13 @@ public function renderAdmin_withCorrectCapability_delegateToMethod() $this->configuration->expects($this->exactly(5)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::SYNC_TO_AD_AUTHCODE], [Options::DOMAIN_SID], [Options::SYNC_TO_AD_ENABLED], [Options::SYNC_TO_AD_GLOBAL_USER], [Options::SYNC_TO_AD_GLOBAL_PASSWORD] - ) + )) ->willReturnOnConsecutiveCalls($authCode, $domainSid, $syncEnabled, $syncUser, $syncPass); @@ -186,27 +186,27 @@ public function renderAdmin_withCorrectCapability_delegateToMethod() */ public function loadJavaScriptAdmin_validHook_enqeueScript() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'sync_to_ad'; \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int_bootstrap_min_css',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int_bootstrap_min_css',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); \WP_Mock::userFunction( 'wp_enqueue_script', array( - 'args' => array('next_ad_int_bootstrap_min_js',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', array(), Ui::VERSION_PAGE_JS), + 'args' => array('next_ad_int_bootstrap_min_js',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', [], Ui::VERSION_PAGE_JS), 'times' => 1, ) ); @@ -236,7 +236,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'angular.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/angular.min.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -284,7 +284,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_shared_util_array', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/array.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -295,7 +295,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_shared_util_value', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/value.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -307,7 +307,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_app_module', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.module.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -319,7 +319,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_app_config', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.nadi.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -331,7 +331,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_shared_service_browser', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/browser.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -343,7 +343,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_shared_service_template', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/template.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -355,7 +355,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_shared_service_notification', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/notification.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -367,7 +367,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_shared_service_list', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/list.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -404,7 +404,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'ng-notify', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/ng-notify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -416,7 +416,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'selectizecss', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/selectize.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -428,7 +428,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'alertify.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/alertify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -440,7 +440,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() 'args' => array( 'next_ad_int_blog_options_controller_sync_action', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/sync-action.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -455,7 +455,7 @@ public function loadJavaScriptAdmin_validHook_enqeueScript() */ public function loadJavaScriptAdmin_invalidHook_doNothing() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'some_other_stuff'; \WP_Mock::userFunction('wp_enqueue_style', array( @@ -470,10 +470,10 @@ public function loadJavaScriptAdmin_invalidHook_doNothing() */ public function processData_withInvalidPost_returnEmptyArray() { - $sut = $this->sut(null); + $sut = $this->sut(); - $actual = $sut->processData(array()); - $this->assertEquals(array(), $actual); + $actual = $sut->processData([]); + $this->assertEquals([], $actual); } /** @@ -481,7 +481,7 @@ public function processData_withInvalidPost_returnEmptyArray() */ public function processData_invalidNonce_callWpDie() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array( 'syncToAd' => '', @@ -509,7 +509,7 @@ public function processData_invalidNonce_callWpDie() */ public function processData_validNonce_callSyncToAd() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array( 'syncToAd' => 'someData', diff --git a/test/Nadi/Synchronization/Ui/SyncToWordPressPageTest.php b/test/Nadi/Synchronization/Ui/SyncToWordPressPageTest.php index 745b7c5..ad2fdbd 100644 --- a/test/Nadi/Synchronization/Ui/SyncToWordPressPageTest.php +++ b/test/Nadi/Synchronization/Ui/SyncToWordPressPageTest.php @@ -5,7 +5,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Synchronization\WordPressSynchronizationService; use Dreitier\Nadi\Ui\NadiSingleSiteConfigurationPage; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\Multisite\Ui; use Dreitier\WordPress\Multisite\View\TwigContainer; @@ -17,7 +17,7 @@ * @author Danny Meißner * @access private */ -class SyncToWordPressPageTest extends BasicTest +class SyncToWordPressPageTest extends BasicTestCase { /* @var TwigContainer|MockObject */ private $twigContainer; @@ -46,7 +46,7 @@ public function tearDown(): void * * @return SyncToWordPressPage| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(SyncToWordPressPage::class) ->setConstructorArgs( @@ -56,7 +56,7 @@ public function sut($methods = null) $this->configuration ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -65,7 +65,7 @@ public function sut($methods = null) */ public function getTitle() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunctionEsc_html__(); $returnedTitle = $sut->getTitle(); @@ -77,7 +77,7 @@ public function getTitle() */ public function getSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $returnedValue = $sut->getSlug(); $this->assertEquals(NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . SyncToWordPressPage::SLUG, $returnedValue); @@ -122,7 +122,7 @@ public function renderAdmin_validCapability_delegateToMethod() $sut->expects($this->once()) ->method('processData') - ->willReturn(array()); + ->willReturn([]); \WP_Mock::userFunction('wp_create_nonce', array( 'args' => SyncToWordPressPage::NONCE, @@ -133,13 +133,13 @@ public function renderAdmin_validCapability_delegateToMethod() $this->configuration->expects($this->exactly(5)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::SYNC_TO_WORDPRESS_AUTHCODE], [Options::DOMAIN_SID], [Options::SYNC_TO_WORDPRESS_ENABLED], [Options::SYNC_TO_WORDPRESS_USER], [Options::SYNC_TO_WORDPRESS_PASSWORD] - ) + )) ->willReturnOnConsecutiveCalls($authCode, $domainSid, $syncEnabled, $syncUser, $syncPass); @@ -166,26 +166,26 @@ public function renderAdmin_validCapability_delegateToMethod() */ public function loadJavaScriptAdmin_validHook_enqueueScript() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . SyncToWordPressPage::SLUG; \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int_bootstrap_min_css',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int_bootstrap_min_css',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); \WP_Mock::userFunction( 'wp_enqueue_script', array( - 'args' => array('next_ad_int_bootstrap_min_js',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', array(), Ui::VERSION_PAGE_JS), + 'args' => array('next_ad_int_bootstrap_min_js',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', [], Ui::VERSION_PAGE_JS), 'times' => 1, ) ); @@ -215,7 +215,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'angular.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/angular.min.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -263,7 +263,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_shared_util_array', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/array.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -274,7 +274,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_shared_util_value', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/value.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -286,7 +286,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_app_module', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.module.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -298,7 +298,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_app_config', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.nadi.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -310,7 +310,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_shared_service_browser', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/browser.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -322,7 +322,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_shared_service_template', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/template.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -334,7 +334,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_shared_service_notification', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/notification.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -346,7 +346,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_shared_service_list', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/list.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -383,7 +383,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'ng-notify', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/ng-notify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -395,7 +395,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'selectizecss', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/selectize.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -407,7 +407,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'alertify.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/alertify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -419,7 +419,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() 'args' => array( 'next_ad_int_blog_options_controller_sync_action', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/sync-action.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -434,7 +434,7 @@ public function loadJavaScriptAdmin_validHook_enqueueScript() */ public function loadJavaScriptAdmin_invalidHook_doNothing() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'some_stuff'; \WP_Mock::userFunction('wp_enqueue_style', array( @@ -449,12 +449,12 @@ public function loadJavaScriptAdmin_invalidHook_doNothing() */ public function processData_invalidPost_returnEmptyArray() { - $sut = $this->sut(null); + $sut = $this->sut(); - $post = array(); + $post = []; $actual = $sut->processData($post); - $this->assertEquals(array(), $actual); + $this->assertEquals([], $actual); } /** @@ -462,7 +462,7 @@ public function processData_invalidPost_returnEmptyArray() */ public function processData_invalidNonce_callWpDie() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array( 'syncToWordpress' => '', @@ -487,7 +487,7 @@ public function processData_invalidNonce_callWpDie() */ public function processData_validNonce_returnResult() { - $sut = $this->sut(null); + $sut = $this->sut(); $post = array( 'syncToWordpress' => '', @@ -523,7 +523,7 @@ public function processData_validNonce_returnResult() */ public function wpAjaxSlug_getAjaxSlug_returnAjaxSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $returnedTitle = $sut->wpAjaxSlug(); $this->assertEquals(SyncToWordPressPage::AJAX_SLUG, $returnedTitle); diff --git a/test/Nadi/Synchronization/WordPressSynchronizationServiceTest.php b/test/Nadi/Synchronization/WordPressSynchronizationServiceTest.php index a501279..cb62ee1 100644 --- a/test/Nadi/Synchronization/WordPressSynchronizationServiceTest.php +++ b/test/Nadi/Synchronization/WordPressSynchronizationServiceTest.php @@ -11,7 +11,7 @@ use Dreitier\Nadi\User\Manager; use Dreitier\Nadi\User\Persistence\Repository; use Dreitier\Nadi\User\User; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -21,7 +21,7 @@ * @author Danny Meißner * @access private */ -class WordPressSynchronizationServiceTest extends BasicTest +class WordPressSynchronizationServiceTest extends BasicTestCase { /* @var Connection | MockObject */ private $ldapConnection; @@ -66,7 +66,7 @@ public function tearDown(): void * * @return WordPressSynchronizationService| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(WordPressSynchronizationService::class) ->setConstructorArgs( @@ -79,7 +79,7 @@ public function sut($methods = null) $this->roleManager, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -127,7 +127,7 @@ public function synchronize_itReturnsTrue_whenMultipleUsersAreSynchronized() ->method('logNumberOfUsers') ->with($users); - $usernames = array(); + $usernames = []; $call = -1; $sut->expects($this->exactly(3)) @@ -203,7 +203,7 @@ public function ADI_145_synchronize_itCallsFilter_nextadi_sync_ad2wp_filter_sync ); $users = array('a', 'b', 'c'); - $modifiedUsers = array(); + $modifiedUsers = []; $sut->expects($this->once()) ->method('prepareForSync') @@ -237,7 +237,7 @@ public function prepareForSync_syncIsDisabled_returnFalse() ->with(Options::SYNC_TO_WORDPRESS_ENABLED) ->willReturn(false); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(false, $actual); } @@ -251,11 +251,11 @@ public function prepareForSync_connectionNotEstablished_returnFalse() $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_ENABLED), array(Options::SYNC_TO_WORDPRESS_USER), array(Options::SYNC_TO_WORDPRESS_PASSWORD) - ) + )) ->will($this->onConsecutiveCalls( true, 'user', @@ -270,7 +270,7 @@ public function prepareForSync_connectionNotEstablished_returnFalse() ->with('user', 'password') ->willReturn(false); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(false, $actual); } @@ -283,11 +283,11 @@ public function prepareForSync_syncIsEnabled_returnTrue() $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_ENABLED), array(Options::SYNC_TO_WORDPRESS_USER), array(Options::SYNC_TO_WORDPRESS_PASSWORD) - ) + )) ->will($this->onConsecutiveCalls( true, 'user', @@ -309,7 +309,7 @@ public function prepareForSync_syncIsEnabled_returnTrue() ->method('isUsernameInDomain') ->willReturn(true); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(true, $actual); } @@ -323,11 +323,11 @@ public function prepareForSync_whenUsernameIsNotInDomain_itReturnsFalse() $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_ENABLED), array(Options::SYNC_TO_WORDPRESS_USER), array(Options::SYNC_TO_WORDPRESS_PASSWORD) - ) + )) ->will($this->onConsecutiveCalls( true, 'user', @@ -346,7 +346,7 @@ public function prepareForSync_whenUsernameIsNotInDomain_itReturnsFalse() ->method('isUsernameInDomain') ->willReturn(false); - $actual = $this->invokeMethod($sut, 'prepareForSync', array()); + $actual = $this->invokeMethod($sut, 'prepareForSync', []); $this->assertEquals(false, $actual); } @@ -380,7 +380,7 @@ public function findSynchronizableUsers_iReturnsMergedActiveDirectoryAndWordPres 'k2' => 'ad1', 'k3' => 'ad2', ); - $actual = $this->invokeMethod($sut, 'findSynchronizableUsers', array()); + $actual = $this->invokeMethod($sut, 'findSynchronizableUsers', []); $this->assertEquals($expected, $actual); } @@ -427,7 +427,7 @@ public function userAccountControl_withEmptyAttributes_itReturnsZero() { $sut = $this->sut(); - $this->assertEquals(0, $sut->userAccountControl(array())); + $this->assertEquals(0, $sut->userAccountControl([])); } /** @@ -596,7 +596,7 @@ public function logNumberOfUsers_getElapsedTime_logMessages() $sut->expects($this->once()) ->method('getElapsedTime'); - $this->invokeMethod($sut, 'logNumberOfUsers', array(array())); + $this->invokeMethod($sut, 'logNumberOfUsers', array([])); } /** @@ -604,7 +604,7 @@ public function logNumberOfUsers_getElapsedTime_logMessages() */ public function checkAccountRestrictions_itDisablesTheWordPressAccount_whenActiveDirectoryUserDoesNotExist() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $adiUser = new User(PrincipalResolver::createCredentials("username"), new Attributes()); @@ -686,12 +686,11 @@ public function checkAccountRestrictions_itPasses_whenRestrictionsAreFulfilled() */ public function synchronizeUser_itFindsLdapAttributesOfSAMAccountName() { - $sut = $this->sut(array('checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013' @@ -707,13 +706,12 @@ public function synchronizeUser_itFindsLdapAttributesOfSAMAccountName() */ public function synchronizeUser_itUpdatesUserPrincipalName() { - $sut = $this->sut(array('checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013' @@ -730,14 +728,14 @@ public function synchronizeUser_itUpdatesUserPrincipalName() */ public function synchronizeUser_withSynchronizeDisabledAccounts_theAccountRestrictionsAreChecked() { - $sut = $this->sut(array('checkAccountRestrictions', 'resolveLdapAttributes', 'createOrUpdateUser')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = new User($credentials, new Attributes()); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), array( + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013' ))); @@ -746,10 +744,10 @@ public function synchronizeUser_withSynchronizeDisabledAccounts_theAccountRestri $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_DISABLE_USERS), array(Options::SYNC_TO_WORDPRESS_IMPORT_DISABLED_USERS) - ) + )) ->willReturnOnConsecutiveCalls( true, false @@ -769,15 +767,14 @@ public function synchronizeUser_withSynchronizeDisabledAccounts_theAccountRestri */ public function synchronizeUser_withoutSynchronizeDisabledAccounts_theUserIsCreated() { - $sut = $this->sut(array('checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = new User($credentials, new Attributes()); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectguid' => '123', @@ -788,10 +785,10 @@ public function synchronizeUser_withoutSynchronizeDisabledAccounts_theUserIsCrea $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_DISABLE_USERS), array(Options::SYNC_TO_WORDPRESS_IMPORT_DISABLED_USERS) - ) + )) ->willReturnOnConsecutiveCalls( true, false @@ -819,15 +816,14 @@ public function synchronizeUser_withoutSynchronizeDisabledAccounts_theUserIsCrea */ public function synchronizeUser_afterCreateOrUpdate_theAccountStatusIsSynchronized() { - $sut = $this->sut(array('checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = new User($credentials, new Attributes()); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), array( + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectguid' => '123', 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013' @@ -837,10 +833,10 @@ public function synchronizeUser_afterCreateOrUpdate_theAccountStatusIsSynchroniz $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_DISABLE_USERS), array(Options::SYNC_TO_WORDPRESS_IMPORT_DISABLED_USERS) - ) + )) ->willReturnOnConsecutiveCalls( true, false @@ -872,15 +868,14 @@ public function synchronizeUser_afterCreateOrUpdate_theAccountStatusIsSynchroniz */ public function synchronizeUser_itAddsDomainSid() { - $sut = $this->sut(array('checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = new User($credentials, new Attributes()); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013', @@ -891,10 +886,10 @@ public function synchronizeUser_itAddsDomainSid() $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_DISABLE_USERS), array(Options::SYNC_TO_WORDPRESS_IMPORT_DISABLED_USERS) - ) + )) ->willReturnOnConsecutiveCalls( true, false @@ -924,12 +919,11 @@ public function synchronizeUser_itAddsDomainSid() */ public function ADI_145_synchronizeUser_itCallsFilter_nextadi_sync_ad2wp_filter_user_before_synchronize() { - $sut = $this->sut(array('disableUserWithoutValidGuid', 'checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['disableUserWithoutValidGuid', 'checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = $this->createMock(User::class); - $ldapAttributes = new Attributes(array(), array('objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013')); + $ldapAttributes = new Attributes([], array('objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013')); $modifiedAdiUser = $this->createMock(User::class); $this->behave($this->userManager, "createAdiUser", $adiUser); @@ -957,12 +951,11 @@ public function ADI_145_synchronizeUser_itCallsFilter_nextadi_sync_ad2wp_filter_ */ public function ADI_145_synchronizeUser_itCallsAction_nextadi_sync_wp2ad_after_user_synchronize() { - $sut = $this->sut(array('disableUserWithoutValidGuid', 'checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['disableUserWithoutValidGuid', 'checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = $this->createMock(User::class); - $ldapAttributes = new Attributes(array(), + $ldapAttributes = new Attributes([], array( 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013' )); @@ -990,14 +983,14 @@ public function ADI_145_synchronizeUser_itCallsAction_nextadi_sync_wp2ad_after_u */ public function ADI_223_synchronizeUser_withDoNotSynchronizeDisabledAccounts_skipDisabledUsers() { - $sut = $this->sut(array('checkAccountRestrictions', 'findLdapAttributesOfUser', 'createOrUpdateUser', 'isAccountDisabled')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'isAccountDisabled']); $credentials = PrincipalResolver::createCredentials("username"); $adiUser = new User($credentials, new Attributes()); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), + ->willReturn(new Attributes([], array( 'userprincipalname' => 'username@test.ad', 'objectsid' => 'S-1-5-21-3623811015-3361044348-30300820-1013' @@ -1007,10 +1000,10 @@ public function ADI_223_synchronizeUser_withDoNotSynchronizeDisabledAccounts_ski $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_WORDPRESS_DISABLE_USERS), array(Options::SYNC_TO_WORDPRESS_IMPORT_DISABLED_USERS) - ) + )) ->willReturnOnConsecutiveCalls( true, false @@ -1030,13 +1023,12 @@ public function ADI_223_synchronizeUser_withDoNotSynchronizeDisabledAccounts_ski */ public function synchronizeUser_itSetsDomainSidOnlyIfUserIsPresent_gh141() { - $sut = $this->sut(array('checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus', - 'resolveLdapAttributes')); + $sut = $this->sut(['checkAccountRestrictions', 'createOrUpdateUser', 'synchronizeAccountStatus']); $credentials = PrincipalResolver::createCredentials("username"); $this->attributeService->expects($this->once()) ->method('resolveLdapAttributes') - ->willReturn(new Attributes(array(), + ->willReturn(new Attributes([], array( 'userprincipalname' => '', 'objectsid' => '' @@ -1059,7 +1051,7 @@ public function synchronizeAccountStatus_ifAccountIsDisabled_theUserIsDisabled() $ldapAttributes = array('cn' => array('value')); $adiUser = $this->createMock(User::class); - $this->behave($adiUser, 'getLdapAttributes', new Attributes($ldapAttributes, array())); + $this->behave($adiUser, 'getLdapAttributes', new Attributes($ldapAttributes, [])); $this->behave($adiUser, 'getId', 666); $this->behave($adiUser, 'getUserLogin', 'username@test.ad'); @@ -1091,7 +1083,7 @@ public function synchronizeAccountStatus_ifAccountIsEnabled_theUserIsEnabled() $ldapAttributes = array('cn' => array('value')); $adiUser = $this->createMock(User::class); - $this->behave($adiUser, 'getLdapAttributes', new Attributes($ldapAttributes, array())); + $this->behave($adiUser, 'getLdapAttributes', new Attributes($ldapAttributes, [])); $this->behave($adiUser, 'getId', 666); $this->behave($adiUser, 'getUserLogin', 'username@test.ad'); @@ -1122,7 +1114,7 @@ public function synchronizeAccountStatus_ifAccountIsEnabled_theUserIsEnabled() */ public function createOrUpdateUser_itDelegatesToCreate_whenUserDoesNotExist() { - $sut = $this->sut(null); + $sut = $this->sut(); $adiUser = $this->createMock(User::class); $this->behave($adiUser, 'getId', 0); @@ -1147,7 +1139,7 @@ public function createOrUpdateUser_itDelegatesToCreate_whenUserDoesNotExist() */ public function createOrUpdateUser_itDelegatesToUpdate_whenUserDoesNotExist() { - $sut = $this->sut(null); + $sut = $this->sut(); $adiUser = $this->createMock(User::class); $this->behave($adiUser, 'getId', 666); @@ -1172,7 +1164,7 @@ public function createOrUpdateUser_itDelegatesToUpdate_whenUserDoesNotExist() */ public function createOrUpdateUser_itReturnsMinusOne_whenDelegateFailed() { - $sut = $this->sut(null); + $sut = $this->sut(); $adiUser = $this->createMock(User::class); $this->behave($adiUser, 'getId', 666); @@ -1251,10 +1243,10 @@ public function disableUserWithoutValidGuid_withNullGuid() */ public function disableUserWithoutValidGuid_withValidGuid() { - $ldapAttributes = new Attributes(array(), array('objectguid' => '123')); + $ldapAttributes = new Attributes([], array('objectguid' => '123')); $credentials = PrincipalResolver::createCredentials('username', 'password'); - $sut = $this->sut(null); + $sut = $this->sut(); $sut->disableUserWithoutValidGuid($ldapAttributes, $credentials); } diff --git a/test/Nadi/Ui/ConnectivityTestPageTest.php b/test/Nadi/Ui/ConnectivityTestPageTest.php index ca99ae6..dd5f598 100644 --- a/test/Nadi/Ui/ConnectivityTestPageTest.php +++ b/test/Nadi/Ui/ConnectivityTestPageTest.php @@ -6,7 +6,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\User\LoginSucceededService; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\Multisite\Ui; use Dreitier\WordPress\Multisite\View\TwigContainer; @@ -18,7 +18,7 @@ * @author Danny Meißner * @access private */ -class ConnectivityTestPageTest extends BasicTest +class ConnectivityTestPageTest extends BasicTestCase { /* @var TwigContainer|MockObject */ private $twigContainer; @@ -67,7 +67,7 @@ public function tearDown(): void */ public function getTitle() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunctionEsc_html__(); $expectedTitle = 'Test authentication'; @@ -80,7 +80,7 @@ public function getTitle() * * @return ConnectivityTestPage| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ConnectivityTestPage::class) ->setConstructorArgs( @@ -94,7 +94,7 @@ public function sut($methods = null) $this->loginSucceededService ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -103,7 +103,7 @@ public function sut($methods = null) */ public function getSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'test_connection'; $returnedValue = $sut->getSlug(); @@ -166,26 +166,26 @@ public function renderAdmin() */ public function loadJavaScriptAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'test_connection'; \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int_bootstrap_min_css',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int_bootstrap_min_css',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); \WP_Mock::userFunction( 'wp_enqueue_script', array( - 'args' => array('next_ad_int_bootstrap_min_js',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', array(), Ui::VERSION_PAGE_JS), + 'args' => array('next_ad_int_bootstrap_min_js',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', [], Ui::VERSION_PAGE_JS), 'times' => 1, ) ); @@ -198,7 +198,7 @@ public function loadJavaScriptAdmin() */ public function processData_withEscapedCharacter_unescapeThem() { - $sut = $this->sut(array('printSystemEnvironment', 'connectToActiveDirectory', 'collectInformation')); + $sut = $this->sut(array('collectInformation')); $collectInformationResult = array('output' => 'Test', 'authentication_result' => new \WP_User()); $_POST['username'] = 'test\User'; // should be addslashes('test\User'); @@ -233,7 +233,7 @@ public function processData_withEscapedCharacter_unescapeThem() */ public function processData_withValidCredentials_returnsTrue() { - $sut = $this->sut(array('printSystemEnvironment', 'connectToActiveDirectory', 'collectInformation')); + $sut = $this->sut(array('collectInformation')); $collectInformationResult = array('output' => 'Test', 'authentication_result' => true); $_POST['username'] = 'john.doe'; @@ -265,7 +265,7 @@ public function processData_withValidCredentials_returnsTrue() */ public function processData_withMissingOrInvalidNonce_dies() { - $sut = $this->sut(array('printSystemEnvironment', 'connectToActiveDirectory', 'collectInformation')); + $sut = $this->sut(array('collectInformation')); $_POST['username'] = 'john.doe'; $_POST['password'] = 'secret'; @@ -339,7 +339,7 @@ public function detectSystemEnvironment_hasRelevantInformation() */ public function processData_returnEmptyArray() { - $sut = $this->sut(null); + $sut = $this->sut(); $returnedCache = $sut->processData(); diff --git a/test/Nadi/Ui/Menu/MenuAdapterTest.php b/test/Nadi/Ui/Menu/MenuAdapterTest.php index 3987f43..654e343 100644 --- a/test/Nadi/Ui/Menu/MenuAdapterTest.php +++ b/test/Nadi/Ui/Menu/MenuAdapterTest.php @@ -2,7 +2,8 @@ namespace Dreitier\Nadi\Ui\Menu; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; +use Dreitier\Test\CallableMock; use Dreitier\WordPress\Multisite\Option\Provider; use Dreitier\WordPress\Multisite\View\Page\Page; use PHPUnit\Framework\MockObject\MockObject; @@ -20,7 +21,7 @@ public function register() } } -class MenuAdapterTest extends BasicTest +class MenuAdapterTest extends BasicTestCase { /** * @var Provider @@ -45,7 +46,7 @@ public function tearDown(): void * * @return MenuAdapter|MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(MenuAdapterStub::class) ->setConstructorArgs( @@ -53,7 +54,7 @@ private function sut($methods = null) $this->optionProvider ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -62,13 +63,13 @@ private function sut($methods = null) */ public function addHelpTab_addsCorrectHelpTabToScreen() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->optionProvider->expects($this->once()) ->method('getAll') ->willReturn(array('domain_controllers' => array('detail' => 'detail', 'title' => 'title'))); - $screen = $this->createMockWithMethods('BlueprintClass', array('add_help_tab')); + $screen = $this->getMockBuilder(MockedScreen::class)->getMock(); \WP_Mock::userFunction('get_current_screen', array( 'return' => $screen, @@ -76,7 +77,7 @@ public function addHelpTab_addsCorrectHelpTabToScreen() $screen->expects($this->once()) ->method('add_help_tab') - ->withConsecutive( + ->with(...self::withConsecutive( array( array( 'id' => 'domain_controllers', @@ -84,7 +85,7 @@ public function addHelpTab_addsCorrectHelpTabToScreen() 'content' => '

' . 'detail' . '

', ), ) - ); + )); $sut->addHelpTab(); } @@ -117,7 +118,7 @@ public function addSubMenu_addsSubMenuPage_ifPageIsInstanceOfPageInterface() $permission = null; $callbackMethodName = 'renderAdmin'; - $page = $this->getMockBuilder(Page::class)->setMethods(array( + $page = $this->getMockBuilder(Page::class)->onlyMethods(array( 'getTitle', 'getSlug', 'wpAjaxSlug', ))->getMock(); @@ -136,4 +137,9 @@ public function addSubMenu_addsSubMenuPage_ifPageIsInstanceOfPageInterface() $this->invokeMethod($sut, 'addSubMenu', array($menuSlug, $permission, $page, $callbackMethodName)); } +} + +class MockedScreen +{ + public function add_help_tab() {} } \ No newline at end of file diff --git a/test/Nadi/Ui/Menu/MenuTest.php b/test/Nadi/Ui/Menu/MenuTest.php index e1ceb99..c4f8b15 100644 --- a/test/Nadi/Ui/Menu/MenuTest.php +++ b/test/Nadi/Ui/Menu/MenuTest.php @@ -7,7 +7,7 @@ use Dreitier\Nadi\Synchronization\Ui\SyncToWordPressPage; use Dreitier\Nadi\Ui\ConnectivityTestPage; use Dreitier\Nadi\Ui\NadiSingleSiteConfigurationPage; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\Multisite\Option\Provider; use PHPUnit\Framework\MockObject\MockObject; @@ -18,7 +18,7 @@ * @author Danny Meißner * @access private */ -class MenuTest extends BasicTest +class MenuTest extends BasicTestCase { /* @var Service $configuration */ private $configuration; @@ -57,7 +57,7 @@ public function tearDown(): void * * @return Menu|MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(Menu::class) ->setConstructorArgs( @@ -70,7 +70,7 @@ private function sut($methods = null) $this->syncToActiveDirectoryPage ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -79,7 +79,7 @@ private function sut($methods = null) */ public function register_itAddsTheMenus() { - $sut = $this->sut(array('addAjaxListeners')); + $sut = $this->sut(array('addAjaxListener')); \WP_Mock::expectActionAdded('admin_menu', array($sut, 'registerMenu')); @@ -95,8 +95,8 @@ public function register_itAddsTheAjaxListeners() $sut->expects($this->exactly(1)) ->method('addAjaxListener') - ->withConsecutive(array( - $this->nadiSingleSiteConfigurationPage + ->with(...self::withConsecutive( + [$this->nadiSingleSiteConfigurationPage] )); $sut->register(); @@ -107,7 +107,7 @@ public function register_itAddsTheAjaxListeners() */ public function registerMenu_addsMenusToWordPress() { - $sut = $this->sut(array('addSubMenu', 'blogOption')); + $sut = $this->sut(array('addSubMenu')); $this->mockFunctionEsc_html__(); $this->nadiSingleSiteConfigurationPage->expects($this->once()) @@ -136,17 +136,17 @@ public function registerMenu_addsMenusToWordPress() */ public function registerMenu_whenShowTestAuthentication_itEnablesTestAuthentication() { - $sut = $this->sut(array('addSubMenu', 'blogOption')); + $sut = $this->sut(array('addSubMenu')); $this->mockFunction__(); $this->mockFunctionEsc_html__(); $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::SHOW_MENU_TEST_AUTHENTICATION], [Options::SHOW_MENU_SYNC_TO_AD], [Options::SHOW_MENU_SYNC_TO_WORDPRESS] - ) + )) ->willReturn( true, false, @@ -163,10 +163,10 @@ public function registerMenu_whenShowTestAuthentication_itEnablesTestAuthenticat $sut->expects($this->exactly(2)) ->method('addSubMenu') - ->withConsecutive( + ->with(...self::withConsecutive( array('next_ad_int_slug', 'manage_options', $this->nadiSingleSiteConfigurationPage, 'renderAdmin'), array('next_ad_int_slug', 'manage_options', $this->connectivityTestPage, 'renderAdmin') - ); + )); $sut->registerMenu(); } @@ -177,16 +177,16 @@ public function registerMenu_whenShowTestAuthentication_itEnablesTestAuthenticat */ public function registerMenu_whenShowSyncToAD_itEnablesSyncToAD() { - $sut = $this->sut(array('addSubMenu', 'blogOption')); + $sut = $this->sut(array('addSubMenu')); $this->mockFunctionEsc_html__(); $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::SHOW_MENU_TEST_AUTHENTICATION], [Options::SHOW_MENU_SYNC_TO_AD], [Options::SHOW_MENU_SYNC_TO_WORDPRESS] - ) + )) ->willReturn( false, true, @@ -203,10 +203,10 @@ public function registerMenu_whenShowSyncToAD_itEnablesSyncToAD() $sut->expects($this->exactly(2)) ->method('addSubMenu') - ->withConsecutive( + ->with(...self::withConsecutive( array('next_ad_int_slug', 'manage_options', $this->nadiSingleSiteConfigurationPage, 'renderAdmin'), array('next_ad_int_slug', 'manage_options', $this->syncToActiveDirectoryPage, 'renderAdmin') - ); + )); $sut->registerMenu(); } @@ -217,16 +217,16 @@ public function registerMenu_whenShowSyncToAD_itEnablesSyncToAD() */ public function registerMenu_whenShowSyncToWordPress_itEnablesSyncToWordPress() { - $sut = $this->sut(array('addSubMenu', 'blogOption')); + $sut = $this->sut(array('addSubMenu')); $this->mockFunctionEsc_html__(); $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::SHOW_MENU_TEST_AUTHENTICATION], [Options::SHOW_MENU_SYNC_TO_AD], [Options::SHOW_MENU_SYNC_TO_WORDPRESS] - ) + )) ->willReturn( false, false, @@ -243,10 +243,10 @@ public function registerMenu_whenShowSyncToWordPress_itEnablesSyncToWordPress() $sut->expects($this->exactly(2)) ->method('addSubMenu') - ->withConsecutive( + ->with(...self::withConsecutive( array('next_ad_int_slug', 'manage_options', $this->nadiSingleSiteConfigurationPage, 'renderAdmin'), array('next_ad_int_slug', 'manage_options', $this->syncToWordPressPage, 'renderAdmin') - ); + )); $sut->registerMenu(); } diff --git a/test/Nadi/Ui/NadiMultisiteConfigurationPageTest.php b/test/Nadi/Ui/NadiMultisiteConfigurationPageTest.php index 27b6a9a..3cde1e3 100644 --- a/test/Nadi/Ui/NadiMultisiteConfigurationPageTest.php +++ b/test/Nadi/Ui/NadiMultisiteConfigurationPageTest.php @@ -17,7 +17,8 @@ use Dreitier\Nadi\Ui\Validator\Rule\Port; use Dreitier\Nadi\Ui\Validator\Rule\SelectValueValid; use Dreitier\Nadi\Ui\Validator\Rule\WordPressMetakeyConflict; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; +use Dreitier\Util\Validator\Result; use Dreitier\Util\Validator\Rule\Conditional; use Dreitier\Util\Validator\Rule\NotEmptyOrWhitespace; use Dreitier\Util\Validator\Rule\PositiveNumericOrZero; @@ -33,7 +34,7 @@ * @author Tobias Hellmann * @access private */ -class NadiMultisiteConfigurationPageTest extends BasicTest +class NadiMultisiteConfigurationPageTest extends BasicTestCase { /* @var TwigContainer |MockObject */ private $twigContainer; @@ -71,7 +72,7 @@ public function tearDown(): void */ public function getTitle() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunctionEsc_html__(); $expectedTitle = 'Profile options'; @@ -85,7 +86,7 @@ public function getTitle() * * @return NadiMultisiteConfigurationPage|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(NadiMultisiteConfigurationPage::class) ->setConstructorArgs( @@ -97,7 +98,7 @@ public function sut($methods = null) $this->configuration, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -106,7 +107,7 @@ public function sut($methods = null) */ public function getSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'profile_options'; $returnedValue = $sut->getSlug(); @@ -119,7 +120,7 @@ public function getSlug() */ public function wpAjaxSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'profile_options'; $returnedValue = $sut->wpAjaxSlug(); @@ -207,7 +208,7 @@ public function renderNetwork() */ public function loadJavaScriptAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'profile_options'; \WP_Mock::userFunction( @@ -235,7 +236,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'angular.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/angular.min.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -283,7 +284,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_shared_util_array', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/array.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -294,7 +295,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_shared_util_value', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/value.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -306,7 +307,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_app_module', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.module.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -317,7 +318,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_app_config', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.nadi.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -329,7 +330,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_shared_service_browser', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/browser.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -341,7 +342,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_shared_service_template', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/template.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -353,7 +354,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_shared_service_notification', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/notification.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -365,7 +366,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_service_persistence', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/services/persistence.service.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -377,7 +378,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_shared_service_list', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/list.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -388,7 +389,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_service_data', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/services/data.service.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -401,7 +402,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_profile', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/profile.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -413,7 +414,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_delete', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/delete.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -425,7 +426,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_ajax', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/ajax.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -437,7 +438,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_general', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/general.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -448,7 +449,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_environment', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/environment.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -459,7 +460,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_user', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/user.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -470,7 +471,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_password', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/credential.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -481,7 +482,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_permission', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/permission.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -492,7 +493,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_security', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/security.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -503,7 +504,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_sso', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/sso.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -514,7 +515,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_attributes', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/attributes.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -525,7 +526,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_sync_to_ad', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/sync-to-ad.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -536,7 +537,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_sync_to_wordpress', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/sync-to-wordpress.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -547,7 +548,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_profile_options_controller_logging', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/controllers/logging.controller.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -559,7 +560,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_blog_options_model', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/profile-options/models/profile.model.js', - array(), + [], NadiMultisiteConfigurationPage::VERSION_PROFILE_CONFIGURATION_JS, ), 'times' => 1, @@ -596,7 +597,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -608,7 +609,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'ng-notify', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/ng-notify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -620,7 +621,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'selectizecss', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/selectize.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -632,7 +633,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'alertify.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/alertify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -644,7 +645,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_bootstrap_min_js', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -656,7 +657,7 @@ public function loadJavaScriptAdmin() 'args' => array( 'next_ad_int_bootstrap_min_css', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -709,7 +710,7 @@ public function routeRequest_withoutExistingSubAction_returnsFalse() { $sut = $this->sut(); - $result = $this->invokeMethod($sut, 'routeRequest', array('does-not-exist', array())); + $result = $this->invokeMethod($sut, 'routeRequest', array('does-not-exist', [])); $this->assertFalse($result); } @@ -817,7 +818,7 @@ public function persistProfileOptionsValues_delegatesCallToProfileConfigurationC 'message' => 'The configuration was saved successfully.', 'type' => 'success', 'isMessage' => true, - 'additionalInformation' => array(), + 'additionalInformation' => [], ); $expected = array( @@ -851,7 +852,7 @@ public function persistProfileOptionsValues_delegatesCallToProfileConfigurationC $fakeValidator->expects($this->once()) ->method('getValidationResult') - ->willReturn(array()); + ->willReturn([]); $result = $this->invokeMethod($sut, 'persistProfileOptionsValues', array($data)); @@ -888,19 +889,19 @@ public function persistProfileOptionsValues_delegatesCallGetErrorMessage() 0 => 'Error' ); - $fakeValidator = $this->createAnonymousMock(array('containsErrors', 'getValidationResult')); + $fakeValidationResult = $this->getMockBuilder(Result::class)->getMock(); $this->mockFunction__(); $sut->expects($this->once()) ->method('validate') - ->willReturn($fakeValidator); + ->willReturn($fakeValidationResult); - $fakeValidator->expects($this->once()) + $fakeValidationResult->expects($this->once()) ->method('containsErrors') ->willReturn(true); - $fakeValidator->expects($this->once()) + $fakeValidationResult->expects($this->once()) ->method('getValidationResult') ->willReturn(array('Error')); @@ -1008,7 +1009,7 @@ public function getValidator_hasRequiredValidations() public function persistDomainSidForProfile_itSavesBlogOptions() { $sut = $this->sut(); - $data = array(); + $data = []; $this->profileConfigurationController->expects($this->once()) ->method('saveProfileOptions') diff --git a/test/Nadi/Ui/NadiSingleSiteConfigurationPageTest.php b/test/Nadi/Ui/NadiSingleSiteConfigurationPageTest.php index 381a993..6bc83cb 100644 --- a/test/Nadi/Ui/NadiSingleSiteConfigurationPageTest.php +++ b/test/Nadi/Ui/NadiSingleSiteConfigurationPageTest.php @@ -19,7 +19,7 @@ use Dreitier\Nadi\Ui\Validator\Rule\Port; use Dreitier\Nadi\Ui\Validator\Rule\SelectValueValid; use Dreitier\Nadi\Ui\Validator\Rule\WordPressMetakeyConflict; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use Dreitier\Util\Validator\Result; use Dreitier\Util\Validator\Rule\Conditional; @@ -36,7 +36,7 @@ * @author Tobias Hellmann * @access private */ -class NadiSingleSiteConfigurationPageTest extends BasicTest +class NadiSingleSiteConfigurationPageTest extends BasicTestCase { /* @var TwigContainer|MockObject */ private $twigContainer; @@ -62,7 +62,7 @@ public function tearDown(): void */ public function getTitle() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunctionEsc_html__(); $expectedTitle = 'Configuration'; @@ -74,7 +74,7 @@ public function getTitle() * * @return NadiSingleSiteConfigurationPage|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(NadiSingleSiteConfigurationPage::class) ->setConstructorArgs( @@ -83,7 +83,7 @@ public function sut($methods = null) $this->blogConfigurationController, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -92,7 +92,7 @@ public function sut($methods = null) */ public function getSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'blog_options'; $returnedValue = $sut->getSlug(); @@ -105,7 +105,7 @@ public function getSlug() */ public function wpAjaxSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'blog_options'; $returnedValue = $sut->wpAjaxSlug(); @@ -168,7 +168,7 @@ public function renderAdmin() */ public function loadAdminScriptsAndStyle() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'blog_options'; \WP_Mock::userFunction( @@ -196,7 +196,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'angular.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/angular.min.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -244,7 +244,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_shared_util_array', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/array.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -255,7 +255,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_shared_util_value', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/utils/value.util.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -267,7 +267,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_app_module', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.module.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -278,7 +278,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_app_config', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/app.nadi.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -290,7 +290,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_shared_service_browser', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/browser.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -302,7 +302,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_shared_service_template', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/template.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -314,7 +314,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_shared_service_notification', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/notification.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -325,7 +325,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_service_persistence', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/services/persistence.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -336,7 +336,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_shared_service_list', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/shared/services/list.service.js', - array(), + [], Ui::VERSION_PAGE_JS, ), 'times' => 1, @@ -347,7 +347,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_service_data', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/services/data.service.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -360,7 +360,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_blog', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/blog.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -371,7 +371,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_ajax', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/ajax.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -382,7 +382,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_general', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/general.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -393,7 +393,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_environment', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/environment.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -404,7 +404,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_user', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/user.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -415,7 +415,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_password', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/credential.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -426,7 +426,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_permission', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/permission.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -437,7 +437,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_security', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/security.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -448,7 +448,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_sso', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/sso.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -459,7 +459,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_attributes', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/attributes.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -470,7 +470,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_sync_to_ad', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/sync-to-ad.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -481,7 +481,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_sync_to_wordpress', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/sync-to-wordpress.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -493,7 +493,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_blog_options_controller_logging', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/app/blog-options/controllers/logging.controller.js', - array(), + [], NadiSingleSiteConfigurationPage::VERSION_BLOG_OPTIONS_JS, ), 'times' => 1, @@ -527,7 +527,7 @@ public function loadAdminScriptsAndStyle() \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); @@ -537,7 +537,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'ng-notify', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/ng-notify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -549,7 +549,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'selectizecss', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/selectize.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -561,7 +561,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'alertify.min', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/alertify.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -573,7 +573,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_bootstrap_min_js', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/js/libraries/bootstrap.min.js', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -585,7 +585,7 @@ public function loadAdminScriptsAndStyle() 'args' => array( 'next_ad_int_bootstrap_min_css', NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/bootstrap.min.css', - array(), + [], Ui::VERSION_CSS, ), 'times' => 1, @@ -683,7 +683,7 @@ public function wpAjaxListener() */ public function wpAjaxListener_EmptyData() { - $sut = $this->sut(null); + $sut = $this->sut(); $_POST['data'] = ''; $this->mockWordpressFunction('current_user_can'); @@ -703,7 +703,7 @@ public function wpAjaxListener_EmptyData() */ public function wpAjaxListener_NoPermission() { - $sut = $this->sut(null); + $sut = $this->sut(); $_POST['data'] = 'something'; \WP_Mock::userFunction( @@ -731,7 +731,7 @@ public function routeRequest_withoutExistingMapping_returnsFalse() { $sut = $this->sut(); - $actual = $this->invokeMethod($sut, 'routeRequest', array('test', array())); + $actual = $this->invokeMethod($sut, 'routeRequest', array('test', [])); $this->assertFalse($actual); } @@ -745,11 +745,11 @@ public function routeRequest_withExistingMapping_triggersMethod() $sut->expects($this->once()) ->method(NadiSingleSiteConfigurationPage::SUB_ACTION_GENERATE_AUTHCODE) - ->with(array()); + ->with([]); $subAction = NadiSingleSiteConfigurationPage::SUB_ACTION_GENERATE_AUTHCODE; - $this->invokeMethod($sut, 'routeRequest', array($subAction, array())); + $this->invokeMethod($sut, 'routeRequest', array($subAction, [])); } /** @@ -849,7 +849,7 @@ public function persistOptionsValues_withInsufficientPermission_removesDataBefor $this->blogConfigurationController->expects($this->once()) ->method('saveBlogOptions') - ->with(array()) + ->with([]) ->willReturn(array("status_success" => true)); $sut->expects($this->once()) @@ -866,7 +866,7 @@ public function validate_withoutValidationErrors_rendersErrors() { $sut = $this->sut(array('getValidator', 'validateWithValidator')); - $data = array(array('options' => array())); + $data = array(array('options' => [])); $validator = $this->createMock(Validator::class); $sut->expects($this->once()) @@ -918,7 +918,7 @@ public function getValidator_hasRequiredValidations() public function persistDomainSid_itSavesBlogOptions() { $sut = $this->sut(); - $data = array(); + $data = []; $this->blogConfigurationController->expects($this->once()) ->method('saveBlogOptions') @@ -956,7 +956,7 @@ public function verifyAdConnection_withValidData_returnsSuccess() $validation->expects($this->once()) ->method('getValidationResult') - ->willReturn(array()); + ->willReturn([]); $actual = $this->invokeMethod($sut, 'verifyAdConnection', array($nestedData)); $this->assertEquals($actual, array('status_success' => 1234)); @@ -1006,7 +1006,7 @@ public function verifyInternal_withValidData_returnsSuccess() $expectedNetBiosName = 'TEST'; $expectedNetBiosData = array("netbios_name" => $expectedNetBiosName); - $sut = $this->sut(array('prepareDomainSid', 'persistDomainSid', 'prepareNetBiosName', 'persistNetBiosName', 'findActiveDirectoryNetBiosName')); + $sut = $this->sut(array('prepareDomainSid', 'persistDomainSid', 'prepareNetBiosName', 'persistNetBiosName')); $this->twigContainer->expects($this->once()) ->method('findActiveDirectoryDomainSid') @@ -1194,7 +1194,7 @@ public function getNetBiosNameForPersistence_returnsValidArray() public function persistNetBiosName_calls_saveBlogOptions() { $sut = $this->sut(); - $data = array(); + $data = []; $this->blogConfigurationController->expects($this->once()) ->method('saveBlogOptions') @@ -1213,7 +1213,7 @@ public function validateVerification_calls_validateWithValidator() { $sut = $this->sut(array('getVerificationValidator', 'validateWithValidator')); - $data = array(); + $data = []; $validator = new Validator(); $result = new Result(); @@ -1241,7 +1241,7 @@ public function validateWithValidator_calls_givenValidator_validateMethod() $validator = $this->createMock(Validator::class); - $data = array(); + $data = []; $result = new Result(); $validator->expects($this->once()) diff --git a/test/Nadi/Ui/Validator/Rule/AccountSuffixTest.php b/test/Nadi/Ui/Validator/Rule/AccountSuffixTest.php index 6e66bb1..5eee9c8 100644 --- a/test/Nadi/Ui/Validator/Rule/AccountSuffixTest.php +++ b/test/Nadi/Ui/Validator/Rule/AccountSuffixTest.php @@ -3,11 +3,11 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; -class AccountSuffixTest extends BasicTest +class AccountSuffixTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Username has to contain a suffix.'; @@ -26,7 +26,7 @@ public function tearDown(): void * * @return AccountSuffix|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(AccountSuffix::class) ->setConstructorArgs( @@ -34,7 +34,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, '@', ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -45,7 +45,7 @@ public function validate_withSingleEmailConflict_returnString() { $sut = $this->sut(); - $actual = $sut->validate('test@test.ad', array()); + $actual = $sut->validate('test@test.ad', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -57,7 +57,7 @@ public function validate_withSingleEmail_returnTrue() { $sut = $this->sut(); - $actual = $sut->validate('@test.ad', array()); + $actual = $sut->validate('@test.ad', []); $this->assertTrue($actual); } @@ -69,7 +69,7 @@ public function validate_withEmailListConflict_returnString() { $sut = $this->sut(); - $actual = $sut->validate('@test;test@test.ad', array()); + $actual = $sut->validate('@test;test@test.ad', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -81,7 +81,7 @@ public function validate_withEmailList_returntrue() { $sut = $this->sut(); - $actual = $sut->validate('@test.ad;@test2.ad;@test3.ad', array()); + $actual = $sut->validate('@test.ad;@test2.ad;@test3.ad', []); $this->assertTrue($actual); } diff --git a/test/Nadi/Ui/Validator/Rule/AdAttributeConflictTest.php b/test/Nadi/Ui/Validator/Rule/AdAttributeConflictTest.php index 7ddcc8c..a97114a 100644 --- a/test/Nadi/Ui/Validator/Rule/AdAttributeConflictTest.php +++ b/test/Nadi/Ui/Validator/Rule/AdAttributeConflictTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class AdAttributeConflictTest extends BasicTest +class AdAttributeConflictTest extends BasicTestCase { const VALIDATION_MESSAGE = 'You cannot use the same Ad Attribute multiple times.'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return AdAttributeConflict|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(AdAttributeConflict::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function validate_withConflict_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0;testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0", @@ -66,7 +66,7 @@ public function validate_withConflict_returnString() */ public function validate_withoutConflict_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", diff --git a/test/Nadi/Ui/Validator/Rule/AdminEmailTest.php b/test/Nadi/Ui/Validator/Rule/AdminEmailTest.php index 384067d..0fe7ccb 100644 --- a/test/Nadi/Ui/Validator/Rule/AdminEmailTest.php +++ b/test/Nadi/Ui/Validator/Rule/AdminEmailTest.php @@ -1,11 +1,11 @@ getMockBuilder(AdminEmail::class) ->setConstructorArgs( @@ -32,7 +32,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, '@', ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -43,7 +43,7 @@ public function validate_withSingleEmailConflict_returnString() { $sut = $this->sut(); - $actual = $sut->validate('@test.ad', array()); + $actual = $sut->validate('@test.ad', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -55,7 +55,7 @@ public function validate_withSingleEmail_returnTrue() { $sut = $this->sut(); - $actual = $sut->validate('test@test.ad', array()); + $actual = $sut->validate('test@test.ad', []); $this->assertTrue($actual); } @@ -67,7 +67,7 @@ public function validate_withEmailListConflict_returnString() { $sut = $this->sut(); - $actual = $sut->validate('test@test.ad;test2@;test3@test.ad', array()); + $actual = $sut->validate('test@test.ad;test2@;test3@test.ad', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -79,7 +79,7 @@ public function validate_withEmailList_returnTrue() { $sut = $this->sut(); - $actual = $sut->validate('test@test.ad;test2@test.ad;test3@test.ad', array()); + $actual = $sut->validate('test@test.ad;test2@test.ad;test3@test.ad', []); $this->assertTrue($actual); } diff --git a/test/Nadi/Ui/Validator/Rule/AttributeMappingNullTest.php b/test/Nadi/Ui/Validator/Rule/AttributeMappingNullTest.php index b5a4944..17c986e 100644 --- a/test/Nadi/Ui/Validator/Rule/AttributeMappingNullTest.php +++ b/test/Nadi/Ui/Validator/Rule/AttributeMappingNullTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -13,7 +13,7 @@ * * @access */ -class AttributeMappingNullTest extends BasicTest +class AttributeMappingNullTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Ad Attribute / Data Type / WordPress Attribute cannot be empty!'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return AttributeMappingNull|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder( AttributeMappingNull::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function validate_withAdAttributeUndefined_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "undefined:string:testWordpressAttribute1:testDescription:0:0:0;testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0", @@ -66,7 +66,7 @@ public function validate_withAdAttributeUndefined_returnString() */ public function validate_withWordPressAttributeUndefined_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:undefined:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", @@ -81,7 +81,7 @@ public function validate_withWordPressAttributeUndefined_returnString() */ public function validate_withWordPressAttributeEmpty_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string::testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", @@ -96,7 +96,7 @@ public function validate_withWordPressAttributeEmpty_returnString() */ public function validate_withWordPressAttributeDefaultValue_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:next_ad_int_:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", @@ -111,7 +111,7 @@ public function validate_withWordPressAttributeDefaultValue_returnString() */ public function validate_withTypeUndefined_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:undefined:WordPressAttribut1:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", @@ -126,7 +126,7 @@ public function validate_withTypeUndefined_returnString() */ public function validate_withTypeEmpty_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1::WordPressAttribut1:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", @@ -142,7 +142,7 @@ public function validate_withTypeEmpty_returnString() */ public function validate_withoutConflict_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute2:testDescription:0:0:0", diff --git a/test/Nadi/Ui/Validator/Rule/DefaultEmailDomainTest.php b/test/Nadi/Ui/Validator/Rule/DefaultEmailDomainTest.php index f87a42a..4e8884c 100644 --- a/test/Nadi/Ui/Validator/Rule/DefaultEmailDomainTest.php +++ b/test/Nadi/Ui/Validator/Rule/DefaultEmailDomainTest.php @@ -3,11 +3,11 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; -class DefaultEmailDomainTest extends BasicTest +class DefaultEmailDomainTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Please remove the "@", it will be added automatically.'; @@ -26,7 +26,7 @@ public function tearDown(): void * * @return DefaultEmailDomain|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(DefaultEmailDomain::class) ->setConstructorArgs( @@ -34,7 +34,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -45,7 +45,7 @@ public function validate_withEmailConflict_returnString() { $sut = $this->sut(); - $actual = $sut->validate('@test.ad', array()); + $actual = $sut->validate('@test.ad', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -58,7 +58,7 @@ public function validate_withoutConflict_returnTrue() // TODO Code anpassen damit als default email domain normales suffix angegeben werden kann (z.b. "@test.ad") $sut = $this->sut(); - $actual = $sut->validate('test.ad', array()); + $actual = $sut->validate('test.ad', []); $this->assertTrue($actual); } diff --git a/test/Nadi/Ui/Validator/Rule/DisallowInvalidWordPressRolesTest.php b/test/Nadi/Ui/Validator/Rule/DisallowInvalidWordPressRolesTest.php index e2c44d4..f21bd59 100644 --- a/test/Nadi/Ui/Validator/Rule/DisallowInvalidWordPressRolesTest.php +++ b/test/Nadi/Ui/Validator/Rule/DisallowInvalidWordPressRolesTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; use Dreitier\Nadi\Role\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class DisallowInvalidWordPressRolesTest extends BasicTest +class DisallowInvalidWordPressRolesTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Validation failed!'; const VALIDATION_MESSAGE_2 = 'Validation 2 failed!'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return DisallowInvalidWordPressRoles|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(DisallowInvalidWordPressRoles::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) array(self::VALIDATION_MESSAGE, self::VALIDATION_MESSAGE_2) ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -57,7 +57,7 @@ public function validate_onNetworkDashboard_returnsTrue() ->method('isOnNetworkDashboard') ->willReturn(true); - $actual = $sut->validate('', array()); + $actual = $sut->validate('', []); $this->assertTrue($actual); } @@ -75,9 +75,9 @@ public function validate_withoutSuperAdminRole_returnsTrue() $sut->expects($this->once()) ->method('getWpRoles') - ->willReturn(array()); + ->willReturn([]); - $actual = $sut->validate('', array()); + $actual = $sut->validate('', []); $this->assertTrue($actual); } @@ -97,7 +97,7 @@ public function validate_withSuperAdminRoleInBlogConfig_returnsMessage() ->method('getWpRoles') ->willReturn(array(Manager::ROLE_SUPER_ADMIN)); - $actual = $sut->validate('', array()); + $actual = $sut->validate('', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -113,7 +113,7 @@ public function validate_withInvalidString_returnsMessage() ->method('isOnNetworkDashboard') ->willReturn(false); - $actual = $sut->validate('role=super admin;', array()); + $actual = $sut->validate('role=super admin;', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } diff --git a/test/Nadi/Ui/Validator/Rule/NoDefaultAttributeNameTest.php b/test/Nadi/Ui/Validator/Rule/NoDefaultAttributeNameTest.php index 9468cce..a96f06c 100644 --- a/test/Nadi/Ui/Validator/Rule/NoDefaultAttributeNameTest.php +++ b/test/Nadi/Ui/Validator/Rule/NoDefaultAttributeNameTest.php @@ -2,11 +2,11 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; -class NoDefaultAttributeNameTest extends BasicTest +class NoDefaultAttributeNameTest extends BasicTestCase { /** @var string */ private $invalidTestString = 'givenname:string:next_ad_int_samaccountname:first name:true:true:true'; @@ -28,11 +28,11 @@ public function tearDown(): void * * @return NoDefaultAttributeName|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(NoDefaultAttributeName::class) ->setConstructorArgs(array('test')) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } diff --git a/test/Nadi/Ui/Validator/Rule/PortTest.php b/test/Nadi/Ui/Validator/Rule/PortTest.php index de4bbe9..37a051b 100644 --- a/test/Nadi/Ui/Validator/Rule/PortTest.php +++ b/test/Nadi/Ui/Validator/Rule/PortTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class PortTest extends BasicTest +class PortTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Port has to be numeric and in the range from 0 - 65535.'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return Port|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Port::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function validate_withWrongRange_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( 123456789, diff --git a/test/Nadi/Ui/Validator/Rule/WordPressMetakeyConflictTest.php b/test/Nadi/Ui/Validator/Rule/WordPressMetakeyConflictTest.php index 686e2f0..5c6587e 100644 --- a/test/Nadi/Ui/Validator/Rule/WordPressMetakeyConflictTest.php +++ b/test/Nadi/Ui/Validator/Rule/WordPressMetakeyConflictTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\Ui\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class WordPressMetakeyConflictTest extends BasicTest +class WordPressMetakeyConflictTest extends BasicTestCase { const VALIDATION_MESSAGE = 'You cannot use the same WordPress Attribute multiple times.'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return WordPressMetakeyConflict|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(WordPressMetakeyConflict::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function validate_withConflict_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute1:testDescription:0:0:0", @@ -66,7 +66,7 @@ public function validate_withConflict_returnString() */ public function validate_withoutConflict_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "testAdAttribute1:string:testWordpressAttribute1:testDescription:0:0:0;testAdAttribute2:string:testWordpressAttribute2:testDescription:0:0:0", diff --git a/test/Nadi/User/HelperTest.php b/test/Nadi/User/HelperTest.php index 5f93f02..d6cfda5 100644 --- a/test/Nadi/User/HelperTest.php +++ b/test/Nadi/User/HelperTest.php @@ -5,7 +5,7 @@ use Dreitier\Ldap\Attributes; use Dreitier\Nadi\Authentication\PrincipalResolver; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -13,7 +13,7 @@ * @author Tobias Hellmann * @access private */ -class HelperTest extends BasicTest +class HelperTest extends BasicTestCase { /* @var Service| MockObject */ private $configuration; @@ -22,7 +22,7 @@ public function setUp(): void { $this->configuration = $this->getMockBuilder(Service::class) ->disableOriginalConstructor() - ->setMethods(array('getOptionValue')) + ->onlyMethods(array('getOptionValue')) ->getMock(); \WP_Mock::setUp(); @@ -46,7 +46,7 @@ public function getEnrichedUserData_withAutoUpdateDescriptionFalseAndDisplayName ); $adiUser = $this->createMock(User::class); - $this->behave($adiUser, 'getLdapAttributes', new Attributes(array(), $ldapAttributes)); + $this->behave($adiUser, 'getLdapAttributes', new Attributes([], $ldapAttributes)); $this->behave($adiUser, 'getId', 1); $this->behave($adiUser, 'getCredentials', PrincipalResolver::createCredentials('username')); @@ -77,7 +77,7 @@ public function getEnrichedUserData_withAutoUpdateDescriptionFalseAndDisplayName */ public function getAccountSuffix_returnSuffix() { - $sut = $this->sut(null); + $sut = $this->sut(); $userAttributeValues = array('userprincipalname' => 'test@company.it'); $expectedReturn = "@company.it"; @@ -91,7 +91,7 @@ public function getAccountSuffix_returnSuffix() */ public function getUserAccountSuffix_returnEmptyString() { - $sut = $this->sut(null); + $sut = $this->sut(); $userAttributeValues = array('userprincipalname' => 'testcompany.it'); $expectedReturn = ""; @@ -126,7 +126,7 @@ public function createPassword_handlesDataCorrectly() */ public function isRandomGeneratePassword_withSyncToWordPressFalseAndNoRandomPasswordFalse_returnsExpectedResult() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -142,7 +142,7 @@ public function isRandomGeneratePassword_withSyncToWordPressFalseAndNoRandomPass */ public function isRandomGeneratePassword_withSyncToWordPressFalseAndNoRandomPasswordTrue_returnsExpectedResult() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -158,7 +158,7 @@ public function isRandomGeneratePassword_withSyncToWordPressFalseAndNoRandomPass */ public function isRandomGeneratePassword_withSyncToWordPressTrueAndNoRandomPasswordFalse_returnsExpectedResult() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -174,7 +174,7 @@ public function isRandomGeneratePassword_withSyncToWordPressTrueAndNoRandomPassw */ public function isRandomGeneratePassword_withSyncToWordPressTrueAndNoRandomPasswordTrue_returnsExpectedResult() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -190,7 +190,7 @@ public function isRandomGeneratePassword_withSyncToWordPressTrueAndNoRandomPassw */ public function getPassword_withGenerateRandomPasswordFalse_returnsDefaultPassword() { - $sut = $this->sut(null); + $sut = $this->sut(); $expected = 'password'; $actual = $this->invokeMethod($sut, 'getRandomPassword', array(false, $expected)); @@ -203,7 +203,7 @@ public function getPassword_withGenerateRandomPasswordFalse_returnsDefaultPasswo */ public function getDisplayNameFromUserAttributeValues_returnUsernameIfEmptyOrSamaAccountName() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -223,7 +223,7 @@ public function getDisplayNameFromUserAttributeValues_returnUsernameIfEmptyOrSam */ public function getDisplayNameFromUserAttributeValues_generateWantedDisplayName() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -248,7 +248,7 @@ public function getDisplayNameFromUserAttributeValues_generateWantedDisplayName( */ public function getDisplayNameFromUserAttributeValues_returnUsernameIfDisplayNameEmpty() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -268,7 +268,7 @@ public function getDisplayNameFromUserAttributeValues_returnUsernameIfDisplayNam */ public function createUniqueEmailAddress() { - $sut = $this->sut(array('checkIfEmailExists')); + $sut = $this->sut(); \WP_Mock::userFunction( 'email_exists', array( @@ -291,7 +291,7 @@ public function createUniqueEmailAddress() */ public function createUniqueEmailAddress_withExistingEmail() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'email_exists', array( @@ -320,7 +320,7 @@ public function createUniqueEmailAddress_withExistingEmail() * * @return Helper|MockObject */ - private function sut($methods) + private function sut(array $methods = []) { return $this->getMockBuilder(Helper::class) ->setConstructorArgs( @@ -328,7 +328,7 @@ private function sut($methods) $this->configuration, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } } diff --git a/test/Nadi/User/LocalUserResolverTest.php b/test/Nadi/User/LocalUserResolverTest.php index 65352a1..030228f 100644 --- a/test/Nadi/User/LocalUserResolverTest.php +++ b/test/Nadi/User/LocalUserResolverTest.php @@ -10,7 +10,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Log\NadiLog; use Dreitier\Nadi\Role\Mapping; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\WordPressErrorException; use Hoa\Protocol\Bin\Resolve; @@ -20,7 +20,7 @@ * @author Christopher Klein * @access private */ -class LocalUserResolverTest extends BasicTest +class LocalUserResolverTest extends BasicTestCase { public function setUp(): void { diff --git a/test/Nadi/User/LoginSucceededServiceTest.php b/test/Nadi/User/LoginSucceededServiceTest.php index d256d4d..2b32c59 100644 --- a/test/Nadi/User/LoginSucceededServiceTest.php +++ b/test/Nadi/User/LoginSucceededServiceTest.php @@ -9,11 +9,11 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\LoginState; use Dreitier\Nadi\Role\Mapping; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Nadi\Authentication\Credentials; use PHPUnit\Framework\MockObject\MockObject; -class LoginSucceededServiceTest extends BasicTest +class LoginSucceededServiceTest extends BasicTestCase { /** @var LoginState|MockObject $loginState */ private $loginState = null; @@ -52,7 +52,7 @@ public function tearDown(): void * * @return LoginSucceededService|MockObject */ - public function sut($methods = null, $simulated = false) + public function sut(array $methods = [], bool $simulated = false) { return $this->getMockBuilder(LoginSucceededService::class) ->setConstructorArgs( @@ -63,7 +63,7 @@ public function sut($methods = null, $simulated = false) $this->configuration, $simulated ? null : $this->userManager, ) - )->setMethods($methods) + )->onlyMethods($methods) ->getMock(); } @@ -204,7 +204,7 @@ public function updateOrCreateUser_withValidCredentials_preCreateStatusFalse_ret { $credentials = new Credentials(); $filteredAttrs = array('samaccountname' => 'john.doe'); - $expectedLdapAttrs = new Attributes(array(), $filteredAttrs); + $expectedLdapAttrs = new Attributes([], $filteredAttrs); $sut = $this->sut(); $this->loginState->expects($this->once()) @@ -242,7 +242,7 @@ public function updateOrCreateUser_withValidCredentials_errorUpdatingWpUser_retu $credentials = new Credentials(); $filteredAttrs = array('samaccountname' => 'john.doe', 'objectsid' => $userSid); - $expectedLdapAttrs = new Attributes(array(), $filteredAttrs); + $expectedLdapAttrs = new Attributes([], $filteredAttrs); $adiUserCreds = new Credentials('john.doe@test.ad'); $adiUserCreds->setUpnUsername('jdo'); @@ -306,7 +306,7 @@ public function updateOrCreateUser_withValidCredentials_errorCreatingWpUser_retu $credentials = new Credentials(); $filteredAttrs = array('samaccountname' => 'john.doe', 'objectsid' => $userSid); - $expectedLdapAttrs = new Attributes(array(), $filteredAttrs); + $expectedLdapAttrs = new Attributes([], $filteredAttrs); $adiUserCreds = new Credentials('john.doe@test.ad'); $adiUserCreds->setUpnUsername('jdo'); @@ -369,7 +369,7 @@ public function updateOrCreateUser_withValidCredentials_returnsExpected() $credentials = new Credentials(); $filteredAttrs = array('samaccountname' => 'john.doe', 'objectsid' => $userSid); - $expectedLdapAttrs = new Attributes(array(), $filteredAttrs); + $expectedLdapAttrs = new Attributes([], $filteredAttrs); $adiUserCreds = new Credentials('john.doe@test.ad'); $adiUserCreds->setUpnUsername('jdo'); @@ -440,7 +440,7 @@ public function createUser_withValidAdiUser_withSimulatedLogin_returnsFalse() ->method('getUsername') ->willReturn('jdo'); - $sut = $this->sut(null, true); + $sut = $this->sut(simulated: true); $actual = $sut->createUser($adiUser); @@ -485,10 +485,10 @@ public function updateUser_withAutoUpdatePassword_withAutoUpdateUser_returnsExpe $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::AUTO_UPDATE_USER], [Options::AUTO_UPDATE_PASSWORD] - ) + )) ->willReturnOnConsecutiveCalls( true, true @@ -531,10 +531,10 @@ public function updateUser_withoutAutoUpdatePassword_withoutAutoUpdateUser_retur $this->configuration->expects($this->exactly(2)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( [Options::AUTO_UPDATE_USER], [Options::AUTO_UPDATE_PASSWORD] - ) + )) ->willReturnOnConsecutiveCalls( false, false diff --git a/test/Nadi/User/ManagerTest.php b/test/Nadi/User/ManagerTest.php index 44800ba..7609f1d 100644 --- a/test/Nadi/User/ManagerTest.php +++ b/test/Nadi/User/ManagerTest.php @@ -9,7 +9,7 @@ use Dreitier\Nadi\Authentication\PrincipalResolver; use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Role\Mapping; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\WordPressErrorException; use PHPUnit\Framework\MockObject\MockObject; @@ -18,7 +18,7 @@ * @author Tobias Hellmann * @access private */ -class ManagerTest extends BasicTest +class ManagerTest extends BasicTestCase { /* @var Service|MockObject */ private $configuration; @@ -78,7 +78,7 @@ public function tearDown(): void * * @return Manager|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { $r = $this->getMockBuilder(Manager::class) ->setConstructorArgs( @@ -92,7 +92,7 @@ public function sut($methods = null) $this->userRepository, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); return $r; @@ -141,7 +141,7 @@ public function createAdiUser_itMapsRoles() $userGuid = 'e16d5d9c-xxxx-xxxx-9b8b-969fdf4b2702'; - $attributes = new Attributes(array(), array('objectguid' => $userGuid)); + $attributes = new Attributes([], array('objectguid' => $userGuid)); $sut = $this->sut(); $this->roleManager->expects($this->once()) @@ -164,7 +164,7 @@ public function createAdiUser_itFindsUserByObjectGuid() $wpUser->ID = 1; $wpUser->user_login = 'username'; - $ldapAttributes = new Attributes(array(), array('samAccountName' => 'username', 'objectguid' => '666-666')); + $ldapAttributes = new Attributes([], array('samAccountName' => 'username', 'objectguid' => '666-666')); $credentials = PrincipalResolver::createCredentials("username@test.ad", "password"); $this->userRepository->expects($this->once()) @@ -186,7 +186,7 @@ public function createAdiUser_itFindsUserByObjectGuid() public function GH_188_createAdiUser_itFallsbackToLocalUserResolver() { $credentials = PrincipalResolver::createCredentials("username@test.ad", "password"); - $ldapAttributes = new Attributes(array(), array('samAccountName' => 'username', 'objectguid' => '666-666')); + $ldapAttributes = new Attributes([], array('samAccountName' => 'username', 'objectguid' => '666-666')); $sut = $this->sut(array('createDefaultLocalUserResolver')); $localUserResolver = $this->createMock(LocalUserResolver::class); @@ -246,7 +246,7 @@ public function GH_188_createAdiUser_itDiscardsUserWithNonMatchingGuids() public function createAdiUser_itCopiesCredentialValues() { $credentials = PrincipalResolver::createCredentials("username@test.ad", "password"); - $sut = $this->sut(array('findByUsername')); + $sut = $this->sut(); $ldapAttributes = new Attributes(); $actual = $sut->createAdiUser($credentials, $ldapAttributes); @@ -299,7 +299,7 @@ public function GH_188_createDefaultLocalUserResolver_itHasLdapResolverIfLdapAtt */ public function create_itUpdatesThePassword() { - $sut = $this->sut(array('checkDuplicateEmail', 'update')); + $sut = $this->sut(array('update')); $adiUser = $this->createMock(User::class); $credentials = $this->createMock(Credentials::class); @@ -333,7 +333,7 @@ public function create_itUpdatesThePassword() */ public function create_itUsesUserPrincipalNameAsUserLogin_whenAppendSuffixToNewUserIsEnabled() { - $sut = $this->sut(array('checkDuplicateEmail', 'update', 'appendSuffixToNewUser')); + $sut = $this->sut(array('update')); $adiUser = $this->createMock(User::class); $credentials = $this->createMock(Credentials::class); @@ -343,7 +343,6 @@ public function create_itUsesUserPrincipalNameAsUserLogin_whenAppendSuffixToNewU $this->behave($credentials, 'getPassword', 'password'); $this->behave($credentials, 'getUserPrincipalName', 'userPrincipalName'); - $this->behave($sut, 'appendSuffixToNewUser', true); $this->behave($adiUser, 'getLdapAttributes', new Attributes()); $this->behave($this->userRepository, 'create', 100); @@ -363,7 +362,7 @@ public function create_itUsesUserPrincipalNameAsUserLogin_whenAppendSuffixToNewU */ public function create_itChecksForDuplicateMail() { - $sut = $this->sut(array('handleEmailAddressOfUser', 'update', 'appendSuffixToNewUser')); + $sut = $this->sut(array('handleEmailAddressOfUser', 'update')); $adiUser = $this->createMock(User::class); $credentials = $this->createMock(Credentials::class); @@ -371,7 +370,7 @@ public function create_itChecksForDuplicateMail() $this->behave($adiUser, 'getCredentials', $credentials); $this->behave($credentials, 'getPassword', 'password'); - $this->behave($adiUser, 'getLdapAttributes', new Attributes(array(), $ldapAttributes)); + $this->behave($adiUser, 'getLdapAttributes', new Attributes([], $ldapAttributes)); $this->behave($credentials, 'getUserPrincipalName', 'userprincipalname'); $this->behave($this->userRepository, 'create', 100); @@ -396,7 +395,7 @@ public function create_itChecksForDuplicateMail() */ public function create_itUpdatesTheAdiUsersId() { - $sut = $this->sut(array('checkDuplicateEmail', 'update', 'appendSuffixToNewUser')); + $sut = $this->sut(array('update')); $adiUser = $this->createMock(User::class); $credentials = $this->createMock(Credentials::class); @@ -578,7 +577,7 @@ public function update_itWritesTheUserMetaData() )); $rawLdapAttributes = array('cn' => array('common_name')); - $ldapAttributes = new Attributes(array(), $rawLdapAttributes); + $ldapAttributes = new Attributes([], $rawLdapAttributes); $adiUser = $this->createMock(User::class); $credentials = $this->createMock(Credentials::class); @@ -799,15 +798,15 @@ public function assertUserExisting_withUserIdSet_shouldNotThrowException() { $sut = $this->sut(); - $adiUser = $this->createMockWithMethods(User::class, array('getId', 'getUsername')); + $adiUser = $this->getMockBuilder(User::class) + ->disableOriginalConstructor() + ->onlyMethods(array('getId')) + ->getMock(); + $adiUser->expects($this->once()) ->method('getId') ->willReturn(1); - $adiUser->expects($this->never()) - ->method('getUsername') - ->willReturn('hugo'); - $this->exceptionUtil->shouldReceive('processWordPressError') ->never(); @@ -842,7 +841,7 @@ public function updateWordPressAccount_iiUpdatesAccountInformation() ); $credentials = PrincipalResolver::createCredentials('username'); - $adiUser = new User($credentials, new Attributes(array(), $attributes)); + $adiUser = new User($credentials, new Attributes([], $attributes)); $adiUser->setRoleMapping($roleMapping); $adiUser->setId($userId); @@ -964,7 +963,7 @@ public function filterDisallowedAttributes_itFiltersAttributes_whenNotPresentInW */ public function filterEmptyAttributes_withUserMetaEmptyOverwriteFalse_filtersAttributesWithEmptyValues() { - $sut = $this->sut(null); + $sut = $this->sut(); $telephonenumber = new Attribute(); $telephonenumber->setType('string'); @@ -989,7 +988,7 @@ public function filterEmptyAttributes_withUserMetaEmptyOverwriteFalse_filtersAtt */ public function filterEmptyAttributes_withUserMetaEmptyOverwriteTrue_doesNotFiltersAttributesWithEmptyValues() { - $sut = $this->sut(null); + $sut = $this->sut(); $telephonenumber = new Attribute(); $telephonenumber->setType('string'); @@ -1014,7 +1013,7 @@ public function filterEmptyAttributes_withUserMetaEmptyOverwriteTrue_doesNotFilt */ public function updateEmail_withInvalidEmail_doesNotTriggerAnyRepositoryMethods() { - $sut = $this->sut(array('getEmailForUpdate')); + $sut = $this->sut(); $adiUser = $this->createMock(User::class); @@ -1644,7 +1643,7 @@ public function migratePreviousVersion_itIgnoresSamAccountName_whenAlreadyMigrat */ public function isNAdiUser_userIsNAdiUser_SamAndUpnSet_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = (object)(array('ID' => 6)); @@ -1669,7 +1668,7 @@ public function isNAdiUser_userIsNAdiUser_SamAndUpnSet_returnTrue() */ public function isNAdiUser_userIsNoNAdiUser_NoSamOrUpnSet_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = (object)(array('ID' => 6)); @@ -1694,7 +1693,7 @@ public function isNAdiUser_userIsNoNAdiUser_NoSamOrUpnSet_returnFalse() */ public function isNAdiUser_userIsNAdiUser_samAccountNameSet_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = (object)(array('ID' => 6)); @@ -1719,7 +1718,7 @@ public function isNAdiUser_userIsNAdiUser_samAccountNameSet_returnTrue() */ public function isNAdiUser_userIsNAdiUser_userPrincipalNameSet_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = (object)(array('ID' => 6)); diff --git a/test/Nadi/User/Meta/Persistence/RepositoryTest.php b/test/Nadi/User/Meta/Persistence/RepositoryTest.php index b2ad066..dac85e4 100644 --- a/test/Nadi/User/Meta/Persistence/RepositoryTest.php +++ b/test/Nadi/User/Meta/Persistence/RepositoryTest.php @@ -2,14 +2,14 @@ namespace Dreitier\Nadi\User\Meta\Persistence; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Sebastian Weinert * @access private */ -class RepositoryTest extends BasicTest +class RepositoryTest extends BasicTestCase { public function setUp(): void { @@ -26,7 +26,7 @@ public function tearDown(): void */ public function find_delegatesCallToWordPressFunction() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('get_user_meta', array( 'args' => array(1, 'metaKey', false), @@ -43,7 +43,7 @@ public function find_delegatesCallToWordPressFunction() */ public function create_delegatesCallToWordPressFunction() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('add_user_meta', array( 'args' => array(1, 'metaKey', 'metaValue'), @@ -60,7 +60,7 @@ public function create_delegatesCallToWordPressFunction() */ public function update_delegatesCallToWordPressFunction() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('update_user_meta', array( 'args' => array(1, 'metaKey', 'metaValue'), @@ -77,7 +77,7 @@ public function update_delegatesCallToWordPressFunction() */ public function delete_delegatesCallToWordPressFunction() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('delete_user_meta', array( 'args' => array(1, 'metaKey'), @@ -103,11 +103,11 @@ public function disableUser_triggersCorrectMethods() $sut->expects($this->exactly(3)) ->method('update') - ->withConsecutive( + ->with(...self::withConsecutive( array(1, 'next_ad_int_user_disabled', true), array(1, 'next_ad_int_user_disabled_reason', 'reason'), array(1, 'next_ad_int_user_disabled_email', 'user_email') - ); + )); $sut->disableUser($wpUser, 'reason'); } @@ -124,10 +124,10 @@ public function enableUser_triggersCorrectMethods() $sut->expects($this->exactly(2)) ->method('update') - ->withConsecutive( + ->with(...self::withConsecutive( array(1, 'next_ad_int_user_disabled', false), array(1, 'next_ad_int_user_disabled_reason', '') - ); + )); $sut->expects($this->once()) ->method('delete') @@ -160,11 +160,11 @@ public function isUserDisabled_returnsExpectedResult() * * @return Repository|MockObject */ - private function sut($methods) + private function sut(array $methods = []) { return $this->getMockBuilder(Repository::class) - ->setConstructorArgs(array()) - ->setMethods($methods) + ->setConstructorArgs([]) + ->onlyMethods($methods) ->getMock(); } } \ No newline at end of file diff --git a/test/Nadi/User/Persistence/RepositoryTest.php b/test/Nadi/User/Persistence/RepositoryTest.php index 8f067a9..9b3cd71 100644 --- a/test/Nadi/User/Persistence/RepositoryTest.php +++ b/test/Nadi/User/Persistence/RepositoryTest.php @@ -4,7 +4,7 @@ use Dreitier\Nadi\Authentication\PrincipalResolver; use Dreitier\Nadi\User\User; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\WordPressErrorException; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Sebastian Weinert * @access private */ -class RepositoryTest extends BasicTest +class RepositoryTest extends BasicTestCase { /** @var WordPressErrorException|\Mockery\MockInterface */ private $exceptionUtil; @@ -91,7 +91,7 @@ public function findByEmail_delegatesCallToInternalMethod() */ public function findByKey_delegatesCallToWordPressFunction() { - $sut = $this->sut(array()); + $sut = $this->sut([]); $expected = $this->createMock(\WP_User::class); @@ -385,10 +385,10 @@ public function updateProperty_doesTriggerWordPressErrorPart() $wpUser = $this->createMock(\WP_User::class); $wpUser->display_name = 'display_name'; - $wpErrorMock = $this->createMockedObject(\WP_Error::class, array(), array('get_error_messages')); + $wpErrorMock = $this->createMockedObject(\WP_Error::class, [], array('get_error_messages')); $wpErrorMock->expects($this->once()) ->method('get_error_messages') - ->willReturn(array()); + ->willReturn([]); \WP_Mock::userFunction('wp_update_user', array( 'args' => array( @@ -419,9 +419,9 @@ public function create_withErrorOnCreation_throwsException() { $email = 'john.doe@test.ad'; - $sut = $this->sut(null); + $sut = $this->sut(); - $wpError = $this->createMockedObject(\WP_Error::class, array(), array('get_error_messages')); + $wpError = $this->createMockedObject(\WP_Error::class, [], array('get_error_messages')); $adiUser = $this->createMock(User::class); @@ -453,7 +453,7 @@ public function create_itReturnsResult() { $email = 'john.doe@test.ad'; - $sut = $this->sut(null); + $sut = $this->sut(); $adiUser = $this->createMock(User::class); @@ -484,12 +484,12 @@ public function create_itReturnsResult() */ public function update_itReturnswithErrorOnUpdate_returnsErrorObject() { - $sut = $this->sut(null); + $sut = $this->sut(); - $wpError = $this->createMockedObject(\WP_Error::class, array(), array('get_error_messages')); + $wpError = $this->createMockedObject(\WP_Error::class, [], array('get_error_messages')); $wpError->expects($this->once()) ->method('get_error_messages') - ->willReturn(array()); + ->willReturn([]); $adiUser = $this->createMock(User::class); @@ -508,12 +508,12 @@ public function update_itReturnswithErrorOnUpdate_returnsErrorObject() )); \WP_Mock::userFunction('wp_update_user', array( - 'args' => array(array()), + 'args' => array([]), 'times' => 1, 'return' => $wpError, )); - $actual = $sut->update($adiUser, array()); + $actual = $sut->update($adiUser, []); $this->assertEquals($wpError, $actual); } @@ -524,11 +524,11 @@ public function update_itReturnswithErrorOnUpdate_returnsErrorObject() * * @return Repository|MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(Repository::class) - ->setConstructorArgs(array()) - ->setMethods($methods) + ->setConstructorArgs([]) + ->onlyMethods($methods) ->getMock(); } } \ No newline at end of file diff --git a/test/Nadi/User/Profile/Ui/PreventEmailChangeTest.php b/test/Nadi/User/Profile/Ui/PreventEmailChangeTest.php index 2f6a717..8e55ee4 100644 --- a/test/Nadi/User/Profile/Ui/PreventEmailChangeTest.php +++ b/test/Nadi/User/Profile/Ui/PreventEmailChangeTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\User\Profile\Ui; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -11,7 +11,7 @@ * @author Tobias Hellmann * @access private */ -class PreventEmailChangeTest extends BasicTest +class PreventEmailChangeTest extends BasicTestCase { /* @var Service| MockObject */ private $configuration; @@ -32,7 +32,7 @@ public function tearDown(): void * * @return PreventEmailChange| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(PreventEmailChange::class) ->setConstructorArgs( @@ -40,7 +40,7 @@ public function sut($methods = null) $this->configuration ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -49,7 +49,7 @@ public function sut($methods = null) */ public function register_returnBecauseForbidden() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -64,7 +64,7 @@ public function register_returnBecauseForbidden() */ public function register_addActions() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -83,7 +83,7 @@ public function register_addActions() */ public function disableEmailField_echoExecuted() { - $sut = $this->sut(null); + $sut = $this->sut(); $user = (object)array( 'ID' => 1 @@ -113,7 +113,7 @@ public function disableEmailField_echoExecuted() */ public function disableEmailField_echoNotExecuted() { - $sut = $this->sut(null); + $sut = $this->sut(); $user = (object)array( 'ID' => 1 @@ -141,7 +141,7 @@ public function disableEmailField_echoNotExecuted() public function preventEmailChange() { - $sut = $this->sut(null); + $sut = $this->sut(); $user = (object)array( 'ID' => 1, @@ -178,7 +178,7 @@ public function preventEmailChange() 'times' => 1,) ); - $errors = (object)array(); + $errors = (object)[]; $sut->preventEmailChange($errors, null, $user); $this->assertEquals('test@company.it', $_POST['email']); @@ -191,10 +191,10 @@ public function preventEmailChange() */ public function ADI_670_disablePreventEmailChange_ifUserParameterIsMissing() { - $errors = (object)array(); + $errors = (object)[]; $user = (object)array('missing_ID' => -1); - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectFilterNotAdded('send_password_change_email', '__return_false'); @@ -206,7 +206,7 @@ public function ADI_670_disablePreventEmailChange_ifUserParameterIsMissing() */ public function addMissingEmailAddressToPOST_ReturnBecauseAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; $samaccountname = "testUser"; @@ -237,7 +237,7 @@ public function addMissingEmailAddressToPOST_ReturnBecauseAdmin() */ public function addMissingEmailAddressToPOST_ReturnBecauseNoSamaccountname() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; @@ -263,7 +263,7 @@ public function addMissingEmailAddressToPOST_ReturnBecauseNoSamaccountname() */ public function addMissingEmailAddressToPost() { - $sut = $this->sut(null); + $sut = $this->sut(); $user = (object)array( 'ID' => 1, diff --git a/test/Nadi/User/Profile/Ui/PreventPasswordChangeTest.php b/test/Nadi/User/Profile/Ui/PreventPasswordChangeTest.php index 130c713..2bc0217 100644 --- a/test/Nadi/User/Profile/Ui/PreventPasswordChangeTest.php +++ b/test/Nadi/User/Profile/Ui/PreventPasswordChangeTest.php @@ -4,7 +4,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\User\Manager; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; use WP_Mock; @@ -13,7 +13,7 @@ * @author Tobias Hellmann * @access private */ -class PreventPasswordChangeTest extends BasicTest +class PreventPasswordChangeTest extends BasicTestCase { /* @var Service | MockObject */ private $configuration; @@ -35,7 +35,7 @@ public function tearDown(): void } /* @return PreventPasswordChange| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(PreventPasswordChange::class) ->setConstructorArgs( @@ -44,7 +44,7 @@ public function sut($methods = null) $this->userManager ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -53,7 +53,7 @@ public function sut($methods = null) */ public function register_localPasswordChangeNotAllowed() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectFilterAdded('show_password_fields', array($sut, 'showPasswordFields'), 10, 2); @@ -65,7 +65,7 @@ public function register_localPasswordChangeNotAllowed() */ public function isPasswordChangeEnabled_delegatesToconfiguration() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -80,7 +80,7 @@ public function isPasswordChangeEnabled_delegatesToconfiguration() */ public function showPasswordFields_usesParentSetting_ifNoActiveDirectoryAccountIsGiven() { - $sut = $this->sut(null); + $sut = $this->sut(); $wpUser = (object)array('ID' => 666); diff --git a/test/Nadi/User/Profile/Ui/ProvideDisableUserOptionTest.php b/test/Nadi/User/Profile/Ui/ProvideDisableUserOptionTest.php index 11a4b67..df2cf2f 100644 --- a/test/Nadi/User/Profile/Ui/ProvideDisableUserOptionTest.php +++ b/test/Nadi/User/Profile/Ui/ProvideDisableUserOptionTest.php @@ -4,7 +4,7 @@ use Dreitier\Nadi\User\Manager; use Dreitier\Nadi\Vendor\Twig\Environment; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\View\TwigContainer; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Tobias Hellmann * @access private */ -class ProvideDisableUserOptionTest extends BasicTest +class ProvideDisableUserOptionTest extends BasicTestCase { /* @var TwigContainer| MockObject */ private $twigContainer; @@ -41,7 +41,7 @@ public function tearDown(): void * * @return ProvideDisableUserOption| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ProvideDisableUserOption::class) ->setConstructorArgs( @@ -50,7 +50,7 @@ public function sut($methods = null) $this->userManager, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -59,7 +59,7 @@ public function sut($methods = null) */ public function register() { - $sut = $this->sut(array('addOption', 'persistSanitized')); + $sut = $this->sut(array('addOption')); \WP_Mock::expectActionAdded('edit_user_profile', array($sut, 'addOption')); \WP_Mock::expectActionAdded('edit_user_profile_update', array($sut, 'saveOption'), 100, 1); @@ -73,7 +73,7 @@ public function register() */ public function addOption_userHasNotPermission() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'current_user_can', array( @@ -91,7 +91,7 @@ public function addOption_userHasNotPermission() */ public function addOption_returnBecauseAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); $user = (object)array( 'ID' => 1, @@ -114,7 +114,7 @@ public function addOption_returnBecauseAdmin() */ public function addOption_disableUserShowMessage() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $user = (object)array( @@ -171,7 +171,7 @@ public function addOption_disableUserShowMessage() */ public function saveOption_blockUser() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $userMessage = "User \"TestUser\" with ID \"2\" manually disabled by \"Admin\" with the ID \"1\"."; @@ -229,7 +229,7 @@ public function saveOption_blockUser() */ public function saveOption_unblockUser() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 2; $_POST[NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'user_disabled'] = '0'; diff --git a/test/Nadi/User/Profile/Ui/ShowLdapAttributesTest.php b/test/Nadi/User/Profile/Ui/ShowLdapAttributesTest.php index 6fad5ab..6841580 100644 --- a/test/Nadi/User/Profile/Ui/ShowLdapAttributesTest.php +++ b/test/Nadi/User/Profile/Ui/ShowLdapAttributesTest.php @@ -6,7 +6,7 @@ use Dreitier\Ldap\Attribute\Repository; use Dreitier\Nadi\Synchronization\ActiveDirectorySynchronizationService; use Dreitier\Nadi\Vendor\Twig\Environment; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\Multisite\View\TwigContainer; use PHPUnit\Framework\MockObject\MockObject; @@ -15,7 +15,7 @@ * @author Tobias Hellmann * @access private */ -class ShowLdapAttributesTest extends BasicTest +class ShowLdapAttributesTest extends BasicTestCase { /* @var Service|MockObject */ private $configuration; @@ -44,7 +44,7 @@ public function setUp(): void $this->twig = $this->getMockBuilder(Environment::class) ->disableOriginalConstructor() - ->setMethods(array('render'))// do not replace this line with ->disableProxyingToOriginalMethods() + ->onlyMethods(array('render'))// do not replace this line with ->disableProxyingToOriginalMethods() ->getMock(); \WP_Mock::setUp(); @@ -60,7 +60,7 @@ public function tearDown(): void * * @return ShowLdapAttributes|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ShowLdapAttributes::class) ->setConstructorArgs( @@ -71,7 +71,7 @@ public function sut($methods = null) $this->syncToActiveDirectory ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -81,7 +81,7 @@ public function sut($methods = null) */ public function register_AddAction() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectActionAdded('show_user_profile', array($sut, 'extendOwnProfile')); @@ -196,7 +196,7 @@ public function extendProfile_rendersView() */ public function createViewModel_createsData() { - $attributes = array(); + $attributes = []; $wpUser = (object)array( 'ID' => '123', ); @@ -235,7 +235,7 @@ public function createViewModel_createsData() */ public function createViewModel_containsSynchronizationUnavailableErrorMessage() { - $attributes = array(); + $attributes = []; $wpUser = (object)array( 'ID' => '123', ); @@ -264,7 +264,7 @@ public function createViewModel_containsSynchronizationUnavailableErrorMessage() */ public function createViewModel_containsRequirementForEnteringPassword() { - $attributes = array(); + $attributes = []; $wpUser = (object)array( 'ID' => '123', ); @@ -310,7 +310,7 @@ public function createAttributesViewModel_delegatesToCreateAttributeViewModel() */ public function createAttributeViewModel_withMetakey() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); $metaObject->setMetakey('m_key'); @@ -339,7 +339,7 @@ public function createAttributeViewModel_withMetakey() */ public function createAttributeViewModel_withoutMetakey() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); @@ -364,7 +364,7 @@ public function createAttributeViewModel_withoutMetakey() */ public function createAttributeViewModel_withDescription() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); $metaObject->setMetakey('m_key'); @@ -391,7 +391,7 @@ public function createAttributeViewModel_withDescription() */ public function createAttributeViewModel_withoutDescription() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); $metaObject->setMetakey('m_key'); @@ -418,7 +418,7 @@ public function createAttributeViewModel_withoutDescription() */ public function createAttributeViewModel_withTypeList() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); $metaObject->setType('list'); @@ -437,7 +437,7 @@ public function createAttributeViewModel_withTypeList() */ public function createAttributeViewModel_withTypeString() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); $metaObject->setType('string'); @@ -456,7 +456,7 @@ public function createAttributeViewModel_withTypeString() */ public function createAttributeViewModel_withoutTypeList() { - $sut = $this->sut(null); + $sut = $this->sut(); $metaObject = new Attribute(); $metaObject->setType('string'); diff --git a/test/Nadi/User/Profile/Ui/TriggerActiveDirectorySynchronizationTest.php b/test/Nadi/User/Profile/Ui/TriggerActiveDirectorySynchronizationTest.php index 350d81a..767c888 100644 --- a/test/Nadi/User/Profile/Ui/TriggerActiveDirectorySynchronizationTest.php +++ b/test/Nadi/User/Profile/Ui/TriggerActiveDirectorySynchronizationTest.php @@ -8,7 +8,7 @@ use Dreitier\Ldap\Attributes; use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Synchronization\ActiveDirectorySynchronizationService; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -16,7 +16,7 @@ * @author Tobias Hellmann * @access private */ -class TriggerActiveDirectorySynchronizationTest extends BasicTest +class TriggerActiveDirectorySynchronizationTest extends BasicTestCase { /* @var Service | MockObject */ private $configuration; @@ -45,7 +45,7 @@ public function tearDown(): void * * @return TriggerActiveDirectorySynchronization|MockObject */ - public function sut($methods = null, $errors = array()) + public function sut(array $methods = [], $errors = []) { return $this->getMockBuilder(TriggerActiveDirectorySynchronization::class) ->setConstructorArgs( @@ -56,7 +56,7 @@ public function sut($methods = null, $errors = array()) $errors ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -65,7 +65,7 @@ public function sut($methods = null, $errors = array()) */ public function register_addsWordPressHooks() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectActionAdded('personal_options_update', array($sut, 'updateOwnProfile')); \WP_Mock::expectActionAdded('edit_user_profile_update', array($sut, 'updateForeignProfile')); @@ -220,7 +220,7 @@ public function updateProfile_triggersSynchronizationToActiveDirectory() */ public function updateWordPressProfile_triggers_update_user_meta() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; @@ -324,7 +324,7 @@ public function createLdapConnectionDetails_withCustomPassword_returnConnectionD $user->ID = 1; \WP_Mock::userFunction('get_user_meta', array( - 'args' => array($user->ID,NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'userprincipalname', true), + 'args' => array($user->ID, NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'userprincipalname', true), 'times' => 1, 'return' => 'user@test.ad', )); @@ -352,7 +352,7 @@ public function createLdapConnectionDetails_withCustomPassword_returnConnectionD */ public function triggerSyncToActiveDirectory_usesTheCustomPassword() { - $sut = $this->sut(array('createLdapConnectionDetails', 'synchronize')); + $sut = $this->sut(array('createLdapConnectionDetails')); $username = 'testUser'; $wpUserdata = (object)array('user_login' => 'username'); @@ -399,7 +399,7 @@ public function triggerSyncToActiveDirectory_startsSynchronization() ->with(666, 'serviceUsername', 'servicePassword') ->willReturn(true); - $actual = $sut->triggerSyncToActiveDirectory(666, array()); + $actual = $sut->triggerSyncToActiveDirectory(666, []); $this->assertTrue($actual); } @@ -417,11 +417,11 @@ public function triggerSyncToActiveDirectory_withUseServiceAccountAndNoCredentia $this->configuration->expects($this->exactly(3)) ->method('getOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::SYNC_TO_AD_USE_GLOBAL_USER), array(Options::SYNC_TO_AD_GLOBAL_USER), array(Options::SYNC_TO_AD_GLOBAL_PASSWORD) - ) + )) ->will( $this->onConsecutiveCalls( true, @@ -446,7 +446,7 @@ public function triggerSyncToActiveDirectory_withUseServiceAccountAndNoCredentia ->with(666, 'serviceUsername', 'servicePassword') ->willReturn(true); - $actual = $sut->triggerSyncToActiveDirectory(666, array()); + $actual = $sut->triggerSyncToActiveDirectory(666, []); $this->assertFalse($actual); } @@ -460,7 +460,7 @@ public function generateError() array('code2', 'message2', 'data2'), ); - $sut = $this->sut(null, $errors); + $sut = $this->sut([], $errors); $error = new \WP_Error(); diff --git a/test/Nadi/User/ResolveLocalUserTest.php b/test/Nadi/User/ResolveLocalUserTest.php index 31d04d7..d4d8e92 100644 --- a/test/Nadi/User/ResolveLocalUserTest.php +++ b/test/Nadi/User/ResolveLocalUserTest.php @@ -10,7 +10,7 @@ use Dreitier\Nadi\Configuration\Options; use Dreitier\Nadi\Log\NadiLog; use Dreitier\Nadi\Role\Mapping; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\WordPressErrorException; use Hoa\Protocol\Bin\Resolve; @@ -20,7 +20,7 @@ * @author Christopher Klein * @access private */ -class ResolveLocalUserTest extends BasicTest +class ResolveLocalUserTest extends BasicTestCase { public function setUp(): void { diff --git a/test/Nadi/User/Ui/ExtendUserListTest.php b/test/Nadi/User/Ui/ExtendUserListTest.php index ee55751..7cf4f23 100644 --- a/test/Nadi/User/Ui/ExtendUserListTest.php +++ b/test/Nadi/User/Ui/ExtendUserListTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Nadi\User\Ui; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Util; use Dreitier\WordPress\Multisite\Configuration\Service; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Tobias Hellmann * @access private */ -class ExtendUserListTest extends BasicTest +class ExtendUserListTest extends BasicTestCase { /* @var Service | MockObject */ private $configuration; @@ -26,7 +26,7 @@ public function setUp(): void $this->configuration = $this->getMockBuilder(Service::class) ->disableOriginalConstructor() - ->setMethods(array('getOptionValue')) + ->onlyMethods(array('getOptionValue')) ->getMock(); // mock native functions @@ -44,7 +44,7 @@ public function tearDown(): void */ public function register_showUserStatusFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -59,7 +59,7 @@ public function register_showUserStatusFalse() * * @return ExtendUserList|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ExtendUserList::class) ->setConstructorArgs( @@ -67,7 +67,7 @@ public function sut($methods = null) $this->configuration ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -76,7 +76,7 @@ public function sut($methods = null) */ public function register_itAddsFilters() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->configuration->expects($this->once()) ->method('getOptionValue') @@ -94,10 +94,10 @@ public function register_itAddsFilters() */ public function addColumns() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); - $columns = array(); + $columns = []; $filledColumns = array( $sut->__columnIsAdiUser() => 'NADI User', @@ -125,7 +125,7 @@ public function addColumns_withCrmPeActivated() ->method('__columnManagedByCrmPe') ->willReturn('pe_crm_is_managed_by_pe_1'); - $columns = array(); + $columns = []; $filledColumns = array( $sut->__columnIsAdiUser() => 'NADI User', @@ -172,7 +172,7 @@ public function addContent_rendersDisabledReason() */ public function renderUsernameColumn_itAddsPlaceholder() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; @@ -194,7 +194,7 @@ public function renderUsernameColumn_itAddsPlaceholder() */ public function renderUsernameColumn_itAddsAnEmptyString() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; @@ -217,7 +217,7 @@ public function renderUsernameColumn_itAddsAnEmptyString() */ public function renderDisabledColumn_itShowsDisablingReason() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; @@ -276,7 +276,7 @@ public function renderManagedByCrmPeColumn_itShowsIfPremiumExtensionCRMIsEnabled */ public function renderDisabledColumn_itShowEmptyString() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; @@ -306,7 +306,7 @@ public function renderDisabledColumn_itShowEmptyString() */ public function addContent_noCase_doNotAlterValuesFromOtherColumns() { - $sut = $this->sut(null); + $sut = $this->sut(); $userId = 1; diff --git a/test/PHPUnitHelper.php b/test/PHPUnitHelper.php new file mode 100644 index 0000000..2822f4f --- /dev/null +++ b/test/PHPUnitHelper.php @@ -0,0 +1,54 @@ + $firstCallArguments + * @param array ...$consecutiveCallsArguments + * + * @return iterable> + */ + public static function withConsecutive(array $firstCallArguments, array ...$consecutiveCallsArguments): iterable + { + foreach ($consecutiveCallsArguments as $consecutiveCallArguments) { + self::assertSameSize($firstCallArguments, $consecutiveCallArguments, 'Each expected arguments list need to have the same size.'); + } + + $allConsecutiveCallsArguments = [$firstCallArguments, ...$consecutiveCallsArguments]; + + $numberOfArguments = count($firstCallArguments); + $argumentList = []; + for ($argumentPosition = 0; $argumentPosition < $numberOfArguments; $argumentPosition++) { + $argumentList[$argumentPosition] = array_column($allConsecutiveCallsArguments, $argumentPosition); + } + + $mockedMethodCall = 0; + $callbackCall = 0; + foreach ($argumentList as $index => $argument) { + yield new Callback( + static function (mixed $actualArgument) use ($argumentList, &$mockedMethodCall, &$callbackCall, $index, $numberOfArguments): bool { + $expected = $argumentList[$index][$mockedMethodCall] ?? null; + + $callbackCall++; + $mockedMethodCall = (int) ($callbackCall / $numberOfArguments); + + if ($expected instanceof Constraint) { + self::assertThat($actualArgument, $expected); + } else { + self::assertEquals($expected, $actualArgument); + } + + return true; + }, + ); + } + } +} diff --git a/test/Util/ArrayUtilTest.php b/test/Util/ArrayUtilTest.php index ec11ca8..75b0ee7 100644 --- a/test/Util/ArrayUtilTest.php +++ b/test/Util/ArrayUtilTest.php @@ -2,13 +2,13 @@ namespace Dreitier\Util; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann * @access private */ -class ArrayUtilTest extends BasicTest +class ArrayUtilTest extends BasicTestCase { /** * @test @@ -111,7 +111,7 @@ public function filter_withPreserveKeysTrue_returnsExpectedResult() */ public function findFirstOrDefault_withoutElementsAndWithoutDefault_returnsNull() { - $actual = ArrayUtil::findFirstOrDefault(array()); + $actual = ArrayUtil::findFirstOrDefault([]); $this->assertNull($actual); } @@ -121,7 +121,7 @@ public function findFirstOrDefault_withoutElementsAndWithoutDefault_returnsNull( */ public function findFirstOrDefault_withoutElementsAndWithDefault_returnsDefault() { - $actual = ArrayUtil::findFirstOrDefault(array(), false); + $actual = ArrayUtil::findFirstOrDefault([], false); $this->assertFalse($actual); } diff --git a/test/Util/EncryptionTest.php b/test/Util/EncryptionTest.php index ba501f5..3063b1a 100644 --- a/test/Util/EncryptionTest.php +++ b/test/Util/EncryptionTest.php @@ -2,13 +2,13 @@ namespace Dreitier\Util; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann * @access private */ -class EncryptionTest extends BasicTest +class EncryptionTest extends BasicTestCase { /* @var Encryption $enryptionHandler */ private $encryptionHandler; diff --git a/test/Util/EscapeUtilTest.php b/test/Util/EscapeUtilTest.php index 9e17d27..ee75823 100644 --- a/test/Util/EscapeUtilTest.php +++ b/test/Util/EscapeUtilTest.php @@ -2,13 +2,13 @@ namespace Dreitier\Util; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann * @access private */ -class EscapeUtilTest extends BasicTest +class EscapeUtilTest extends BasicTestCase { /** * @test @@ -54,7 +54,7 @@ public function escapeHarmfulHtml_withHarmlessTag_keepHarmlessTag() /** * @test */ - public function escapeHarmfulHtml_withArray_escapeStringsInArray() + public function escapeHarmfulHtml_withArray_escapeStringsInArrray() { $raw = array( 'hi', diff --git a/test/Util/Session/SessionHandlerTest.php b/test/Util/Session/SessionHandlerTest.php index ff5fd8f..41ce9a6 100644 --- a/test/Util/Session/SessionHandlerTest.php +++ b/test/Util/Session/SessionHandlerTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Util\Session; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Internal\Native; use Dreitier\Util\Util; use PHPUnit\Framework\MockObject\MockObject; @@ -13,7 +13,7 @@ * @author Sebastian Weinert * @author Danny Meißner */ -class SessionHandlerTest extends BasicTest +class SessionHandlerTest extends BasicTestCase { /* @var Native|\Mockery\MockInterface */ @@ -38,11 +38,11 @@ public function tearDown(): void /** * @return SessionHandler|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(SessionHandler::class) ->disableOriginalConstructor() - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function getInstance_startSession() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->internalNative->expects($this->once()) ->method('getSessionId') @@ -68,7 +68,7 @@ public function getInstance_startSession() */ public function getInstance_dontStartSession() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->internalNative->expects($this->once()) ->method('getSessionId') @@ -147,7 +147,7 @@ public function clearValue_withKey_unsetKey() $key = 'testKey'; $_SESSION[NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . $key] = 'value'; - $sut = $this->sut(null); + $sut = $this->sut(); $sut->clearValue($key); diff --git a/test/Util/StringUtilTest.php b/test/Util/StringUtilTest.php index 7bf9951..e0d7adc 100644 --- a/test/Util/StringUtilTest.php +++ b/test/Util/StringUtilTest.php @@ -2,13 +2,13 @@ namespace Dreitier\Util; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Tobias Hellmann * @access private */ -class StringUtilTest extends BasicTest +class StringUtilTest extends BasicTestCase { /** * @test diff --git a/test/Util/UninstallerTest.php b/test/Util/UninstallerTest.php index af30a36..ac25cf5 100644 --- a/test/Util/UninstallerTest.php +++ b/test/Util/UninstallerTest.php @@ -2,10 +2,11 @@ namespace Dreitier\Util; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; +use Dreitier\Test\CallableMock; use PHPUnit\Framework\MockObject\MockObject; -class UninstallerTest extends BasicTest +class UninstallerTest extends BasicTestCase { public function setUp(): void { @@ -24,10 +25,10 @@ public function tearDown(): void /** * @return Uninstaller| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Uninstaller::class) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -41,7 +42,7 @@ public function getAllOptionTables_withSingleSite_returnDefaultTable() 'options' => 'wp_options' ); - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -87,13 +88,13 @@ public function getAllOptionTables_withMultiSite_returnAllTables() public function deleteAllEntriesFromTable_shouldExecuteSQLQuery() { global $wpdb; - $wpdb = $this->createMockWithMethods('BlueprintClass', array('query')); + $wpdb = $this->createMock(CallableMock::class); $sut = $this->sut(); $wpdb->expects($this->once()) - ->method('query') - ->with("DELETE FROM wp_options WHERE option_name LIKE 'next_ad_int_%';"); + ->method('__call') + ->with("query", ["DELETE FROM wp_options WHERE option_name LIKE 'next_ad_int_%';"]); $sut->deleteAllEntriesFromTable('wp_options', 'option_name'); } @@ -121,9 +122,10 @@ public function removePluginSettings_fromSingleSite_callMethodsInRightOrder() $sut->expects($this->exactly(2)) ->method('deleteAllEntriesFromTable') - ->withConsecutive( + ->with(...self::withConsecutive( array('wp_options', 'option_name'), - array('wp_usermeta', 'meta_key')); + array('wp_usermeta', 'meta_key')) + ); $sut->removePluginSettings(); } @@ -152,11 +154,12 @@ public function removePluginSettings_fromMultiSite_callMethodsInRightOrder() $sut->expects($this->exactly(4)) ->method('deleteAllEntriesFromTable') - ->withConsecutive( + ->with(...self::withConsecutive( array('wp_options', 'option_name'), array('wp_2_options', 'option_name'), array('wp_sitemeta', 'meta_key'), - array('wp_usermeta', 'meta_key')); + array('wp_usermeta', 'meta_key')) + ); $sut->removePluginSettings(); } diff --git a/test/Util/Validator/ResultTest.php b/test/Util/Validator/ResultTest.php index bed476c..b5ba871 100644 --- a/test/Util/Validator/ResultTest.php +++ b/test/Util/Validator/ResultTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Util\Validator; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** @@ -11,7 +11,7 @@ * @author Danny Meißner * @access private */ -class ResultTest extends BasicTest +class ResultTest extends BasicTestCase { public function setUp(): void { @@ -26,10 +26,10 @@ public function tearDown(): void /** * @return Result| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Result::class) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -38,7 +38,7 @@ public function sut($methods = null) */ public function isValid_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $sut->addValidationResult( 'sync_to_ad_global_user', 'Username has to contain a suffix.' @@ -54,7 +54,7 @@ public function isValid_returnFalse() */ public function isValid_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isValid(); diff --git a/test/Util/Validator/Rule/ConditionalTest.php b/test/Util/Validator/Rule/ConditionalTest.php index d3218ae..fcf0c96 100644 --- a/test/Util/Validator/Rule/ConditionalTest.php +++ b/test/Util/Validator/Rule/ConditionalTest.php @@ -2,10 +2,10 @@ namespace Dreitier\Util\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; -class ConditionalTest extends BasicTest +class ConditionalTest extends BasicTestCase { public function setUp(): void { @@ -23,7 +23,7 @@ public function tearDown(): void * * @return Conditional|MockObject */ - public function sut($methods = null, $rules = array()) + public function sut(array $methods = [], array $rules = []) { return $this->getMockBuilder(Conditional::class) ->setConstructorArgs(array( @@ -31,7 +31,7 @@ public function sut($methods = null, $rules = array()) 'sync_to_wordpress_enabled' => true, ), )) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -41,7 +41,7 @@ public function sut($methods = null, $rules = array()) public function validate_withConditionsTrue_executesAllRules() { $value = ''; - $data = array(); + $data = []; $ruleOne = $this->createMock(RuleAdapter::class); $ruleTwo = $this->createMock(RuleAdapter::class); @@ -70,7 +70,7 @@ public function validate_withConditionsTrue_executesAllRules() public function validate_withFirstRuleInvalid_doesNotExecuteOtherRules() { $value = ''; - $data = array(); + $data = []; $ruleOne = $this->createMock(RuleAdapter::class); $ruleTwo = $this->createMock(RuleAdapter::class); @@ -102,7 +102,7 @@ public function validate_withConditionsFalse_returnsTrue() $this->behave($sut, 'areConditionsTrue', false); - $result = $sut->validate('', array()); + $result = $sut->validate('', []); $this->assertTrue($result); } diff --git a/test/Util/Validator/Rule/HasSuffixTest.php b/test/Util/Validator/Rule/HasSuffixTest.php index 289676d..6b32aab 100644 --- a/test/Util/Validator/Rule/HasSuffixTest.php +++ b/test/Util/Validator/Rule/HasSuffixTest.php @@ -2,11 +2,11 @@ namespace Dreitier\Util\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; -class HasSuffixTest extends BasicTest +class HasSuffixTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Username has to contain a suffix.'; @@ -25,7 +25,7 @@ public function tearDown(): void * * @return HasSuffix|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(HasSuffix::class) ->setConstructorArgs( @@ -33,7 +33,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, '@', ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -44,7 +44,7 @@ public function validate_withEmptyMessage_returnTrue() { $sut = $this->sut(); - $actual = $sut->validate('', array()); + $actual = $sut->validate('', []); $this->assertTrue($actual); } @@ -54,9 +54,9 @@ public function validate_withEmptyMessage_returnTrue() */ public function validate_returnMessage() { - $sut = $this->sut(null); + $sut = $this->sut(); - $actual = $sut->validate('Administrator', array()); + $actual = $sut->validate('Administrator', []); $this->assertEquals(array(Type::ERROR => self::VALIDATION_MESSAGE), $actual); } @@ -66,9 +66,9 @@ public function validate_returnMessage() */ public function validate_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); - $actual = $sut->validate('Administrator@test.ad', array()); + $actual = $sut->validate('Administrator@test.ad', []); $this->assertTrue($actual); } @@ -78,7 +78,7 @@ public function validate_returnTrue() */ public function getMsg() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->getMsg(); diff --git a/test/Util/Validator/Rule/NotEmptyOrWhitespaceTest.php b/test/Util/Validator/Rule/NotEmptyOrWhitespaceTest.php index 4ec5b81..642625d 100644 --- a/test/Util/Validator/Rule/NotEmptyOrWhitespaceTest.php +++ b/test/Util/Validator/Rule/NotEmptyOrWhitespaceTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Util\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class NotEmptyOrWhitespaceTest extends BasicTest +class NotEmptyOrWhitespaceTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Validation failed.'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return NotEmptyOrWhitespace|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(NotEmptyOrWhitespace::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function validate_withEmptyString_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "", @@ -66,7 +66,7 @@ public function validate_withEmptyString_returnString() */ public function validate_withWhitespaceOnly_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( " ", @@ -81,7 +81,7 @@ public function validate_withWhitespaceOnly_returnString() */ public function validate_withWhitespacesAndLetters_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( " test ", @@ -96,7 +96,7 @@ public function validate_withWhitespacesAndLetters_returnTrue() */ public function validate_withLettersOnly_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "test", diff --git a/test/Util/Validator/Rule/NumericTest.php b/test/Util/Validator/Rule/NumericTest.php index e38eadb..3dc6915 100644 --- a/test/Util/Validator/Rule/NumericTest.php +++ b/test/Util/Validator/Rule/NumericTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Util\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class NumericTest extends BasicTest +class NumericTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Validation failed.'; @@ -34,7 +34,7 @@ public function tearDown(): void * * @return Numeric|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Numeric::class) ->setConstructorArgs( @@ -42,7 +42,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -51,7 +51,7 @@ public function sut($methods = null) */ public function validate_withString_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( "test", @@ -66,7 +66,7 @@ public function validate_withString_returnString() */ public function validate_withNumeric_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( 123, @@ -81,7 +81,7 @@ public function validate_withNumeric_returnTrue() */ public function isNegative_withNegativeNumeric_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isNegative(-123); @@ -93,7 +93,7 @@ public function isNegative_withNegativeNumeric_returnTrue() */ public function isNegative_withPositiveNumeric_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isNegative(123); @@ -106,7 +106,7 @@ public function isNegative_withPositiveNumeric_returnFalse() */ public function isPositive_withPositiveNumeric_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isPositive(123); @@ -118,7 +118,7 @@ public function isPositive_withPositiveNumeric_returnTrue() */ public function isPositive_withNegativeNumeric_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isPositive(-123); @@ -130,7 +130,7 @@ public function isPositive_withNegativeNumeric_returnFalse() */ public function isFloat_withFloatNumeric_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isFloat(123.4); @@ -142,7 +142,7 @@ public function isFloat_withFloatNumeric_returnTrue() */ public function isFloat_withoutFloatNumeric_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isFloat(123); @@ -154,7 +154,7 @@ public function isFloat_withoutFloatNumeric_returnFalse() */ public function isZero_withZero_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isZero(0); @@ -166,7 +166,7 @@ public function isZero_withZero_returnTrue() */ public function isZero_withNumeric_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isZero(123); diff --git a/test/Util/Validator/Rule/PositiveNumericOrZeroTest.php b/test/Util/Validator/Rule/PositiveNumericOrZeroTest.php index 62fcc78..70c7dfc 100644 --- a/test/Util/Validator/Rule/PositiveNumericOrZeroTest.php +++ b/test/Util/Validator/Rule/PositiveNumericOrZeroTest.php @@ -3,7 +3,7 @@ namespace Dreitier\Util\Validator\Rule; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Message\Type; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * * @access */ -class PositiveNumericOrZeroTest extends BasicTest +class PositiveNumericOrZeroTest extends BasicTestCase { const VALIDATION_MESSAGE = 'Validation failed!'; @@ -35,7 +35,7 @@ public function tearDown(): void * * @return PositiveNumericOrZero|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(PositiveNumericOrZero::class) ->setConstructorArgs( @@ -43,7 +43,7 @@ public function sut($methods = null) self::VALIDATION_MESSAGE ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -52,7 +52,7 @@ public function sut($methods = null) */ public function validate_withPositiveNumeric_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( 2, @@ -67,7 +67,7 @@ public function validate_withPositiveNumeric_returnTrue() */ public function validate_withZero_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( 0, @@ -82,7 +82,7 @@ public function validate_withZero_returnTrue() */ public function validate_withNegativeNumeric_returnString() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validate( -123456789, diff --git a/test/Util/Validator/ValidatorTest.php b/test/Util/Validator/ValidatorTest.php index 6b1ae8c..6f9c276 100644 --- a/test/Util/Validator/ValidatorTest.php +++ b/test/Util/Validator/ValidatorTest.php @@ -2,7 +2,7 @@ namespace Dreitier\Util\Validator; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Validator\Rule\HasSuffix; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Danny Meißner * @access private */ -class ValidatorTest extends BasicTest +class ValidatorTest extends BasicTestCase { public function setUp(): void @@ -29,10 +29,10 @@ public function tearDown(): void * * @return Validator| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Validator::class) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -56,7 +56,7 @@ public function validate_returnResult() ) ); - $sut = $this->sut(null); + $sut = $this->sut(); $sut->addRule('sync_to_ad_global_user', $suffixRule); $actual = $sut->validate($data); diff --git a/test/WordPress/Multisite/Configuration/Persistence/BlogConfigurationRepositoryTest.php b/test/WordPress/Multisite/Configuration/Persistence/BlogConfigurationRepositoryTest.php index a239e1f..38a8303 100644 --- a/test/WordPress/Multisite/Configuration/Persistence/BlogConfigurationRepositoryTest.php +++ b/test/WordPress/Multisite/Configuration/Persistence/BlogConfigurationRepositoryTest.php @@ -3,7 +3,7 @@ namespace Dreitier\WordPress\Multisite\Configuration\Persistence; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\Util\Encryption; use Dreitier\WordPress\Multisite\Configuration\Service; use Dreitier\WordPress\Multisite\Option\Attribute; @@ -15,7 +15,7 @@ * @author Tobias Hellmann * @access private */ -class BlogConfigurationRepositoryTest extends BasicTest +class BlogConfigurationRepositoryTest extends BasicTestCase { /* @var Sanitizer|MockObject $attributes */ private $sanitizer; @@ -55,7 +55,7 @@ public function tearDown(): void * @param array $customConstructorArgs * @return BlogConfigurationRepository|MockObject */ - public function sut($methods, $customConstructorArgs = []) + public function sut(array $methods = [], $customConstructorArgs = []) { return $this->getMockBuilder(BlogConfigurationRepository::class) ->setConstructorArgs( @@ -67,7 +67,7 @@ public function sut($methods, $customConstructorArgs = []) $this->defaultProfileRepository, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -93,7 +93,7 @@ public function findAllSanitized_getValuesForAllOptions_delegateToMethod() */ public function findAllSanitized_invalidOptionName_returnNull() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->findSanitizedValue(5, BlogConfigurationRepository::PROFILE_ID); $this->assertEquals(null, $actual); } @@ -397,7 +397,7 @@ public function find_multiSite_returnBlogOptionValue() */ public function persistSanitized_invalidOptionName_returnNull() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = $sut->persistSanitizedValue(5, BlogConfigurationRepository::PROFILE_ID, ''); $this->assertEquals(null, $value); @@ -763,10 +763,10 @@ public function deleteProfileAssociations_delegateToMethod_returnProfileId() $sut->expects($this->exactly(2)) ->method('findRawValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(1, BlogConfigurationRepository::PROFILE_ID), array(3, BlogConfigurationRepository::PROFILE_ID) - ) + )) ->will($this->onConsecutiveCalls(7, 9)); $sut->expects($this->once()) @@ -781,7 +781,7 @@ public function deleteProfileAssociations_delegateToMethod_returnProfileId() */ public function getSites_multiSite_returnDummy() { - $sut = $this->sut(null); + $sut = $this->sut(); $sites = array( array( @@ -813,7 +813,7 @@ public function getSites_multiSite_returnDummy() */ public function getSites_singleSite_returnSites() { - $sut = $this->sut(null); + $sut = $this->sut(); $sites = array( array( diff --git a/test/WordPress/Multisite/Configuration/Persistence/DefaultProfileRepositoryTest.php b/test/WordPress/Multisite/Configuration/Persistence/DefaultProfileRepositoryTest.php index 0885add..699e5f4 100644 --- a/test/WordPress/Multisite/Configuration/Persistence/DefaultProfileRepositoryTest.php +++ b/test/WordPress/Multisite/Configuration/Persistence/DefaultProfileRepositoryTest.php @@ -2,14 +2,14 @@ namespace Dreitier\WordPress\Multisite\Configuration\Persistence; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Sebastian Weinert * @access private */ -class DefaultProfileRepositoryTest extends BasicTest +class DefaultProfileRepositoryTest extends BasicTestCase { public function setUp(): void { @@ -26,11 +26,11 @@ public function tearDown(): void * * @return DefaultProfileRepository|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(DefaultProfileRepository::class) - ->setConstructorArgs(array()) - ->setMethods($methods) + ->setConstructorArgs([]) + ->onlyMethods($methods) ->getMock(); } diff --git a/test/WordPress/Multisite/Configuration/Persistence/ProfileConfigurationRepositoryTest.php b/test/WordPress/Multisite/Configuration/Persistence/ProfileConfigurationRepositoryTest.php index fbbfe4e..77fc736 100644 --- a/test/WordPress/Multisite/Configuration/Persistence/ProfileConfigurationRepositoryTest.php +++ b/test/WordPress/Multisite/Configuration/Persistence/ProfileConfigurationRepositoryTest.php @@ -3,14 +3,14 @@ namespace Dreitier\WordPress\Multisite\Configuration\Persistence; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Option\Attribute; use Dreitier\WordPress\Multisite\Option\Encryption; use Dreitier\WordPress\Multisite\Option\Provider; use Dreitier\WordPress\Multisite\Option\Sanitizer; use PHPUnit\Framework\MockObject\MockObject; -class ProfileConfigurationRepositoryTest extends BasicTest +class ProfileConfigurationRepositoryTest extends BasicTestCase { /* @var Sanitizer|MockObject $sanitizer */ private $sanitizer; @@ -39,7 +39,7 @@ public function tearDown(): void * * @return ProfileConfigurationRepository|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { return $this->getMockBuilder(ProfileConfigurationRepository::class) ->setConstructorArgs( @@ -49,7 +49,7 @@ public function sut($methods) $this->optionProvider ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } diff --git a/test/WordPress/Multisite/Configuration/Persistence/ProfileRepositoryTest.php b/test/WordPress/Multisite/Configuration/Persistence/ProfileRepositoryTest.php index 0e5abad..e58537e 100644 --- a/test/WordPress/Multisite/Configuration/Persistence/ProfileRepositoryTest.php +++ b/test/WordPress/Multisite/Configuration/Persistence/ProfileRepositoryTest.php @@ -3,7 +3,7 @@ namespace Dreitier\WordPress\Multisite\Configuration\Persistence; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Option\Provider; use Dreitier\WordPress\WordPressRepository; use PHPUnit\Framework\MockObject\MockObject; @@ -14,7 +14,7 @@ * @author Danny Meißner * @access private */ -class ProfileRepositoryTest extends BasicTest +class ProfileRepositoryTest extends BasicTestCase { /* @var ProfileConfigurationRepository|MockObject $profileConfigurationRepository */ private $profileConfigurationRepository; @@ -48,7 +48,7 @@ public function tearDown(): void * * @return ProfileRepository|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ProfileRepository::class) ->setConstructorArgs( @@ -59,7 +59,7 @@ public function sut($methods = null) $this->optionProvider, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -123,7 +123,7 @@ public function findAll_returnsExpectedResult() */ public function findAllIDs_singleSite_returnEmptyArray() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -131,7 +131,7 @@ public function findAllIDs_singleSite_returnEmptyArray() )); $actual = $sut->findAllIds(); - $this->assertEquals(array(), $actual); + $this->assertEquals([], $actual); } /** @@ -139,7 +139,7 @@ public function findAllIDs_singleSite_returnEmptyArray() */ public function findAllIDs_multiSite_returnAllProfileIds() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -213,7 +213,7 @@ public function findDescription_triggersCorrectMethods() */ public function insert_searchUnusedProfileId_createNewProfile() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('get_site_option', array( 'args' => array('next_ad_int_p_n_1', false), @@ -267,10 +267,10 @@ public function insertProfileData_triggersCorrectMethods() $sut->expects($this->exactly(2)) ->method('getOptionNameByMapping') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::PROFILE_NAME, 1), array('show', 1) - ) + )) ->willReturnOnConsecutiveCalls( 'name', false @@ -309,10 +309,10 @@ public function updateProfileData_triggersCorrectMethods() $sut->expects($this->exactly(2)) ->method('getOptionNameByMapping') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::PROFILE_NAME, 1), array('show', 1) - ) + )) ->willReturnOnConsecutiveCalls( 'name', false @@ -381,7 +381,7 @@ public function insertDefaultProfile_profilesExist_doNothing() */ public function updateName_delegateToMethod_updateProfileName() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('update_site_option', array( 'args' => array('next_ad_int_p_n_5', 'new name'), @@ -398,7 +398,7 @@ public function updateName_delegateToMethod_updateProfileName() */ public function updateDescription_delegateToMethod_updateProfileDescription() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('update_site_option', array( 'args' => array('next_ad_int_p_d_5', 'new description'), @@ -415,7 +415,7 @@ public function updateDescription_delegateToMethod_updateProfileDescription() */ public function delete_delegateToMethod_deleteProfileAndDependencies() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('delete_site_option', array( 'args' => array('next_ad_int_p_n_5'), diff --git a/test/WordPress/Multisite/Configuration/ServiceTest.php b/test/WordPress/Multisite/Configuration/ServiceTest.php index 4702502..80f8973 100644 --- a/test/WordPress/Multisite/Configuration/ServiceTest.php +++ b/test/WordPress/Multisite/Configuration/ServiceTest.php @@ -3,7 +3,7 @@ namespace Dreitier\WordPress\Multisite\Configuration; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\BlogConfigurationRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileConfigurationRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileRepository; @@ -13,7 +13,7 @@ * @author Tobias Hellmann * @access private */ -class ServiceTest extends BasicTest +class ServiceTest extends BasicTestCase { /* @var BlogConfigurationRepository|MockObject */ private $blogConfigurationRepository; @@ -42,7 +42,7 @@ public function tearDown(): void * * @return Service|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(Service::class) ->setConstructorArgs( @@ -52,7 +52,7 @@ public function sut($methods = null) $this->profileRepository, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -86,11 +86,11 @@ public function findAllProfiles_withGivenOptionNames_usesOnlyGivenOptions() $sut->expects($this->any()) ->method('getProfileOptionsValues') - ->withConsecutive( + ->with(...self::withConsecutive( array(1, $options), array(2, $options), array(3, $options) - ) + )) ->willReturnOnConsecutiveCalls( $expected[1], $expected[2], @@ -131,11 +131,11 @@ public function findAllProfiles_withEmptyOptionNames_usesAllOptions() $sut->expects($this->any()) ->method('getProfileOptionsValues') - ->withConsecutive( + ->with(...self::withConsecutive( array(1, $options), array(2, $options), array(3, $options) - ) + )) ->willReturnOnConsecutiveCalls( $expected[1], $expected[2], @@ -188,10 +188,10 @@ public function getOption_withBlogId_delegateToMethods() $sut->expects($this->exactly(2)) ->method('getProfileOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::DOMAIN_SID, 44), array(Options::PORT, 44) - ) + )) ->will( $this->onConsecutiveCalls( '', @@ -237,10 +237,10 @@ public function getOptionWithCache() $sut->expects($this->exactly(2)) ->method('getProfileOptionValue') - ->withConsecutive( + ->with(...self::withConsecutive( array(Options::DOMAIN_SID, 44), array(Options::PORT, 44) - ) + )) ->will( $this->onConsecutiveCalls( '', @@ -274,7 +274,7 @@ public function getOptionWithCache() */ public function getProfileOptionValue_singleSite_returnNull() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -290,7 +290,7 @@ public function getProfileOptionValue_singleSite_returnNull() */ public function getProfileOptionValue_multisite_returnProfileOptions() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -322,7 +322,7 @@ public function getProfileOptionValue_multisite_returnProfileOptions() */ public function getValue_optionPermissionEqual3_returnBlogOptionValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $this->invokeMethod($sut, 'getValue', array(3, '999', '389')); $this->assertEquals('389', $actual); @@ -333,7 +333,7 @@ public function getValue_optionPermissionEqual3_returnBlogOptionValue() */ public function getValue_optionPermissionEqual1_returnProfileOptionValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $this->invokeMethod($sut, 'getValue', array(1, '999', '389')); $this->assertEquals('999', $actual); @@ -344,7 +344,7 @@ public function getValue_optionPermissionEqual1_returnProfileOptionValue() */ public function getPermission_multiSite_returnPermission() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -365,7 +365,7 @@ public function getPermission_multiSite_returnPermission() */ public function getPermission_singleSite_returnPermission() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('is_multisite', array( 'times' => 1, @@ -395,7 +395,7 @@ public function addProfileInformation_returnsExpectedResult() ), ); - $result = $this->invokeMethod($sut, 'addProfileInformation', array(1, array())); + $result = $this->invokeMethod($sut, 'addProfileInformation', array(1, [])); $this->assertEquals($expected, $result); } @@ -405,7 +405,7 @@ public function addProfileInformation_returnsExpectedResult() */ public function isEnvironmentOption_whenCheckingEnvironmentOption_itReturnsTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isEnvironmentOption(Options::PORT); $this->assertTrue($actual); @@ -416,7 +416,7 @@ public function isEnvironmentOption_whenCheckingEnvironmentOption_itReturnsTrue( */ public function isEnvironmentOption_whenCheckingNonEnvironmentOption_itReturnsFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isEnvironmentOption(Options::SYNC_TO_WORDPRESS_USER); $this->assertFalse($actual); diff --git a/test/WordPress/Multisite/Option/AttributeTest.php b/test/WordPress/Multisite/Option/AttributeTest.php index affe713..ffe4e89 100644 --- a/test/WordPress/Multisite/Option/AttributeTest.php +++ b/test/WordPress/Multisite/Option/AttributeTest.php @@ -2,14 +2,14 @@ namespace Dreitier\WordPress\Multisite\Option; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use ReflectionClass; /** * @author Tobias Hellmann * @access private */ -class AttributeTest extends BasicTest +class AttributeTest extends BasicTestCase { /** * @test diff --git a/test/WordPress/Multisite/Option/SanitizerTest.php b/test/WordPress/Multisite/Option/SanitizerTest.php index 7dd6229..be95305 100644 --- a/test/WordPress/Multisite/Option/SanitizerTest.php +++ b/test/WordPress/Multisite/Option/SanitizerTest.php @@ -2,14 +2,14 @@ namespace Dreitier\WordPress\Multisite\Option; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @author Tobias Hellmann * @access private */ -class SanitizerTest extends BasicTest +class SanitizerTest extends BasicTestCase { public function setUp(): void { @@ -26,21 +26,21 @@ public function tearDown(): void */ public function sanitize_boolean_checkString() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'boolean' // name of the call-method ); - $this->assertTrue($sut->sanitize('TrUe', $params, array())); - $this->assertTrue($sut->sanitize('0.0', $params, array())); - $this->assertTrue($sut->sanitize('1', $params, array())); - $this->assertTrue($sut->sanitize('stuff', $params, array())); - $this->assertTrue($sut->sanitize(' ', $params, array())); + $this->assertTrue($sut->sanitize('TrUe', $params, [])); + $this->assertTrue($sut->sanitize('0.0', $params, [])); + $this->assertTrue($sut->sanitize('1', $params, [])); + $this->assertTrue($sut->sanitize('stuff', $params, [])); + $this->assertTrue($sut->sanitize(' ', $params, [])); - $this->assertFalse($sut->sanitize('fAlSe', $params, array())); - $this->assertFalse($sut->sanitize('0', $params, array())); - $this->assertFalse($sut->sanitize('', $params, array())); + $this->assertFalse($sut->sanitize('fAlSe', $params, [])); + $this->assertFalse($sut->sanitize('0', $params, [])); + $this->assertFalse($sut->sanitize('', $params, [])); } /** @@ -48,10 +48,10 @@ public function sanitize_boolean_checkString() * * @return Sanitizer|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { return $connection = $this->getMockBuilder(Sanitizer::class) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -60,14 +60,14 @@ public function sut($methods) */ public function sanitize_boolean_checkNumber() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'boolean' // name of the call-method ); - $this->assertTrue($sut->sanitize(1, $params, array())); - $this->assertFalse($sut->sanitize(0, $params, array())); + $this->assertTrue($sut->sanitize(1, $params, [])); + $this->assertFalse($sut->sanitize(0, $params, [])); } /** @@ -75,15 +75,15 @@ public function sanitize_boolean_checkNumber() */ public function sanitize_boolean_checkSpecialValues() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'boolean' // name of the call-method ); - $this->assertTrue($sut->sanitize(true, $params, array())); - $this->assertFalse($sut->sanitize(false, $params, array())); - $this->assertFalse($sut->sanitize(null, $params, array())); + $this->assertTrue($sut->sanitize(true, $params, [])); + $this->assertFalse($sut->sanitize(false, $params, [])); + $this->assertFalse($sut->sanitize(null, $params, [])); } /** @@ -91,7 +91,7 @@ public function sanitize_boolean_checkSpecialValues() */ public function sanitize_integer() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'integer' // name of the call-method @@ -113,7 +113,7 @@ public function sanitize_integer() $this->assertEquals(666, $sut->sanitize("no number", $params, $metadata)); $this->assertEquals(666, $sut->sanitize(true, $params, $metadata)); $this->assertEquals(666, $sut->sanitize(false, $params, $metadata)); - $this->assertEquals(666, $sut->sanitize(array(), $params, $metadata)); + $this->assertEquals(666, $sut->sanitize([], $params, $metadata)); $this->assertEquals(666, $sut->sanitize(array('a' => 'b'), $params, $metadata)); } @@ -122,7 +122,7 @@ public function sanitize_integer() */ public function sanitize_email_withCorrectEmail() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'email' // name of the call-method @@ -155,7 +155,7 @@ public function sanitize_email_withCorrectEmail() */ public function sanitize_email_withInvalidEmailAndDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'email' // name of the call-method @@ -188,12 +188,12 @@ public function sanitize_email_withInvalidEmailAndDefaultValue() */ public function sanitize_email_withInvalidEmailAndNoDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'email' // name of the call-method ); - $metadata = array(); + $metadata = []; \WP_Mock::userFunction( 'sanitize_email', array( @@ -219,7 +219,7 @@ public function sanitize_email_withInvalidEmailAndNoDefaultValue() */ public function sanitize_integerRange_noBorder() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'integerRange', // name of the call-method @@ -238,7 +238,7 @@ public function sanitize_integerRange_noBorder() */ public function sanitize_integerRange_leftBorder() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'integerRange', // name of the call-method @@ -262,7 +262,7 @@ public function sanitize_integerRange_leftBorder() */ public function sanitize_integerRange_rightBorder() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'integerRange', // name of the call-method @@ -287,7 +287,7 @@ public function sanitize_integerRange_rightBorder() */ public function sanitize_integerRange_leftAndRightBorders() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'integerRange', // name of the call-method @@ -317,7 +317,7 @@ public function sanitize_integerRange_leftAndRightBorders() */ public function sanitize_accumulation() { - $sut = $this->sut(null); + $sut = $this->sut(); $params = array( 'accumulation', // name of the call-method @@ -338,7 +338,7 @@ public function sanitize_accumulation() */ public function sanitize_valueAssignment() { - $sut = $this->sut(null); + $sut = $this->sut(); $metadata = array( Attribute::DEFAULT_VALUE => 'oh no' @@ -406,7 +406,7 @@ public function sanitize_valueAssignment() */ public function sanitize_selection() { - $sut = $this->sut(null); + $sut = $this->sut(); $metadata = array( Attribute::DEFAULT_VALUE => 'Kaugummi', @@ -426,7 +426,7 @@ public function sanitize_selection() */ public function sanitize_custom() { - $sut = $this->sut(null); + $sut = $this->sut(); $expected = "Bitterschokolade:1\n" . "Edelnougat:555\n" . @@ -440,7 +440,7 @@ public function sanitize_custom() */ public function sanitize_authcode_weakAuthCode_generateNewAuthCode() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'wp_generate_password', array( @@ -448,7 +448,7 @@ public function sanitize_authcode_weakAuthCode_generateNewAuthCode() ) ); - $this->assertEquals('xahFwxtHSx5kMjCfTzTL', $sut->sanitize('weakpassword', array('authcode'), array(), true)); + $this->assertEquals('xahFwxtHSx5kMjCfTzTL', $sut->sanitize('weakpassword', array('authcode'), [], true)); } /** @@ -456,7 +456,7 @@ public function sanitize_authcode_weakAuthCode_generateNewAuthCode() */ public function sanitize_authcode_nonString_generateNewAuthCode() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'wp_generate_password', array( @@ -464,7 +464,7 @@ public function sanitize_authcode_nonString_generateNewAuthCode() ) ); - $this->assertEquals('xahFwxtHSx5kMjCfTzTL', $sut->sanitize(999, array('authcode'), array(), true)); + $this->assertEquals('xahFwxtHSx5kMjCfTzTL', $sut->sanitize(999, array('authcode'), [], true)); } /** @@ -472,7 +472,7 @@ public function sanitize_authcode_nonString_generateNewAuthCode() */ public function sanitize_authcode_onlyReadValue_returnOldAuthCode() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'wp_generate_password', array( @@ -480,7 +480,7 @@ public function sanitize_authcode_onlyReadValue_returnOldAuthCode() ) ); - $this->assertEquals(999, $sut->sanitize(999, array('authcode'), array(), false)); + $this->assertEquals(999, $sut->sanitize(999, array('authcode'), [], false)); } /** @@ -488,7 +488,7 @@ public function sanitize_authcode_onlyReadValue_returnOldAuthCode() */ public function sanitize_authcode_strongAuthcode_returnOldAuthCode() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'wp_generate_password', array( @@ -497,7 +497,7 @@ public function sanitize_authcode_strongAuthcode_returnOldAuthCode() ); $pw = "very_very_very_strong_password"; - $this->assertEquals($pw, $sut->sanitize($pw, array('authcode'), array(), true)); + $this->assertEquals($pw, $sut->sanitize($pw, array('authcode'), [], true)); } @@ -506,9 +506,9 @@ public function sanitize_authcode_strongAuthcode_returnOldAuthCode() */ public function sanitize_arrayBelowOneReturnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); - $array = array(); + $array = []; $returnedValue = $sut->sanitize(null, $array, null); @@ -538,7 +538,7 @@ public function sanitize_checkCalledMethod() */ public function boolean_StringReturnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "false"; $returnedValue = $sut->boolean($value, null, null); @@ -550,7 +550,7 @@ public function boolean_StringReturnFalse() */ public function boolean_StringReturnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "true"; $returnedValue = $sut->boolean($value, null, null); @@ -562,7 +562,7 @@ public function boolean_StringReturnTrue() */ public function boolean_NumericReturnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = 0; $returnedValue = $sut->boolean($value, null, null); @@ -574,7 +574,7 @@ public function boolean_NumericReturnFalse() */ public function boolean_NumericReturnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = 1; $returnedValue = $sut->boolean($value, null, null); @@ -586,7 +586,7 @@ public function boolean_NumericReturnTrue() */ public function boolean_BoolReturnValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $valueTrue = true; $valueFalse = false; @@ -602,7 +602,7 @@ public function boolean_BoolReturnValue() */ public function integer_returnInteger() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = 42; @@ -615,7 +615,7 @@ public function integer_returnInteger() */ public function integer_returnDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = ""; $optionDataTrue = array('defaultValue' => 42); @@ -629,10 +629,10 @@ public function integer_returnDefaultValue() */ public function integer_returnNull() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = ""; - $optionDataTrue = array(); + $optionDataTrue = []; $returnedValue = $sut->integer($value, null, $optionDataTrue); $this->assertNull($returnedValue); @@ -643,10 +643,10 @@ public function integer_returnNull() */ public function string_returnDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $optionData = array('defaultValue' => 'someDefaultString'); - $userParams = array(); + $userParams = []; $userParams[2] = true; $returnedValue = $sut->string("", $userParams, $optionData); @@ -659,10 +659,10 @@ public function string_returnDefaultValue() */ public function string_returnValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $optionData = array('defaultValue' => 'someDefaultString'); - $userParams = array(); + $userParams = []; $userParams[2] = true; $returnedValue = $sut->string("someValue", $userParams, $optionData); @@ -674,7 +674,7 @@ public function string_returnValue() */ public function email_returnDefault() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "noEmail"; $optionData = array('defaultValue' => 'test@company.it'); @@ -703,7 +703,7 @@ public function email_returnDefault() */ public function email_returnValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "test@company.it"; $optionData = array('defaultValue' => 'testdefault@company.it'); @@ -732,7 +732,7 @@ public function email_returnValue() */ public function integerRange_returnValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = 5; $optionData = array('defaultValue' => 20); $userParams = array(0, 10); @@ -747,7 +747,7 @@ public function integerRange_returnValue() */ public function integerRange_returnDefault() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = null; $optionData = array('defaultValue' => 20); $userParams = array(0, 10); @@ -761,9 +761,9 @@ public function integerRange_returnDefault() */ public function integerRange_returnNull() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = null; - $optionData = array(); + $optionData = []; $userParams = array(0, 10); $returnedValue = $sut->integerRange($value, $userParams, $optionData); @@ -777,16 +777,16 @@ public function accumulation_returnResult() { $sut = $this->sut(array('sanitize')); $value = "something;somethingNew;somethingOld"; - $optionData = array(); - $userParams = array(); + $optionData = []; + $userParams = []; $sut->expects($this->exactly(3)) ->method('sanitize') - ->withConsecutive( + ->with(...self::withConsecutive( array('something', null, null), array('somethingNew', null, null), array('somethingOld', null, null) - ) + )) ->will( $this->onConsecutiveCalls( 'something', @@ -806,15 +806,15 @@ public function valueAssignment_returnLeftEqualsRight() { $sut = $this->sut(array('string')); $value = "something=somethingNew"; - $optionData = array(); - $userParams = array(); + $optionData = []; + $userParams = []; $sut->expects($this->exactly(2)) ->method('string') - ->withConsecutive( + ->with(...self::withConsecutive( array('something', array(false, true), null), array('somethingNew', array(true, true), null) - ) + )) ->will( $this->onConsecutiveCalls( 'something', @@ -834,10 +834,10 @@ public function valueAssignment_returnLeftEqualsRight() */ public function valueAssignment_returnDefault() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "something;somethingNew;somethingOld"; $optionData = array('defaultValue' => 'DefaultLeft=DefaultRight'); - $userParams = array(); + $userParams = []; $expectedReturn = 'DefaultLeft=DefaultRight'; @@ -854,14 +854,14 @@ public function valueAssignment_returnDefaultReasonLeftOrRightEmptyString() $sut = $this->sut(array('string', 'getDefaultValue')); $value = "something=somethingNew"; $optionData = array('defaultValue' => 'DefaultLeft=DefaultRight'); - $userParams = array(); + $userParams = []; $sut->expects($this->exactly(2)) ->method('string') - ->withConsecutive( + ->with(...self::withConsecutive( array('something', array(false, true), null), array('somethingNew', array(true, true), null) - ) + )) ->will( $this->onConsecutiveCalls( '', @@ -885,10 +885,10 @@ public function valueAssignment_returnDefaultReasonLeftOrRightEmptyString() */ public function selection_returnValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "someValue"; $optionData = array('elements' => array('someValue')); - $userParams = array(); + $userParams = []; $returnedValue = $sut->selection($value, $userParams, $optionData); @@ -900,10 +900,10 @@ public function selection_returnValue() */ public function selection_returnDefaultValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $value = "someValue"; $optionData = array('elements' => array('someOtherValue'), 'defaultValue' => 'defaultValue'); - $userParams = array(); + $userParams = []; $returnedValue = $sut->selection($value, $userParams, $optionData); $this->assertEquals('defaultValue', $returnedValue); diff --git a/test/WordPress/Multisite/Option/TypeTest.php b/test/WordPress/Multisite/Option/TypeTest.php index cc5f791..47133aa 100644 --- a/test/WordPress/Multisite/Option/TypeTest.php +++ b/test/WordPress/Multisite/Option/TypeTest.php @@ -2,14 +2,14 @@ namespace Dreitier\WordPress\Multisite\Option; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use ReflectionClass; /** * @author Tobias Hellmann * @access private */ -class TypeTest extends BasicTest +class TypeTest extends BasicTestCase { /** * @test diff --git a/test/WordPress/Multisite/Ui/BlogConfigurationControllerTest.php b/test/WordPress/Multisite/Ui/BlogConfigurationControllerTest.php index 9aca331..34b36c6 100644 --- a/test/WordPress/Multisite/Ui/BlogConfigurationControllerTest.php +++ b/test/WordPress/Multisite/Ui/BlogConfigurationControllerTest.php @@ -2,7 +2,7 @@ namespace Dreitier\WordPress\Multisite\Ui; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\BlogConfigurationRepository; use Dreitier\WordPress\Multisite\Option\Provider; use PHPUnit\Framework\MockObject\MockObject; @@ -11,7 +11,7 @@ * @author Tobias Hellmann * @access private */ -class BlogConfigurationControllerTest extends BasicTest +class BlogConfigurationControllerTest extends BasicTestCase { /** @var BlogConfigurationRepository| MockObject */ private $blogConfigurationRepository; @@ -25,7 +25,7 @@ public function setUp(): void $this->blogConfigurationRepository = $this->getMockBuilder(BlogConfigurationRepository::class) ->disableOriginalConstructor() - ->setMethods(array('persistSanitizedValue')) + ->onlyMethods(['persistSanitizedValue']) ->getMock(); $this->optionProvider = $this->createMock(Provider::class); @@ -41,13 +41,13 @@ public function tearDown(): void * * @return BlogConfigurationController|MockObject */ - public function sut($methods) + public function sut(array $methods = []) { return $this->getMockBuilder(BlogConfigurationController::class) ->setConstructorArgs(array( $this->blogConfigurationRepository, $this->optionProvider)) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -59,7 +59,7 @@ public function saveBlogOptions_withoutErrors_returnsSuccessMessage() $sut = $this->sut(array('saveBlogOptionsInternal')); $this->mockFunction__(); - $data = array(); + $data = []; $expected = array("status_success" => true); $sut->expects($this->once()) @@ -79,7 +79,7 @@ public function saveBlogOptions_withErrors_returnsSuccessMessage() $sut = $this->sut(array('saveBlogOptionsInternal')); $this->mockFunction__(); - $data = array(); + $data = []; $expected = array("status_success" => false); $sut->expects($this->once()) @@ -138,11 +138,11 @@ public function saveBlogOptionsInternal_delegateCorrectly() $sut->expects($this->exactly(3)) ->method('validateOption') - ->withConsecutive( + ->with(...self::withConsecutive( array('port', array('option_value' => 'stuff')), array('tls', array('option_value' => 'true')), array('base_dn', array('option_value' => '127.0.0.1')) - )->will($this->onConsecutiveCalls( + ))->will($this->onConsecutiveCalls( true, false, true @@ -150,10 +150,10 @@ public function saveBlogOptionsInternal_delegateCorrectly() $sut->expects($this->exactly(2)) ->method('persistOption') - ->withConsecutive( + ->with(...self::withConsecutive( array('port', array('option_value' => 'stuff')), array('base_dn', array('option_value' => '127.0.0.1')) - ); + )); $this->invokeMethod($sut, 'saveBlogOptionsInternal', array($options)); } @@ -163,7 +163,7 @@ public function saveBlogOptionsInternal_delegateCorrectly() */ public function validateOption_optionIsNull_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->validateOption("port", null); $this->assertEquals(false, $actual); @@ -174,7 +174,7 @@ public function validateOption_optionIsNull_returnFalse() */ public function validateOption_noMetadata_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->optionProvider->expects($this->never()) ->method('existOption'); @@ -189,7 +189,7 @@ public function validateOption_noMetadata_returnFalse() public function persistOption_withMetadata_persist() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('get_current_blog_id', array( 'return' => 1) diff --git a/test/WordPress/Multisite/Ui/BlogProfileRelationshipControllerTest.php b/test/WordPress/Multisite/Ui/BlogProfileRelationshipControllerTest.php index 3fb849a..84f5022 100644 --- a/test/WordPress/Multisite/Ui/BlogProfileRelationshipControllerTest.php +++ b/test/WordPress/Multisite/Ui/BlogProfileRelationshipControllerTest.php @@ -2,7 +2,7 @@ namespace Dreitier\WordPress\Multisite\Ui; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\BlogConfigurationRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\DefaultProfileRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileRepository; @@ -14,7 +14,7 @@ * @author Tobias Hellmann * @access private */ -class BlogProfileRelationshipControllerTest extends BasicTest +class BlogProfileRelationshipControllerTest extends BasicTestCase { /** @var BlogConfigurationRepository|MockObject */ private $blogConfigurationRepository; @@ -48,7 +48,7 @@ public function tearDown(): void * * @return BlogProfileRelationshipController|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(BlogProfileRelationshipController::class) ->setConstructorArgs( @@ -58,7 +58,7 @@ public function sut($methods = null) $this->defaultProfileRepository, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -155,7 +155,7 @@ public function saveBlogProfileAssociations_withExistingBlogAndProfileId() */ public function validateBlog_withNotExistingBlogId_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $sites = array( array('blog_id' => '2'), @@ -174,7 +174,7 @@ public function validateBlog_withNotExistingBlogId_returnFalse() */ public function validateProfile_withNotExistingProfileId_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $profiles = array( '3', diff --git a/test/WordPress/Multisite/Ui/BlogProfileRelationshipPageTest.php b/test/WordPress/Multisite/Ui/BlogProfileRelationshipPageTest.php index b7b3189..be42af3 100644 --- a/test/WordPress/Multisite/Ui/BlogProfileRelationshipPageTest.php +++ b/test/WordPress/Multisite/Ui/BlogProfileRelationshipPageTest.php @@ -2,7 +2,7 @@ namespace Dreitier\WordPress\Multisite\Ui; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Ui; use Dreitier\WordPress\Multisite\View\TwigContainer; use Mockery\Mock; @@ -12,7 +12,7 @@ * @author Tobias Hellmann * @access private */ -class BlogProfileRelationshipPageTest extends BasicTest +class BlogProfileRelationshipPageTest extends BasicTestCase { /* @var TwigContainer|MockObject */ private $twigContainer; @@ -38,7 +38,7 @@ public function tearDown(): void */ public function getTitle() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunctionEsc_html__(); $expectedTitle = 'Profile assignment'; @@ -51,7 +51,7 @@ public function getTitle() * * @return BlogProfileRelationshipPage| MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(BlogProfileRelationshipPage::class) ->setConstructorArgs( @@ -60,7 +60,7 @@ public function sut($methods = null) $this->blogProfileRelationshipController, ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -69,7 +69,7 @@ public function sut($methods = null) */ public function getSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'blog_profile_relationship'; $returnedValue = $sut->getSlug(); @@ -82,7 +82,7 @@ public function getSlug() */ public function wpAjaxSlug() { - $sut = $this->sut(null); + $sut = $this->sut(); $expectedReturn =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'blog_profile_relationship'; $returnedValue = $sut->wpAjaxSlug(); @@ -133,7 +133,7 @@ public function renderNetwork() */ public function loadJavaScriptAdmin() { - $sut = $this->sut(null); + $sut = $this->sut(); $hook =NEXT_ACTIVE_DIRECTORY_INTEGRATION_PREFIX . 'blog_profile_relationship'; \WP_Mock::userFunction( @@ -150,7 +150,7 @@ public function loadJavaScriptAdmin() \WP_Mock::userFunction( 'wp_enqueue_style', array( - 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', array(), Ui::VERSION_CSS), + 'args' => array('next_ad_int',NEXT_ACTIVE_DIRECTORY_INTEGRATION_URL . '/css/next_ad_int.css', [], Ui::VERSION_CSS), 'times' => 1, ) ); @@ -201,7 +201,7 @@ public function wpAjaxListener() */ public function wpAjaxListener_noData() { - $sut = $this->sut(null); + $sut = $this->sut(); $_POST['data'] = ''; @@ -220,7 +220,7 @@ public function wpAjaxListener_noData() */ public function wpAjaxListener_noPermission() { - $sut = $this->sut(null); + $sut = $this->sut(); $_POST['data'] = 'someData'; @@ -249,7 +249,7 @@ public function saveBlogProfileAssociations_noData_doesNotTriggerController() { $sut = $this->sut(); - $data = array(); + $data = []; $this->blogProfileRelationshipController->expects($this->never()) ->method('saveBlogProfileAssociations'); @@ -283,7 +283,7 @@ public function saveDefaultProfile_noData_doesNotTriggerController() { $sut = $this->sut(); - $data = array(); + $data = []; $this->blogProfileRelationshipController->expects($this->never()) ->method('saveDefaultProfile'); diff --git a/test/WordPress/Multisite/Ui/ProfileConfigurationControllerTest.php b/test/WordPress/Multisite/Ui/ProfileConfigurationControllerTest.php index 47b750b..8400972 100644 --- a/test/WordPress/Multisite/Ui/ProfileConfigurationControllerTest.php +++ b/test/WordPress/Multisite/Ui/ProfileConfigurationControllerTest.php @@ -3,7 +3,7 @@ namespace Dreitier\WordPress\Multisite\Ui; use Dreitier\Nadi\Configuration\Options; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileConfigurationRepository; use Dreitier\WordPress\Multisite\Option\Provider; use PHPUnit\Framework\MockObject\MockObject; @@ -12,7 +12,7 @@ * @author Tobias Hellmann * @access private */ -class ProfileConfigurationControllerTest extends BasicTest +class ProfileConfigurationControllerTest extends BasicTestCase { /** @var ProfileConfigurationRepository|MockObject */ private $profileConfigurationRepository; @@ -38,14 +38,14 @@ public function tearDown(): void * * @return ProfileConfigurationController|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ProfileConfigurationController::class) ->setConstructorArgs(array( $this->profileConfigurationRepository, $this->optionProvider )) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -65,10 +65,10 @@ public function saveProfileOptions_withErrorOnSave_returnsErrorMessage() 'message' => 'An error occurred while saving the configuration.', 'type' => 'error', 'isMessage' => true, - 'additionalInformation' => array(), + 'additionalInformation' => [], ); - $result = $sut->saveProfileOptions(array(), 1); + $result = $sut->saveProfileOptions([], 1); $this->assertEquals($expected, $result); } @@ -88,10 +88,10 @@ public function saveProfileOptions_withSuccessOnSave_returnsSuccessMessage() 'message' => 'The configuration was saved successfully.', 'type' => 'success', 'isMessage' => true, - 'additionalInformation' => array(), + 'additionalInformation' => [], ); - $result = $sut->saveProfileOptions(array(), 1); + $result = $sut->saveProfileOptions([], 1); $this->assertEquals($expected, $result); } @@ -119,7 +119,7 @@ public function saveProfileOptions_triggersSaveProfileOptionsInternalMethod() 'message' => 'The configuration was saved successfully.', 'type' => 'success', 'isMessage' => true, - 'additionalInformation' => array(), + 'additionalInformation' => [], ); $result = $sut->saveProfileOptions($options, 1); @@ -159,7 +159,7 @@ public function saveProfileOptionsInternal_executeSaveOptions() */ public function validateOption_metadataEmpty_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $option = array( 'option_value' => '389', @@ -175,7 +175,7 @@ public function validateOption_metadataEmpty_returnFalse() */ public function validateOption_optionPermissionNotSet() { - $sut = $this->sut(null); + $sut = $this->sut(); $option = array( 'option_value' => '389', @@ -190,7 +190,7 @@ public function validateOption_optionPermissionNotSet() */ public function validateOption_optionValueNotSet() { - $sut = $this->sut(null); + $sut = $this->sut(); $option = array( 'option_permission' => '1' @@ -205,7 +205,7 @@ public function validateOption_optionValueNotSet() */ public function validateOption_metadataNotEmpty_returnTrue() { - $sut = $this->sut(null); + $sut = $this->sut(); $option = array( 'option_value' => '389', diff --git a/test/WordPress/Multisite/Ui/ProfileControllerTest.php b/test/WordPress/Multisite/Ui/ProfileControllerTest.php index 191ec96..145eb89 100644 --- a/test/WordPress/Multisite/Ui/ProfileControllerTest.php +++ b/test/WordPress/Multisite/Ui/ProfileControllerTest.php @@ -2,7 +2,7 @@ namespace Dreitier\WordPress\Multisite\Ui; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\BlogConfigurationRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\DefaultProfileRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileRepository; @@ -13,7 +13,7 @@ * @author Tobias Hellmann * @access private */ -class ProfileControllerTest extends BasicTest +class ProfileControllerTest extends BasicTestCase { /** @var ProfileRepository| MockObject */ private $profileRepository; @@ -41,7 +41,7 @@ public function tearDown(): void * * @return ProfileController|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ProfileController::class) ->setConstructorArgs(array( @@ -49,7 +49,7 @@ public function sut($methods = null) $this->blogConfigurationRepository, $this->defaultProfileRepository, )) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -100,7 +100,7 @@ public function validateType_withoutType_returnsFalse() { $sut = $this->sut(); - $result = $sut->validateType(array()); + $result = $sut->validateType([]); $this->assertFalse($result); } @@ -127,7 +127,7 @@ public function saveProfile_withEmptyName_returnsFalse() $sut->expects($this->never()) ->method('saveProfileInternal'); - $result = $sut->saveProfile(array(), 1); + $result = $sut->saveProfile([], 1); $this->assertFalse($result); } @@ -205,7 +205,7 @@ public function saveProfileInternal_withExistingProfile_delegatesCallToProfileRe */ public function addProfile() { - $sut = $this->sut(null); + $sut = $this->sut(); $data = array( 'type' => 'add', @@ -225,7 +225,7 @@ public function addProfile() */ public function deleteProfile() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->profileRepository->expects($this->once()) ->method('delete') @@ -239,7 +239,7 @@ public function deleteProfile() */ public function deleteProfile_withEmptyId_returnsFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->profileRepository->expects($this->never()) ->method('delete') @@ -255,7 +255,7 @@ public function deleteProfile_withEmptyId_returnsFalse() */ public function deleteProfile_withErrorOnDelete_returnsErrorMessage() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $this->profileRepository->expects($this->once()) @@ -267,7 +267,7 @@ public function deleteProfile_withErrorOnDelete_returnsErrorMessage() 'message' => 'An error occurred while deleting the profile.', 'type' => 'error', 'isMessage' => true, - 'additionalInformation' => array(), + 'additionalInformation' => [], ); $result = $sut->deleteProfile(1); @@ -280,7 +280,7 @@ public function deleteProfile_withErrorOnDelete_returnsErrorMessage() */ public function deleteProfile_withSuccessOnDelete_returnsSuccessMessage() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->mockFunction__(); $this->profileRepository->expects($this->once()) @@ -291,7 +291,7 @@ public function deleteProfile_withSuccessOnDelete_returnsSuccessMessage() 'message' => 'The profile was deleted successfully.', 'type' => 'success', 'isMessage' => true, - 'additionalInformation' => array(), + 'additionalInformation' => [], ); $result = $sut->deleteProfile(1); @@ -346,7 +346,7 @@ public function validateName_withoutName_returnsFalse() { $sut = $this->sut(); - $result = $sut->validateName(array()); + $result = $sut->validateName([]); $this->assertFalse($result); } @@ -370,7 +370,7 @@ public function validateDescription_withoutDescription_returnsFalse() { $sut = $this->sut(); - $result = $sut->validateDescription(array()); + $result = $sut->validateDescription([]); $this->assertFalse($result); } @@ -394,7 +394,7 @@ public function validateId_withoutId_returnsFalse() { $sut = $this->sut(); - $result = $sut->validateId(array()); + $result = $sut->validateId([]); $this->assertFalse($result); } diff --git a/test/WordPress/Multisite/Ui/Table/ProfileAssignmentTest.php b/test/WordPress/Multisite/Ui/Table/ProfileAssignmentTest.php index e39c65f..c5bbfb4 100644 --- a/test/WordPress/Multisite/Ui/Table/ProfileAssignmentTest.php +++ b/test/WordPress/Multisite/Ui/Table/ProfileAssignmentTest.php @@ -2,7 +2,7 @@ namespace Dreitier\WordPress\Multisite\Ui\Table; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use PHPUnit\Framework\MockObject\MockObject; /** @@ -10,7 +10,7 @@ * * @access private */ -class ProfileAssignmentTest extends BasicTest +class ProfileAssignmentTest extends BasicTestCase { public function setUp(): void { @@ -27,11 +27,11 @@ public function tearDown(): void * * @return ProfileAssignment|MockObject */ - public function sut($methods = null) + public function sut(array $methods = []) { return $this->getMockBuilder(ProfileAssignment::class) ->disableOriginalConstructor() - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } @@ -40,7 +40,7 @@ public function sut($methods = null) */ public function register_itAddsFilter() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::expectActionAdded('manage_sites_custom_column', array($sut, 'addContent'), 1, 2); @@ -124,7 +124,7 @@ public function addContent_outputsSiteName() $wp_version = '4.6'; - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('get_blog_details', array( 'args' => 666, @@ -149,7 +149,7 @@ public function ADI_419_addContent_itUses_get_site_whenRunningWordPress4_7OrLate $wp_version = '4.7'; - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction('get_site', array( 'args' => 666, diff --git a/test/WordPress/Multisite/View/TwigContainerTest.php b/test/WordPress/Multisite/View/TwigContainerTest.php index 300978d..7bd5337 100644 --- a/test/WordPress/Multisite/View/TwigContainerTest.php +++ b/test/WordPress/Multisite/View/TwigContainerTest.php @@ -4,7 +4,7 @@ use Dreitier\Nadi\Authentication\VerificationService; use Dreitier\Nadi\Configuration\Ui\Layout; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; use Dreitier\WordPress\Multisite\Configuration\Persistence\BlogConfigurationRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\DefaultProfileRepository; use Dreitier\WordPress\Multisite\Configuration\Persistence\ProfileConfigurationRepository; @@ -19,7 +19,7 @@ * @author Danny Meißner * @access private */ -class TwigContainerTest extends BasicTest +class TwigContainerTest extends BasicTestCase { /** @var BlogConfigurationRepository |MockObject */ private $blogConfigurationRepository; @@ -67,7 +67,7 @@ public function tearDown(): void */ public function register_registersNecessaryTwigFilters() { - $sut = $this->sut(null); + $sut = $this->sut(); $sut->register(); $twig = $sut->getTwig(); @@ -80,7 +80,7 @@ public function register_registersNecessaryTwigFilters() */ public function register_registersNecessaryTwigFiltersWithCorrectCallback() { - $sut = $this->sut(null); + $sut = $this->sut(); $sut->register(); $twig = $sut->getTwig(); @@ -93,7 +93,7 @@ public function register_registersNecessaryTwigFiltersWithCorrectCallback() */ public function register_registersNecessaryTwigFunctions() { - $sut = $this->sut(null); + $sut = $this->sut(); $sut->register(); $twig = $sut->getTwig(); @@ -121,7 +121,7 @@ public function register_registersNecessaryTwigFunctions() */ public function register_registersNecessaryTwigFunctionsWithCorrectCallback() { - $sut = $this->sut(null); + $sut = $this->sut(); $sut->register(); $twig = $sut->getTwig(); @@ -238,7 +238,7 @@ public function isOptionGroupVisible_MultisiteOnlyFalseAndOnNetworkDashboardFals */ public function getOptionValue_withProfileId_returnProfileValue() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->profileConfigurationRepository->expects($this->once()) ->method('findSanitizedValue') @@ -254,7 +254,7 @@ public function getOptionValue_withProfileId_returnProfileValue() */ public function getOptionValue_withNoPermission_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $blogId = 4444; $profileId = 3333; @@ -311,7 +311,7 @@ public function getOptionValue_withPermission_returnBlogValue() */ public function isOptionDisabled_withProfileId_returnFalse() { - $sut = $this->sut(null); + $sut = $this->sut(); $actual = $sut->isOptionDisabled('port', 5); $this->assertEquals(false, $actual); @@ -356,7 +356,7 @@ public function isOptionDisabled_withoutPermission_returnTrue() */ public function getPermissionForOptionAndBlog_getBlogId_returnPermission() { - $sut = $this->sut(null); + $sut = $this->sut(); $blogId = 4444; $profileId = 3333; @@ -386,7 +386,7 @@ public function getPermissionForOptionAndBlog_getBlogId_returnPermission() */ public function getOptionPermission_withoutProfileId_getProfileOption() { - $sut = $this->sut(null); + $sut = $this->sut(); $blogId = 4444; $profileId = 5; @@ -416,7 +416,7 @@ public function getOptionPermission_withoutProfileId_getProfileOption() */ public function getOptionPermission_withProfileId_getProfileOption() { - $sut = $this->sut(null); + $sut = $this->sut(); $profileId = 5; $optionName = 'port'; @@ -435,7 +435,7 @@ public function getOptionPermission_withProfileId_getProfileOption() */ public function getBlogName_withoutBlogId_delegateToGetOption() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'get_option', array( @@ -453,7 +453,7 @@ public function getBlogName_withoutBlogId_delegateToGetOption() */ public function getBlogName_notMultisite_delegateToGetOption() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'is_multisite', array( @@ -478,7 +478,7 @@ public function getBlogName_notMultisite_delegateToGetOption() */ public function getBlogName_withBlogId_delegateToGetBlogOption() { - $sut = $this->sut(null); + $sut = $this->sut(); \WP_Mock::userFunction( 'get_blog_option', array( @@ -502,7 +502,7 @@ public function getBlogName_withBlogId_delegateToGetBlogOption() */ public function getProfileIdOfBlog() { - $sut = $this->sut(null); + $sut = $this->sut(); $this->blogConfigurationRepository->expects($this->once()) ->method('findProfileId') @@ -518,7 +518,7 @@ public function getProfileIdOfBlog() */ public function getSites_isMultisite_returnSites() { - $sut = $this->sut(null); + $sut = $this->sut(); $sites[0] = array( 'network_id' => 1, @@ -558,9 +558,9 @@ public function getSites_isMultisite_returnSites() */ public function getSites_noMultisite_returnDefaultArray() { - $sut = $this->sut(null); + $sut = $this->sut(); - $sites = array(); + $sites = []; $sites[0] = array( 'network_id' => 0, 'public' => null, @@ -602,7 +602,7 @@ public function getTwig() * * @return TwigContainer| MockObject */ - private function sut($methods = null) + private function sut(array $methods = []) { return $this->getMockBuilder(TwigContainer::class) ->setConstructorArgs( @@ -616,7 +616,7 @@ private function sut($methods = null) $this->verificationService ) ) - ->setMethods($methods) + ->onlyMethods($methods) ->getMock(); } } \ No newline at end of file diff --git a/test/WordPress/WordPressErrorExceptionTest.php b/test/WordPress/WordPressErrorExceptionTest.php index 74f264e..0a3e2bf 100644 --- a/test/WordPress/WordPressErrorExceptionTest.php +++ b/test/WordPress/WordPressErrorExceptionTest.php @@ -2,13 +2,13 @@ namespace Dreitier\WordPress; -use Dreitier\Test\BasicTest; +use Dreitier\Test\BasicTestCase; /** * @author Christopher Klein * @access private */ -class WordPressErrorExceptionTest extends BasicTest +class WordPressErrorExceptionTest extends BasicTestCase { /** * This test has to be run in a separate process: diff --git a/test/WordPress/WordPressSiteRepositoryTest.php b/test/WordPress/WordPressSiteRepositoryTest.php index 40e12f9..18ec2ad 100644 --- a/test/WordPress/WordPressSiteRepositoryTest.php +++ b/test/WordPress/WordPressSiteRepositoryTest.php @@ -1,13 +1,13 @@ * @access private */ -class WordPressSiteRepositoryTest extends BasicTest +class WordPressSiteRepositoryTest extends BasicTestCase { public function setUp() : void { @@ -21,30 +21,6 @@ public function tearDown() : void parent::tearDown(); } - /** - * @test - */ - public function getSites_withWordPress4_6_shouldCallGetSites() { - global $wp_version; - $wp_version = '4.6'; - - $expected = array('blog_id' => 1); - - $site = $this->createMockWithMethods(\BlueprintClass::class, array('to_array')); - $site->expects($this->once()) - ->method('to_array') - ->willReturn($expected); - - \WP_Mock::userFunction('get_sites', array( - 'times' => 1, - 'return' => array($site)) - ); - - // call function get_sites(); - $actual = WordPressSiteRepository::getSites(); - $this->assertEquals(array($expected), $actual); - } - /** * @test */