From c4943cff72f95a28fbb9404e3c20b169ff098e5c Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Tue, 18 May 2021 11:40:23 +0100 Subject: CodeStyle --- tests/TestCase.php | 19 +------------------ .../SurnameTradition/DefaultSurnameTraditionTest.php | 3 +-- .../IcelandicSurnameTraditionTest.php | 5 ++--- .../LithuanianSurnameTraditionTest.php | 5 ++--- .../MatrilinealSurnameTraditionTest.php | 5 ++--- .../SurnameTradition/PaternalSurnameTraditionTest.php | 3 +-- .../PatrilinealSurnameTraditionTest.php | 3 +-- .../SurnameTradition/PolishSurnameTraditionTest.php | 5 ++--- .../PortugueseSurnameTraditionTest.php | 5 ++--- .../SurnameTradition/SpanishSurnameTraditionTest.php | 3 +-- 10 files changed, 15 insertions(+), 41 deletions(-) (limited to 'tests') diff --git a/tests/TestCase.php b/tests/TestCase.php index 7f5a5cf16e..e2c2ada252 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,22 +22,6 @@ namespace Fisharebest\Webtrees; use Aura\Router\Route; use Aura\Router\RouterContainer; use Fig\Http\Message\RequestMethodInterface; -use Fisharebest\Webtrees\Factories\CacheFactory; -use Fisharebest\Webtrees\Factories\FamilyFactory; -use Fisharebest\Webtrees\Factories\FilesystemFactory; -use Fisharebest\Webtrees\Factories\ElementFactory; -use Fisharebest\Webtrees\Factories\GedcomRecordFactory; -use Fisharebest\Webtrees\Factories\HeaderFactory; -use Fisharebest\Webtrees\Factories\IndividualFactory; -use Fisharebest\Webtrees\Factories\LocationFactory; -use Fisharebest\Webtrees\Factories\MediaFactory; -use Fisharebest\Webtrees\Factories\NoteFactory; -use Fisharebest\Webtrees\Factories\RepositoryFactory; -use Fisharebest\Webtrees\Factories\SlugFactory; -use Fisharebest\Webtrees\Factories\SourceFactory; -use Fisharebest\Webtrees\Factories\SubmissionFactory; -use Fisharebest\Webtrees\Factories\SubmitterFactory; -use Fisharebest\Webtrees\Factories\XrefFactory; use Fisharebest\Webtrees\Http\RequestHandlers\GedcomLoad; use Fisharebest\Webtrees\Http\Routes\WebRoutes; use Fisharebest\Webtrees\Module\ModuleThemeInterface; @@ -60,7 +44,6 @@ use function app; use function basename; use function filesize; use function http_build_query; -use function microtime; use const UPLOAD_ERR_OK; @@ -233,7 +216,7 @@ class TestCase extends \PHPUnit\Framework\TestCase $tree_service->importGedcomFile($tree, $stream, $gedcom_file); - $timeout_service = new TimeoutService(microtime(true)); + $timeout_service = new TimeoutService(); $controller = new GedcomLoad($timeout_service, $tree_service); $request = self::createRequest()->withAttribute('tree', $tree); diff --git a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php index f92df9c7a5..00cc5f1bbc 100644 --- a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class DefaultSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php index f27f384e21..b42375899f 100644 --- a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class IcelandicSurnameTradition */ class IcelandicSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php index 0c84143a1b..41acceda7e 100644 --- a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class LithuanianSurnameTraditionTest */ class LithuanianSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php index 4d099d26a9..91bbb92c44 100644 --- a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class PatrilinenalSurnameTradition + * Test harness for the class MatrilinenalSurnameTradition */ class MatrilinealSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php index 562db3eeaa..998c8fb42a 100644 --- a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class PaternalSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php index 9257cb81b4..f21e14b6eb 100644 --- a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class PatrilinealSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php index 8f9aaf876b..e219bdd2b8 100644 --- a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class PolishSurnameTradition */ class PolishSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php index 466c70cc83..80d997a8c1 100644 --- a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class PortugueseSurnameTradition */ class PortugueseSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php index 6dab56fdd5..ac2f2937c0 100644 --- a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class SpanishSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests -- cgit v1.3