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

Fixed merge conflicts

Browse Source
This commit is contained in:
Alejandro Celaya
2019-12-06 23:34:50 +01:00
parent 03825469ca 3479bbbb36
commit a070a68a57
13 changed files with 170 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/Rest/src/Action/ShortUrl/CreateShortUrlAction.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
use Cake\Chronos\Chronos;
use Psr\Http\Message\ServerRequestInterface as Request;
use Shlinkio\Shlink\Core\Exception\ValidationException;
use Shlinkio\Shlink\Core\Model\CreateShortUrlData;
@@ -31,8 +30,8 @@ class CreateShortUrlAction extends AbstractCreateShortUrlAction
}
$meta = ShortUrlMeta::createFromParams(
$this->getOptionalDate($postData, 'validSince'),
$this->getOptionalDate($postData, 'validUntil'),
$postData['validSince'] ?? null,
$postData['validUntil'] ?? null,
$postData['customSlug'] ?? null,
$postData['maxVisits'] ?? null,
$postData['findIfExists'] ?? null,
@@ -41,9 +40,4 @@ class CreateShortUrlAction extends AbstractCreateShortUrlAction
return new CreateShortUrlData(new Uri($postData['longUrl']), (array) ($postData['tags'] ?? []), $meta);
}
private function getOptionalDate(array $postData, string $fieldName): ?Chronos
{
return isset($postData[$fieldName]) ? Chronos::parse($postData[$fieldName]) : null;
}
}