Merge pull request shlinkio#9 from acelaya-forks/feature/missing-unit…

…-tests Feature/missing unit tests
acelaya-forks · Dec 4, 2021 · adabe2e · adabe2e
2 parents 4353b06 + eeaeae8
commit adabe2e
Show file tree

Hide file tree

Showing 11 changed files with 756 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "test": "phpdbg -qrr vendor/bin/phpunit --order-by=random --testdox --colors=always",
         "test:ci": "@test --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/junit.xml",
         "test:pretty": "@test --coverage-html build/coverage-html",
-        "infect": "infection --threads=4 --min-msi=85 --log-verbosity=default --only-covered --only-covering-test-cases",
+        "infect": "infection --threads=4 --min-msi=80 --log-verbosity=default --only-covered --only-covering-test-cases",
         "infect:ci": "@infect --coverage=build --skip-initial-tests",
         "infect:show": "@infect --show-mutations",
         "infect:show:ci": "@infect --show-mutations --coverage=build",

diff --git a/src/Visits/Model/OrphanVisit.php b/src/Visits/Model/OrphanVisit.php
@@ -30,9 +30,9 @@ public function referer(): string
         return $this->visit->referer();
     }
 
-    public function dateTime(): DateTimeInterface
+    public function date(): DateTimeInterface
     {
-        return $this->visit->dateTime();
+        return $this->visit->date();
     }
 
     public function userAgent(): string
@@ -45,7 +45,7 @@ public function potentialBot(): bool
         return $this->visit->potentialBot();
     }
 
-    public function location(): VisitLocation
+    public function location(): ?VisitLocation
     {
         return $this->visit->location();
     }

diff --git a/src/Visits/Model/Visit.php b/src/Visits/Model/Visit.php
@@ -11,10 +11,10 @@ final class Visit implements VisitInterface
 {
     private function __construct(
         private string $referer,
-        private DateTimeInterface $dateTime,
+        private DateTimeInterface $date,
         private string $userAgent,
         private bool $potentialBot,
-        private VisitLocation $location,
+        private ?VisitLocation $location,
     ) {
     }
 
@@ -25,7 +25,7 @@ public static function fromArray(array $payload): self
             DateTimeImmutable::createFromFormat(DateTimeInterface::ATOM, $payload['date']), // @phpstan-ignore-line
             $payload['userAgent'] ?? '',
             $payload['potentialBot'] ?? false,
-            VisitLocation::fromArray($payload['visitLocation'] ?? []),
+            isset($payload['visitLocation']) ? VisitLocation::fromArray($payload['visitLocation']) : null,
         );
     }
 
@@ -34,9 +34,9 @@ public function referer(): string
         return $this->referer;
     }
 
-    public function dateTime(): DateTimeInterface
+    public function date(): DateTimeInterface
     {
-        return $this->dateTime;
+        return $this->date;
     }
 
     public function userAgent(): string
@@ -49,7 +49,7 @@ public function potentialBot(): bool
         return $this->potentialBot;
     }
 
-    public function location(): VisitLocation
+    public function location(): ?VisitLocation
     {
         return $this->location;
     }

diff --git a/src/Visits/Model/VisitInterface.php b/src/Visits/Model/VisitInterface.php
@@ -9,8 +9,8 @@
 interface VisitInterface
 {
     public function referer(): string;
-    public function dateTime(): DateTimeInterface;
+    public function date(): DateTimeInterface;
     public function userAgent(): string;
     public function potentialBot(): bool;
-    public function location(): VisitLocation;
+    public function location(): ?VisitLocation;
 }
diff --git a/test/Domains/Model/DomainRedirectsConfigTest.php b/test/Domains/Model/DomainRedirectsConfigTest.php
@@ -14,24 +14,26 @@ class DomainRedirectsConfigTest extends TestCase
      * @test
      * @dataProvider provideConfigs
      */
-    public function payloadIsBuiltAsExpected(DomainRedirectsConfig $config, array $expectedPayload): void
+    public function payloadIsBuiltAsExpected(callable $createConfig, array $expectedPayload): void
     {
+        /** @var DomainRedirectsConfig $config */
+        $config = $createConfig();
         self::assertEquals($expectedPayload, $config->jsonSerialize());
     }
 
     public function provideConfigs(): iterable
     {
-        yield [DomainRedirectsConfig::forDomain('foo.com'), ['domain' => 'foo.com']];
+        yield [fn () => DomainRedirectsConfig::forDomain('foo.com'), ['domain' => 'foo.com']];
         yield [
-            DomainRedirectsConfig::forDomain('foo.com')
+            fn () => DomainRedirectsConfig::forDomain('foo.com')
                 ->withRegularNotFoundRedirect('somewhere.com'),
             [
                 'domain' => 'foo.com',
                 DomainRedirectProps::REGULAR_NOT_FOUND => 'somewhere.com',
             ],
         ];
         yield [
-            DomainRedirectsConfig::forDomain('bar.com')
+            fn () => DomainRedirectsConfig::forDomain('bar.com')
                 ->withRegularNotFoundRedirect('foo.com')
                 ->removingBaseUrlRedirect(),
             [
@@ -41,7 +43,7 @@ public function provideConfigs(): iterable
             ],
         ];
         yield [
-            DomainRedirectsConfig::forDomain('bar.com')
+            fn () => DomainRedirectsConfig::forDomain('bar.com')
                 ->withRegularNotFoundRedirect('foo.net')
                 ->withInvalidShortUrlRedirect('something.com')
                 ->removingBaseUrlRedirect(),
@@ -53,7 +55,7 @@ public function provideConfigs(): iterable
             ],
         ];
         yield [
-            DomainRedirectsConfig::forDomain('baz.com')
+            fn () => DomainRedirectsConfig::forDomain('baz.com')
                 ->removingBaseUrlRedirect()
                 ->removingRegularNotFoundRedirect()
                 ->removingInvalidShortUrlRedirect(),
@@ -65,7 +67,7 @@ public function provideConfigs(): iterable
             ],
         ];
         yield [
-            DomainRedirectsConfig::forDomain('foobarbaz.com')
+            fn () => DomainRedirectsConfig::forDomain('foobarbaz.com')
                 ->withRegularNotFoundRedirect('foo.net')
                 ->withInvalidShortUrlRedirect('something.com')
                 ->withBaseUrlRedirect('base-redirect.com'),