php 8.1 compat (#34)

* more php 8.1 compat * drop php 7.4
genkgo · Nov 8, 2022 · a575600 · a575600
1 parent d75572f
commit a575600
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['8.0', '8.1']
 
     name: PHP ${{ matrix.php }} tests
     steps:

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name" : "genkgo/xsl",
     "description": "XSL 2.0 Transpiler in PHP",
     "require" : {
-        "php" : "^7.4 || ~8.0.0 || ~8.1.0",
+        "php" : "~8.0.0 || ~8.1.0",
         "ext-json" : "*",
         "ext-libxml" : "*",
         "ext-xsl" : "*",

diff --git a/src/XsltProcessor.php b/src/XsltProcessor.php
@@ -58,12 +58,10 @@ public function excludeAllPrefixes(): void
         $this->excludeAllNamespaces = true;
     }
 
-    /**
-     * @param object $stylesheet
-     */
-    public function importStyleSheet($stylesheet)
+    public function importStylesheet(object $stylesheet): bool
     {
         $this->styleSheet = $stylesheet;
+        return true;
     }
 
     /**
@@ -91,23 +89,21 @@ function () use ($doc, $styleSheet, $transpiler):? string {
     }
 
     /**
-     * @param \DOMDocument $doc
-     * @param string|null $returnClass
-     * @return \DOMDocument
+     * @param object|\DOMDocument $document
      */
-    public function transformToDoc($doc, ?string $returnClass = null):? \DOMDocument
+    public function transformToDoc(object $document, ?string $returnClass = null): \DOMDocument|false
     {
         $styleSheet = $this->styleSheetToDomDocument();
 
         $transpiler = $this->createTranspiler($styleSheet);
 
         return $this->catchLibXmlErrorThrowTransformException(
-            function () use ($doc, $styleSheet, $transpiler):? \DOMDocument {
+            function () use ($document, $returnClass, $styleSheet, $transpiler):? \DOMDocument {
                 parent::importStylesheet($this->getTranspiledStyleSheet($transpiler, $styleSheet));
                 $this->throwOnLibxmlError();
 
-                return $transpiler->transform(function () use ($doc) {
-                    $result = parent::transformToDoc($doc);
+                return $transpiler->transform(function () use ($document, $returnClass) {
+                    $result = parent::transformToDoc($document, $returnClass);
                     $this->throwOnLibxmlError();
                     return $result;
                 });
@@ -116,22 +112,20 @@ function () use ($doc, $styleSheet, $transpiler):? \DOMDocument {
     }
 
     /**
-     * @param \DOMDocument|\SimpleXMLElement $doc
-     * @param string $uri
-     * @return int
+     * @param object|\DOMDocument|\SimpleXMLElement $document
      */
-    public function transformToUri($doc, $uri):? int
+    public function transformToUri(object $document, string $uri): int
     {
         $styleSheet = $this->styleSheetToDomDocument();
         $transpiler = $this->createTranspiler($styleSheet);
 
         return $this->catchLibXmlErrorThrowTransformException(
-            function () use ($doc, $uri, $styleSheet, $transpiler):? int {
+            function () use ($document, $uri, $styleSheet, $transpiler):? int {
                 parent::importStylesheet($this->getTranspiledStyleSheet($transpiler, $styleSheet));
                 $this->throwOnLibxmlError();
 
-                return $transpiler->transform(function () use ($doc, $uri) {
-                    $result = parent::transformToUri($doc, $uri);
+                return $transpiler->transform(function () use ($document, $uri) {
+                    $result = parent::transformToUri($document, $uri);
                     $this->throwOnLibxmlError();
                     return $result;
                 });

diff --git a/test/Integration/ProcessXslt1DocumentsTest.php b/test/Integration/ProcessXslt1DocumentsTest.php
@@ -107,6 +107,7 @@ public function testTransformToDoc(): void
 
         $transpiler = new XsltProcessor(new NullCache());
         $transpiler->importStylesheet($xslDoc);
+        /** @var DOMDocument $transpilerResult */
         $transpilerResult = $transpiler->transformToDoc($xmlDoc);
 
         $this->assertEquals($nativeResult->saveXML(), $transpilerResult->saveXML());