Merge remote-tracking branch 'origin/master'

jetwaves · jetwaves · commit 37bd60a7559c · 2018-02-17T18:40:33.000+08:00
diff --git a/src/EditArrayInFileEditor.php b/src/EditArrayInFileEditor.php
@@ -58,6 +58,11 @@ public function getEditArea()
         return $this->_editArea;
     }
 
+    public function setEditArea($val)
+    {
+        $this->_editArea = $val;
+    }
+
     public function getTargetLines()
     {
         return array_slice($this->_editArea, 1, count($this->_editArea) - 2, true);
@@ -223,7 +228,7 @@ public function insert($data, $insertType = self::INSERT_TYPE_RAW ){
                 foreach($items as $key => $val){
                     if(trim($val) == '') continue;
                     if(self::endsWith(trim($val), ',')){
-                        $items[$key] = '        '.trim(trim($val), ',').','.PHP_EOL;        //
+                        $items[$key] = '        '.trim(trim($val), ',').','.PHP_EOL;
                     } else {
                         $items[$key] = '        '.trim(trim($val), ',').PHP_EOL;
                     }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,11 @@ public function getEditArea()`
`58`	`58`	`return $this->_editArea;`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ public function setEditArea($val)`
	`62`	`+ {`
	`63`	`+ $this->_editArea = $val;`
	`64`	`+ }`
	`65`	`+`
`61`	`66`	`public function getTargetLines()`
`62`	`67`	`{`
`63`	`68`	`return array_slice($this->_editArea, 1, count($this->_editArea) - 2, true);`
`@@ -223,7 +228,7 @@ public function insert($data, $insertType = self::INSERT_TYPE_RAW ){`
`223`	`228`	`foreach($items as $key => $val){`
`224`	`229`	`if(trim($val) == '') continue;`
`225`	`230`	`if(self::endsWith(trim($val), ',')){`
`226`		`- $items[$key] = ' '.trim(trim($val), ',').','.PHP_EOL; //`
	`231`	`+ $items[$key] = ' '.trim(trim($val), ',').','.PHP_EOL;`
`227`	`232`	`} else {`
`228`	`233`	`$items[$key] = ' '.trim(trim($val), ',').PHP_EOL;`
`229`	`234`	`}`