Skip to content

Commit

Permalink
Merge e5fcaa9 into 2c7db74
Browse files Browse the repository at this point in the history
  • Loading branch information
maechler committed Apr 17, 2020
2 parents 2c7db74 + e5fcaa9 commit 4832ffd
Show file tree
Hide file tree
Showing 30 changed files with 78 additions and 42 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ language: php
matrix:
fast_finish: true
include:
- php: 5.6
env: TYPO3_VERSION=^7
- php: 7.0
env: TYPO3_VERSION=^7
env: TYPO3_VERSION=^8
- php: 7.1
env: TYPO3_VERSION=^8 COVERAGE="YES"
env: TYPO3_VERSION=^8
- php: 7.2
env: TYPO3_VERSION=^9
- php: 7.3
env: TYPO3_VERSION=^9 COVERAGE="YES"
- php: 7.4
env: TYPO3_VERSION=^10

services:
- mysql
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog for TYPO3 CMS Extension pdfviewhelpers

## 2.3.0 - April 17, 2020

- Adds support for TYPO3 10 LTS
- Drops support for TYPO3 7 LTS
- Changes PHP minimum version to 7.0
- Migrates documentation to new build system, [#124](https://github.com/bithost-gmbh/pdfviewhelpers/issues/124)

## 2.2.2 - December 4, 2019

- Fixes custom fonts not working in AvoidPageBreakViewhelper (regression), [#141](https://github.com/bithost-gmbh/pdfviewhelpers/issues/141) (Thanks [@MK-42](https://github.com/MK-42))
Expand Down
2 changes: 1 addition & 1 deletion Classes/ViewHelpers/AbstractPDFViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
use Bithost\Pdfviewhelpers\Service\ConversionService;
use Bithost\Pdfviewhelpers\Service\ValidationService;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;

/**
* AbstractPDFViewHelper
Expand Down
13 changes: 6 additions & 7 deletions Classes/ViewHelpers/MultiColumnViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,16 @@
* * */

use Bithost\Pdfviewhelpers\Exception\Exception;
use TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode;
use TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
use TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler;
use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;

/**
* MultiColumnViewHelper
* ATTENTION: Templates using this ViewHelper may not be compiled and thus lead to longer loading times (see method compile)
*
* @author Markus Mächler <markus.maechler@bithost.ch>, Esteban Gehring <esteban.gehring@bithost.ch>
*/
class MultiColumnViewHelper extends AbstractPDFViewHelper implements \TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface
class MultiColumnViewHelper extends AbstractPDFViewHelper
{
/**
* @var array
Expand Down Expand Up @@ -70,7 +69,7 @@ public function initialize()
$multiColumnContext['startingPage'] = $this->getPDF()->getPage();

foreach ($this->childNodes as $childNode) {
if ($childNode instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode
if ($childNode instanceof ViewHelperNode
&& $childNode->getViewHelperClassName() === 'Bithost\Pdfviewhelpers\ViewHelpers\ColumnViewHelper'
) {
$multiColumnContext['columns'][] = $childNode;
Expand Down Expand Up @@ -138,12 +137,12 @@ public function setChildNodes(array $childNodes)
* @param string $argumentsName
* @param string $closureName
* @param string $initializationPhpCode
* @param AbstractNode $node
* @param ViewHelperNode $node
* @param TemplateCompiler $compiler
*
* @return string
*/
public function compile($argumentsName, $closureName, &$initializationPhpCode, AbstractNode $node, TemplateCompiler $compiler)
public function compile($argumentsName, $closureName, &$initializationPhpCode, ViewHelperNode $node, TemplateCompiler $compiler)
{
$compiler->disable();

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/BasicUsage/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Fluid Template
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" title="Bithost Example">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/ExtendExistingPDFs/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Fluid Template
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document sourceFile="EXT:pdfviewhelpers/Resources/Public/Examples/ExtendExistingPDFs/pdf_template.pdf">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/FullFeatureShowCase/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Fluid Template
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputPath="overwritten_name.pdf" title="Full Feature Show Case">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/HeaderAndFooter/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Fluid Template
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" title="Bithost Example">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/PdfaShowCase/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Fluid Template
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" outputPath="{fileTitle}" author="{docAuthor}" title="{docTitle}" creator="PDF View Helpers" keywords="{docKeywords}" subject="{docAbstract}">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Examples/TableOfContent/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Fluid Template
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">
<pdf:document outputDestination="inline">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ PDF ViewHelpers
pdf, generation, generator, fluid, viewhelper, fpdi, tcpdf

:Copyright:
2016 - 2018
2016 - 2020

:Author:
Markus Mächler, Esteban Gehring
Expand Down
21 changes: 21 additions & 0 deletions Documentation/Settings.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[general]
project = pdfviewhelpers
release = 2.3.0
copyright = 2020
state = stable

[html_theme_options]
github_branch = master
github_repository = bithost-gmbh/pdfviewhelpers

project_home = https://github.com/bithost-gmbh/pdfviewhelpers
project_issues = https://github.com/bithost-gmbh/pdfviewhelpers/issues
project_repository = https://github.com/bithost-gmbh/pdfviewhelpers

[intersphinx_mapping]
t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/

[latex_elements]
papersize = a4paper
preamble = \usepackage{typo3}
pointsize = 10pt
4 changes: 2 additions & 2 deletions Documentation/Settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
conf.py:
copyright: 2016 - 2019
project: PDF ViewHelpers
version: 2.2.2
release: 2.2.2
version: 2.3.0
release: 2.3.0
intersphinx_mapping:
t3tsref:
- http://docs.typo3.org/typo3cms/TyposcriptReference/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![TYPO3](https://img.shields.io/badge/TYPO3-7%20LTS-orange.svg)](https://typo3.org/)
[![TYPO3](https://img.shields.io/badge/TYPO3-8%20LTS-orange.svg)](https://typo3.org/)
[![TYPO3](https://img.shields.io/badge/TYPO3-9%20LTS-orange.svg)](https://typo3.org/)
[![TYPO3](https://img.shields.io/badge/TYPO3-10%20LTS-orange.svg)](https://typo3.org/)
[![Build Status](https://travis-ci.org/bithost-gmbh/pdfviewhelpers.svg?branch=master)](https://travis-ci.org/bithost-gmbh/pdfviewhelpers)
[![Coverage](https://img.shields.io/coveralls/bithost-gmbh/pdfviewhelpers/master.svg)](https://coveralls.io/github/bithost-gmbh/pdfviewhelpers)
[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YGTVWHW8TP8Q4)
Expand Down Expand Up @@ -59,7 +59,7 @@ So if you feel like this extension was useful to you and saved you and your busi
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" title="Bithost Example">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" outputPath="{newsItem.pathSegment}.pdf" title="{newsItem.title}" keywords="{newsItem.keywords}" author="{newsItem.author}">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Examples/BasicUsage/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" title="Bithost Example">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Examples/ExtendExistingPDFs/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document sourceFile="EXT:pdfviewhelpers/Resources/Public/Examples/ExtendExistingPDFs/pdf_template.pdf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputPath="overwritten_name.pdf" title="Full Feature Show Case">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Examples/HeaderAndFooter/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" title="Bithost Example">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Examples/PdfaShowCase/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline" outputPath="{fileTitle}" author="{docAuthor}" title="{docTitle}" creator="PDF View Helpers" keywords="{docKeywords}" subject="{docAbstract}">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Examples/TableOfContent/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="inline">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Fixtures/Examples/BasicUsage.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="string" title="Bithost Example">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Fixtures/Examples/ExtendExistingPDFs.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="string" sourceFile="EXT:pdfviewhelpers/Resources/Public/Examples/ExtendExistingPDFs/pdf_template.pdf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="string" outputPath="overwritten_name.pdf" title="Full Feature Show Case">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Fixtures/Examples/PDFA.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="string">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Fixtures/Examples/TableOfContent.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="string">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Fixtures/ExtendExistingPDFs/Template.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:pdf="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.2.xsd"
xsi:schemaLocation="http://typo3.org/ns/Bithost/Pdfviewhelpers/ViewHelpers https://pdfviewhelpers.bithost.ch/schema/2.3.xsd"
data-namespace-typo3-fluid="true">

<pdf:document outputDestination="string" sourceFile="EXT:pdfviewhelpers/Resources/Public/Examples/ExtendExistingPDFs/pdf_template.pdf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,12 @@ public function testCustomFont()
'text2' => 'text2',
]
);

$pdf = $this->parseContent($output);
$pages = $pdf->getPages();

$this->assertCount(1, $pages);
$this->assertContains('text1', $pages[0]->getText());
$this->assertContains('text2', $pages[0]->getText());
}
}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
}
],
"require": {
"typo3/cms-core": ">=7.6.0 <9.5.99",
"php": ">=5.6.0"
"typo3/cms-core": ">=8.7.0 <10.3.99",
"php": ">=7.0.0"
},
"require-dev": {
"nimut/testing-framework": "^2.0 || ^3.0 || ^4.0",
"nimut/testing-framework": "^2.0 || ^3.0 || ^4.0 || ^5.0",
"smalot/pdfparser": "^0.12.0",
"php-coveralls/php-coveralls": "^2.1"
},
Expand Down
6 changes: 3 additions & 3 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
'uploadfolder' => '0',
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '2.2.2',
'version' => '2.3.0',
'constraints' => [
'depends' => [
'typo3' => '7.6.0-9.5.99',
'php' => '5.6.0-0.0.0',
'typo3' => '8.7.0-10.3.99',
'php' => '7.0.0-0.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down

0 comments on commit 4832ffd

Please sign in to comment.