OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reduced amount of dead lines in tests

Browse Source
This commit is contained in:
Alejandro Celaya 2019-02-17 20:28:34 +01:00
parent 1bcd03b150
commit 687a1cc9c7
100 changed files with 481 additions and 938 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/CLI/test/Command/Api/DisableKeyCommandTest.php
View File

@ -27,9 +27,7 @@ class DisableKeyCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function providedApiKeyIsDisabled()
{
$apiKey = 'abcd1234';
@ -44,9 +42,7 @@ class DisableKeyCommandTest extends TestCase
$this->assertStringContainsString('API key "abcd1234" properly disabled', $output);
}
/**
* @test
*/
/** @test */
public function errorIsReturnedIfServiceThrowsException()
{
$apiKey = 'abcd1234';

8
module/CLI/test/Command/Api/GenerateKeyCommandTest.php
View File

@ -29,9 +29,7 @@ class GenerateKeyCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function noExpirationDateIsDefinedIfNotProvided()
{
$create = $this->apiKeyService->create(null)->willReturn(new ApiKey());
@ -45,9 +43,7 @@ class GenerateKeyCommandTest extends TestCase
$create->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function expirationDateIsDefinedIfProvided()
{
$this->apiKeyService->create(Argument::type(Chronos::class))->shouldBeCalledOnce()

4
module/CLI/test/Command/Config/GenerateCharsetCommandTest.php
View File

@ -25,9 +25,7 @@ class GenerateCharsetCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function charactersAreGeneratedFromDefault()
{
$prefix = 'Character set: ';

8
module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php
View File

@ -39,9 +39,7 @@ class GeneratePreviewCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function previewsForEveryUrlAreGenerated()
{
$paginator = $this->createPaginator([
@ -69,9 +67,7 @@ class GeneratePreviewCommandTest extends TestCase
$generatePreview3->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function exceptionWillOutputError()
{
$items = [

12
module/CLI/test/Command/ShortUrl/GenerateShortUrlCommandTest.php
View File

@ -34,9 +34,7 @@ class GenerateShortUrlCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function properShortCodeIsCreatedIfLongUrlIsCorrect()
{
$urlToShortCode = $this->urlShortener->urlToShortCode(Argument::cetera())->willReturn(
@ -54,9 +52,7 @@ class GenerateShortUrlCommandTest extends TestCase
$urlToShortCode->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function exceptionWhileParsingLongUrlOutputsError()
{
$this->urlShortener->urlToShortCode(Argument::cetera())->willThrow(new InvalidUrlException())
@ -73,9 +69,7 @@ class GenerateShortUrlCommandTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function properlyProcessesProvidedTags()
{
$urlToShortCode = $this->urlShortener->urlToShortCode(

8
module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php
View File

@ -37,9 +37,7 @@ class GetVisitsCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function noDateFlagsTriesToListWithoutDateRange()
{
$shortCode = 'abc123';
@ -53,9 +51,7 @@ class GetVisitsCommandTest extends TestCase
]);
}
/**
* @test
*/
/** @test */
public function providingDateFlagsTheListGetsFiltered()
{
$shortCode = 'abc123';

20
module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
View File

@ -30,9 +30,7 @@ class ListShortUrlsCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function noInputCallsListJustOnce()
{
$this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
@ -42,9 +40,7 @@ class ListShortUrlsCommandTest extends TestCase
$this->commandTester->execute(['command' => 'shortcode:list']);
}
/**
* @test
*/
/** @test */
public function loadingMorePagesCallsListMoreTimes()
{
// The paginator will return more than one page
@ -66,9 +62,7 @@ class ListShortUrlsCommandTest extends TestCase
$this->assertStringContainsString('Continue with page 4?', $output);
}
/**
* @test
*/
/** @test */
public function havingMorePagesButAnsweringNoCallsListJustOnce()
{
// The paginator will return more than one page
@ -93,9 +87,7 @@ class ListShortUrlsCommandTest extends TestCase
$this->assertStringNotContainsString('Continue with page 3?', $output);
}
/**
* @test
*/
/** @test */
public function passingPageWillMakeListStartOnThatPage()
{
$page = 5;
@ -109,9 +101,7 @@ class ListShortUrlsCommandTest extends TestCase
]);
}
/**
* @test
*/
/** @test */
public function ifTagsFlagIsProvidedTagsColumnIsIncluded()
{
$this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))

12
module/CLI/test/Command/ShortUrl/ResolveUrlCommandTest.php
View File

@ -31,9 +31,7 @@ class ResolveUrlCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function correctShortCodeResolvesUrl()
{
$shortCode = 'abc123';
@ -50,9 +48,7 @@ class ResolveUrlCommandTest extends TestCase
$this->assertEquals('Long URL: ' . $expectedUrl . PHP_EOL, $output);
}
/**
* @test
*/
/** @test */
public function incorrectShortCodeOutputsErrorMessage()
{
$shortCode = 'abc123';
@ -67,9 +63,7 @@ class ResolveUrlCommandTest extends TestCase
$this->assertStringContainsString('Provided short code "' . $shortCode . '" could not be found.', $output);
}
/**
* @test
*/
/** @test */
public function wrongShortCodeFormatOutputsErrorMessage()
{
$shortCode = 'abc123';

8
module/CLI/test/Command/Tag/CreateTagCommandTest.php
View File

@ -30,9 +30,7 @@ class CreateTagCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function errorIsReturnedWhenNoTagsAreProvided()
{
$this->commandTester->execute([]);
@ -41,9 +39,7 @@ class CreateTagCommandTest extends TestCase
$this->assertStringContainsString('You have to provide at least one tag name', $output);
}
/**
* @test
*/
/** @test */
public function serviceIsInvokedOnSuccess()
{
$tagNames = ['foo', 'bar'];

8
module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
View File

@ -31,9 +31,7 @@ class DeleteTagsCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function errorIsReturnedWhenNoTagsAreProvided()
{
$this->commandTester->execute([]);
@ -42,9 +40,7 @@ class DeleteTagsCommandTest extends TestCase
$this->assertStringContainsString('You have to provide at least one tag name', $output);
}
/**
* @test
*/
/** @test */
public function serviceIsInvokedOnSuccess()
{
$tagNames = ['foo', 'bar'];

8
module/CLI/test/Command/Tag/ListTagsCommandTest.php
View File

@ -32,9 +32,7 @@ class ListTagsCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function noTagsPrintsEmptyMessage()
{
/** @var MethodProphecy $listTags */
@ -47,9 +45,7 @@ class ListTagsCommandTest extends TestCase
$listTags->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function listOfTagsIsPrinted()
{
/** @var MethodProphecy $listTags */

8
module/CLI/test/Command/Tag/RenameTagCommandTest.php
View File

@ -33,9 +33,7 @@ class RenameTagCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function errorIsPrintedIfExceptionIsThrown()
{
$oldName = 'foo';
@ -53,9 +51,7 @@ class RenameTagCommandTest extends TestCase
$renameTag->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function successIsPrintedIfNoErrorOccurs()
{
$oldName = 'foo';

4
module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
View File

@ -155,9 +155,7 @@ class ProcessVisitsCommandTest extends TestCase
$resolveIpLocation->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function noActionIsPerformedIfLockIsAcquired()
{
$this->lock->acquire()->willReturn(false);

8
module/CLI/test/Command/Visit/UpdateDbCommandTest.php
View File

@ -30,9 +30,7 @@ class UpdateDbCommandTest extends TestCase
$this->commandTester = new CommandTester($command);
}
/**
* @test
*/
/** @test */
public function successMessageIsPrintedIfEverythingWorks()
{
$download = $this->dbUpdater->downloadFreshCopy(Argument::type('callable'))->will(function () {
@ -45,9 +43,7 @@ class UpdateDbCommandTest extends TestCase
$download->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function errorMessageIsPrintedIfAnExceptionIsThrown()
{
$download = $this->dbUpdater->downloadFreshCopy(Argument::type('callable'))->willThrow(RuntimeException::class);

4
module/CLI/test/ConfigProviderTest.php
View File

@ -16,9 +16,7 @@ class ConfigProviderTest extends TestCase
$this->configProvider = new ConfigProvider();
}
/**
* @test
*/
/** @test */
public function confiIsProperlyReturned()
{
$config = ($this->configProvider)();

8
module/CLI/test/Factory/ApplicationFactoryTest.php
View File

@ -23,18 +23,14 @@ class ApplicationFactoryTest extends TestCase
$this->factory = new ApplicationFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreated()
{
$instance = ($this->factory)($this->createServiceManager(), '');
$this->assertInstanceOf(Application::class, $instance);
}
/**
* @test
*/
/** @test */
public function allCommandsWhichAreServicesAreAdded()
{
$sm = $this->createServiceManager([

4
module/Common/test/ConfigProviderTest.php
View File

@ -16,9 +16,7 @@ class ConfigProviderTest extends TestCase
$this->configProvider = new ConfigProvider();
}
/**
* @test
*/
/** @test */
public function configIsReturned()
{
$config = $this->configProvider->__invoke();

8
module/Common/test/Console/ShlinkTableTest.php
View File

@ -25,9 +25,7 @@ class ShlinkTableTest extends TestCase
$this->shlinkTable = new ShlinkTable($this->baseTable->reveal());
}
/**
* @test
*/
/** @test */
public function renderMakesTableToBeRenderedWithProvidedInfo()
{
$headers = [];
@ -54,9 +52,7 @@ class ShlinkTableTest extends TestCase
$render->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function newTableIsCreatedForFactoryMethod()
{
$instance = ShlinkTable::fromOutput($this->prophesize(OutputInterface::class)->reveal());

8
module/Common/test/Exception/WrongIpExceptionTest.php
View File

@ -9,9 +9,7 @@ use Shlinkio\Shlink\Common\Exception\WrongIpException;
class WrongIpExceptionTest extends TestCase
{
/**
* @test
*/
/** @test */
public function fromIpAddressProperlyCreatesExceptionWithoutPrev()
{
$e = WrongIpException::fromIpAddress('1.2.3.4');
@ -20,9 +18,7 @@ class WrongIpExceptionTest extends TestCase
$this->assertEquals(0, $e->getCode());
$this->assertNull($e->getPrevious());
}
/**
* @test
*/
/** @test */
public function fromIpAddressProperlyCreatesExceptionWithPrev()
{
$prev = new Exception('Previous error');

24
module/Common/test/Factory/CacheFactoryTest.php
View File

@ -32,9 +32,7 @@ class CacheFactoryTest extends TestCase
putenv('APP_ENV');
}
/**
* @test
*/
/** @test */
public function productionReturnsApcAdapter()
{
putenv('APP_ENV=pro');
@ -42,9 +40,7 @@ class CacheFactoryTest extends TestCase
$this->assertInstanceOf(ApcuCache::class, $instance);
}
/**
* @test
*/
/** @test */
public function developmentReturnsArrayAdapter()
{
putenv('APP_ENV=dev');
@ -52,9 +48,7 @@ class CacheFactoryTest extends TestCase
$this->assertInstanceOf(ArrayCache::class, $instance);
}
/**
* @test
*/
/** @test */
public function adapterDefinedInConfigIgnoresEnvironment()
{
putenv('APP_ENV=pro');
@ -62,9 +56,7 @@ class CacheFactoryTest extends TestCase
$this->assertInstanceOf(ArrayCache::class, $instance);
}
/**
* @test
*/
/** @test */
public function invalidAdapterDefinedInConfigFallbacksToEnvironment()
{
putenv('APP_ENV=pro');
@ -72,9 +64,7 @@ class CacheFactoryTest extends TestCase
$this->assertInstanceOf(ApcuCache::class, $instance);
}
/**
* @test
*/
/** @test */
public function filesystemCacheAdaptersReadDirOption()
{
$dir = realpath(sys_get_temp_dir());
@ -84,9 +74,7 @@ class CacheFactoryTest extends TestCase
$this->assertEquals($dir, $instance->getDirectory());
}
/**
* @test
*/
/** @test */
public function memcachedCacheAdaptersReadServersOption()
{
$servers = [

29
module/Common/test/Factory/DottedAccessConfigAbstractFactoryTest.php
View File

@ -20,30 +20,23 @@ class DottedAccessConfigAbstractFactoryTest extends TestCase
}
/**
* @param string $serviceName
* @param bool $canCreate
*
* @test
* @dataProvider provideDotNames
*/
public function canCreateOnlyServicesWithDot(string $serviceName, bool $canCreate)
public function canCreateOnlyServicesWithDot(string $serviceName, bool $canCreate): void
{
$this->assertEquals($canCreate, $this->factory->canCreate(new ServiceManager(), $serviceName));
}
public function provideDotNames(): array
public function provideDotNames(): iterable
{
return [
['foo.bar', true],
['config.something', true],
['config_something', false],
['foo', false],
];
yield 'with a valid service' => ['foo.bar', true];
yield 'with another valid service' => ['config.something', true];
yield 'with an invalid service' => ['config_something', false];
yield 'with another invalid service' => ['foo', false];
}
/**
* @test
*/
/** @test */
public function throwsExceptionWhenFirstPartOfTheServiceIsNotRegistered()
{
$this->expectException(ServiceNotCreatedException::class);
@ -54,9 +47,7 @@ class DottedAccessConfigAbstractFactoryTest extends TestCase
$this->factory->__invoke(new ServiceManager(), 'foo.bar');
}
/**
* @test
*/
/** @test */
public function dottedNotationIsRecursivelyResolvedUntilLastValueIsFoundAndReturned()
{
$expected = 'this is the result';
@ -70,9 +61,7 @@ class DottedAccessConfigAbstractFactoryTest extends TestCase
$this->assertEquals($expected, $result);
}
/**
* @test
*/
/** @test */
public function exceptionIsThrownIfAnyStepCannotBeResolved()
{
$this->expectException(InvalidArgumentException::class);

8
module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
View File

@ -20,18 +20,14 @@ class EmptyResponseImplicitOptionsMiddlewareFactoryTest extends TestCase
$this->factory = new EmptyResponseImplicitOptionsMiddlewareFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreated()
{
$instance = $this->factory->__invoke(new ServiceManager(), '');
$this->assertInstanceOf(ImplicitOptionsMiddleware::class, $instance);
}
/**
* @test
*/
/** @test */
public function responsePrototypeIsEmptyResponse()
{
$instance = $this->factory->__invoke(new ServiceManager(), '');

4
module/Common/test/Factory/EntityManagerFactoryTest.php
View File

@ -18,9 +18,7 @@ class EntityManagerFactoryTest extends TestCase
$this->factory = new EntityManagerFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreated()
{
$sm = new ServiceManager(['services' => [

12
module/Common/test/Factory/LoggerFactoryTest.php
View File

@ -19,9 +19,7 @@ class LoggerFactoryTest extends TestCase
$this->factory = new LoggerFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreated()
{
/** @var Logger $instance */
@ -30,9 +28,7 @@ class LoggerFactoryTest extends TestCase
$this->assertEquals('Logger', $instance->getName());
}
/**
* @test
*/
/** @test */
public function nameIsSetFromOptions()
{
/** @var Logger $instance */
@ -41,9 +37,7 @@ class LoggerFactoryTest extends TestCase
$this->assertEquals('Foo', $instance->getName());
}
/**
* @test
*/
/** @test */
public function serviceNameOverwritesOptionsLoggerName()
{
/** @var Logger $instance */

4
module/Common/test/Factory/TranslatorFactoryTest.php
View File

@ -18,9 +18,7 @@ class TranslatorFactoryTest extends TestCase
$this->factory = new TranslatorFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreated()
{
$instance = $this->factory->__invoke(new ServiceManager(['services' => [

4
module/Common/test/Image/ImageBuilderFactoryTest.php
View File

@ -18,9 +18,7 @@ class ImageBuilderFactoryTest extends TestCase
$this->factory = new ImageBuilderFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreated()
{
$instance = $this->factory->__invoke(new ServiceManager(), '');

8
module/Common/test/Image/ImageFactoryTest.php
View File

@ -19,9 +19,7 @@ class ImageFactoryTest extends TestCase
$this->factory = new ImageFactory();
}
/**
* @test
*/
/** @test */
public function noPageIsSetWhenOptionsAreNotProvided()
{
/** @var Image $image */
@ -36,9 +34,7 @@ class ImageFactoryTest extends TestCase
$this->assertNull($page->getValue($image));
}
/**
* @test
*/
/** @test */
public function aPageIsSetWhenOptionsIncludeTheUrl()
{
$expectedPage = 'foo/bar.html';

4
module/Common/test/IpGeolocation/ChainIpLocationResolverTest.php
View File

@ -30,9 +30,7 @@ class ChainIpLocationResolverTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function throwsExceptionWhenNoInnerResolverCanHandleTheResolution()
{
$ipAddress = '1.2.3.4';

2
module/Common/test/IpGeolocation/EmptyIpLocationResolverTest.php
View File

@ -26,7 +26,7 @@ class EmptyIpLocationResolverTest extends TestCase
* @test
* @dataProvider provideEmptyResponses
*/
public function alwaysReturnsAnEmptyResponse(string $ipAddress): void
public function alwaysReturnsAnEmptyLocation(string $ipAddress): void
{
$this->assertEquals(Location::emptyInstance(), $this->resolver->resolveIpLocation($ipAddress));
}

28
module/Common/test/IpGeolocation/GeoLite2/DbUpdaterTest.php
View File

@ -39,10 +39,8 @@ class DbUpdaterTest extends TestCase
$this->dbUpdater = new DbUpdater($this->httpClient->reveal(), $this->filesystem->reveal(), $this->options);
}
/**
* @test
*/
public function anExceptionIsThrownIfFreshDbCannotBeDownloaded()
/** @test */
public function anExceptionIsThrownIfFreshDbCannotBeDownloaded(): void
{
$request = $this->httpClient->request(Argument::cetera())->willThrow(ClientException::class);
@ -56,10 +54,8 @@ class DbUpdaterTest extends TestCase
$this->dbUpdater->downloadFreshCopy();
}
/**
* @test
*/
public function anExceptionIsThrownIfFreshDbCannotBeExtracted()
/** @test */
public function anExceptionIsThrownIfFreshDbCannotBeExtracted(): void
{
$this->options->tempDir = '__invalid__';
@ -79,7 +75,7 @@ class DbUpdaterTest extends TestCase
* @test
* @dataProvider provideFilesystemExceptions
*/
public function anExceptionIsThrownIfFreshDbCannotBeCopiedToDestination(string $e)
public function anExceptionIsThrownIfFreshDbCannotBeCopiedToDestination(string $e): void
{
$request = $this->httpClient->request(Argument::cetera())->willReturn(new Response());
$copy = $this->filesystem->copy(Argument::cetera())->willThrow($e);
@ -93,18 +89,14 @@ class DbUpdaterTest extends TestCase
$this->dbUpdater->downloadFreshCopy();
}
public function provideFilesystemExceptions(): array
public function provideFilesystemExceptions(): iterable
{
return [
[FilesystemException\FileNotFoundException::class],
[FilesystemException\IOException::class],
];
yield 'file not found' => [FilesystemException\FileNotFoundException::class];
yield 'IO error' => [FilesystemException\IOException::class];
}
/**
* @test
*/
public function noExceptionsAreThrownIfEverythingWorksFine()
/** @test */
public function noExceptionsAreThrownIfEverythingWorksFine(): void
{
$request = $this->httpClient->request(Argument::cetera())->willReturn(new Response());
$copy = $this->filesystem->copy(Argument::cetera())->will(function () {

10
module/Common/test/IpGeolocation/GeoLite2LocationResolverTest.php
View File

@ -30,7 +30,7 @@ class GeoLite2LocationResolverTest extends TestCase
* @test
* @dataProvider provideReaderExceptions
*/
public function exceptionIsThrownIfReaderThrowsException(string $e, string $message)
public function exceptionIsThrownIfReaderThrowsException(string $e, string $message): void
{
$ipAddress = '1.2.3.4';
@ -44,12 +44,10 @@ class GeoLite2LocationResolverTest extends TestCase
$this->resolver->resolveIpLocation($ipAddress);
}
public function provideReaderExceptions(): array
public function provideReaderExceptions(): iterable
{
return [
[AddressNotFoundException::class, 'Provided IP "1.2.3.4" is invalid'],
[InvalidDatabaseException::class, 'Provided GeoLite2 db file is invalid'],
];
yield 'invalid IP address' => [AddressNotFoundException::class, 'Provided IP "1.2.3.4" is invalid'];
yield 'invalid geolite DB' => [InvalidDatabaseException::class, 'Provided GeoLite2 db file is invalid'];
}
/** @test */

45
module/Common/test/Logger/Processor/ExceptionWithNewLineProcessorTest.php
View File

@ -5,10 +5,15 @@ namespace ShlinkioTest\Shlink\Common\Logger\Processor;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Common\Logger\Processor\ExceptionWithNewLineProcessor;
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
use const PHP_EOL;
use function Functional\map;
use function range;
class ExceptionWithNewLineProcessorTest extends TestCase
{
use StringUtilsTrait;
/** @var ExceptionWithNewLineProcessor */
private $processor;
@ -21,44 +26,40 @@ class ExceptionWithNewLineProcessorTest extends TestCase
* @test
* @dataProvider provideNoPlaceholderRecords
*/
public function keepsRecordAsIsWhenNoPlaceholderExists(array $record)
public function keepsRecordAsIsWhenNoPlaceholderExists(array $record): void
{
$this->assertSame($record, ($this->processor)($record));
}
public function provideNoPlaceholderRecords(): array
public function provideNoPlaceholderRecords(): iterable
{
return [
[['message' => 'Hello World']],
[['message' => 'Shlink']],
[['message' => 'Foo bar']],
];
return map(range(1, 5), function () {
return [['message' => $this->generateRandomString()]];
});
}
/**
* @test
* @dataProvider providePlaceholderRecords
*/
public function properlyReplacesExceptionPlaceholderAddingNewLine(array $record, array $expected)
public function properlyReplacesExceptionPlaceholderAddingNewLine(array $record, array $expected): void
{
$this->assertEquals($expected, ($this->processor)($record));
}
public function providePlaceholderRecords(): array
public function providePlaceholderRecords(): iterable
{
return [
[
['message' => 'Hello World with placeholder {e}'],
['message' => 'Hello World with placeholder ' . PHP_EOL . '{e}'],
],
[
['message' => '{e} Shlink'],
['message' => PHP_EOL . '{e} Shlink'],
],
[
['message' => 'Foo {e} bar'],
['message' => 'Foo ' . PHP_EOL . '{e} bar'],
],
yield [
['message' => 'Hello World with placeholder {e}'],
['message' => 'Hello World with placeholder ' . PHP_EOL . '{e}'],
];
yield [
['message' => '{e} Shlink'],
['message' => PHP_EOL . '{e} Shlink'],
];
yield [
['message' => 'Foo {e} bar'],
['message' => 'Foo ' . PHP_EOL . '{e} bar'],
];
}
}

4
module/Common/test/Middleware/CloseDbConnectionMiddlewareTest.php
View File

@ -29,9 +29,7 @@ class CloseDbConnectionMiddlewareTest extends TestCase
$this->middleware = new CloseDbConnectionMiddleware($this->em->reveal());
}
/**
* @test
*/
/** @test */
public function connectionIsClosedWhenMiddlewareIsProcessed()
{
$req = new ServerRequest();

4
module/Common/test/Middleware/IpAddressMiddlewareFactoryTest.php
View File

@ -18,9 +18,7 @@ class IpAddressMiddlewareFactoryTest extends TestCase
$this->factory = new IpAddressMiddlewareFactory();
}
/**
* @test
*/
/** @test */
public function returnedInstanceIsProperlyConfigured()
{
$instance = $this->factory->__invoke(new ServiceManager(), '');

24
module/Common/test/Middleware/LocaleMiddlewareTest.php
View File

@ -22,20 +22,16 @@ class LocaleMiddlewareTest extends TestCase
$this->middleware = new LocaleMiddleware($this->translator);
}
/**
* @test
*/
public function whenNoHeaderIsPresentLocaleIsNotChanged()
/** @test */
public function whenNoHeaderIsPresentLocaleIsNotChanged(): void
{
$this->assertEquals('ru', $this->translator->getLocale());
$this->middleware->process(new ServerRequest(), TestUtils::createReqHandlerMock()->reveal());
$this->assertEquals('ru', $this->translator->getLocale());
}
/**
* @test
*/
public function whenTheHeaderIsPresentLocaleIsChanged()
/** @test */
public function whenTheHeaderIsPresentLocaleIsChanged(): void
{
$this->assertEquals('ru', $this->translator->getLocale());
$request = (new ServerRequest())->withHeader('Accept-Language', 'es');
@ -47,7 +43,7 @@ class LocaleMiddlewareTest extends TestCase
* @test
* @dataProvider provideLanguages
*/
public function localeGetsNormalized(string $lang, string $expected)
public function localeGetsNormalized(string $lang, string $expected): void
{
$handler = TestUtils::createReqHandlerMock();
@ -58,12 +54,10 @@ class LocaleMiddlewareTest extends TestCase
$this->assertEquals($expected, $this->translator->getLocale());
}
public function provideLanguages(): array
public function provideLanguages(): iterable
{
return [
['ru', 'ru'],
['es_ES', 'es'],
['en-US', 'en'],
];
yield 'language only' => ['ru', 'ru'];
yield 'country and language with underscore' => ['es_ES', 'es'];
yield 'country and language with dash' => ['en-US', 'en'];
}
}

8
module/Common/test/Paginator/PaginableRepositoryAdapterTest.php
View File

@ -21,18 +21,14 @@ class PaginableRepositoryAdapterTest extends TestCase
$this->adapter = new PaginableRepositoryAdapter($this->repo->reveal(), 'search', ['foo', 'bar'], 'order');
}
/**
* @test
*/
/** @test */
public function getItemsFallbacksToFindList()
{
$this->repo->findList(10, 5, 'search', ['foo', 'bar'], 'order')->shouldBeCalledOnce();
$this->adapter->getItems(5, 10);
}
/**
* @test
*/
/** @test */
public function countFallbacksToCountList()
{
$this->repo->countList('search', ['foo', 'bar'])->shouldBeCalledOnce();

4
module/Common/test/Response/PixelResponseTest.php
View File

@ -16,9 +16,7 @@ class PixelResponseTest extends TestCase
$this->resp = new PixelResponse();
}
/**
* @test
*/
/** @test */
public function responseHasGifTypeAndIsNotEmpty()
{
$this->assertEquals('image/gif', $this->resp->getHeaderLine('Content-Type'));

4
module/Common/test/Response/QrCodeResponseTest.php
View File

@ -9,9 +9,7 @@ use Shlinkio\Shlink\Common\Response\QrCodeResponse;
class QrCodeResponseTest extends TestCase
{
/**
* @test
*/
/** @test */
public function providedQrCoideIsSetAsBody()
{
$qrCode = new QrCode('Hello');

8
module/Common/test/Service/PreviewGeneratorTest.php
View File

@ -38,9 +38,7 @@ class PreviewGeneratorTest extends TestCase
]), $this->filesystem->reveal(), 'dir');
}
/**
* @test
*/
/** @test */
public function alreadyProcessedElementsAreNotProcessed()
{
$url = 'http://foo.com';
@ -50,9 +48,7 @@ class PreviewGeneratorTest extends TestCase
$this->assertEquals(sprintf('dir/preview_%s.png', urlencode($url)), $this->generator->generatePreview($url));
}
/**
* @test
*/
/** @test */
public function nonProcessedElementsAreProcessed()
{
$url = 'http://foo.com';

4
module/Common/test/Template/Extension/TranslatorExtensionTest.php
View File

@ -19,9 +19,7 @@ class TranslatorExtensionTest extends TestCase
$this->extension = new TranslatorExtension($this->prophesize(Translator::class)->reveal());
}
/**
* @test
*/
/** @test */
public function properFunctionsAreReturned()
{
$engine = $this->prophesize(Engine::class);

38
module/Common/test/Type/ChronosDateTimeTypeTest.php
View File

@ -28,10 +28,8 @@ class ChronosDateTimeTypeTest extends TestCase
$this->type = Type::getType(ChronosDateTimeType::CHRONOS_DATETIME);
}
/**
* @test
*/
public function nameIsReturned()
/** @test */
public function nameIsReturned(): void
{
$this->assertEquals(ChronosDateTimeType::CHRONOS_DATETIME, $this->type->getName());
}
@ -40,7 +38,7 @@ class ChronosDateTimeTypeTest extends TestCase
* @test
* @dataProvider provideValues
*/
public function valueIsConverted(?string $value, ?string $expected)
public function valueIsConverted(?string $value, ?string $expected): void
{
$platform = $this->prophesize(AbstractPlatform::class);
$platform->getDateTimeFormatString()->willReturn('Y-m-d H:i:s');
@ -54,20 +52,18 @@ class ChronosDateTimeTypeTest extends TestCase
}
}
public function provideValues(): array
public function provideValues(): iterable
{
return [
[null, null],
['now', Chronos::class],
['2017-01-01', Chronos::class],
];
yield 'null date' => [null, null];
yield 'human friendly date' => ['now', Chronos::class];
yield 'numeric date' => ['2017-01-01', Chronos::class];
}
/**
* @test
* @dataProvider providePhpValues
*/
public function valueIsConvertedToDatabaseFormat(?DateTimeInterface $value, ?string $expected)
public function valueIsConvertedToDatabaseFormat(?DateTimeInterface $value, ?string $expected): void
{
$platform = $this->prophesize(AbstractPlatform::class);
$platform->getDateTimeFormatString()->willReturn('Y-m-d');
@ -75,20 +71,16 @@ class ChronosDateTimeTypeTest extends TestCase
$this->assertEquals($expected, $this->type->convertToDatabaseValue($value, $platform->reveal()));
}
public function providePhpValues(): array
public function providePhpValues(): iterable
{
return [
[null, null],
[new DateTimeImmutable('2017-01-01'), '2017-01-01'],
[Chronos::parse('2017-02-01'), '2017-02-01'],
[new DateTime('2017-03-01'), '2017-03-01'],
];
yield 'null date' => [null, null];
yield 'DateTimeImmutable date' => [new DateTimeImmutable('2017-01-01'), '2017-01-01'];
yield 'Chronos date' => [Chronos::parse('2017-02-01'), '2017-02-01'];
yield 'DateTime date' => [new DateTime('2017-03-01'), '2017-03-01'];
}
/**
* @test
*/
public function exceptionIsThrownIfInvalidValueIsParsedToDatabase()
/** @test */
public function exceptionIsThrownIfInvalidValueIsParsedToDatabase(): void
{
$this->expectException(ConversionException::class);
$this->type->convertToDatabaseValue(new stdClass(), $this->prophesize(AbstractPlatform::class)->reveal());

27
module/Common/test/Util/DateRangeTest.php
View File

@ -9,9 +9,7 @@ use Shlinkio\Shlink\Common\Util\DateRange;
class DateRangeTest extends TestCase
{
/**
* @test
*/
/** @test */
public function defaultConstructorSetDatesToNull()
{
$range = new DateRange();
@ -20,9 +18,7 @@ class DateRangeTest extends TestCase
$this->assertTrue($range->isEmpty());
}
/**
* @test
*/
/** @test */
public function providedDatesAreSet()
{
$startDate = Chronos::now();
@ -37,19 +33,20 @@ class DateRangeTest extends TestCase
* @test
* @dataProvider provideDates
*/
public function isConsideredEmptyOnlyIfNoneOfTheDatesIsSet(?Chronos $startDate, ?Chronos $endDate, bool $isEmpty)
{
public function isConsideredEmptyOnlyIfNoneOfTheDatesIsSet(
?Chronos $startDate,
?Chronos $endDate,
bool $isEmpty
): void {
$range = new DateRange($startDate, $endDate);
$this->assertEquals($isEmpty, $range->isEmpty());
}
public function provideDates(): array
public function provideDates(): iterable
{
return [
[null, null, true],
[null, Chronos::now(), false],
[Chronos::now(), null, false],
[Chronos::now(), Chronos::now(), false],
];
yield 'both are null' => [null, null, true];
yield 'start is null' => [null, Chronos::now(), false];
yield 'end is null' => [Chronos::now(), null, false];
yield 'none are null' => [Chronos::now(), Chronos::now(), false];
}
}

16
module/Common/test/Util/StringUtilsTraitTest.php
View File

@ -5,6 +5,8 @@ namespace ShlinkioTest\Shlink\Common\Util;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
use function Functional\map;
use function range;
use function strlen;
class StringUtilsTraitTest extends TestCase
@ -15,23 +17,19 @@ class StringUtilsTraitTest extends TestCase
* @test
* @dataProvider provideLengths
*/
public function generateRandomStringGeneratesStringOfProvidedLength(int $length)
public function generateRandomStringGeneratesStringOfProvidedLength(int $length): void
{
$this->assertEquals($length, strlen($this->generateRandomString($length)));
}
public function provideLengths(): array
{
return [
[1],
[10],
[15],
];
return map(range(10, 50, 5), function (int $i) {
return [$i];
});
}
/**
* @test
*/
/** @test */
public function generatesUuidV4()
{
$uuidPattern = '/[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}/';

2
module/Core/src/Entity/Visit.php
View File

@ -82,7 +82,7 @@ class Visit extends AbstractEntity implements JsonSerializable
{
return [
'referer' => $this->referer,
'date' => isset($this->date) ? $this->date->toAtomString() : null,
'date' => $this->date !== null ? $this->date->toAtomString() : null,
'userAgent' => $this->userAgent,
'visitLocation' => $this->visitLocation,

4
module/Core/src/Exception/InvalidShortCodeException.php
View File

@ -3,12 +3,12 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Exception;
use Exception;
use Throwable;
use function sprintf;
class InvalidShortCodeException extends RuntimeException
{
public static function fromCharset(string $shortCode, string $charSet, Exception $previous = null): self
public static function fromCharset(string $shortCode, string $charSet, ?Throwable $previous = null): self
{
$code = $previous !== null ? $previous->getCode() : -1;
return new static(

2
module/Core/src/Exception/InvalidUrlException.php
View File

@ -8,7 +8,7 @@ use function sprintf;
class InvalidUrlException extends RuntimeException
{
public static function fromUrl(string $url, Throwable $previous = null)
public static function fromUrl(string $url, Throwable $previous = null): self
{
$code = $previous !== null ? $previous->getCode() : -1;
return new static(sprintf('Provided URL "%s" is not an existing and valid URL', $url), $code, $previous);

16
module/Core/test-db/Repository/ShortUrlRepositoryTest.php
View File

@ -30,9 +30,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
$this->repo = $this->getEntityManager()->getRepository(ShortUrl::class);
}
/**
* @test
*/
/** @test */
public function findOneByShortCodeReturnsProperData()
{
$foo = new ShortUrl('foo');
@ -62,9 +60,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
$this->assertNull($this->repo->findOneByShortCode($baz->getShortCode()));
}
/**
* @test
*/
/** @test */
public function countListReturnsProperNumberOfResults()
{
$count = 5;
@ -78,9 +74,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
$this->assertEquals($count, $this->repo->countList());
}
/**
* @test
*/
/** @test */
public function findListProperlyFiltersByTagAndSearchTerm()
{
$tag = new Tag('bar');
@ -125,9 +119,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
$this->assertSame($bar, $result[0]);
}
/**
* @test
*/
/** @test */
public function findListProperlyMapsFieldNamesToColumnNamesWhenOrdering()
{
$urls = ['a', 'z', 'c', 'b'];

8
module/Core/test-db/Repository/TagRepositoryTest.php
View File

@ -21,17 +21,13 @@ class TagRepositoryTest extends DatabaseTestCase
$this->repo = $this->getEntityManager()->getRepository(Tag::class);
}
/**
* @test
*/
/** @test */
public function deleteByNameDoesNothingWhenEmptyListIsProvided()
{
$this->assertEquals(0, $this->repo->deleteByName([]));
}
/**
* @test
*/
/** @test */
public function allTagsWhichMatchNameAreDeleted()
{
$names = ['foo', 'bar', 'baz'];

4
module/Core/test/Action/PixelActionTest.php
View File

@ -37,9 +37,7 @@ class PixelActionTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function imageIsReturned()
{
$shortCode = 'abc123';

12
module/Core/test/Action/PreviewActionTest.php
View File

@ -37,9 +37,7 @@ class PreviewActionTest extends TestCase
$this->action = new PreviewAction($this->previewGenerator->reveal(), $this->urlShortener->reveal());
}
/**
* @test
*/
/** @test */
public function invalidShortCodeFallsBackToNextMiddleware()
{
$shortCode = 'abc123';
@ -52,9 +50,7 @@ class PreviewActionTest extends TestCase
$this->action->process((new ServerRequest())->withAttribute('shortCode', $shortCode), $delegate->reveal());
}
/**
* @test
*/
/** @test */
public function correctShortCodeReturnsImageResponse()
{
$shortCode = 'abc123';
@ -73,9 +69,7 @@ class PreviewActionTest extends TestCase
$this->assertEquals((new finfo(FILEINFO_MIME))->file($path), $resp->getHeaderLine('Content-type'));
}
/**
* @test
*/
/** @test */
public function invalidShortCodeExceptionFallsBackToNextMiddleware()
{
$shortCode = 'abc123';

12
module/Core/test/Action/QrCodeActionTest.php
View File

@ -35,9 +35,7 @@ class QrCodeActionTest extends TestCase
$this->action = new QrCodeAction($router->reveal(), $this->urlShortener->reveal());
}
/**
* @test
*/
/** @test */
public function aNotFoundShortCodeWillDelegateIntoNextMiddleware()
{
$shortCode = 'abc123';
@ -51,9 +49,7 @@ class QrCodeActionTest extends TestCase
$process->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function anInvalidShortCodeWillReturnNotFoundResponse()
{
$shortCode = 'abc123';
@ -68,9 +64,7 @@ class QrCodeActionTest extends TestCase
$process->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function aCorrectRequestReturnsTheQrCodeResponse()
{
$shortCode = 'abc123';

16
module/Core/test/Action/RedirectActionTest.php
View File

@ -42,9 +42,7 @@ class RedirectActionTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function redirectionIsPerformedToLongUrl()
{
$shortCode = 'abc123';
@ -63,9 +61,7 @@ class RedirectActionTest extends TestCase
$this->assertEquals($expectedUrl, $response->getHeaderLine('Location'));
}
/**
* @test
*/
/** @test */
public function nextMiddlewareIsInvokedIfLongUrlIsNotFound()
{
$shortCode = 'abc123';
@ -82,9 +78,7 @@ class RedirectActionTest extends TestCase
$handle->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function redirectToCustomUrlIsReturnedIfConfiguredSoAndShortUrlIsNotFound()
{
$shortCode = 'abc123';
@ -107,9 +101,7 @@ class RedirectActionTest extends TestCase
$handle->shouldNotHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function visitIsNotTrackedIfDisableParamIsProvided()
{
$shortCode = 'abc123';

4
module/Core/test/ConfigProviderTest.php
View File

@ -16,9 +16,7 @@ class ConfigProviderTest extends TestCase
$this->configProvider = new ConfigProvider();
}
/**
* @test
*/
/** @test */
public function properConfigIsReturned()
{
$config = $this->configProvider->__invoke();

4
module/Core/test/Entity/TagTest.php
View File

@ -8,9 +8,7 @@ use Shlinkio\Shlink\Core\Entity\Tag;
class TagTest extends TestCase
{
/**
* @test
*/
/** @test */
public function jsonSerializationOfTagsReturnsItsStringRepresentation()
{
$tag = new Tag('This is my name');

10
module/Core/test/Entity/VisitTest.php
View File

@ -15,7 +15,7 @@ class VisitTest extends TestCase
* @test
* @dataProvider provideDates
*/
public function isProperlyJsonSerialized(?Chronos $date)
public function isProperlyJsonSerialized(?Chronos $date): void
{
$visit = new Visit(new ShortUrl(''), new Visitor('Chrome', 'some site', '1.2.3.4'), $date);
@ -30,11 +30,9 @@ class VisitTest extends TestCase
], $visit->jsonSerialize());
}
public function provideDates(): array
public function provideDates(): iterable
{
return [
[null],
[Chronos::now()->subDays(10)],
];
yield 'null date' => [null];
yield 'not null date' => [Chronos::now()->subDays(10)];
}
}

45
module/Core/test/Exception/DeleteShortUrlExceptionTest.php
View File

@ -4,61 +4,56 @@ declare(strict_types=1);
namespace ShlinkioTest\Shlink\Core\Exception;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
use Shlinkio\Shlink\Core\Exception\DeleteShortUrlException;
use function Functional\map;
use function range;
use function sprintf;
class DeleteShortUrlExceptionTest extends TestCase
{
use StringUtilsTrait;
/**
* @test
* @dataProvider provideMessages
* @dataProvider provideThresholds
*/
public function fromVisitsThresholdGeneratesMessageProperly(
int $threshold,
string $shortCode,
string $expectedMessage
) {
): void {
$e = DeleteShortUrlException::fromVisitsThreshold($threshold, $shortCode);
$this->assertEquals($threshold, $e->getVisitsThreshold());
$this->assertEquals($expectedMessage, $e->getMessage());
$this->assertEquals(0, $e->getCode());
}
public function provideMessages(): array
{
return [
[
50,
'abc123',
'Impossible to delete short URL with short code "abc123" since it has more than "50" visits.',
],
[
33,
'def456',
'Impossible to delete short URL with short code "def456" since it has more than "33" visits.',
],
[
5713,
'foobar',
'Impossible to delete short URL with short code "foobar" since it has more than "5713" visits.',
],
];
$this->assertNull($e->getPrevious());
}
/**
* @test
* @dataProvider provideThresholds
*/
public function visitsThresholdIsProperlyReturned(int $threshold)
public function visitsThresholdIsProperlyReturned(int $threshold): void
{
$e = new DeleteShortUrlException($threshold);
$this->assertEquals($threshold, $e->getVisitsThreshold());
$this->assertEquals('', $e->getMessage());
$this->assertEquals(0, $e->getCode());
$this->assertNull($e->getPrevious());
}
public function provideThresholds(): array
{
return map(range(5, 50, 5), function (int $number) {
return [$number];
$shortCode = $this->generateRandomString(6);
return [$number, $shortCode, sprintf(
'Impossible to delete short URL with short code "%s" since it has more than "%s" visits.',
$shortCode,
$number
)];
});
}
}

16
module/Core/test/Exception/InvalidShortCodeExceptionTest.php
View File

@ -14,7 +14,7 @@ class InvalidShortCodeExceptionTest extends TestCase
* @test
* @dataProvider providePrevious
*/
public function properlyCreatesExceptionFromCharset(?Throwable $prev)
public function properlyCreatesExceptionFromCharset(?Throwable $prev): void
{
$e = InvalidShortCodeException::fromCharset('abc123', 'def456', $prev);
@ -23,18 +23,14 @@ class InvalidShortCodeExceptionTest extends TestCase
$this->assertEquals($prev, $e->getPrevious());
}
public function providePrevious(): array
public function providePrevious(): iterable
{
return [
[null],
[new Exception('Previos error', 10)],
];
yield 'null previous' => [null];
yield 'instance previous' => [new Exception('Previous error', 10)];
}
/**
* @test
*/
public function properlyCreatesExceptionFromNotFoundShortCode()
/** @test */
public function properlyCreatesExceptionFromNotFoundShortCode(): void
{
$e = InvalidShortCodeException::fromNotFoundShortCode('abc123');

10
module/Core/test/Exception/InvalidUrlExceptionTest.php
View File

@ -14,7 +14,7 @@ class InvalidUrlExceptionTest extends TestCase
* @test
* @dataProvider providePrevious
*/
public function properlyCreatesExceptionFromUrl(?Throwable $prev)
public function properlyCreatesExceptionFromUrl(?Throwable $prev): void
{
$e = InvalidUrlException::fromUrl('http://the_url.com', $prev);
@ -23,11 +23,9 @@ class InvalidUrlExceptionTest extends TestCase
$this->assertEquals($prev, $e->getPrevious());
}
public function providePrevious(): array
public function providePrevious(): iterable
{
return [
[null],
[new Exception('Previos error', 10)],
];
yield 'null previous' => [null];
yield 'instance previous' => [new Exception('Previous error', 10)];
}
}

8
module/Core/test/Middleware/QrCodeCacheMiddlewareTest.php
View File

@ -26,9 +26,7 @@ class QrCodeCacheMiddlewareTest extends TestCase
$this->middleware = new QrCodeCacheMiddleware($this->cache);
}
/**
* @test
*/
/** @test */
public function noCachedPathFallsBackToNextMiddleware()
{
$delegate = $this->prophesize(RequestHandlerInterface::class);
@ -39,9 +37,7 @@ class QrCodeCacheMiddlewareTest extends TestCase
$this->assertTrue($this->cache->contains('/foo/bar'));
}
/**
* @test
*/
/** @test */
public function cachedPathReturnsCacheContent()
{
$isCalled = false;

32
module/Core/test/Model/ShortUrlMetaTest.php
View File

@ -16,32 +16,28 @@ class ShortUrlMetaTest extends TestCase
* @test
* @dataProvider provideInvalidData
*/
public function exceptionIsThrownIfProvidedDataIsInvalid(array $data)
public function exceptionIsThrownIfProvidedDataIsInvalid(array $data): void
{
$this->expectException(ValidationException::class);
ShortUrlMeta::createFromRawData($data);
}
public function provideInvalidData(): array
public function provideInvalidData(): iterable
{
return [
[[
ShortUrlMetaInputFilter::VALID_SINCE => '',
ShortUrlMetaInputFilter::VALID_UNTIL => '',
ShortUrlMetaInputFilter::CUSTOM_SLUG => 'foobar',
ShortUrlMetaInputFilter::MAX_VISITS => 'invalid',
]],
[[
ShortUrlMetaInputFilter::VALID_SINCE => '2017',
ShortUrlMetaInputFilter::MAX_VISITS => 5,
]],
];
yield [[
ShortUrlMetaInputFilter::VALID_SINCE => '',
ShortUrlMetaInputFilter::VALID_UNTIL => '',
ShortUrlMetaInputFilter::CUSTOM_SLUG => 'foobar',
ShortUrlMetaInputFilter::MAX_VISITS => 'invalid',
]];
yield [[
ShortUrlMetaInputFilter::VALID_SINCE => '2017',
ShortUrlMetaInputFilter::MAX_VISITS => 5,
]];
}
/**
* @test
*/
public function properlyCreatedInstanceReturnsValues()
/** @test */
public function properlyCreatedInstanceReturnsValues(): void
{
$meta = ShortUrlMeta::createFromParams(Chronos::parse('2015-01-01')->toAtomString(), null, 'foobar');

20
module/Core/test/Response/NotFoundHandlerTest.php
View File

@ -5,7 +5,6 @@ namespace ShlinkioTest\Shlink\Core\Response;
use PHPUnit\Framework\TestCase;
use Prophecy\Argument;
use Prophecy\Prophecy\MethodProphecy;
use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\Core\Response\NotFoundHandler;
use Zend\Diactoros\Response;
@ -26,17 +25,12 @@ class NotFoundHandlerTest extends TestCase
}
/**
* @param string $expectedResponse
* @param string $accept
* @param int $renderCalls
*
* @test
* @dataProvider provideResponses
*/
public function properResponseTypeIsReturned(string $expectedResponse, string $accept, int $renderCalls)
public function properResponseTypeIsReturned(string $expectedResponse, string $accept, int $renderCalls): void
{
$request = (new ServerRequest())->withHeader('Accept', $accept);
/** @var MethodProphecy $render */
$render = $this->renderer->render(Argument::cetera())->willReturn('');
$resp = $this->delegate->handle($request);
@ -45,13 +39,11 @@ class NotFoundHandlerTest extends TestCase
$render->shouldHaveBeenCalledTimes($renderCalls);
}
public function provideResponses(): array
public function provideResponses(): iterable
{
return [
[Response\JsonResponse::class, 'application/json', 0],
[Response\JsonResponse::class, 'text/json', 0],
[Response\JsonResponse::class, 'application/x-json', 0],
[Response\HtmlResponse::class, 'text/html', 1],
];
yield 'application/json' => [Response\JsonResponse::class, 'application/json', 0];
yield 'text/json' => [Response\JsonResponse::class, 'text/json', 0];
yield 'application/x-json' => [Response\JsonResponse::class, 'application/x-json', 0];
yield 'text/html' => [Response\HtmlResponse::class, 'text/html', 1];
}
}

16
module/Core/test/Service/ShortUrl/DeleteShortUrlServiceTest.php
View File

@ -39,9 +39,7 @@ class DeleteShortUrlServiceTest extends TestCase
$this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal());
}
/**
* @test
*/
/** @test */
public function deleteByShortCodeThrowsExceptionWhenThresholdIsReached()
{
$service = $this->createService();
@ -54,9 +52,7 @@ class DeleteShortUrlServiceTest extends TestCase
$service->deleteByShortCode('abc123');
}
/**
* @test
*/
/** @test */
public function deleteByShortCodeDeletesUrlWhenThresholdIsReachedButExplicitlyIgnored()
{
$service = $this->createService();
@ -70,9 +66,7 @@ class DeleteShortUrlServiceTest extends TestCase
$flush->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function deleteByShortCodeDeletesUrlWhenThresholdIsReachedButCheckIsDisabled()
{
$service = $this->createService(false);
@ -86,9 +80,7 @@ class DeleteShortUrlServiceTest extends TestCase
$flush->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function deleteByShortCodeDeletesUrlWhenThresholdIsNotReached()
{
$service = $this->createService(true, 100);

16
module/Core/test/Service/ShortUrlServiceTest.php
View File

@ -32,9 +32,7 @@ class ShortUrlServiceTest extends TestCase
$this->service = new ShortUrlService($this->em->reveal());
}
/**
* @test
*/
/** @test */
public function listedUrlsAreReturnedFromEntityManager()
{
$list = [
@ -53,9 +51,7 @@ class ShortUrlServiceTest extends TestCase
$this->assertEquals(4, $list->getCurrentItemCount());
}
/**
* @test
*/
/** @test */
public function exceptionIsThrownWhenSettingTagsOnInvalidShortcode()
{
$shortCode = 'abc123';
@ -68,9 +64,7 @@ class ShortUrlServiceTest extends TestCase
$this->service->setTagsByShortCode($shortCode);
}
/**
* @test
*/
/** @test */
public function providedTagsAreGetFromRepoAndSetToTheShortUrl()
{
$shortUrl = $this->prophesize(ShortUrl::class);
@ -89,9 +83,7 @@ class ShortUrlServiceTest extends TestCase
$this->service->setTagsByShortCode($shortCode, ['foo', 'bar']);
}
/**
* @test
*/
/** @test */
public function updateMetadataByShortCodeUpdatesProvidedData()
{
$shortUrl = new ShortUrl('');

20
module/Core/test/Service/Tag/TagServiceTest.php
View File

@ -27,9 +27,7 @@ class TagServiceTest extends TestCase
$this->service = new TagService($this->em->reveal());
}
/**
* @test
*/
/** @test */
public function listTagsDelegatesOnRepository()
{
$expected = [new Tag('foo'), new Tag('bar')];
@ -47,9 +45,7 @@ class TagServiceTest extends TestCase
$getRepo->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function deleteTagsDelegatesOnRepository()
{
$repo = $this->prophesize(TagRepository::class);
@ -64,9 +60,7 @@ class TagServiceTest extends TestCase
$getRepo->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function createTagsPersistsEntities()
{
$repo = $this->prophesize(TagRepository::class);
@ -88,9 +82,7 @@ class TagServiceTest extends TestCase
$flush->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function renameInvalidTagThrowsException()
{
$repo = $this->prophesize(TagRepository::class);
@ -106,9 +98,7 @@ class TagServiceTest extends TestCase
$this->service->renameTag('foo', 'bar');
}
/**
* @test
*/
/** @test */
public function renameValidTagChangesItsName()
{
$expected = new Tag('foo');

100
module/Core/test/Service/UrlShortenerTest.php
View File

@ -60,7 +60,7 @@ class UrlShortenerTest extends TestCase
$this->setUrlShortener(false);
}
public function setUrlShortener(bool $urlValidationEnabled): void
private function setUrlShortener(bool $urlValidationEnabled): void
{
$this->urlShortener = new UrlShortener(
$this->httpClient->reveal(),
@ -69,9 +69,7 @@ class UrlShortenerTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function urlIsProperlyShortened(): void
{
// 10 -> 0Q1Y
@ -119,9 +117,7 @@ class UrlShortenerTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function exceptionIsThrownWhenNonUniqueSlugIsProvided(): void
{
$repo = $this->prophesize(ShortUrlRepository::class);
@ -143,7 +139,7 @@ class UrlShortenerTest extends TestCase
/**
* @test
* @dataProvider provideExsitingShortUrls
* @dataProvider provideExistingShortUrls
*/
public function existingShortUrlIsReturnedWhenRequested(
string $url,
@ -162,58 +158,54 @@ class UrlShortenerTest extends TestCase
$getRepo->shouldHaveBeenCalledOnce();
}
public function provideExsitingShortUrls(): array
public function provideExistingShortUrls(): iterable
{
$url = 'http://foo.com';
return [
[$url, [], ShortUrlMeta::createFromRawData(['findIfExists' => true]), new ShortUrl($url)],
[$url, [], ShortUrlMeta::createFromRawData(
['findIfExists' => true, 'customSlug' => 'foo']
), new ShortUrl($url)],
[
$url,
['foo', 'bar'],
ShortUrlMeta::createFromRawData(['findIfExists' => true]),
(new ShortUrl($url))->setTags(new ArrayCollection([new Tag('bar'), new Tag('foo')])),
],
[
$url,
[],
ShortUrlMeta::createFromRawData(['findIfExists' => true, 'maxVisits' => 3]),
new ShortUrl($url, ShortUrlMeta::createFromRawData(['maxVisits' => 3])),
],
[
$url,
[],
ShortUrlMeta::createFromRawData(['findIfExists' => true, 'validSince' => Chronos::parse('2017-01-01')]),
new ShortUrl($url, ShortUrlMeta::createFromRawData(['validSince' => Chronos::parse('2017-01-01')])),
],
[
$url,
[],
ShortUrlMeta::createFromRawData(['findIfExists' => true, 'validUntil' => Chronos::parse('2017-01-01')]),
new ShortUrl($url, ShortUrlMeta::createFromRawData(['validUntil' => Chronos::parse('2017-01-01')])),
],
[
$url,
['baz', 'foo', 'bar'],
ShortUrlMeta::createFromRawData([
'findIfExists' => true,
'validUntil' => Chronos::parse('2017-01-01'),
'maxVisits' => 4,
]),
(new ShortUrl($url, ShortUrlMeta::createFromRawData([
'validUntil' => Chronos::parse('2017-01-01'),
'maxVisits' => 4,
])))->setTags(new ArrayCollection([new Tag('foo'), new Tag('bar'), new Tag('baz')])),
],
yield [$url, [], ShortUrlMeta::createFromRawData(['findIfExists' => true]), new ShortUrl($url)];
yield [$url, [], ShortUrlMeta::createFromRawData(
['findIfExists' => true, 'customSlug' => 'foo']
), new ShortUrl($url)];
yield [
$url,
['foo', 'bar'],
ShortUrlMeta::createFromRawData(['findIfExists' => true]),
(new ShortUrl($url))->setTags(new ArrayCollection([new Tag('bar'), new Tag('foo')])),
];
yield [
$url,
[],
ShortUrlMeta::createFromRawData(['findIfExists' => true, 'maxVisits' => 3]),
new ShortUrl($url, ShortUrlMeta::createFromRawData(['maxVisits' => 3])),
];
yield [
$url,
[],
ShortUrlMeta::createFromRawData(['findIfExists' => true, 'validSince' => Chronos::parse('2017-01-01')]),
new ShortUrl($url, ShortUrlMeta::createFromRawData(['validSince' => Chronos::parse('2017-01-01')])),
];
yield [
$url,
[],
ShortUrlMeta::createFromRawData(['findIfExists' => true, 'validUntil' => Chronos::parse('2017-01-01')]),
new ShortUrl($url, ShortUrlMeta::createFromRawData(['validUntil' => Chronos::parse('2017-01-01')])),
];
yield [
$url,
['baz', 'foo', 'bar'],
ShortUrlMeta::createFromRawData([
'findIfExists' => true,
'validUntil' => Chronos::parse('2017-01-01'),
'maxVisits' => 4,
]),
(new ShortUrl($url, ShortUrlMeta::createFromRawData([
'validUntil' => Chronos::parse('2017-01-01'),
'maxVisits' => 4,
])))->setTags(new ArrayCollection([new Tag('foo'), new Tag('bar'), new Tag('baz')])),
];
}
/**
* @test
*/
/** @test */
public function shortCodeIsProperlyParsed(): void
{
$shortCode = '12C1c';

4
module/Core/test/Service/VisitServiceTest.php
View File

@ -67,9 +67,7 @@ class VisitServiceTest extends TestCase
$clear->shouldHaveBeenCalledTimes(count($unlocatedVisits));
}
/**
* @test
*/
/** @test */
public function visitsWhichCannotBeLocatedAreIgnored()
{
$unlocatedVisits = [

12
module/Core/test/Service/VisitsTrackerTest.php
View File

@ -31,9 +31,7 @@ class VisitsTrackerTest extends TestCase
$this->visitsTracker = new VisitsTracker($this->em->reveal());
}
/**
* @test
*/
/** @test */
public function trackPersistsVisit()
{
$shortCode = '123ABC';
@ -47,9 +45,7 @@ class VisitsTrackerTest extends TestCase
$this->visitsTracker->track($shortCode, Visitor::emptyInstance());
}
/**
* @test
*/
/** @test */
public function trackedIpAddressGetsObfuscated()
{
$shortCode = '123ABC';
@ -67,9 +63,7 @@ class VisitsTrackerTest extends TestCase
$this->visitsTracker->track($shortCode, new Visitor('', '', '4.3.2.1'));
}
/**
* @test
*/
/** @test */
public function infoReturnsVisistForCertainShortCode()
{
$shortCode = '123ABC';

61
module/Rest/test-api/Action/CreateShortUrlActionTest.php
View File

@ -6,12 +6,12 @@ namespace ShlinkioApiTest\Shlink\Rest\Action;
use Cake\Chronos\Chronos;
use GuzzleHttp\RequestOptions;
use ShlinkioTest\Shlink\Common\ApiTest\ApiTestCase;
use function Functional\map;
use function range;
class CreateShortUrlActionTest extends ApiTestCase
{
/**
* @test
*/
/** @test */
public function createsNewShortUrlWhenOnlyLongUrlIsProvided(): void
{
$expectedKeys = ['shortCode', 'shortUrl', 'longUrl', 'dateCreated', 'visitsCount', 'tags'];
@ -23,9 +23,7 @@ class CreateShortUrlActionTest extends ApiTestCase
}
}
/**
* @test
*/
/** @test */
public function createsNewShortUrlWithCustomSlug(): void
{
[$statusCode, $payload] = $this->createShortUrl(['customSlug' => 'my cool slug']);
@ -34,9 +32,7 @@ class CreateShortUrlActionTest extends ApiTestCase
$this->assertEquals('my-cool-slug', $payload['shortCode']);
}
/**
* @test
*/
/** @test */
public function createsNewShortUrlWithTags(): void
{
[$statusCode, $payload] = $this->createShortUrl(['tags' => ['foo', 'bar', 'baz']]);
@ -65,16 +61,12 @@ class CreateShortUrlActionTest extends ApiTestCase
public function provideMaxVisits(): array
{
return [
[1],
[5],
[3],
];
return map(range(1, 20), function (int $i) {
return [$i];
});
}
/**
* @test
*/
/** @test */
public function createsShortUrlWithValidSince(): void
{
[$statusCode, ['shortCode' => $shortCode]] = $this->createShortUrl([
@ -88,9 +80,7 @@ class CreateShortUrlActionTest extends ApiTestCase
$this->assertEquals(self::STATUS_NOT_FOUND, $lastResp->getStatusCode());
}
/**
* @test
*/
/** @test */
public function createsShortUrlWithValidUntil(): void
{
[$statusCode, ['shortCode' => $shortCode]] = $this->createShortUrl([
@ -110,7 +100,6 @@ class CreateShortUrlActionTest extends ApiTestCase
*/
public function returnsAnExistingShortUrlWhenRequested(array $body): void
{
[$firstStatusCode, ['shortCode' => $firstShortCode]] = $this->createShortUrl($body);
$body['findIfExists'] = true;
@ -121,26 +110,22 @@ class CreateShortUrlActionTest extends ApiTestCase
$this->assertEquals($firstShortCode, $secondShortCode);
}
public function provideMatchingBodies(): array
public function provideMatchingBodies(): iterable
{
$longUrl = 'https://www.alejandrocelaya.com';
return [
'only long URL' => [['longUrl' => $longUrl]],
'long URL and tags' => [['longUrl' => $longUrl, 'tags' => ['boo', 'far']]],
'long URL custom slug' => [['longUrl' => $longUrl, 'customSlug' => 'my cool slug']],
'several params' => [[
'longUrl' => $longUrl,
'tags' => ['boo', 'far'],
'validSince' => Chronos::now()->toAtomString(),
'maxVisits' => 7,
]],
];
yield 'only long URL' => [['longUrl' => $longUrl]];
yield 'long URL and tags' => [['longUrl' => $longUrl, 'tags' => ['boo', 'far']]];
yield 'long URL and custom slug' => [['longUrl' => $longUrl, 'customSlug' => 'my cool slug']];
yield 'several params' => [[
'longUrl' => $longUrl,
'tags' => ['boo', 'far'],
'validSince' => Chronos::now()->toAtomString(),
'maxVisits' => 7,
]];
}
/**
* @test
*/
/** @test */
public function returnsErrorWhenRequestingReturnExistingButCustomSlugIsInUse(): void
{
$longUrl = 'https://www.alejandrocelaya.com';
@ -156,9 +141,7 @@ class CreateShortUrlActionTest extends ApiTestCase
$this->assertEquals(self::STATUS_BAD_REQUEST, $secondStatusCode);
}
/**
* @test
*/
/** @test */
public function createsNewShortUrlIfRequestedToFindButThereIsNoMatch(): void
{
[$firstStatusCode, ['shortCode' => $firstShortCode]] = $this->createShortUrl([

4
module/Rest/test-api/Action/ListShortUrlsTest.php
View File

@ -7,9 +7,7 @@ use ShlinkioTest\Shlink\Common\ApiTest\ApiTestCase;
class ListShortUrlsTest extends ApiTestCase
{
/**
* @test
*/
/** @test */
public function shortUrlsAreProperlyListed()
{
$resp = $this->callApiWithKey(self::METHOD_GET, '/short-urls');

18
module/Rest/test-api/Middleware/AuthenticationTest.php
View File

@ -12,10 +12,8 @@ use function sprintf;
class AuthenticationTest extends ApiTestCase
{
/**
* @test
*/
public function authorizationErrorIsReturnedIfNoApiKeyIsSent()
/** @test */
public function authorizationErrorIsReturnedIfNoApiKeyIsSent(): void
{
$resp = $this->callApi(self::METHOD_GET, '/short-codes');
['error' => $error, 'message' => $message] = $this->getJsonResponsePayload($resp);
@ -35,7 +33,7 @@ class AuthenticationTest extends ApiTestCase
* @test
* @dataProvider provideInvalidApiKeys
*/
public function apiKeyErrorIsReturnedWhenProvidedApiKeyIsInvalid(string $apiKey)
public function apiKeyErrorIsReturnedWhenProvidedApiKeyIsInvalid(string $apiKey): void
{
$resp = $this->callApi(self::METHOD_GET, '/short-codes', [
'headers' => [
@ -49,12 +47,10 @@ class AuthenticationTest extends ApiTestCase
$this->assertEquals('Provided API key does not exist or is invalid.', $message);
}
public function provideInvalidApiKeys(): array
public function provideInvalidApiKeys(): iterable
{
return [
'key which does not exist' => ['invalid'],
'key which is expired' => ['expired_api_key'],
'key which is disabled' => ['disabled_api_key'],
];
yield 'key which does not exist' => ['invalid'];
yield 'key which is expired' => ['expired_api_key'];
yield 'key which is disabled' => ['disabled_api_key'];
}
}

12
module/Rest/test/Action/AuthenticateActionTest.php
View File

@ -31,18 +31,14 @@ class AuthenticateActionTest extends TestCase
$this->action = new AuthenticateAction($this->apiKeyService->reveal(), $this->jwtService->reveal());
}
/**
* @test
*/
/** @test */
public function notProvidingAuthDataReturnsError()
{
$resp = $this->action->handle(new ServerRequest());
$this->assertEquals(400, $resp->getStatusCode());
}
/**
* @test
*/
/** @test */
public function properApiKeyReturnsTokenInResponse()
{
$this->apiKeyService->getByKey('foo')->willReturn((new ApiKey())->setId('5'))
@ -58,9 +54,7 @@ class AuthenticateActionTest extends TestCase
$this->assertTrue(strpos($response->getBody()->getContents(), '"token"') > 0);
}
/**
* @test
*/
/** @test */
public function invalidApiKeyReturnsErrorResponse()
{
$this->apiKeyService->getByKey('foo')->willReturn((new ApiKey())->disable())

4
module/Rest/test/Action/HealthActionFactoryTest.php
View File

@ -21,9 +21,7 @@ class HealthActionFactoryTest extends TestCase
$this->factory = new Action\HealthActionFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsCreatedExtractingConnectionFromEntityManager()
{
$em = $this->prophesize(EntityManager::class);

12
module/Rest/test/Action/HealthActionTest.php
View File

@ -25,9 +25,7 @@ class HealthActionTest extends TestCase
$this->action = new HealthAction($this->conn->reveal(), new AppOptions(['version' => '1.2.3']));
}
/**
* @test
*/
/** @test */
public function passResponseIsReturnedWhenConnectionSucceeds()
{
$ping = $this->conn->ping()->willReturn(true);
@ -47,9 +45,7 @@ class HealthActionTest extends TestCase
$ping->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function failResponseIsReturnedWhenConnectionFails()
{
$ping = $this->conn->ping()->willReturn(false);
@ -69,9 +65,7 @@ class HealthActionTest extends TestCase
$ping->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function failResponseIsReturnedWhenConnectionThrowsException()
{
$ping = $this->conn->ping()->willThrow(Exception::class);

20
module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
View File

@ -34,18 +34,14 @@ class CreateShortUrlActionTest extends TestCase
]);
}
/**
* @test
*/
/** @test */
public function missingLongUrlParamReturnsError()
{
$response = $this->action->handle(new ServerRequest());
$this->assertEquals(400, $response->getStatusCode());
}
/**
* @test
*/
/** @test */
public function properShortcodeConversionReturnsData()
{
$this->urlShortener->urlToShortCode(Argument::type(Uri::class), Argument::type('array'), Argument::cetera())
@ -62,9 +58,7 @@ class CreateShortUrlActionTest extends TestCase
$this->assertTrue(strpos($response->getBody()->getContents(), 'http://foo.com/abc123') > 0);
}
/**
* @test
*/
/** @test */
public function anInvalidUrlReturnsError()
{
$this->urlShortener->urlToShortCode(Argument::type(Uri::class), Argument::type('array'), Argument::cetera())
@ -79,9 +73,7 @@ class CreateShortUrlActionTest extends TestCase
$this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::INVALID_URL_ERROR) > 0);
}
/**
* @test
*/
/** @test */
public function nonUniqueSlugReturnsError()
{
$this->urlShortener->urlToShortCode(
@ -100,9 +92,7 @@ class CreateShortUrlActionTest extends TestCase
$this->assertStringContainsString(RestUtils::INVALID_SLUG_ERROR, (string) $response->getBody());
}
/**
* @test
*/
/** @test */
public function aGenericExceptionWillReturnError()
{
$this->urlShortener->urlToShortCode(Argument::type(Uri::class), Argument::type('array'), Argument::cetera())

18
module/Rest/test/Action/ShortUrl/DeleteShortUrlActionTest.php
View File

@ -27,10 +27,8 @@ class DeleteShortUrlActionTest extends TestCase
$this->action = new DeleteShortUrlAction($this->service->reveal());
}
/**
* @test
*/
public function emptyResponseIsReturnedIfProperlyDeleted()
/** @test */
public function emptyResponseIsReturnedIfProperlyDeleted(): void
{
$deleteByShortCode = $this->service->deleteByShortCode(Argument::any())->will(function () {
});
@ -45,7 +43,7 @@ class DeleteShortUrlActionTest extends TestCase
* @test
* @dataProvider provideExceptions
*/
public function returnsErrorResponseInCaseOfException(Throwable $e, string $error, int $statusCode)
public function returnsErrorResponseInCaseOfException(Throwable $e, string $error, int $statusCode): void
{
$deleteByShortCode = $this->service->deleteByShortCode(Argument::any())->willThrow($e);
@ -58,11 +56,13 @@ class DeleteShortUrlActionTest extends TestCase
$deleteByShortCode->shouldHaveBeenCalledOnce();
}
public function provideExceptions(): array
public function provideExceptions(): iterable
{
return [
[new Exception\InvalidShortCodeException(), RestUtils::INVALID_SHORTCODE_ERROR, 404],
[new Exception\DeleteShortUrlException(5), RestUtils::INVALID_SHORTCODE_DELETION_ERROR, 400],
yield 'not found' => [new Exception\InvalidShortCodeException(), RestUtils::INVALID_SHORTCODE_ERROR, 404];
yield 'bad request' => [
new Exception\DeleteShortUrlException(5),
RestUtils::INVALID_SHORTCODE_DELETION_ERROR,
400,
];
}
}

12
module/Rest/test/Action/ShortUrl/EditShortUrlActionTest.php
View File

@ -27,9 +27,7 @@ class EditShortUrlActionTest extends TestCase
$this->action = new EditShortUrlAction($this->shortUrlService->reveal());
}
/**
* @test
*/
/** @test */
public function invalidDataReturnsError()
{
$request = (new ServerRequest())->withParsedBody([
@ -45,9 +43,7 @@ class EditShortUrlActionTest extends TestCase
$this->assertEquals('Provided data is invalid.', $payload['message']);
}
/**
* @test
*/
/** @test */
public function incorrectShortCodeReturnsError()
{
$request = (new ServerRequest())->withAttribute('shortCode', 'abc123')
@ -68,9 +64,7 @@ class EditShortUrlActionTest extends TestCase
$updateMeta->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function correctShortCodeReturnsSuccess()
{
$request = (new ServerRequest())->withAttribute('shortCode', 'abc123')

12
module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php
View File

@ -24,18 +24,14 @@ class EditShortUrlTagsActionTest extends TestCase
$this->action = new EditShortUrlTagsAction($this->shortUrlService->reveal());
}
/**
* @test
*/
/** @test */
public function notProvidingTagsReturnsError()
{
$response = $this->action->handle((new ServerRequest())->withAttribute('shortCode', 'abc123'));
$this->assertEquals(400, $response->getStatusCode());
}
/**
* @test
*/
/** @test */
public function anInvalidShortCodeReturnsNotFound()
{
$shortCode = 'abc123';
@ -49,9 +45,7 @@ class EditShortUrlTagsActionTest extends TestCase
$this->assertEquals(404, $response->getStatusCode());
}
/**
* @test
*/
/** @test */
public function tagsListIsReturnedIfCorrectShortCodeIsProvided()
{
$shortCode = 'abc123';

8
module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php
View File

@ -28,9 +28,7 @@ class ListShortUrlsActionTest extends TestCase
]);
}
/**
* @test
*/
/** @test */
public function properListReturnsSuccessResponse()
{
$page = 3;
@ -43,9 +41,7 @@ class ListShortUrlsActionTest extends TestCase
$this->assertEquals(200, $response->getStatusCode());
}
/**
* @test
*/
/** @test */
public function anExceptionsReturnsErrorResponse()
{
$page = 3;

16
module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php
View File

@ -28,9 +28,7 @@ class ResolveShortUrlActionTest extends TestCase
$this->action = new ResolveShortUrlAction($this->urlShortener->reveal(), []);
}
/**
* @test
*/
/** @test */
public function incorrectShortCodeReturnsError()
{
$shortCode = 'abc123';
@ -43,9 +41,7 @@ class ResolveShortUrlActionTest extends TestCase
$this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::INVALID_ARGUMENT_ERROR) > 0);
}
/**
* @test
*/
/** @test */
public function correctShortCodeReturnsSuccess()
{
$shortCode = 'abc123';
@ -59,9 +55,7 @@ class ResolveShortUrlActionTest extends TestCase
$this->assertTrue(strpos($response->getBody()->getContents(), 'http://domain.com/foo/bar') > 0);
}
/**
* @test
*/
/** @test */
public function invalidShortCodeExceptionReturnsError()
{
$shortCode = 'abc123';
@ -74,9 +68,7 @@ class ResolveShortUrlActionTest extends TestCase
$this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::INVALID_SHORTCODE_ERROR) > 0);
}
/**
* @test
*/
/** @test */
public function unexpectedExceptionWillReturnError()
{
$shortCode = 'abc123';

12
module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php
View File

@ -40,9 +40,7 @@ class SingleStepCreateShortUrlActionTest extends TestCase
);
}
/**
* @test
*/
/** @test */
public function errorResponseIsReturnedIfInvalidApiKeyIsProvided()
{
$request = (new ServerRequest())->withQueryParams(['apiKey' => 'abc123']);
@ -58,9 +56,7 @@ class SingleStepCreateShortUrlActionTest extends TestCase
$findApiKey->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function errorResponseIsReturnedIfNoUrlIsProvided()
{
$request = (new ServerRequest())->withQueryParams(['apiKey' => 'abc123']);
@ -76,9 +72,7 @@ class SingleStepCreateShortUrlActionTest extends TestCase
$findApiKey->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function properDataIsPassedWhenGeneratingShortCode()
{
$request = (new ServerRequest())->withQueryParams([

17
module/Rest/test/Action/Tag/CreateTagsActionTest.php
View File

@ -5,7 +5,6 @@ namespace ShlinkioTest\Shlink\Rest\Action\Tag;
use Doctrine\Common\Collections\ArrayCollection;
use PHPUnit\Framework\TestCase;
use Prophecy\Prophecy\MethodProphecy;
use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
use Shlinkio\Shlink\Rest\Action\Tag\CreateTagsAction;
@ -27,12 +26,10 @@ class CreateTagsActionTest extends TestCase
/**
* @test
* @dataProvider provideTags
* @param array|null $tags
*/
public function processDelegatesIntoService($tags)
public function processDelegatesIntoService(?array $tags): void
{
$request = (new ServerRequest())->withParsedBody(['tags' => $tags]);
/** @var MethodProphecy $deleteTags */
$deleteTags = $this->tagService->createTags($tags ?: [])->willReturn(new ArrayCollection());
$response = $this->action->handle($request);
@ -41,13 +38,11 @@ class CreateTagsActionTest extends TestCase
$deleteTags->shouldHaveBeenCalled();
}
public function provideTags()
public function provideTags(): iterable
{
return [
[['foo', 'bar', 'baz']],
[['some', 'thing']],
[null],
[[]],
];
yield 'three tags' => [['foo', 'bar', 'baz']];
yield 'two tags' => [['some', 'thing']];
yield 'null tags' => [null];
yield 'empty tags' => [[]];
}
}

15
module/Rest/test/Action/Tag/DeleteTagsActionTest.php
View File

@ -26,9 +26,8 @@ class DeleteTagsActionTest extends TestCase
/**
* @test
* @dataProvider provideTags
* @param array|null $tags
*/
public function processDelegatesIntoService($tags)
public function processDelegatesIntoService(?array $tags): void
{
$request = (new ServerRequest())->withQueryParams(['tags' => $tags]);
/** @var MethodProphecy $deleteTags */
@ -40,13 +39,11 @@ class DeleteTagsActionTest extends TestCase
$deleteTags->shouldHaveBeenCalled();
}
public function provideTags()
public function provideTags(): iterable
{
return [
[['foo', 'bar', 'baz']],
[['some', 'thing']],
[null],
[[]],
];
yield 'three tags' => [['foo', 'bar', 'baz']];
yield 'two tags' => [['some', 'thing']];
yield 'null tags' => [null];
yield 'empty tags' => [[]];
}
}

4
module/Rest/test/Action/Tag/ListTagsActionTest.php
View File

@ -25,9 +25,7 @@ class ListTagsActionTest extends TestCase
$this->action = new ListTagsAction($this->tagService->reveal());
}
/**
* @test
*/
/** @test */
public function returnsDataFromService()
{
/** @var MethodProphecy $listTags */

25
module/Rest/test/Action/Tag/UpdateTagActionTest.php
View File

@ -28,9 +28,8 @@ class UpdateTagActionTest extends TestCase
/**
* @test
* @dataProvider provideParams
* @param array $bodyParams
*/
public function whenInvalidParamsAreProvidedAnErrorIsReturned(array $bodyParams)
public function whenInvalidParamsAreProvidedAnErrorIsReturned(array $bodyParams): void
{
$request = (new ServerRequest())->withParsedBody($bodyParams);
$resp = $this->action->handle($request);
@ -38,19 +37,15 @@ class UpdateTagActionTest extends TestCase
$this->assertEquals(400, $resp->getStatusCode());
}
public function provideParams()
public function provideParams(): iterable
{
return [
[['oldName' => 'foo']],
[['newName' => 'foo']],
[[]],
];
yield 'old name only' => [['oldName' => 'foo']];
yield 'new name only' => [['newName' => 'foo']];
yield 'no params' => [[]];
}
/**
* @test
*/
public function requestingInvalidTagReturnsError()
/** @test */
public function requestingInvalidTagReturnsError(): void
{
$request = (new ServerRequest())->withParsedBody([
'oldName' => 'foo',
@ -65,10 +60,8 @@ class UpdateTagActionTest extends TestCase
$rename->shouldHaveBeenCalled();
}
/**
* @test
*/
public function correctInvocationRenamesTag()
/** @test */
public function correctInvocationRenamesTag(): void
{
$request = (new ServerRequest())->withParsedBody([
'oldName' => 'foo',

12
module/Rest/test/Action/Visit/GetVisitsActionTest.php
View File

@ -29,9 +29,7 @@ class GetVisitsActionTest extends TestCase
$this->action = new GetVisitsAction($this->visitsTracker->reveal());
}
/**
* @test
*/
/** @test */
public function providingCorrectShortCodeReturnsVisits()
{
$shortCode = 'abc123';
@ -43,9 +41,7 @@ class GetVisitsActionTest extends TestCase
$this->assertEquals(200, $response->getStatusCode());
}
/**
* @test
*/
/** @test */
public function providingInvalidShortCodeReturnsError()
{
$shortCode = 'abc123';
@ -57,9 +53,7 @@ class GetVisitsActionTest extends TestCase
$this->assertEquals(404, $response->getStatusCode());
}
/**
* @test
*/
/** @test */
public function paramsAreReadFromQuery()
{
$shortCode = 'abc123';

4
module/Rest/test/Authentication/AuthenticationPluginManagerFactoryTest.php
View File

@ -18,9 +18,7 @@ class AuthenticationPluginManagerFactoryTest extends TestCase
$this->factory = new AuthenticationPluginManagerFactory();
}
/**
* @test
*/
/** @test */
public function serviceIsProperlyCreated()
{
$instance = $this->factory->__invoke(new ServiceManager(['services' => [

20
module/Rest/test/Authentication/JWTServiceTest.php
View File

@ -25,9 +25,7 @@ class JWTServiceTest extends TestCase
]));
}
/**
* @test
*/
/** @test */
public function tokenIsProperlyCreated()
{
$id = '34';
@ -40,9 +38,7 @@ class JWTServiceTest extends TestCase
$this->assertEquals('ShlinkTest:v10000.3.1', $payload['iss']);
}
/**
* @test
*/
/** @test */
public function refreshIncreasesExpiration()
{
$originalLifetime = 10;
@ -55,25 +51,19 @@ class JWTServiceTest extends TestCase
$this->assertGreaterThan($originalPayload['exp'], $newPayload['exp']);
}
/**
* @test
*/
/** @test */
public function verifyReturnsTrueWhenTheTokenIsCorrect()
{
$this->assertTrue($this->service->verify(JWT::encode([], 'foo')));
}
/**
* @test
*/
/** @test */
public function verifyReturnsFalseWhenTheTokenIsCorrect()
{
$this->assertFalse($this->service->verify('invalidToken'));
}
/**
* @test
*/
/** @test */
public function getPayloadWorksWithCorrectTokens()
{
$originalPayload = [

12
module/Rest/test/Authentication/Plugin/ApiKeyHeaderPluginTest.php
View File

@ -25,9 +25,7 @@ class ApiKeyHeaderPluginTest extends TestCase
$this->plugin = new ApiKeyHeaderPlugin($this->apiKeyService->reveal());
}
/**
* @test
*/
/** @test */
public function verifyThrowsExceptionWhenApiKeyIsNotValid()
{
$apiKey = 'abc-ABC';
@ -40,9 +38,7 @@ class ApiKeyHeaderPluginTest extends TestCase
$this->plugin->verify($this->createRequest($apiKey));
}
/**
* @test
*/
/** @test */
public function verifyDoesNotThrowExceptionWhenApiKeyIsValid()
{
$apiKey = 'abc-ABC';
@ -53,9 +49,7 @@ class ApiKeyHeaderPluginTest extends TestCase
$check->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function updateReturnsResponseAsIs()
{
$apiKey = 'abc-ABC';

20
module/Rest/test/Authentication/Plugin/AuthorizationHeaderPluginTest.php
View File

@ -25,9 +25,7 @@ class AuthorizationHeaderPluginTest extends TestCase
$this->plugin = new AuthorizationHeaderPlugin($this->jwtService->reveal());
}
/**
* @test
*/
/** @test */
public function verifyAnAuthorizationWithoutBearerTypeThrowsException()
{
$authToken = 'ABC-abc';
@ -45,9 +43,7 @@ class AuthorizationHeaderPluginTest extends TestCase
$this->plugin->verify($request);
}
/**
* @test
*/
/** @test */
public function verifyAnAuthorizationWithWrongTypeThrowsException()
{
$authToken = 'Basic ABC-abc';
@ -64,9 +60,7 @@ class AuthorizationHeaderPluginTest extends TestCase
$this->plugin->verify($request);
}
/**
* @test
*/
/** @test */
public function verifyAnExpiredTokenThrowsException()
{
$authToken = 'Bearer ABC-abc';
@ -88,9 +82,7 @@ class AuthorizationHeaderPluginTest extends TestCase
$jwtVerify->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function verifyValidTokenDoesNotThrowException()
{
$authToken = 'Bearer ABC-abc';
@ -105,9 +97,7 @@ class AuthorizationHeaderPluginTest extends TestCase
$jwtVerify->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
/** @test */
public function updateReturnsAnUpdatedResponseWithNewJwt()
{
$authToken = 'Bearer ABC-abc';

32
module/Rest/test/Authentication/RequestToAuthPluginTest.php
View File

@ -28,10 +28,8 @@ class RequestToAuthPluginTest extends TestCase
$this->requestToPlugin = new RequestToHttpAuthPlugin($this->pluginManager->reveal());
}
/**
* @test
*/
public function exceptionIsFoundWhenNoneOfTheSupportedMethodsIsFound()
/** @test */
public function exceptionIsFoundWhenNoneOfTheSupportedMethodsIsFound(): void
{
$request = new ServerRequest();
@ -48,7 +46,7 @@ class RequestToAuthPluginTest extends TestCase
* @test
* @dataProvider provideHeaders
*/
public function properPluginIsFetchedWhenAnyAuthTypeIsFound(array $headers, string $expectedHeader)
public function properPluginIsFetchedWhenAnyAuthTypeIsFound(array $headers, string $expectedHeader): void
{
$request = new ServerRequest();
foreach ($headers as $header => $value) {
@ -63,19 +61,17 @@ class RequestToAuthPluginTest extends TestCase
$getPlugin->shouldHaveBeenCalledOnce();
}
public function provideHeaders(): array
public function provideHeaders(): iterable
{
return [
'API key header only' => [[
ApiKeyHeaderPlugin::HEADER_NAME => 'foobar',
], ApiKeyHeaderPlugin::HEADER_NAME],
'Authorization header only' => [[
AuthorizationHeaderPlugin::HEADER_NAME => 'foobar',
], AuthorizationHeaderPlugin::HEADER_NAME],
'Both headers' => [[
AuthorizationHeaderPlugin::HEADER_NAME => 'foobar',
ApiKeyHeaderPlugin::HEADER_NAME => 'foobar',
], ApiKeyHeaderPlugin::HEADER_NAME],
];
yield 'API key header only' => [[
ApiKeyHeaderPlugin::HEADER_NAME => 'foobar',
], ApiKeyHeaderPlugin::HEADER_NAME];
yield 'Authorization header only' => [[
AuthorizationHeaderPlugin::HEADER_NAME => 'foobar',
], AuthorizationHeaderPlugin::HEADER_NAME];
yield 'Both headers' => [[
AuthorizationHeaderPlugin::HEADER_NAME => 'foobar',
ApiKeyHeaderPlugin::HEADER_NAME => 'foobar',
], ApiKeyHeaderPlugin::HEADER_NAME];
}
}

4
module/Rest/test/ConfigProviderTest.php
View File

@ -16,9 +16,7 @@ class ConfigProviderTest extends TestCase
$this->configProvider = new ConfigProvider();
}
/**
* @test
*/
/** @test */
public function properConfigIsReturned()
{
$config = $this->configProvider->__invoke();

2
module/Rest/test/Exception/AuthenticationExceptionTest.php
View File

@ -23,7 +23,7 @@ class AuthenticationExceptionTest extends TestCase
$this->assertEquals('The token has expired.', $e->getMessage());
}
public function providePrev()
public function providePrev(): iterable
{
yield 'with previous exception' => [new Exception('Prev')];
yield 'without previous exception' => [null];

61
module/Rest/test/Middleware/AuthenticationMiddlewareTest.php
View File

@ -21,6 +21,7 @@ use Shlinkio\Shlink\Rest\Exception\NoAuthenticationException;
use Shlinkio\Shlink\Rest\Exception\VerifyAuthenticationException;
use Shlinkio\Shlink\Rest\Middleware\AuthenticationMiddleware;
use Shlinkio\Shlink\Rest\Util\RestUtils;
use Throwable;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequest;
use Zend\Expressive\Router\Route;
@ -49,7 +50,7 @@ class AuthenticationMiddlewareTest extends TestCase
* @test
* @dataProvider provideWhitelistedRequests
*/
public function someWhiteListedSituationsFallbackToNextMiddleware(ServerRequestInterface $request)
public function someWhiteListedSituationsFallbackToNextMiddleware(ServerRequestInterface $request): void
{
$handler = $this->prophesize(RequestHandlerInterface::class);
$handle = $handler->handle($request)->willReturn(new Response());
@ -63,34 +64,32 @@ class AuthenticationMiddlewareTest extends TestCase
$fromRequest->shouldNotHaveBeenCalled();
}
public function provideWhitelistedRequests(): array
public function provideWhitelistedRequests(): iterable
{
$dummyMiddleware = $this->getDummyMiddleware();
return [
'with no route result' => [new ServerRequest()],
'with failure route result' => [(new ServerRequest())->withAttribute(
RouteResult::class,
RouteResult::fromRouteFailure([RequestMethodInterface::METHOD_GET])
)],
'with whitelisted route' => [(new ServerRequest())->withAttribute(
RouteResult::class,
RouteResult::fromRoute(
new Route('foo', $dummyMiddleware, Route::HTTP_METHOD_ANY, AuthenticateAction::class)
)
)],
'with OPTIONS method' => [(new ServerRequest())->withAttribute(
RouteResult::class,
RouteResult::fromRoute(new Route('bar', $dummyMiddleware), [])
)->withMethod(RequestMethodInterface::METHOD_OPTIONS)],
];
yield 'with no route result' => [new ServerRequest()];
yield 'with failure route result' => [(new ServerRequest())->withAttribute(
RouteResult::class,
RouteResult::fromRouteFailure([RequestMethodInterface::METHOD_GET])
)];
yield 'with whitelisted route' => [(new ServerRequest())->withAttribute(
RouteResult::class,
RouteResult::fromRoute(
new Route('foo', $dummyMiddleware, Route::HTTP_METHOD_ANY, AuthenticateAction::class)
)
)];
yield 'with OPTIONS method' => [(new ServerRequest())->withAttribute(
RouteResult::class,
RouteResult::fromRoute(new Route('bar', $dummyMiddleware), [])
)->withMethod(RequestMethodInterface::METHOD_OPTIONS)];
}
/**
* @test
* @dataProvider provideExceptions
*/
public function errorIsReturnedWhenNoValidAuthIsProvided($e)
public function errorIsReturnedWhenNoValidAuthIsProvided(Throwable $e): void
{
$request = (new ServerRequest())->withAttribute(
RouteResult::class,
@ -110,19 +109,15 @@ class AuthenticationMiddlewareTest extends TestCase
$fromRequest->shouldHaveBeenCalledOnce();
}
public function provideExceptions(): array
public function provideExceptions(): iterable
{
return [
[new class extends Exception implements ContainerExceptionInterface {
}],
[NoAuthenticationException::fromExpectedTypes([])],
];
yield 'container exception' => [new class extends Exception implements ContainerExceptionInterface {
}];
yield 'authentication exception' => [NoAuthenticationException::fromExpectedTypes([])];
}
/**
* @test
*/
public function errorIsReturnedWhenVerificationFails()
/** @test */
public function errorIsReturnedWhenVerificationFails(): void
{
$request = (new ServerRequest())->withAttribute(
RouteResult::class,
@ -145,10 +140,8 @@ class AuthenticationMiddlewareTest extends TestCase
$fromRequest->shouldHaveBeenCalledOnce();
}
/**
* @test
*/
public function updatedResponseIsReturnedWhenVerificationPasses()
/** @test */
public function updatedResponseIsReturnedWhenVerificationPasses(): void
{
$newResponse = new Response();
$request = (new ServerRequest())->withAttribute(

6
module/Rest/test/Middleware/BodyParserMiddlewareTest.php
View File

@ -36,9 +36,9 @@ class BodyParserMiddlewareTest extends TestCase
public function provideIgnoredRequestMethods(): iterable
{
yield 'with GET' => ['GET'];
yield 'with HEAD' => ['HEAD'];
yield 'with OPTIONS' => ['OPTIONS'];
yield 'GET' => ['GET'];
yield 'HEAD' => ['HEAD'];
yield 'OPTIONS' => ['OPTIONS'];
}
/** @test */

12
module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
View File

@ -24,9 +24,7 @@ class CrossDomainMiddlewareTest extends TestCase
$this->delegate = $this->prophesize(RequestHandlerInterface::class);
}
/**
* @test
*/
/** @test */
public function nonCrossDomainRequestsAreNotAffected()
{
$originalResponse = new Response();
@ -40,9 +38,7 @@ class CrossDomainMiddlewareTest extends TestCase
$this->assertArrayNotHasKey('Access-Control-Allow-Headers', $headers);
}
/**
* @test
*/
/** @test */
public function anyRequestIncludesTheAllowAccessHeader()
{
$originalResponse = new Response();
@ -59,9 +55,7 @@ class CrossDomainMiddlewareTest extends TestCase
$this->assertArrayNotHasKey('Access-Control-Allow-Headers', $headers);
}
/**
* @test
*/
/** @test */
public function optionsRequestIncludesMoreHeaders()
{
$originalResponse = new Response();

8
module/Rest/test/Middleware/PathVersionMiddlewareTest.php
View File

@ -24,9 +24,7 @@ class PathVersionMiddlewareTest extends TestCase
$this->middleware = new PathVersionMiddleware();
}
/**
* @test
*/
/** @test */
public function whenVersionIsProvidedRequestRemainsUnchanged()
{
$request = (new ServerRequest())->withUri(new Uri('/v2/foo'));
@ -39,9 +37,7 @@ class PathVersionMiddlewareTest extends TestCase
$process->shouldHaveBeenCalled();
}
/**
* @test
*/
/** @test */
public function versionOneIsPrependedWhenNoVersionIsDefined()
{
$request = (new ServerRequest())->withUri(new Uri('/bar/baz'));

40
module/Rest/test/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddlewareTest.php
View File

@ -25,10 +25,8 @@ class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
$this->requestHandler = $this->prophesize(RequestHandlerInterface::class);
}
/**
* @test
*/
public function whenNoJsonResponseIsReturnedNoFurtherOperationsArePerformed()
/** @test */
public function whenNoJsonResponseIsReturnedNoFurtherOperationsArePerformed(): void
{
$expectedResp = new Response();
$this->requestHandler->handle(Argument::type(ServerRequestInterface::class))->willReturn($expectedResp);
@ -43,7 +41,7 @@ class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
* @dataProvider provideData
* @param array $query
*/
public function properResponseIsReturned(?string $accept, array $query, string $expectedContentType)
public function properResponseIsReturned(?string $accept, array $query, string $expectedContentType): void
{
$request = (new ServerRequest())->withQueryParams($query);
if ($accept !== null) {
@ -60,18 +58,16 @@ class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
$handle->shouldHaveBeenCalled();
}
public function provideData(): array
public function provideData(): iterable
{
return [
[null, [], 'application/json'],
[null, ['format' => 'json'], 'application/json'],
[null, ['format' => 'invalid'], 'application/json'],
[null, ['format' => 'txt'], 'text/plain'],
['application/json', [], 'application/json'],
['application/xml', [], 'application/json'],
['text/plain', [], 'text/plain'],
['application/json', ['format' => 'txt'], 'text/plain'],
];
yield [null, [], 'application/json'];
yield [null, ['format' => 'json'], 'application/json'];
yield [null, ['format' => 'invalid'], 'application/json'];
yield [null, ['format' => 'txt'], 'text/plain'];
yield ['application/json', [], 'application/json'];
yield ['application/xml', [], 'application/json'];
yield ['text/plain', [], 'text/plain'];
yield ['application/json', ['format' => 'txt'], 'text/plain'];
}
/**
@ -79,7 +75,7 @@ class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
* @dataProvider provideTextBodies
* @param array $json
*/
public function properBodyIsReturnedInPlainTextResponses(array $json, string $expectedBody)
public function properBodyIsReturnedInPlainTextResponses(array $json, string $expectedBody): void
{
$request = (new ServerRequest())->withQueryParams(['format' => 'txt']);
@ -93,12 +89,10 @@ class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
$handle->shouldHaveBeenCalled();
}
public function provideTextBodies(): array
public function provideTextBodies(): iterable
{
return [
[['shortUrl' => 'foobar'], 'foobar'],
[['error' => 'FOO_BAR'], 'FOO_BAR'],
[[], ''],
];
yield 'shortUrl key' => [['shortUrl' => 'foobar'], 'foobar'];
yield 'error key' => [['error' => 'FOO_BAR'], 'FOO_BAR'];
yield 'no shortUrl or error keys' => [[], ''];
}
}

4
module/Rest/test/Middleware/ShortUrl/ShortCodePathMiddlewareTest.php
View File

@ -25,9 +25,7 @@ class ShortCodePathMiddlewareTest extends TestCase
$this->requestHandler->handle(Argument::type(ServerRequestInterface::class))->willReturn(new Response());
}
/**
* @test
*/
/** @test */
public function properlyReplacesTheOldPathByTheNewOne()
{
$uri = new Uri('/short-codes/foo');

36
module/Rest/test/Service/ApiKeyServiceTest.php
View File

@ -26,9 +26,7 @@ class ApiKeyServiceTest extends TestCase
$this->service = new ApiKeyService($this->em->reveal());
}
/**
* @test
*/
/** @test */
public function keyIsProperlyCreated()
{
$this->em->flush()->shouldBeCalledOnce();
@ -38,9 +36,7 @@ class ApiKeyServiceTest extends TestCase
$this->assertNull($key->getExpirationDate());
}
/**
* @test
*/
/** @test */
public function keyIsProperlyCreatedWithExpirationDate()
{
$this->em->flush()->shouldBeCalledOnce();
@ -51,9 +47,7 @@ class ApiKeyServiceTest extends TestCase
$this->assertSame($date, $key->getExpirationDate());
}
/**
* @test
*/
/** @test */
public function checkReturnsFalseWhenKeyIsInvalid()
{
$repo = $this->prophesize(EntityRepository::class);
@ -64,9 +58,7 @@ class ApiKeyServiceTest extends TestCase
$this->assertFalse($this->service->check('12345'));
}
/**
* @test
*/
/** @test */
public function checkReturnsFalseWhenKeyIsDisabled()
{
$key = new ApiKey();
@ -79,9 +71,7 @@ class ApiKeyServiceTest extends TestCase
$this->assertFalse($this->service->check('12345'));
}
/**
* @test
*/
/** @test */
public function checkReturnsFalseWhenKeyIsExpired()
{
$key = new ApiKey(Chronos::now()->subDay());
@ -93,9 +83,7 @@ class ApiKeyServiceTest extends TestCase
$this->assertFalse($this->service->check('12345'));
}
/**
* @test
*/
/** @test */
public function checkReturnsTrueWhenConditionsAreFavorable()
{
$repo = $this->prophesize(EntityRepository::class);
@ -118,9 +106,7 @@ class ApiKeyServiceTest extends TestCase
$this->service->disable('12345');
}
/**
* @test
*/
/** @test */
public function disableReturnsDisabledKeyWhenFOund()
{
$key = new ApiKey();
@ -137,9 +123,7 @@ class ApiKeyServiceTest extends TestCase
$this->assertSame($key, $returnedKey);
}
/**
* @test
*/
/** @test */
public function listFindsAllApiKeys()
{
$repo = $this->prophesize(EntityRepository::class);
@ -150,9 +134,7 @@ class ApiKeyServiceTest extends TestCase
$this->service->listKeys();
}
/**
* @test
*/
/** @test */
public function listEnabledFindsOnlyEnabledApiKeys()
{
$repo = $this->prophesize(EntityRepository::class);

4
module/Rest/test/Util/RestUtilsTest.php
View File

@ -13,9 +13,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils;
class RestUtilsTest extends TestCase
{
/**
* @test
*/
/** @test */
public function correctCodeIsReturnedFromException()
{
$this->assertEquals(