From 488b10b73b5ccd9bb8fe8a7b2195cd444edf4093 Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Wed, 8 Mar 2017 13:08:33 +0100
Subject: [PATCH 1/2] allow setValue() for SDTs

---
 samples/Sample_34_SDT.php                   | 8 +++++++-
 src/PhpWord/Writer/Word2007/Element/SDT.php | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/samples/Sample_34_SDT.php b/samples/Sample_34_SDT.php
index a5042279..f9077a1a 100644
--- a/samples/Sample_34_SDT.php
+++ b/samples/Sample_34_SDT.php
@@ -15,10 +15,16 @@ $textrun->addSDT('comboBox')->setListItems(array('1' => 'Choice 1', '2' => 'Choi
 $textrun = $section->addTextRun();
 $textrun->addText('Date: ');
 $textrun->addSDT('date');
+$textrun->addTextBreak(1);
+$textrun->addText('Date with pre set value: ');
+$textrun->addSDT('date')->setValue('03/30/2017');
+$textrun->addTextBreak(1);
+$textrun->addText('Date with pre set value: ');
+$textrun->addSDT('date')->setValue('30.03.2017');
 
 $textrun = $section->addTextRun();
 $textrun->addText('Drop down list: ');
-$textrun->addSDT('dropDownList')->setListItems(array('1' => 'Choice 1', '2' => 'Choice 2'));
+$textrun->addSDT('dropDownList')->setListItems(array('1' => 'Choice 1', '2' => 'Choice 2'))->setValue('Choice 1');
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 313bf7e0..e25e8989 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -43,6 +43,10 @@ class SDT extends Text
         }
         $type = $element->getType();
         $writeFormField = "write{$type}";
+        $value = $element->getValue();
+        if ($value === null) {
+            $value = 'Pick value';
+        }
 
         $this->startElementP();
 
@@ -58,7 +62,7 @@ class SDT extends Text
         // Content
         $xmlWriter->startElement('w:sdtContent');
         $xmlWriter->startElement('w:r');
-        $xmlWriter->writeElement('w:t', 'Pick value');
+        $xmlWriter->writeElement('w:t', $value);
         $xmlWriter->endElement(); // w:r
         $xmlWriter->endElement(); // w:sdtContent
 

From 56a3a53e7bb7fbf38deae759cafdc776e10a68a9 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 7 Nov 2017 22:11:31 +0100
Subject: [PATCH 2/2] add unit test

---
 tests/PhpWord/Writer/Word2007/ElementTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 0ebc7c57..dc3d30bd 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -267,7 +267,7 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
 
-        $section->addSDT('comboBox');
+        $section->addSDT('comboBox')->setListItems(array('1' => 'Choice 1', '2' => 'Choice 2'))->setValue('select value');
         $section->addSDT('dropDownList');
         $section->addSDT('date')->setAlias('date_alias')->setTag('my_tag');
 
@@ -275,9 +275,16 @@ class ElementTest extends \PHPUnit_Framework_TestCase
 
         $path = '/w:document/w:body/w:p';
 
+        $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtContent/w:r/w:t'));
+        $this->assertEquals('select value', $doc->getElement($path . '[1]/w:sdt/w:sdtContent/w:r/w:t')->nodeValue);
         $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtPr/w:comboBox'));
+        $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtPr/w:comboBox/w:listItem'));
+        $this->assertEquals('1', $doc->getElementAttribute($path . '[1]/w:sdt/w:sdtPr/w:comboBox/w:listItem[1]', 'w:value'));
+        $this->assertEquals('Choice 1', $doc->getElementAttribute($path . '[1]/w:sdt/w:sdtPr/w:comboBox/w:listItem[1]', 'w:displayText'));
+
         $this->assertTrue($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:dropDownList'));
         $this->assertFalse($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:alias'));
+
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:date'));
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:alias'));
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:tag'));