Fixed merge conflicts

.github/workflows/ci.yml

@@ -80,7 +80,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1, pdo_sqlsrv-5.10.0beta2
+          extensions: openswoole-4.9.1, pdo_sqlsrv-5.10.0
           coverage: pcov
           ini-values: pcov.directory=module
       - run: composer install --no-interaction --prefer-dist

CHANGELOG.md

@@ -21,6 +21,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 
+## [3.0.1] - 2022-02-04
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1363](https://github.com/shlinkio/shlink/issues/1363) Fixed titles being resolved no matter what when `validateUrl` is not set or is explicitly set to true.
+* [#1352](https://github.com/shlinkio/shlink/issues/1352) Updated to stable pdo_sqlsrv in docker image.
+
+
 ## [3.0.0] - 2022-01-28
 ### Added
 * [#767](https://github.com/shlinkio/shlink/issues/767) Added full support to use emojis everywhere, whether it is custom slugs, titles, referrers, etc.

Dockerfile

@@ -3,7 +3,7 @@ FROM php:8.1.1-alpine3.15 as base
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
 ENV OPENSWOOLE_VERSION 4.9.1
-ENV PDO_SQLSRV_VERSION 5.10.0beta2
+ENV PDO_SQLSRV_VERSION 5.10.0
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 ENV LC_ALL "C"
 

composer.json

@@ -128,7 +128,7 @@
         ],
         "test:unit": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
         "test:unit:ci": "@test:unit --coverage-xml=build/coverage-unit/coverage-xml --log-junit=build/coverage-unit/junit.xml",
-        "test:unit:pretty": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage-unit/coverage-html",
+        "test:unit:pretty": "@test:unit --coverage-html build/coverage-unit/coverage-html",
         "test:db": "@parallel test:db:sqlite:ci test:db:mysql test:db:maria test:db:postgres test:db:ms",
         "test:db:sqlite": "APP_ENV=test php vendor/bin/phpunit --order-by=random --colors=always --testdox -c phpunit-db.xml",
         "test:db:sqlite:ci": "@test:db:sqlite --coverage-php build/coverage-db.cov --coverage-xml=build/coverage-db/coverage-xml --log-junit=build/coverage-db/junit.xml",

config/constants.php

@@ -12,7 +12,7 @@ const MIN_SHORT_CODES_LENGTH = 4;
 const DEFAULT_REDIRECT_STATUS_CODE = StatusCodeInterface::STATUS_FOUND;
 const DEFAULT_REDIRECT_CACHE_LIFETIME = 30;
 const LOCAL_LOCK_FACTORY = 'Shlinkio\Shlink\LocalLockFactory';
-const TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside an html title tag
+const TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside a html title tag
 const DEFAULT_QR_CODE_SIZE = 300;
 const DEFAULT_QR_CODE_MARGIN = 0;
 const DEFAULT_QR_CODE_FORMAT = 'png';

data/infra/php.Dockerfile

@@ -2,7 +2,7 @@ FROM php:8.1.1-fpm-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.21
-ENV PDO_SQLSRV_VERSION 5.10.0beta2
+ENV PDO_SQLSRV_VERSION 5.10.0
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 
 RUN apk update

data/infra/swoole.Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 ENV APCU_VERSION 5.1.21
 ENV INOTIFY_VERSION 3.0.0
 ENV OPENSWOOLE_VERSION 4.9.1
-ENV PDO_SQLSRV_VERSION 5.10.0beta2
+ENV PDO_SQLSRV_VERSION 5.10.0
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 
 RUN apk update

module/Core/src/Model/ShortUrlEdit.php

@@ -29,7 +29,7 @@ final class ShortUrlEdit implements TitleResolutionModelInterface
     private bool $titlePropWasProvided = false;
     private ?string $title = null;
     private bool $titleWasAutoResolved = false;
-    private ?bool $validateUrl = null;
+    private bool $validateUrl = false;
     private bool $crawlablePropWasProvided = false;
     private bool $crawlable = false;
     private bool $forwardQueryPropWasProvided = false;
@@ -72,7 +72,7 @@ final class ShortUrlEdit implements TitleResolutionModelInterface
         $this->validSince = parseDateField($inputFilter->getValue(ShortUrlInputFilter::VALID_SINCE));
         $this->validUntil = parseDateField($inputFilter->getValue(ShortUrlInputFilter::VALID_UNTIL));
         $this->maxVisits = getOptionalIntFromInputFilter($inputFilter, ShortUrlInputFilter::MAX_VISITS);
-        $this->validateUrl = getOptionalBoolFromInputFilter($inputFilter, ShortUrlInputFilter::VALIDATE_URL);
+        $this->validateUrl = getOptionalBoolFromInputFilter($inputFilter, ShortUrlInputFilter::VALIDATE_URL) ?? false;
         $this->tags = $inputFilter->getValue(ShortUrlInputFilter::TAGS);
         $this->title = $inputFilter->getValue(ShortUrlInputFilter::TITLE);
         $this->crawlable = $inputFilter->getValue(ShortUrlInputFilter::CRAWLABLE);
@@ -166,7 +166,7 @@ final class ShortUrlEdit implements TitleResolutionModelInterface
         return $copy;
     }
 
-    public function doValidateUrl(): ?bool
+    public function doValidateUrl(): bool
     {
         return $this->validateUrl;
     }

module/Core/src/Model/ShortUrlMeta.php

@@ -26,7 +26,7 @@ final class ShortUrlMeta implements TitleResolutionModelInterface
     private ?bool $findIfExists = null;
     private ?string $domain = null;
     private int $shortCodeLength = 5;
-    private ?bool $validateUrl = null;
+    private bool $validateUrl = false;
     private ?ApiKey $apiKey = null;
     private array $tags = [];
     private ?string $title = null;
@@ -73,7 +73,7 @@ final class ShortUrlMeta implements TitleResolutionModelInterface
         $this->customSlug = $inputFilter->getValue(ShortUrlInputFilter::CUSTOM_SLUG);
         $this->maxVisits = getOptionalIntFromInputFilter($inputFilter, ShortUrlInputFilter::MAX_VISITS);
         $this->findIfExists = $inputFilter->getValue(ShortUrlInputFilter::FIND_IF_EXISTS);
-        $this->validateUrl = getOptionalBoolFromInputFilter($inputFilter, ShortUrlInputFilter::VALIDATE_URL);
+        $this->validateUrl = getOptionalBoolFromInputFilter($inputFilter, ShortUrlInputFilter::VALIDATE_URL) ?? false;
         $this->domain = $inputFilter->getValue(ShortUrlInputFilter::DOMAIN);
         $this->shortCodeLength = getOptionalIntFromInputFilter(
             $inputFilter,
@@ -151,7 +151,7 @@ final class ShortUrlMeta implements TitleResolutionModelInterface
         return $this->shortCodeLength;
     }
 
-    public function doValidateUrl(): ?bool
+    public function doValidateUrl(): bool
     {
         return $this->validateUrl;
     }

module/Core/src/Options/UrlShortenerOptions.php

@@ -10,20 +10,9 @@ class UrlShortenerOptions extends AbstractOptions
 {
     protected $__strictMode__ = false; // phpcs:ignore
 
-    private bool $validateUrl = true;
     private bool $autoResolveTitles = false;
     private bool $appendExtraPath = false;
 
-    public function isUrlValidationEnabled(): bool
-    {
-        return $this->validateUrl;
-    }
-
-    protected function setValidateUrl(bool $validateUrl): void
-    {
-        $this->validateUrl = $validateUrl;
-    }
-
     public function autoResolveTitles(): bool
     {
         return $this->autoResolveTitles;

module/Core/src/ShortUrl/Helper/TitleResolutionModelInterface.php

@@ -10,7 +10,7 @@ interface TitleResolutionModelInterface
 
     public function getLongUrl(): string;
 
-    public function doValidateUrl(): ?bool;
+    public function doValidateUrl(): bool;
 
     public function withResolvedTitle(string $title): self;
 }

module/Core/src/Util/UrlValidator.php

@@ -30,10 +30,8 @@ class UrlValidator implements UrlValidatorInterface, RequestMethodInterface
     /**
      * @throws InvalidUrlException
      */
-    public function validateUrl(string $url, ?bool $doValidate): void
+    public function validateUrl(string $url, bool $doValidate): void
     {
-        // If the URL validation is not enabled, or it was explicitly set to not validate, skip check
-        $doValidate = $doValidate ?? $this->options->isUrlValidationEnabled();
         if (! $doValidate) {
             return;
         }
@@ -41,15 +39,14 @@ class UrlValidator implements UrlValidatorInterface, RequestMethodInterface
         $this->validateUrlAndGetResponse($url, true);
     }
 
-    public function validateUrlWithTitle(string $url, ?bool $doValidate): ?string
+    public function validateUrlWithTitle(string $url, bool $doValidate): ?string
     {
-        $doValidate = $doValidate ?? $this->options->isUrlValidationEnabled();
         if (! $doValidate && ! $this->options->autoResolveTitles()) {
             return null;
         }
 
         $response = $this->validateUrlAndGetResponse($url, $doValidate);
-        if ($response === null) {
+        if ($response === null || ! $this->options->autoResolveTitles()) {
             return null;
         }
 

module/Core/src/Util/UrlValidatorInterface.php

@@ -11,10 +11,10 @@ interface UrlValidatorInterface
     /**
      * @throws InvalidUrlException
      */
-    public function validateUrl(string $url, ?bool $doValidate): void;
+    public function validateUrl(string $url, bool $doValidate): void;
 
     /**
      * @throws InvalidUrlException
      */
-    public function validateUrlWithTitle(string $url, ?bool $doValidate): ?string;
+    public function validateUrlWithTitle(string $url, bool $doValidate): ?string;
 }

module/Core/test/ShortUrl/Helper/ShortUrlTitleResolutionHelperTest.php

@@ -35,10 +35,10 @@ class ShortUrlTitleResolutionHelperTest extends TestCase
             ShortUrlMeta::fromRawData(['longUrl' => $longUrl, 'title' => $title]),
         );
 
-        $this->urlValidator->validateUrlWithTitle($longUrl, null)->shouldHaveBeenCalledTimes(
+        $this->urlValidator->validateUrlWithTitle($longUrl, false)->shouldHaveBeenCalledTimes(
             $validateWithTitleCallsNum,
         );
-        $this->urlValidator->validateUrl($longUrl, null)->shouldHaveBeenCalledTimes($validateCallsNum);
+        $this->urlValidator->validateUrl($longUrl, false)->shouldHaveBeenCalledTimes($validateCallsNum);
     }
 
     public function provideTitles(): iterable

module/Core/test/Util/UrlValidatorTest.php

@@ -42,7 +42,7 @@ class UrlValidatorTest extends TestCase
         $request->shouldBeCalledOnce();
         $this->expectException(InvalidUrlException::class);
 
-        $this->urlValidator->validateUrl('http://foobar.com/12345/hello?foo=bar', null);
+        $this->urlValidator->validateUrl('http://foobar.com/12345/hello?foo=bar', true);
     }
 
     /** @test */
@@ -65,50 +65,33 @@ class UrlValidatorTest extends TestCase
             }),
         )->willReturn(new Response());
 
