diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php | 23 | ||||
| -rw-r--r-- | tests/app/TreeTest.php | 3 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php index b8f7425699..059e4b4eb6 100644 --- a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php +++ b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php @@ -32,6 +32,7 @@ use Fisharebest\Webtrees\Services\UpgradeService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; +use Nyholm\Psr7\Factory\Psr17Factory; /** * Test UpgradeController class. @@ -48,7 +49,7 @@ class UpgradeWizardStepTest extends TestCase public function testIgnoreStepInvalid(): void { $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), new UpgradeService(new TimeoutService()) ); @@ -68,7 +69,7 @@ class UpgradeWizardStepTest extends TestCase $mock_upgrade_service = $this->createMock(UpgradeService::class); $mock_upgrade_service->method('latestVersion')->willReturn('999.999.999'); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), $mock_upgrade_service ); @@ -89,7 +90,7 @@ class UpgradeWizardStepTest extends TestCase $mock_upgrade_service = $this->createMock(UpgradeService::class); $mock_upgrade_service->method('latestVersion')->willReturn(''); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), $mock_upgrade_service ); @@ -108,7 +109,7 @@ class UpgradeWizardStepTest extends TestCase $mock_upgrade_service = $this->createMock(UpgradeService::class); $mock_upgrade_service->method('latestVersion')->willReturn('0.0.0'); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), $mock_upgrade_service ); @@ -123,7 +124,7 @@ class UpgradeWizardStepTest extends TestCase public function testStepPrepare(): void { $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), new UpgradeService(new TimeoutService()) ); @@ -140,7 +141,7 @@ class UpgradeWizardStepTest extends TestCase public function testStepPending(): void { $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), new UpgradeService(new TimeoutService()) ); @@ -164,7 +165,7 @@ class UpgradeWizardStepTest extends TestCase $tree->createIndividual("0 @@ INDI\n1 NAME Joe Bloggs"); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), new UpgradeService(new TimeoutService()) ); @@ -186,7 +187,7 @@ class UpgradeWizardStepTest extends TestCase $tree_service->method('all')->willReturn($all_trees); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), $tree_service, new UpgradeService(new TimeoutService()) ); @@ -212,7 +213,7 @@ class UpgradeWizardStepTest extends TestCase $mock_upgrade_service = $this->createMock(UpgradeService::class); $mock_upgrade_service->method('downloadFile')->will(self::throwException(new Exception())); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), $mock_upgrade_service ); @@ -229,7 +230,7 @@ class UpgradeWizardStepTest extends TestCase $mock_upgrade_service = $this->createMock(UpgradeService::class); $mock_upgrade_service->method('downloadFile')->willReturn(123456); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), $mock_upgrade_service ); @@ -248,7 +249,7 @@ class UpgradeWizardStepTest extends TestCase $mock_upgrade_service = $this->createMock(UpgradeService::class); $mock_upgrade_service->method('webtreesZipContents')->willReturn(new Collection()); $handler = new UpgradeWizardStep( - new GedcomExportService(), + new GedcomExportService(new Psr17Factory(), new Psr17Factory()), new TreeService(new GedcomImportService()), $mock_upgrade_service ); diff --git a/tests/app/TreeTest.php b/tests/app/TreeTest.php index 71d2143ca8..7d6dff01f2 100644 --- a/tests/app/TreeTest.php +++ b/tests/app/TreeTest.php @@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Services\GedcomImportService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Services\UserService; use InvalidArgumentException; +use Nyholm\Psr7\Factory\Psr17Factory; use Symfony\Component\Cache\Adapter\NullAdapter; use function fclose; @@ -358,7 +359,7 @@ class TreeTest extends TestCase { $tree = $this->importTree('demo.ged'); - $gedcom_export_service = new GedcomExportService(); + $gedcom_export_service = new GedcomExportService(new Psr17Factory(), new Psr17Factory()); $resource = $gedcom_export_service->export($tree, true); $original = file_get_contents(__DIR__ . '/../data/demo.ged'); |