XML reports: remove unused PageHeader elements

7 files changed, 4 insertions, 264 deletions

diff --git a/app/Report/AbstractRenderer.php b/app/Report/AbstractRenderer.php
index 414290b4d6..c474614b41 100644
--- a/app/Report/AbstractRenderer.php
+++ b/app/Report/AbstractRenderer.php
@@ -90,7 +90,7 @@ abstract class AbstractRenderer
     /** @var float The default Report font size */
     public $default_font_size = 12.0;
 
-    /** @var string Header (H), Page header (PH), Body (B) or Footer (F) */
+    /** @var string Header (H), Body (B) or Footer (F) */
     public $processing = 'H';
 
     /** @var bool RTL Language (false=LTR, true=RTL) */
@@ -122,13 +122,6 @@ abstract class AbstractRenderer
     abstract public function clearHeader(): void;
 
     /**
-     * Create a new Page Header object
-     *
-     * @return ReportBasePageHeader
-     */
-    abstract public function createPageHeader(): ReportBasePageHeader;
-
-    /**
      * Add an element.
      *
      * @param ReportBaseElement|string $element
@@ -301,9 +294,9 @@ abstract class AbstractRenderer
     }
 
     /**
-     * Process the Header , Page header, Body or Footer
+     * Process the Header, Body or Footer
      *
-     * @param string $p Header (H), Page header (PH), Body (B) or Footer (F)
+     * @param string $p Header (H), Body (B) or Footer (F)
      *
      * @return void
      */
diff --git a/app/Report/HtmlRenderer.php b/app/Report/HtmlRenderer.php
index 6987c812a2..1f6a72beb0 100644
--- a/app/Report/HtmlRenderer.php
+++ b/app/Report/HtmlRenderer.php
@@ -133,9 +133,6 @@ class HtmlRenderer extends AbstractRenderer
     /** @var ReportBaseElement[] Array of elements in the header */
     public $headerElements = [];
 
-    /** @var ReportBaseElement[] Array of elements in the page header */
-    public $pageHeaderElements = [];
-
     /** @var ReportBaseElement[] Array of elements in the footer */
     public $footerElements = [];
 
@@ -198,24 +195,6 @@ class HtmlRenderer extends AbstractRenderer
     }
 
     /**
-     * Generate the page header
-     *
-     * @return void
-     */
-    private function runPageHeader(): void
-    {
-        foreach ($this->pageHeaderElements as $element) {
-            if ($element instanceof ReportBaseElement) {
-                $element->render($this);
-            } elseif ($element === 'footnotetexts') {
-                $this->footnotes();
-            } elseif ($element === 'addpage') {
-                $this->addPage();
-            }
-        }
-    }
-
-    /**
      * Generate footnotes
      *
      * @return void
@@ -282,7 +261,6 @@ class HtmlRenderer extends AbstractRenderer
         echo '<div id="bodydiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt; height: 100%;">';
         $this->Y    = 0;
         $this->maxY = 0;
-        $this->runPageHeader();
         foreach ($this->bodyElements as $element) {
             if ($element instanceof ReportBaseElement) {
                 $element->render($this);
@@ -400,16 +378,6 @@ class HtmlRenderer extends AbstractRenderer
     }
 
     /**
-     * Create a new Page Header object
-     *
-     * @return ReportBasePageHeader
-     */
-    public function createPageHeader(): ReportBasePageHeader
-    {
-        return new ReportHtmlPageHeader();
-    }
-
-    /**
      * Create a new image object.
      *
      * @param string $file  Filename
@@ -529,18 +497,6 @@ class HtmlRenderer extends AbstractRenderer
     }
 
     /**
-     * Add a page header.
-     *
-     * @param ReportBaseElement $element
-     *
-     * @return void
-     */
-    public function addPageHeader($element): void
-    {
-        $this->pageHeaderElements[] = $element;
-    }
-
-    /**
      * Checks the Footnote and numbers them - ReportHtml
      *
      * @param ReportHtmlFootnote $footnote
@@ -571,16 +527,6 @@ class HtmlRenderer extends AbstractRenderer
     }
 
     /**
-     * Clear the Page Header - ReportHtml
-     *
-     * @return void
-     */
-    public function clearPageHeader(): void
-    {
-        $this->pageHeaderElements = [];
-    }
-
-    /**
      * Count the number of lines - ReportHtml
      *
      * @param string $str
diff --git a/app/Report/PdfRenderer.php b/app/Report/PdfRenderer.php
index a632d457e5..7a205ed70d 100644
--- a/app/Report/PdfRenderer.php
+++ b/app/Report/PdfRenderer.php
@@ -67,9 +67,6 @@ class PdfRenderer extends AbstractRenderer
     /** @var ReportBaseElement[] Array of elements in the header */
     public $headerElements = [];
 
-    /** @var ReportBaseElement[] Array of elements in the page header */
-    public $pageHeaderElements = [];
-
     /** @var ReportBaseElement[] Array of elements in the footer */
     public $footerElements = [];
 
