Merge pull request #1683 from shlinkio/develop

Release 3.5.0

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--
 Before opening an issue, just take into account that this is a completely free of charge and open source project.
 I'm always happy to help and provide support, but some understanding will be expected.
-I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personally if an issue gets eventually closed.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
 You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 -->

.github/ISSUE_TEMPLATE/Bug.md

@@ -7,18 +7,18 @@ labels: bug
 <!--
 Before opening an issue, just take into account that this is a completely free of charge and open source project.
 I'm always happy to help and provide support, but some understanding will be expected.
-I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personally if an issue gets eventually closed.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
 You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 
 With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
 -->
 
-#### How Shlink is set up
+#### How Shlink is set-up
 
 * Shlink Version: x.y.z
 * PHP Version: x.y.z
-* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted openswoole|Self-hosted RoadRunner|Openswoole Docker image|RoadRunner Docker image
+* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted openswoole|Docker image
 * Database engine used: MySQL|MariaDB|PostgreSQL|MicrosoftSQL|SQLite (x.y.z)
 
 #### Summary
@@ -31,7 +31,7 @@ With that said, please fill in the information requested next. More information
 
 #### Expected behavior
 
-<!-- How did you expect it to behave? -->
+<!-- How did you expected to behave? -->
 
 #### How to reproduce
 

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -7,7 +7,7 @@ labels: feature
 <!--
 Before opening an issue, just take into account that this is a completely free of charge and open source project.
 I'm always happy to help and provide support, but some understanding will be expected.
-I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personally if an issue gets eventually closed.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
 You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 

.github/ISSUE_TEMPLATE/Question_Support.md

@@ -7,18 +7,18 @@ labels: question
 <!--
 Before opening an issue, just take into account that this is a completely free of charge and open source project.
 I'm always happy to help and provide support, but some understanding will be expected.
-I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personally if an issue gets eventually closed.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
 You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 
 With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
 -->
 
-#### How Shlink is set up
+#### How Shlink is set-up
 
 * Shlink Version: x.y.z
 * PHP Version: x.y.z
-* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted openswoole|Self-hosted RoadRunner|Openswoole Docker image|RoadRunner Docker image
+* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted openswoole|Docker image
 * Database engine used: MySQL|MariaDB|PostgreSQL|MicrosoftSQL|SQLite (x.y.z)
 
 #### Summary

.github/actions/ci-setup/action.yml

@@ -28,7 +28,7 @@ runs:
         extensions: ${{ inputs.php-extensions }}
         key: ${{ inputs.extensions-cache-key }}
     - name: Cache extensions
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ${{ steps.extcache.outputs.dir }}
         key: ${{ steps.extcache.outputs.key }}

.github/workflows/ci-mutation-tests.yml

@@ -27,14 +27,14 @@ jobs:
           path: build
       - name: Resolve infection args
         id: infection_args
-        run: echo "args=--logger-github=false" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=args::--logger-github=false"
 #        TODO Try to filter mutation tests to improve execution times. Investigate why --git-diff-lines --git-diff-base=develop does not work
 #        run: |
 #          BRANCH="${GITHUB_REF#refs/heads/}" |
 #          if [[ $BRANCH == 'main' || $BRANCH == 'develop' ]]; then
-#            echo "args=--logger-github=false" >> $GITHUB_OUTPUT
+#            echo "::set-output name=args::--logger-github=false"
 #          else
-#            echo "args=--logger-github=false --git-diff-lines --git-diff-base=develop" >> $GITHUB_OUTPUT
+#            echo "::set-output name=args::--logger-github=false --git-diff-lines --git-diff-base=develop"
 #          fi;
         shell: bash
       - if: ${{ inputs.test-group == 'unit' }}

.github/workflows/publish-swagger-spec.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Determine version
         id: determine_version
