fixing bug in assigning relationship ids in master slide

Author: Fake51

src/PhpPresentation/Writer/PowerPoint2007/AbstractSlide.php

@@ -108,6 +108,8 @@ protected function writeDrawingRelations(AbstractSlideAlias $pSlideMaster, $objW
                 $iterator->next();
             }
         }
+
+        return $relId;
     }
 
     /**

src/PhpPresentation/Writer/PowerPoint2007/PptSlideMasters.php

@@ -54,12 +54,14 @@ public function writeSlideMasterRelationships(SlideMaster $oMasterSlide)
             // Save the used relationId
             $slideLayout->relationId = 'rId' . $relId;
         }
+
         // Write drawing relationships?
-        $this->writeDrawingRelations($oMasterSlide, $objWriter, ++$relId);
+        $relId = $this->writeDrawingRelations($oMasterSlide, $objWriter, ++$relId);
+
         // TODO: Write hyperlink relationships?
         // TODO: Write comment relationships
         // Relationship theme/theme1.xml
-        $this->writeRelationship($objWriter, ++$relId, 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme', '../theme/theme' . $oMasterSlide->getRelsIndex() . '.xml');
+        $this->writeRelationship($objWriter, $relId, 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme', '../theme/theme' . $oMasterSlide->getRelsIndex() . '.xml');
         $objWriter->endElement();
         // Return
         return $objWriter->getData();

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

@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpPresentation\Writer\PowerPoint2007\PptSlideMasters;
 use PhpOffice\PhpPresentation\Slide\SlideLayout;
+use PhpOffice\PhpPresentation\Shape\Drawing\File as ShapeDrawingFile;
 
 /**
  * Test class for PowerPoint2007
@@ -25,10 +26,30 @@ public function testWriteSlideMasterRelationships()
             ->method('getAllSlideLayouts')
             ->will($this->returnValue($layouts));
 
+        $collection = new \ArrayObject();
+        $collection[] = new ShapeDrawingFile();
+        $collection[] = new ShapeDrawingFile();
+        $collection[] = new ShapeDrawingFile();
+
         $slideMaster->expects($this->exactly(2))
             ->method('getShapeCollection')
-            ->will($this->returnValue(new \ArrayObject()));
+            ->will($this->returnValue($collection));
 
         $data = $writer->writeSlideMasterRelationships($slideMaster);
+
+        $dom = new \DomDocument();
+        $dom->loadXml($data);
+
+        $xpath = new \DomXpath($dom);
+        $xpath->registerNamespace('r', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $list = $xpath->query('//r:Relationship');
+
+        $this->assertEquals(5, $list->length);
+
+        $this->assertEquals('rId1', $list->item(0)->getAttribute('Id'));
+        $this->assertEquals('rId2', $list->item(1)->getAttribute('Id'));
+        $this->assertEquals('rId3', $list->item(2)->getAttribute('Id'));
+        $this->assertEquals('rId4', $list->item(3)->getAttribute('Id'));
+        $this->assertEquals('rId5', $list->item(4)->getAttribute('Id'));
     }
 }