diff options
Diffstat (limited to 'tests')
19 files changed, 180 insertions, 180 deletions
diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php index 60e956a4d0..aa2a39ac34 100644 --- a/tests/app/Module/AhnentafelReportModuleTest.php +++ b/tests/app/Module/AhnentafelReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\AhnentafelReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class AhnentafelReportModuleTest extends TestCase @@ -102,13 +102,13 @@ class AhnentafelReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php index a10e846d91..5b14d8c161 100644 --- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php +++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Webtrees; use League\Flysystem\Adapter\NullAdapter; @@ -33,38 +33,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\BirthDeathMarriageReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class BirthDeathMarriageReportModuleTest extends TestCase @@ -95,13 +95,13 @@ class BirthDeathMarriageReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php index dde50c493d..84419ff784 100644 --- a/tests/app/Module/BirthReportModuleTest.php +++ b/tests/app/Module/BirthReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\BirthReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class BirthReportModuleTest extends TestCase @@ -100,13 +100,13 @@ class BirthReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php index 6c99165a57..6102bc9bcf 100644 --- a/tests/app/Module/CemeteryReportModuleTest.php +++ b/tests/app/Module/CemeteryReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\CemeteryReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class CemeteryReportModuleTest extends TestCase @@ -98,13 +98,13 @@ class CemeteryReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php index e41b329181..4c62652b13 100644 --- a/tests/app/Module/ChangeReportModuleTest.php +++ b/tests/app/Module/ChangeReportModuleTest.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Carbon; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -37,38 +37,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\ChangeReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class ChangeReportModuleTest extends TestCase @@ -101,13 +101,13 @@ class ChangeReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php index 27f6fef821..b5ec3e3862 100644 --- a/tests/app/Module/DeathReportModuleTest.php +++ b/tests/app/Module/DeathReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\FactSourcesReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class DeathReportModuleTest extends TestCase @@ -101,13 +101,13 @@ class DeathReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php index a1d7dec0d2..66990f20b7 100644 --- a/tests/app/Module/DescendancyReportModuleTest.php +++ b/tests/app/Module/DescendancyReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\DescendancyReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class DescendancyReportModuleTest extends TestCase @@ -98,13 +98,13 @@ class DescendancyReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php index 7791ebfc7e..5f9a0d0ebb 100644 --- a/tests/app/Module/FactSourcesReportModuleTest.php +++ b/tests/app/Module/FactSourcesReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\FactSourcesReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class FactSourcesReportModuleTest extends TestCase @@ -98,13 +98,13 @@ class FactSourcesReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php index 9b8ff9be25..85ba46c699 100644 --- a/tests/app/Module/FamilyGroupReportModuleTest.php +++ b/tests/app/Module/FamilyGroupReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\FamilyGroupReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class FamilyGroupReportModuleTest extends TestCase @@ -101,13 +101,13 @@ class FamilyGroupReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php index 0deb3ba11a..ee1bfa9d81 100644 --- a/tests/app/Module/IndividualFamiliesReportModuleTest.php +++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\IndividualFamiliesReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class IndividualFamiliesReportModuleTest extends TestCase @@ -103,13 +103,13 @@ class IndividualFamiliesReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php index b29e29791b..1e73a4113c 100644 --- a/tests/app/Module/IndividualReportModuleTest.php +++ b/tests/app/Module/IndividualReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,40 +36,40 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\IndividualReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer */ class IndividualReportModuleTest extends TestCase { @@ -101,13 +101,13 @@ class IndividualReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php index e3a992865f..215aa9ac6a 100644 --- a/tests/app/Module/MarriageReportModuleTest.php +++ b/tests/app/Module/MarriageReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\MarriageReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class MarriageReportModuleTest extends TestCase @@ -100,13 +100,13 @@ class MarriageReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php index 900d289737..e8fc653dbe 100644 --- a/tests/app/Module/MissingFactsReportModuleTest.php +++ b/tests/app/Module/MissingFactsReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\MissingFactsReportModule * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class MissingFactsReportModuleTest extends TestCase @@ -112,13 +112,13 @@ class MissingFactsReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php index 30321edc14..90b122ef27 100644 --- a/tests/app/Module/OccupationReportModuleTest.php +++ b/tests/app/Module/OccupationReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait * @covers \Fisharebest\Webtrees\Module\OccupationReportModule - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class OccupationReportModuleTest extends TestCase @@ -97,13 +97,13 @@ class OccupationReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php index 660b65089b..aa185761ae 100644 --- a/tests/app/Module/PedigreeReportModuleTest.php +++ b/tests/app/Module/PedigreeReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait * @covers \Fisharebest\Webtrees\Module\PedigreeReportModule - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class PedigreeReportModuleTest extends TestCase @@ -97,13 +97,13 @@ class PedigreeReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php index 744dc27a22..0872968c28 100644 --- a/tests/app/Module/RelatedIndividualsReportModuleTest.php +++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Report\ReportHtml; +use Fisharebest\Webtrees\Report\HtmlRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\ReportPdf; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; @@ -36,38 +36,38 @@ use League\Flysystem\Filesystem; * * @covers \Fisharebest\Webtrees\Module\ModuleReportTrait * @covers \Fisharebest\Webtrees\Module\RelatedIndividualsReportModule - * @covers \Fisharebest\Webtrees\Report\AbstractReport + * @covers \Fisharebest\Webtrees\Report\AbstractRenderer * @covers \Fisharebest\Webtrees\Report\ReportBaseCell * @covers \Fisharebest\Webtrees\Report\ReportBaseElement * @covers \Fisharebest\Webtrees\Report\ReportBaseFootnote * @covers \Fisharebest\Webtrees\Report\ReportBaseHtml * @covers \Fisharebest\Webtrees\Report\ReportBaseImage * @covers \Fisharebest\Webtrees\Report\ReportBaseLine - * @covers \Fisharebest\Webtrees\Report\ReportBasePageheader + * @covers \Fisharebest\Webtrees\Report\ReportBasePageHeader * @covers \Fisharebest\Webtrees\Report\ReportBaseText * @covers \Fisharebest\Webtrees\Report\ReportBaseTextbox * @covers \Fisharebest\Webtrees\Report\ReportExpressionLanguageProvider - * @covers \Fisharebest\Webtrees\Report\ReportHtml + * @covers \Fisharebest\Webtrees\Report\HtmlRenderer * @covers \Fisharebest\Webtrees\Report\ReportHtmlCell * @covers \Fisharebest\Webtrees\Report\ReportHtmlFootnote * @covers \Fisharebest\Webtrees\Report\ReportHtmlHtml * @covers \Fisharebest\Webtrees\Report\ReportHtmlImage * @covers \Fisharebest\Webtrees\Report\ReportHtmlLine - * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageheader + * @covers \Fisharebest\Webtrees\Report\ReportHtmlPageHeader * @covers \Fisharebest\Webtrees\Report\ReportHtmlText * @covers \Fisharebest\Webtrees\Report\ReportHtmlTextbox * @covers \Fisharebest\Webtrees\Report\ReportParserBase * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate * @covers \Fisharebest\Webtrees\Report\ReportParserSetup - * @covers \Fisharebest\Webtrees\Report\ReportPdf + * @covers \Fisharebest\Webtrees\Report\PdfRenderer * @covers \Fisharebest\Webtrees\Report\ReportPdfCell * @covers \Fisharebest\Webtrees\Report\ReportPdfFootnote * @covers \Fisharebest\Webtrees\Report\ReportPdfHtml * @covers \Fisharebest\Webtrees\Report\ReportPdfImage * @covers \Fisharebest\Webtrees\Report\ReportPdfLine - * @covers \Fisharebest\Webtrees\Report\ReportPdfPageheader + * @covers \Fisharebest\Webtrees\Report\ReportPdfPageHeader * @covers \Fisharebest\Webtrees\Report\ReportPdfText - * @covers \Fisharebest\Webtrees\Report\ReportPdfTextbox + * @covers \Fisharebest\Webtrees\Report\ReportPdfTextBox * @covers \Fisharebest\Webtrees\Report\ReportTcpdf */ class RelatedIndividualsReportModuleTest extends TestCase @@ -103,13 +103,13 @@ class RelatedIndividualsReportModuleTest extends TestCase $this->assertIsArray($report->reportProperties()); ob_start(); - new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new HtmlRenderer(), $vars, $tree, $data_filesystem); $html = ob_get_clean(); $this->assertStringStartsWith('<', $html); $this->assertStringEndsWith('>', $html); ob_start(); - new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem); + new ReportParserGenerate($xml, new PdfRenderer(), $vars, $tree, $data_filesystem); $pdf = ob_get_clean(); $this->assertStringStartsWith('%PDF', $pdf); $this->assertStringEndsWith("%%EOF\n", $pdf); diff --git a/tests/app/Report/ReportBaseTest.php b/tests/app/Report/ReportBaseTest.php index e430bf6343..314fa06e67 100644 --- a/tests/app/Report/ReportBaseTest.php +++ b/tests/app/Report/ReportBaseTest.php @@ -33,6 +33,6 @@ class ReportBaseTest extends TestCase */ public function testClassExists(): void { - $this->assertTrue(class_exists(AbstractReport::class)); + $this->assertTrue(class_exists(AbstractRenderer::class)); } } diff --git a/tests/app/Report/ReportHTMLTest.php b/tests/app/Report/ReportHTMLTest.php index 13d932a43e..fd1ed35a82 100644 --- a/tests/app/Report/ReportHTMLTest.php +++ b/tests/app/Report/ReportHTMLTest.php @@ -33,6 +33,6 @@ class ReportHTMLTest extends TestCase */ public function testClassExists(): void { - $this->assertTrue(class_exists(ReportHtml::class)); + $this->assertTrue(class_exists(HtmlRenderer::class)); } } diff --git a/tests/app/Report/ReportPDFTest.php b/tests/app/Report/ReportPDFTest.php index a5b9e88179..9ee9c401d1 100644 --- a/tests/app/Report/ReportPDFTest.php +++ b/tests/app/Report/ReportPDFTest.php @@ -33,6 +33,6 @@ class ReportPDFTest extends TestCase */ public function testClassExists(): void { - $this->assertTrue(class_exists(ReportPdf::class)); + $this->assertTrue(class_exists(PdfRenderer::class)); } } |