-        run: echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=version::${GITHUB_REF#refs/tags/}"
         shell: bash
       - uses: './.github/actions/ci-setup'
         with:

CHANGELOG.md

@@ -4,42 +4,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
-## [Unreleased]
-### Added
-* *Nothing*
-
-### Changed
-* *Nothing*
-
-### Deprecated
-* *Nothing*
-
-### Removed
-* *Nothing*
-
-### Fixed
-* [#1698](https://github.com/shlinkio/shlink/issues/1698) Fixed error 500 in `robots.txt`.
-* [#1688](https://github.com/shlinkio/shlink/issues/1688) Fixed huge performance degradation on `/tags/stats` endpoint.
-
-
-## [3.5.1] - 2023-02-04
-### Added
-* *Nothing*
-
-### Changed
-* [#1685](https://github.com/shlinkio/shlink/issues/1685) Changed `loosely` mode to `loose`, as it was a typo. The old one keeps working and maps to the new one, but it's considered deprecated.
-
-### Deprecated
-* *Nothing*
-
-### Removed
-* *Nothing*
-
-### Fixed
-* [#1682](https://github.com/shlinkio/shlink/issues/1682) Fixed incorrect case-insensitive checks in short URLs when using Microsoft SQL server.
-* [#1684](https://github.com/shlinkio/shlink/issues/1684) Fixed entities metadata cache not being cleared at docker container start-up when using redis with replication.
-
-
 ## [3.5.0] - 2023-01-28
 ### Added
 * [#1557](https://github.com/shlinkio/shlink/issues/1557) Added support to dynamically redirect to different long URLs based on the visitor's device type.
@@ -61,9 +25,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * [#1662](https://github.com/shlinkio/shlink/issues/1662) Added support to provide openswoole-specific config options via env vars prefixed with `OPENSWOOLE_`.
 * [#1389](https://github.com/shlinkio/shlink/issues/1389) and [#706](https://github.com/shlinkio/shlink/issues/706) Added support for case-insensitive short URLs.
 
-  In order to achieve this, a new env var/config option has been implemented (`SHORT_URL_MODE`), which allows either `strict` or ~~`loosely`~~ `loose`.
+  In order to achieve this, a new env var/config option has been implemented (`SHORT_URL_MODE`), which allows either `strict` or `loosely`.
 
-  Default value is `strict`, but if `loose` is provided, then short URLs will be matched in a case-insensitive way, and new short URLs will be generated with short-codes in lowercase only.
+  Default value is `strict`, but if `loosely` is provided, then short URLs will be matched in a case-insensitive way, and new short URLs will be generated with short-codes in lowercase only.
 
 ### Changed
 * *Nothing*

README.md

@@ -6,7 +6,7 @@
 [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink)
 [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/)
 [![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE)
-[![Twitter](https://img.shields.io/badge/follow-shlinkio-blue.svg?style=flat-square&logo=twitter&color=blue)](https://twitter.com/shlinkio)
+[![Twitter](https://img.shields.io/twitter/follow/shlinkio?color=blue&label=follow&logo=twitter&style=flat-square)](https://twitter.com/shlinkio)
 [![Mastodon](https://img.shields.io/mastodon/follow/109329425426175098?color=%236364ff&domain=https%3A%2F%2Ffosstodon.org&label=follow&logo=mastodon&logoColor=white&style=flat-square)](https://fosstodon.org/@shlinkio)
 [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)
 

composer.json

@@ -46,7 +46,7 @@
         "php-middleware/request-id": "^4.1",
         "pugx/shortid-php": "^1.1",
         "ramsey/uuid": "^4.5",
-        "shlinkio/shlink-common": "^5.3.1",
+        "shlinkio/shlink-common": "^5.3",
         "shlinkio/shlink-config": "^2.4",
         "shlinkio/shlink-event-dispatcher": "^2.6",
         "shlinkio/shlink-importer": "^5.0",

config/autoload/logger.local.php.dist

@@ -5,16 +5,14 @@ declare(strict_types=1);
 use Monolog\Level;
 use Shlinkio\Shlink\Common\Logger\LoggerType;
 
-use function Shlinkio\Shlink\Config\runningInOpenswoole;
-
-$logToStream = runningInOpenswoole();
+$isSwoole = extension_loaded('openswoole');
 
 return [
 
     'logger' => [
         'Shlink' => [
-            // For openswoole, send logs as stream
-            'type' => $logToStream ? LoggerType::STREAM->value : LoggerType::FILE->value,
+            // For swoole, send logs as stream
+            'type' => $isSwoole ? LoggerType::STREAM->value : LoggerType::FILE->value,
             'level' => Level::Debug->value,
         ],
     ],

config/autoload/url-shortener.global.php

@@ -14,7 +14,7 @@ return (static function (): array {
         MIN_SHORT_CODES_LENGTH,
     );
     $modeFromEnv = EnvVars::SHORT_URL_MODE->loadFromEnv(ShortUrlMode::STRICT->value);
-    $mode = ShortUrlMode::tryDeprecated($modeFromEnv) ?? ShortUrlMode::STRICT;
+    $mode = ShortUrlMode::tryFrom($modeFromEnv) ?? ShortUrlMode::STRICT;
 
     return [
 

data/infra/ci/install-ms-odbc.sh

@@ -3,7 +3,7 @@
 set -ex
 
 curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
+curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
 apt-get update
-ACCEPT_EULA=Y apt-get install msodbcsql18
+ACCEPT_EULA=Y apt-get install msodbcsql17
 apt-get install unixodbc-dev

data/migrations/Version20230130090946.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkMigrations;
-
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\SQLServerPlatform;
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20230130090946 extends AbstractMigration
-{
-    public function up(Schema $schema): void
-    {
-        $this->skipIf(! $this->isMsSql(), 'This only sets MsSQL-specific database options');
-
-        $shortUrls = $schema->getTable('short_urls');
-        $shortCode = $shortUrls->getColumn('short_code');
-        // Drop the unique index before changing the collation, as the field is part of this index
-        $shortUrls->dropIndex('unique_short_code_plus_domain');
-        $shortCode->setPlatformOption('collation', 'Latin1_General_CS_AS');
-    }
-
-    public function postUp(Schema $schema): void
-    {
-        if ($this->isMsSql()) {
-            // The index needs to be re-created in postUp, but here, we can only use statements run against the
-            // connection directly
-            $this->connection->executeStatement(
-                'CREATE INDEX unique_short_code_plus_domain ON short_urls (domain_id, short_code);',
-            );
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        // No down
-    }
-
-    public function isTransactional(): bool
-    {
-        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
-    }
-
-    private function isMsSql(): bool
-    {
-        return $this->connection->getDatabasePlatform() instanceof SQLServerPlatform;
-    }
-}

data/migrations/Version20230211171904.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkMigrations;
-
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20230211171904 extends AbstractMigration
-{
-    private const INDEX_NAME = 'IDX_visits_potential_bot';
-
-    public function up(Schema $schema): void
-    {
-        $visits = $schema->getTable('visits');
-        $this->skipIf($visits->hasIndex(self::INDEX_NAME));
-
-        $visits->addIndex(['short_url_id', 'potential_bot'], self::INDEX_NAME);
-    }
-
-    public function isTransactional(): bool
-    {
-        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
-    }
-}

module/Core/config/dependencies.config.php

@@ -187,7 +187,7 @@ return [
             Util\DoctrineBatchHelper::class,
         ],
 
-        Crawling\CrawlingHelper::class => [ShortUrl\Repository\CrawlableShortCodesQuery::class],
+        Crawling\CrawlingHelper::class => ['em'],
     ],
 
 ];

module/Core/src/Options/UrlShortenerOptions.php

@@ -22,8 +22,8 @@ final class UrlShortenerOptions
     ) {
     }
 
-    public function isLooseMode(): bool
+    public function isLooselyMode(): bool
     {
-        return $this->mode === ShortUrlMode::LOOSE;
+        return $this->mode === ShortUrlMode::LOOSELY;
     }
 }

module/Core/src/ShortUrl/Entity/ShortUrl.php

@@ -39,8 +39,8 @@ class ShortUrl extends AbstractEntity
     private string $longUrl;
     private string $shortCode;
     private Chronos $dateCreated;
-    /** @var Collection<int, Visit> & Selectable */
-    private Collection & Selectable $visits;
+    /** @var Collection<int, Visit> */
+    private Collection $visits;
     /** @var Collection<string, DeviceLongUrl> */
     private Collection $deviceLongUrls;
     /** @var Collection<int, Tag> */
@@ -255,19 +255,23 @@ class ShortUrl extends AbstractEntity
 
     public function mostRecentImportedVisitDate(): ?Chronos
     {
+        /** @var Selectable $visits */
+        $visits = $this->visits;
         $criteria = Criteria::create()->where(Criteria::expr()->eq('type', VisitType::IMPORTED))
                                       ->orderBy(['id' => 'DESC'])
                                       ->setMaxResults(1);
-        $visit = $this->visits->matching($criteria)->last();
 
-        return $visit instanceof Visit ? $visit->getDate() : null;
+        /** @var Visit|false $visit */
+        $visit = $visits->matching($criteria)->last();
+
+        return $visit === false ? null : $visit->getDate();
     }
 
     /**
-     * @param Collection<int, Visit> & Selectable $visits
+     * @param Collection<int, Visit> $visits
      * @internal
      */
-    public function setVisits(Collection & Selectable $visits): self
+    public function setVisits(Collection $visits): self
     {
         $this->visits = $visits;
         return $this;

module/Core/src/ShortUrl/Model/ShortUrlMode.php

@@ -5,11 +5,5 @@ namespace Shlinkio\Shlink\Core\ShortUrl\Model;
 enum ShortUrlMode: string
 {
     case STRICT = 'strict';
-    case LOOSE = 'loose';
-
-    /** @deprecated */
-    public static function tryDeprecated(string $mode): ?self
-    {
-        return $mode === 'loosely' ? self::LOOSE : self::tryFrom($mode);
-    }
+    case LOOSELY = 'loosely';
 }

module/Core/src/ShortUrl/Model/Validation/CustomSlugFilter.php

@@ -24,7 +24,7 @@ class CustomSlugFilter implements FilterInterface
             return $value;
         }
 
-        $value = $this->options->isLooseMode() ? strtolower($value) : $value;
+        $value = $this->options->isLooselyMode() ? strtolower($value) : $value;
         return (match ($this->options->multiSegmentSlugsEnabled) {
             true => trim(str_replace(' ', '-', $value), '/'),
             false => str_replace([' ', '/'], '-', $value),

module/Core/src/Tag/Repository/TagRepository.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core\Tag\Repository;
 
-use Doctrine\DBAL\Query\QueryBuilder as NativeQueryBuilder;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository;
 use Happyr\DoctrineSpecification\Spec;
@@ -46,6 +45,7 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
         $orderDir = $filtering?->orderBy?->direction;
         $orderMainQuery = $orderField !== null && OrderableField::isAggregateField($orderField);
 
+        $conn = $this->getEntityManager()->getConnection();
         $subQb = $this->createQueryBuilder('t');
         $subQb->select('t.id', 't.name');
 
@@ -53,51 +53,15 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
             $subQb->orderBy('t.name', $orderDir ?? 'ASC')
                   ->setMaxResults($filtering?->limit ?? PHP_INT_MAX)
                   ->setFirstResult($filtering?->offset ?? 0);
-            // TODO Check if applying limit/offset ot visits sub-queries is needed with large amounts of tags
         }
 
-        $conn = $this->getEntityManager()->getConnection();
-        $buildVisitsSubQuery = static function (bool $excludeBots, string $aggregateAlias) use ($conn) {
-            $visitsSubQuery = $conn->createQueryBuilder();
-            $commonJoinCondition = $visitsSubQuery->expr()->eq('v.short_url_id', 's.id');
-            $visitsJoin = ! $excludeBots
-                ? $commonJoinCondition
-                : $visitsSubQuery->expr()->and(
-                    $commonJoinCondition,
-                    $visitsSubQuery->expr()->eq('v.potential_bot', $conn->quote('0')),
-                );
-
-            return $visitsSubQuery
-                ->select('st.tag_id AS tag_id', 'COUNT(DISTINCT v.id) AS ' . $aggregateAlias)
-                ->from('visits', 'v')
-                ->join('v', 'short_urls', 's', $visitsJoin) // @phpstan-ignore-line
-                ->join('s', 'short_urls_in_tags', 'st', $visitsSubQuery->expr()->eq('st.short_url_id', 's.id'))
-                ->groupBy('st.tag_id');
-        };
-        $allVisitsSubQuery = $buildVisitsSubQuery(false, 'visits');
-        $nonBotVisitsSubQuery = $buildVisitsSubQuery(true, 'non_bot_visits');
-
         $searchTerm = $filtering?->searchTerm;
         if ($searchTerm !== null) {
             $subQb->andWhere($subQb->expr()->like('t.name', $conn->quote('%' . $searchTerm . '%')));
-            // TODO Check if applying this to all sub-queries makes it faster or slower
         }
 
         $apiKey = $filtering?->apiKey;
-        $applyApiKeyToNativeQuery = static fn (?ApiKey $apiKey, NativeQueryBuilder $nativeQueryBuilder) =>
-            $apiKey?->mapRoles(static fn (Role $role, array $meta) => match ($role) {
-                Role::DOMAIN_SPECIFIC => $nativeQueryBuilder->andWhere(
-                    $nativeQueryBuilder->expr()->eq('s.domain_id', $conn->quote(Role::domainIdFromMeta($meta))),
-                ),
-                Role::AUTHORED_SHORT_URLS => $nativeQueryBuilder->andWhere(
-                    $nativeQueryBuilder->expr()->eq('s.author_api_key_id', $conn->quote($apiKey->getId())),
-                ),
-            });
-
-        // Apply API key specification to all sub-queries
         $this->applySpecification($subQb, new WithInlinedApiKeySpecsEnsuringJoin($apiKey), 't');
-        $applyApiKeyToNativeQuery($apiKey, $allVisitsSubQuery);
-        $applyApiKeyToNativeQuery($apiKey, $nonBotVisitsSubQuery);
 
         // A native query builder needs to be used here, because DQL and ORM query builders do not support
         // sub-queries at "from" and "join" level.
@@ -107,22 +71,29 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
             ->select(
                 't.id_0 AS id',
                 't.name_1 AS name',
-                'COALESCE(v.visits, 0) AS visits', // COALESCE required for postgres to properly order
-                'COALESCE(v2.non_bot_visits, 0) AS non_bot_visits', // COALESCE required for postgres to properly order
                 'COUNT(DISTINCT s.id) AS short_urls_count',
+                'COUNT(DISTINCT v.id) AS visits', // Native queries require snake_case for cross-db compatibility
+                'COUNT(DISTINCT v2.id) AS non_bot_visits',
             )
             ->from('(' . $subQb->getQuery()->getSQL() . ')', 't') // @phpstan-ignore-line
             ->leftJoin('t', 'short_urls_in_tags', 'st', $nativeQb->expr()->eq('t.id_0', 'st.tag_id'))
             ->leftJoin('st', 'short_urls', 's', $nativeQb->expr()->eq('s.id', 'st.short_url_id'))
-            ->leftJoin('t', '(' . $allVisitsSubQuery->getSQL() . ')', 'v', $nativeQb->expr()->eq('t.id_0', 'v.tag_id'))
-            ->leftJoin('t', '(' . $nonBotVisitsSubQuery->getSQL() . ')', 'v2', $nativeQb->expr()->eq(
-                't.id_0',
-                'v2.tag_id',
+            ->leftJoin('st', 'visits', 'v', $nativeQb->expr()->eq('st.short_url_id', 'v.short_url_id'))
+            ->leftJoin('st', 'visits', 'v2', $nativeQb->expr()->and( // @phpstan-ignore-line
+                $nativeQb->expr()->eq('st.short_url_id', 'v2.short_url_id'),
+                $nativeQb->expr()->eq('v2.potential_bot', $conn->quote('0')),
             ))
-            ->groupBy('t.id_0', 't.name_1', 'v.visits', 'v2.non_bot_visits');
+            ->groupBy('t.id_0', 't.name_1');
 
         // Apply API key role conditions to the native query too, as they will affect the amounts on the aggregates
-        $applyApiKeyToNativeQuery($apiKey, $nativeQb);
+        $apiKey?->mapRoles(static fn (Role $role, array $meta) => match ($role) {
+            Role::DOMAIN_SPECIFIC => $nativeQb->andWhere(
+                $nativeQb->expr()->eq('s.domain_id', $conn->quote(Role::domainIdFromMeta($meta))),
+            ),
+            Role::AUTHORED_SHORT_URLS => $nativeQb->andWhere(
+                $nativeQb->expr()->eq('s.author_api_key_id', $conn->quote($apiKey->getId())),
+            ),
+        });
 
         if ($orderMainQuery) {
             $nativeQb
@@ -136,9 +107,9 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
 
         $rsm = new ResultSetMappingBuilder($this->getEntityManager());
         $rsm->addScalarResult('name', 'tag');
+        $rsm->addScalarResult('short_urls_count', 'shortUrlsCount');
         $rsm->addScalarResult('visits', 'visits');
         $rsm->addScalarResult('non_bot_visits', 'nonBotVisits');
-        $rsm->addScalarResult('short_urls_count', 'shortUrlsCount');
 
         return map(
             $this->getEntityManager()->createNativeQuery($nativeQb->getSQL(), $rsm)->getResult(),

module/Core/test-api/Action/RobotsTest.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkioApiTest\Shlink\Core\Action;
-
-use Shlinkio\Shlink\TestUtils\ApiTest\ApiTestCase;
-
-class RobotsTest extends ApiTestCase
-{
-    /** @test */
-    public function expectedListOfCrawlableShortCodesIsReturned(): void
-    {
-        $resp = $this->callShortUrl('robots.txt');
-        $body = $resp->getBody()->__toString();
-
-        self::assertEquals(200, $resp->getStatusCode());
-        self::assertEquals(
-            <<<ROBOTS
-            # For more information about the robots.txt standard, see:
-            # https://www.robotstxt.org/orig.html
-            
-            User-agent: *
-            Allow: /custom
-            Allow: /abc123
-            Disallow: /
-            ROBOTS,
-            $body,
-        );
-    }
-}

module/Core/test-db/ShortUrl/Repository/ShortUrlRepositoryTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioDbTest\Shlink\Core\ShortUrl\Repository;
 
 use Cake\Chronos\Chronos;
+use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
@@ -54,16 +55,19 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         ));
         self::assertSame($regularOne, $this->repo->findOneWithDomainFallback(
             ShortUrlIdentifier::fromShortCodeAndDomain('foo'),
-            ShortUrlMode::LOOSE,
+            ShortUrlMode::LOOSELY,
         ));
         self::assertSame($regularOne, $this->repo->findOneWithDomainFallback(
             ShortUrlIdentifier::fromShortCodeAndDomain('fOo'),
-            ShortUrlMode::LOOSE,
-        ));
-        self::assertNull($this->repo->findOneWithDomainFallback(
-            ShortUrlIdentifier::fromShortCodeAndDomain('foo'),
-            ShortUrlMode::STRICT,
+            ShortUrlMode::LOOSELY,
         ));
+        // TODO MS is doing loosely checks always, making this fail.
+        if (! $this->getEntityManager()->getConnection()->getDatabasePlatform() instanceof SQLServerPlatform) {
+            self::assertNull($this->repo->findOneWithDomainFallback(
+                ShortUrlIdentifier::fromShortCodeAndDomain('foo'),
+                ShortUrlMode::STRICT,
+            ));
+        }
         self::assertSame($regularOne, $this->repo->findOneWithDomainFallback(
             ShortUrlIdentifier::fromShortCodeAndDomain($withDomainDuplicatingRegular->getShortCode()),
             ShortUrlMode::STRICT,

module/Core/test/ShortUrl/Entity/ShortUrlTest.php

@@ -139,7 +139,7 @@ class ShortUrlTest extends TestCase
     }
 
     /** @test */
-    public function generatesLowercaseOnlyShortCodesInLooseMode(): void
+    public function generatesLowercaseOnlyShortCodesInLooselyMode(): void
     {
         $range = range(1, 1000); // Use a "big" number to reduce false negatives
         $allFor = static fn (ShortUrlMode $mode): bool => every($range, static function () use ($mode): bool {
@@ -152,7 +152,7 @@ class ShortUrlTest extends TestCase
             return $shortCode === strtolower($shortCode);
         });
 
-        self::assertTrue($allFor(ShortUrlMode::LOOSE));
+        self::assertTrue($allFor(ShortUrlMode::LOOSELY));
         self::assertFalse($allFor(ShortUrlMode::STRICT));
     }
 }

module/Core/test/ShortUrl/Model/ShortUrlCreationTest.php

@@ -140,20 +140,20 @@ class ShortUrlCreationTest extends TestCase
     {
         yield ['🔥', '🔥'];
         yield ['🦣 🍅', '🦣-🍅'];
-        yield ['🦣 🍅', '🦣-🍅', false, ShortUrlMode::LOOSE];
+        yield ['🦣 🍅', '🦣-🍅', false, ShortUrlMode::LOOSELY];
         yield ['foobar', 'foobar'];
         yield ['foo bar', 'foo-bar'];
         yield ['foo bar baz', 'foo-bar-baz'];
         yield ['foo bar-baz', 'foo-bar-baz'];
-        yield ['foo BAR-baz', 'foo-bar-baz', false, ShortUrlMode::LOOSE];
+        yield ['foo BAR-baz', 'foo-bar-baz', false, ShortUrlMode::LOOSELY];
         yield ['foo/bar/baz', 'foo/bar/baz', true];
         yield ['/foo/bar/baz', 'foo/bar/baz', true];
-        yield ['/foo/baR/baZ', 'foo/bar/baz', true, ShortUrlMode::LOOSE];
+        yield ['/foo/baR/baZ', 'foo/bar/baz', true, ShortUrlMode::LOOSELY];
         yield ['foo/bar/baz', 'foo-bar-baz'];
         yield ['/foo/bar/baz', '-foo-bar-baz'];
         yield ['wp-admin.php', 'wp-admin.php'];
         yield ['UPPER_lower', 'UPPER_lower'];
-        yield ['UPPER_lower', 'upper_lower', false, ShortUrlMode::LOOSE];
+        yield ['UPPER_lower', 'upper_lower', false, ShortUrlMode::LOOSELY];
         yield ['more~url_special.chars', 'more~url_special.chars'];
         yield ['구글', '구글'];
         yield ['グーグル', 'グーグル'];

module/Core/test/ShortUrl/Model/ShortUrlModeTest.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\Core\ShortUrl\Model;
-
-use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
-
-class ShortUrlModeTest extends TestCase
-{
-    /**
-     * @test
-     * @dataProvider provideModes
-     */
-    public function deprecatedValuesAreProperlyParsed(string $mode, ?ShortUrlMode $expected): void
-    {
-        self::assertSame($expected, ShortUrlMode::tryDeprecated($mode));
-    }
-
-    public function provideModes(): iterable
-    {
-        yield 'invalid' => ['invalid', null];
-        yield 'foo' => ['foo', null];
-        yield 'loose' => ['loose', ShortUrlMode::LOOSE];
-        yield 'loosely' => ['loosely', ShortUrlMode::LOOSE];
-        yield 'strict' => ['strict', ShortUrlMode::STRICT];
-    }
-}

module/Rest/src/ApiKey/Spec/WithInlinedApiKeySpecsEnsuringJoin.php

@@ -11,7 +11,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
 
 class WithInlinedApiKeySpecsEnsuringJoin extends BaseSpecification
 {
-    public function __construct(private readonly ?ApiKey $apiKey, private readonly string $fieldToJoin = 'shortUrls')
+    public function __construct(private ?ApiKey $apiKey, private string $fieldToJoin = 'shortUrls')
     {
         parent::__construct();
     }

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

@@ -122,7 +122,7 @@ class ListShortUrlsTest extends ApiTestCase
         ],
         'domain' => null,
         'title' => null,
-        'crawlable' => true,
+        'crawlable' => false,
         'forwardQuery' => false,
     ];
     private const SHORT_URL_CUSTOM_DOMAIN = [

module/Rest/test-api/Fixtures/ShortUrlsFixture.php

@@ -62,7 +62,6 @@ class ShortUrlsFixture extends AbstractFixture implements DependentFixtureInterf
             'maxVisits' => 2,
             'apiKey' => $authorApiKey,
             'longUrl' => 'https://shlink.io',
-            'crawlable' => true,
             'forwardQuery' => false,
         ])), '2019-01-01 00:00:20');
         $manager->persist($customShortUrl);