Fix regex issues PHPStan identified (#44)

Author: sanmai

Spreadsheet/Excel/Writer/Worksheet.php

@@ -1455,14 +1455,14 @@ protected function _substituteCellref($cell)
         }
 
         // Convert a cell range: 'A1:B7'
-        if (preg_match("/\$?([A-I]?[A-Z]\$?\d+):\$?([A-I]?[A-Z]\$?\d+)/", $cell, $match)) {
+        if (preg_match("/\\$?([A-I]?[A-Z]\\$?\\d+):\\$?([A-I]?[A-Z]\\$?\\d+)/", $cell, $match)) {
             list($row1, $col1) =  $this->_cellToRowcol($match[1]);
             list($row2, $col2) =  $this->_cellToRowcol($match[2]);
             return (array($row1, $col1, $row2, $col2));
         }
 
         // Convert a cell reference: 'A1' or 'AD2000'
-        if (preg_match("/\$?([A-I]?[A-Z]\$?\d+)/", $cell)) {
+        if (preg_match("/\\$?([A-I]?[A-Z]\\$?\\d+)/", $cell, $match)) {
             list($row1, $col1) =  $this->_cellToRowcol($match[1]);
             return (array($row1, $col1));
         }
@@ -1481,12 +1481,12 @@ protected function _substituteCellref($cell)
     */
     protected function _cellToRowcol($cell)
     {
-        preg_match("/\$?([A-I]?[A-Z])\$?(\d+)/",$cell,$match);
+        preg_match("/\\$?([A-I]?[A-Z])\\$?(\\d+)/",$cell,$match);
         $col     = $match[1];
         $row     = $match[2];
 
         // Convert base26 column string to number
-        $chars = explode('', $col);
+        $chars = str_split($col);
         $expn  = 0;
         $col   = 0;
 

test/Test/Spreadsheet/Excel/Writer/WorksheetTest.php

@@ -34,8 +34,68 @@ public function doTearDown()
         parent::doTearDown();
     }
 
-    public function testIt()
+    /**
+     * Test that _substituteCellref handles regex with dollar signs correctly
+     */
+    public function testSubstituteCellrefWithDollarSigns()
     {
-        $this->assertInstanceOf('Spreadsheet_Excel_Writer_Worksheet', $this->worksheet);
+        $method = new \ReflectionMethod($this->worksheet, '_substituteCellref');
+        $method->setAccessible(true);
+
+        // Test absolute cell reference
+        $result = $method->invoke($this->worksheet, '$A$1');
+        $this->assertEquals(array(0, 0), $result);
+
+        // Test mixed references
+        $result = $method->invoke($this->worksheet, 'A$1');
+        $this->assertEquals(array(0, 0), $result);
+
+        $result = $method->invoke($this->worksheet, '$A1');
+        $this->assertEquals(array(0, 0), $result);
+
+        // Test cell range with dollar signs
+        $result = $method->invoke($this->worksheet, '$A$1:$B$2');
+        $this->assertEquals(array(0, 0, 1, 1), $result);
+    }
+
+    /**
+     * Test that _cellToRowcol handles regex with dollar signs correctly
+     */
+    public function testCellToRowcolWithDollarSigns()
+    {
+        $method = new \ReflectionMethod($this->worksheet, '_cellToRowcol');
+        $method->setAccessible(true);
+
+        // Test with absolute reference
+        $result = $method->invoke($this->worksheet, '$A$1');
+        $this->assertEquals(array(0, 0), $result);
+
+        // Test with relative reference
+        $result = $method->invoke($this->worksheet, 'B2');
+        $this->assertEquals(array(1, 1), $result);
+
+        // Test with mixed reference
+        $result = $method->invoke($this->worksheet, '$C3');
+        $this->assertEquals(array(2, 2), $result);
+    }
+
+    /**
+     * Test that getData properly handles clearing _data property
+     */
+    public function testGetDataClearsDataProperty()
+    {
+        // Access protected property
+        $property = new \ReflectionProperty($this->worksheet, '_data');
+        $property->setAccessible(true);
+
+        // Set some data
+        $testData = 'test data';
+        $property->setValue($this->worksheet, $testData);
+
+        // Call getData
+        $result = $this->worksheet->getData();
+
+        // Check that data was returned
+        $this->assertEquals($testData, $result);
     }
 }