Merge branch 'tandoan-master'

Author: asimlqt

src/Google/Spreadsheet/CellFeed.php

@@ -232,8 +232,12 @@ public function createCell($row, $col, $value)
                 xmlns:gs=\"http://schemas.google.com/spreadsheets/2006\">
             </entry>
         ");
-        
-        $child = $entry->addChild("content", $value);
+
+        // use ->content instead of addChild('content', $value)
+        // due to addChild not escaping & properly.
+        // http://php.net/manual/en/simplexmlelement.addchild.php#112204
+        $entry->content = $value;
+        $child = $entry->content;
         $child->addAttribute("type", "text");
         $child = $entry->addChild("title");
         $child->addAttribute("type", "text");
@@ -243,7 +247,9 @@ public function createCell($row, $col, $value)
         $link->addAttribute("type", "application/atom+xml");
         $link->addAttribute("href", $this->getPostUrl() . "/R" . $row . "C" . $col);
 
-        $child = $entry->addChild("xmlns:gs:cell", $value);
+        $elementType = 'gs:cell';
+        $entry->{$elementType} = $value;
+        $child = $entry->{$elementType};
         $child->addAttribute("row", $row);
         $child->addAttribute("col", $col);
         $child->addAttribute("inputValue", $value);

tests/Google/Spreadsheet/CellFeedTest.php

@@ -185,4 +185,23 @@ public function testCreateCell()
         $this->assertTrue($actual instanceof CellEntry);
     }
 
+    public function testCreateCellWithAmpersand()
+    {
+        $mockCellFeed = $this->getMockBuilder(CellFeed::class)
+            ->setMethods(["getPostUrl"])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockCellFeed->expects($this->any())
+            ->method("getPostUrl")
+            ->will($this->returnValue("https://spreadsheets.google.com/"));
+
+        $actual = $mockCellFeed->createCell(2, 1, "a &  b < c");
+
+        $this->assertTrue($actual instanceof CellEntry);
+
+        $expectedXML = file_get_contents(__DIR__."/xml/cell-feed-with-ampersand.xml");
+        $actualXML = $actual->getXML()->asXML();
+        $this->assertXmlStringEqualsXmlString($actualXML,$expectedXML);
+    }
+
 }

tests/Google/Spreadsheet/xml/cell-feed-with-ampersand.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:gs="http://schemas.google.com/spreadsheets/2006">
+    <content type="text">a &amp;  b &lt; c</content>
+    <title type="text"/>
+    <id>https://spreadsheets.google.com//R2C1</id>
+    <link rel="edit" type="application/atom+xml" href="https://spreadsheets.google.com//R2C1"/>
+    <gs:cell row="2" col="1" inputValue="a &amp;  b &lt; c">a &amp;  b &lt; c</gs:cell>
+</entry>