强制提交

vendor/phpoffice/math/.github/workflows/php.yml

@@ -45,6 +45,7 @@ jobs:
             - '8.1'
             - '8.2'
             - '8.3'
+            - '8.4'
     steps:
         -   name: Setup PHP
             uses: shivammathur/setup-php@v2
@@ -75,6 +76,7 @@ jobs:
             - '8.1'
             - '8.2'
             - '8.3'
+            - '8.4'
     steps:
       -   name: Setup PHP
           uses: shivammathur/setup-php@v2

vendor/phpoffice/math/docs/index.md

@@ -48,7 +48,7 @@ Math is an open source project licensed under the terms of [MIT](https://github.
 | **Simple**                | Fraction             | :material-check: | :material-check: |
 |                           | Superscript          | :material-check: |                  |
 | **Architectural**         | Row                  | :material-check: | :material-check: |
-|                           | Semantics            |                  |                  |
+|                           | Semantics            | :material-check: |                  |
 
 ## Contributing
 

vendor/phpoffice/math/src/Math/Reader/MathML.php

@@ -10,6 +10,7 @@ use PhpOffice\Math\Element;
 use PhpOffice\Math\Exception\InvalidInputException;
 use PhpOffice\Math\Exception\NotImplementedException;
 use PhpOffice\Math\Math;
+use PhpOffice\Math\Reader\Security\XmlScanner;
 
 class MathML implements ReaderInterface
 {
@@ -22,8 +23,17 @@ class MathML implements ReaderInterface
     /** @var DOMXPath */
     private $xpath;
 
+    /** @var XmlScanner */
+    private $xmlScanner;
+
+    public function __construct()
+    {
+        $this->xmlScanner = XmlScanner::getInstance();
+    }
+
     public function read(string $content): ?Math
     {
+        $content = $this->xmlScanner->scan($content);
         $content = str_replace(
             [
                 '⁢',
@@ -35,7 +45,7 @@ class MathML implements ReaderInterface
         );
 
         $this->dom = new DOMDocument();
-        $this->dom->loadXML($content, LIBXML_DTDLOAD);
+        $this->dom->loadXML($content);
 
         $this->math = new Math();
         $this->parseNode(null, $this->math);

vendor/phpoffice/math/src/Math/Writer/MathML.php

@@ -40,6 +40,26 @@ class MathML implements WriterInterface
     {
         $tagName = $this->getElementTagName($element);
 
+        // Element\AbstractGroupElement
+        if ($element instanceof Element\Semantics) {
+            $this->output->startElement($tagName);
+            // Write elements
+            foreach ($element->getElements() as $childElement) {
+                $this->writeElementItem($childElement);
+            }
+
+            // Write annotations
+            foreach ($element->getAnnotations() as $encoding => $annotation) {
+                $this->output->startElement('annotation');
+                $this->output->writeAttribute('encoding', $encoding);
+                $this->output->text($annotation);
+                $this->output->endElement();
+            }
+            $this->output->endElement();
+
+            return;
+        }
+
         // Element\AbstractGroupElement
         if ($element instanceof Element\AbstractGroupElement) {
             $this->output->startElement($tagName);
@@ -121,6 +141,9 @@ class MathML implements WriterInterface
         if ($element instanceof Element\Operator) {
             return 'mo';
         }
+        if ($element instanceof Element\Semantics) {
+            return 'semantics';
+        }
 
         throw new NotImplementedException(sprintf(
             '%s : The element of the class `%s` has no tag name',

vendor/phpoffice/math/tests/Math/Writer/MathMLTest.php

@@ -80,6 +80,35 @@ class MathMLTest extends WriterTestCase
         $this->assertIsSchemaMathMLValid($output);
     }
 
+    public function testWriteSemantics(): void
+    {
+        $opTimes = new Element\Operator('⁢');
+
+        $math = new Math();
+
+        $semantics = new Element\Semantics();
+        $semantics->add(new Element\Identifier('y'));
+        $semantics->addAnnotation('application/x-tex', ' y ');
+
+        $math->add($semantics);
+
+        $writer = new MathML();
+        $output = $writer->write($math);
+
+        $expected = '<?xml version="1.0" encoding="UTF-8"?>'
+            . PHP_EOL
+            . '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">'
+            . '<math xmlns="http://www.w3.org/1998/Math/MathML">'
+            . '<semantics>'
+            . '<mi>y</mi>'
+            . '<annotation encoding="application/x-tex"> y </annotation>'
+            . '</semantics>'
+            . '</math>'
+            . PHP_EOL;
+        $this->assertEquals($expected, $output);
+        $this->assertIsSchemaMathMLValid($output);
+    }
+
     public function testWriteNotImplemented(): void
     {
         $this->expectException(NotImplementedException::class);