@@ -110,16 +107,6 @@ class PdfRenderer extends AbstractRenderer
                 $this->newPage();
             }
         }
-
-        foreach ($this->pageHeaderElements as $element) {
-            if ($element instanceof ReportBaseElement) {
-                $element->render($this);
-            } elseif ($element === 'footnotetexts') {
-                $this->footnotes();
-            } elseif ($element === 'addpage') {
-                $this->newPage();
-            }
-        }
     }
 
     /**
@@ -193,18 +180,6 @@ class PdfRenderer extends AbstractRenderer
     }
 
     /**
-     * Add an element to the Page Header -PDF
-     *
-     * @param ReportBaseElement|string $element
-     *
-     * @return void
-     */
-    public function addPageHeader($element): void
-    {
-        $this->pageHeaderElements[] = $element;
-    }
-
-    /**
      * Add an element to the Body -PDF
      *
      * @param ReportBaseElement|string $element
@@ -241,18 +216,6 @@ class PdfRenderer extends AbstractRenderer
     }
 
     /**
-     * Remove the page header.
-     *
-     * @param int $index
-     *
-     * @return void
-     */
-    public function removePageHeader(int $index): void
-    {
-        unset($this->pageHeaderElements[$index]);
-    }
-
-    /**
      * Remove the body.
      *
      * @param int $index
@@ -288,17 +251,6 @@ class PdfRenderer extends AbstractRenderer
     }
 
     /**
-     * Clear the Page Header -PDF
-     *
-     * @return void
-     */
-    public function clearPageHeader(): void
-    {
-        unset($this->pageHeaderElements);
-        $this->pageHeaderElements = [];
-    }
-
-    /**
      * Set the report.
      *
      * @param PdfRenderer $report
@@ -653,16 +605,6 @@ class PdfRenderer extends AbstractRenderer
     }
 
     /**
-     * Create a new Page Header object
-     *
-     * @return ReportBasePageHeader
-     */
-    public function createPageHeader(): ReportBasePageHeader
-    {
-        return new ReportPdfPageHeader();
-    }
-
-    /**
      * Create a new image object.
      *
      * @param string $file  Filename
diff --git a/app/Report/ReportBasePageHeader.php b/app/Report/ReportBasePageHeader.php
deleted file mode 100644
index c8ae8141e7..0000000000
--- a/app/Report/ReportBasePageHeader.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace Fisharebest\Webtrees\Report;
-
-/**
- * Class ReportBasePageHeader
- */
-class ReportBasePageHeader extends ReportBaseElement
-{
-    /** @var ReportBaseElement[] Elements */
-    public $elements = [];
-
-    /**
-     * Create a page header
-     */
-    public function __construct()
-    {
-        $this->elements = [];
-    }
-
-    /**
-     * Unknown?
-     *
-     * @return void
-     */
-    public function textBox(): void
-    {
-        $this->elements = [];
-    }
-
-    /**
-     * Add element - PageHeader
-     *
-     * @param ReportBaseElement $element
-     *
-     * @return void
-     */
-    public function addElement($element): void
-    {
-        $this->elements[] = $element;
-    }
-}
diff --git a/app/Report/ReportHtmlPageHeader.php b/app/Report/ReportHtmlPageHeader.php
deleted file mode 100644
index c9f3f48058..0000000000
--- a/app/Report/ReportHtmlPageHeader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace Fisharebest\Webtrees\Report;
-
-/**
- * Class ReportHtmlPageHeader
- */
-class ReportHtmlPageHeader extends ReportBasePageHeader
-{
-    /**
-     * PageHeader element renderer
-     *
-     * @param HtmlRenderer $renderer
-     *
-     * @return void
-     */
-    public function render($renderer)
-    {
-        $renderer->clearPageHeader();
-        foreach ($this->elements as $element) {
-            $renderer->addPageHeader($element);
-        }
-    }
-}
diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php
index 4278e43b0b..2f4bcd7c7c 100644
--- a/app/Report/ReportParserGenerate.php
+++ b/app/Report/ReportParserGenerate.php
@@ -2596,7 +2596,7 @@ class ReportParserGenerate extends ReportParserBase
 
     /**
      * XML <NewPage /> element handler
-     * Has to be placed in an element (header, pageheader, body or footer)
+     * Has to be placed in an element (header, body or footer)
      *
      * @return void
      */
diff --git a/app/Report/ReportPdfPageHeader.php b/app/Report/ReportPdfPageHeader.php
deleted file mode 100644
index 652fb0bd32..0000000000
--- a/app/Report/ReportPdfPageHeader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace Fisharebest\Webtrees\Report;
-
-/**
- * class ReportPdfPageHeader
- */
-class ReportPdfPageHeader extends ReportBasePageHeader
-{
-    /**
-     * PageHeader element renderer
-     *
-     * @param PdfRenderer $renderer
-     *
-     * @return void
-     */
-    public function render($renderer)
-    {
-        $renderer->clearPageHeader();
-        foreach ($this->elements as $element) {
-            $renderer->addPageHeader($element);
-        }
-    }
-}