ExcelWriter: Optimize code at writeItem()

Fix typo at ExcelWriterTest.php
ddeboer · May 30, 2015 · 2870f94 · 2870f94
1 parent c3230b1
commit 2870f94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Writer/ExcelWriter.php b/src/Writer/ExcelWriter.php
@@ -82,18 +82,17 @@ public function prepare()
      */
     public function writeItem(array $item)
     {
+        $count = count($item);
+
         if ($this->prependHeaderRow && 1 == $this->row) {
             $headers = array_keys($item);
-            $count = count($headers);
-            $values = array_values($headers);
 
             for ($i = 0; $i < $count; $i++) {
-                $this->excel->getActiveSheet()->setCellValueByColumnAndRow($i, $this->row, $values[$i]);
+                $this->excel->getActiveSheet()->setCellValueByColumnAndRow($i, $this->row, $headers[$i]);
             }
             $this->row++;
         }
 
-        $count = count($item);
         $values = array_values($item);
 
         for ($i = 0; $i < $count; $i++) {

diff --git a/tests/Writer/ExcelWriterTest.php b/tests/Writer/ExcelWriterTest.php
@@ -90,7 +90,7 @@ public function testHeaderNotPrependedByDefault()
             ->finish();
 
         $excel = \PHPExcel_IOFactory::load($file);
-        $sheet = $this->worksheet = $excel->getActiveSheet()->toArray();
+        $sheet = $excel->getActiveSheet()->toArray();
 
         # Values should be at first line
         $this->assertEquals(array('col 1 value', 'col 2 value', 'col 3 value'), $sheet[0]);
@@ -119,7 +119,7 @@ public function testHeaderPrependedWhenOptionSetToTrue()
             ->finish();
 
         $excel = \PHPExcel_IOFactory::load($file);
-        $sheet = $this->worksheet = $excel->getActiveSheet()->toArray();
+        $sheet = $excel->getActiveSheet()->toArray();
 
         # Check column names at first line
         $this->assertEquals(array('col 1 name', 'col 2 name', 'col 3 name'), $sheet[0]);