-        $this->urlValidator->validateUrl($expectedUrl, null);
+        $this->urlValidator->validateUrl($expectedUrl, true);
 
         $request->shouldHaveBeenCalledOnce();
     }
 
-    /**
+    /** @test */
-     * @test
+    public function noCheckIsPerformedWhenUrlValidationIsDisabled(): void
-     * @dataProvider provideDisabledCombinations
-     */
-    public function noCheckIsPerformedWhenUrlValidationIsDisabled(?bool $doValidate, bool $validateUrl): void
     {
         $request = $this->httpClient->request(Argument::cetera())->willReturn(new Response());
-        $this->options->validateUrl = $validateUrl;
 
-        $this->urlValidator->validateUrl('', $doValidate);
+        $this->urlValidator->validateUrl('', false);
 
         $request->shouldNotHaveBeenCalled();
     }
 
-    /**
+    /** @test */
-     * @test
+    public function validateUrlWithTitleReturnsNullWhenRequestFailsAndValidationIsDisabled(): void
-     * @dataProvider provideDisabledCombinations
+    {
-     */
-    public function validateUrlWithTitleReturnsNullWhenRequestFailsAndValidationIsDisabled(
-        ?bool $doValidate,
-        bool $validateUrl,
-    ): void {
         $request = $this->httpClient->request(Argument::cetera())->willThrow(ClientException::class);
-        $this->options->validateUrl = $validateUrl;
         $this->options->autoResolveTitles = true;
 
-        $result = $this->urlValidator->validateUrlWithTitle('http://foobar.com/12345/hello?foo=bar', $doValidate);
+        $result = $this->urlValidator->validateUrlWithTitle('http://foobar.com/12345/hello?foo=bar', false);
 
         self::assertNull($result);
         $request->shouldHaveBeenCalledOnce();
     }
 
-    public function provideDisabledCombinations(): iterable
-    {
-        yield 'config is disabled and no runtime option is provided' => [null, false];
-        yield 'config is enabled but runtime option is disabled' => [false, true];
-        yield 'both config and runtime option are disabled' => [false, false];
-    }
-
     /** @test */
     public function validateUrlWithTitleReturnsNullWhenAutoResolutionIsDisabled(): void
     {
@@ -121,6 +104,18 @@ class UrlValidatorTest extends TestCase
         $request->shouldNotHaveBeenCalled();
     }
 
+    /** @test */
+    public function validateUrlWithTitleReturnsNullWhenAutoResolutionIsDisabledAndValidationIsEnabled(): void
+    {
+        $request = $this->httpClient->request(Argument::cetera())->willReturn($this->respWithTitle());
+        $this->options->autoResolveTitles = false;
+
+        $result = $this->urlValidator->validateUrlWithTitle('http://foobar.com/12345/hello?foo=bar', true);
+
+        self::assertNull($result);
+        $request->shouldHaveBeenCalledOnce();
+    }
+
     /** @test */
     public function validateUrlWithTitleResolvesTitleWhenAutoResolutionIsEnabled(): void
     {

module/Rest/test-api/Action/CreateShortUrlTest.php

@@ -230,7 +230,7 @@ class CreateShortUrlTest extends ApiTestCase
     {
         $expectedDetail = sprintf('Provided URL %s is invalid. Try with a different one.', $url);
 
-        [$statusCode, $payload] = $this->createShortUrl(['longUrl' => $url]);
+        [$statusCode, $payload] = $this->createShortUrl(['longUrl' => $url, 'validateUrl' => true]);
 
         self::assertEquals(self::STATUS_BAD_REQUEST, $statusCode);
         self::assertEquals(self::STATUS_BAD_REQUEST, $payload['status']);

module/Rest/test-api/Action/EditShortUrlTest.php

@@ -82,6 +82,7 @@ class EditShortUrlTest extends ApiTestCase
 
         $resp = $this->callApiWithKey(self::METHOD_PATCH, $url, [RequestOptions::JSON => [
             'longUrl' => $longUrl,
+            'validateUrl' => true,
         ]]);
 
         self::assertEquals($expectedStatus, $resp->getStatusCode());