adjust chart writer according to schema

Author: chriskapp

src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php

@@ -97,15 +97,15 @@ public function writeChart(Chart $chart)
         $objWriter->writeAttribute('val', $chart->getView3D()->getRotationX());
         $objWriter->endElement();
 
+        // c:hPercent
+        $hPercent = $chart->getView3D()->getHeightPercent();
+        $objWriter->writeElementIf($hPercent != null, 'c:hPercent', 'val', $hPercent . '%');
+
         // c:rotY
         $objWriter->startElement('c:rotY');
         $objWriter->writeAttribute('val', $chart->getView3D()->getRotationY());
         $objWriter->endElement();
 
-        // c:hPercent
-        $hPercent = $chart->getView3D()->getHeightPercent();
-        $objWriter->writeElementIf($hPercent != null, 'c:hPercent', 'val', $hPercent);
-
         // c:depthPercent
         $objWriter->startElement('c:depthPercent');
         $objWriter->writeAttribute('val', $chart->getView3D()->getDepthPercent() . '%');
@@ -2033,34 +2033,6 @@ protected function writeAxis(XMLWriter $objWriter, Chart\Axis $oAxis, $typeAxis,
             $objWriter->endElement();
         }
 
-        // c:numFmt
-        $objWriter->startElement('c:numFmt');
-        $objWriter->writeAttribute('formatCode', $oAxis->getFormatCode());
-        $objWriter->writeAttribute('sourceLinked', '1');
-        $objWriter->endElement();
-
-        // c:majorTickMark
-        $objWriter->startElement('c:majorTickMark');
-        $objWriter->writeAttribute('val', $oAxis->getMajorTickMark());
-        $objWriter->endElement();
-
-        // c:minorTickMark
-        $objWriter->startElement('c:minorTickMark');
-        $objWriter->writeAttribute('val', $oAxis->getMinorTickMark());
-        $objWriter->endElement();
-
-        // c:tickLblPos
-        $objWriter->startElement('c:tickLblPos');
-        $objWriter->writeAttribute('val', 'nextTo');
-        $objWriter->endElement();
-
-        // c:spPr
-        $objWriter->startElement('c:spPr');
-        // Outline
-        $this->writeOutline($objWriter, $oAxis->getOutline());
-        // ##c:spPr
-        $objWriter->endElement();
-
         if ($oAxis->getTitle() != '') {
             // c:title
             $objWriter->startElement('c:title');
@@ -2143,6 +2115,34 @@ protected function writeAxis(XMLWriter $objWriter, Chart\Axis $oAxis, $typeAxis,
             $objWriter->endElement();
         }
 
+        // c:numFmt
+        $objWriter->startElement('c:numFmt');
+        $objWriter->writeAttribute('formatCode', $oAxis->getFormatCode());
+        $objWriter->writeAttribute('sourceLinked', '1');
+        $objWriter->endElement();
+
+        // c:majorTickMark
+        $objWriter->startElement('c:majorTickMark');
+        $objWriter->writeAttribute('val', $oAxis->getMajorTickMark());
+        $objWriter->endElement();
+
+        // c:minorTickMark
+        $objWriter->startElement('c:minorTickMark');
+        $objWriter->writeAttribute('val', $oAxis->getMinorTickMark());
+        $objWriter->endElement();
+
+        // c:tickLblPos
+        $objWriter->startElement('c:tickLblPos');
+        $objWriter->writeAttribute('val', 'nextTo');
+        $objWriter->endElement();
+
+        // c:spPr
+        $objWriter->startElement('c:spPr');
+        // Outline
+        $this->writeOutline($objWriter, $oAxis->getOutline());
+        // ##c:spPr
+        $objWriter->endElement();
+
         // c:crossAx
         $objWriter->startElement('c:crossAx');
         $objWriter->writeAttribute('val', $crossAxVal);

tests/PhpPresentation/Tests/Writer/PowerPoint2007/SchemaTest.php

@@ -85,7 +85,7 @@ public function testSchema(PhpPresentation $presentation)
 
             $error = libxml_get_last_error();
             if ($error) {
-                $this->fail(sprintf("Validation error: %s in file %s on line %s", $error->message, $file, $error->line));
+                $this->fail(sprintf("Validation error: %s in file %s on line %s\n%s", $error->message, $file, $error->line, $dom->saveXML()));
             }
         }
     }