Apply fixes from StyleCI

jxlwqq · jxlwqq · commit 21cd13d92bce · 2018-09-09T04:55:19.000-05:00
diff --git a/src/Helper.php b/src/Helper.php
@@ -336,10 +336,9 @@ private function _generatorAddressCode($address)
     private function _generatorBirthdayCode($birthday)
     {
         if ($birthday && is_numeric($birthday)) {
-            $year = $this->_getStrPad(substr($birthday, 0,4), 4);
+            $year = $this->_getStrPad(substr($birthday, 0, 4), 4);
             $month = $this->_getStrPad(substr($birthday, 4, 2), 2);
             $day = $this->_getStrPad(substr($birthday, 6, 2), 2);
-
         }
         if (!isset($year) || empty($year) || $year < 1800 || $year > date('Y')) {
             $year = $this->_getStrPad($this->_generatorRandInt(99, 50), 2, '0');
@@ -373,11 +372,12 @@ private function _generatorOrderCode($sex)
     {
         $orderCode = $this->_getStrPad($this->_generatorRandInt(999, 1), 3, '1');
         if ($sex === 1) {
-            $orderCode = $orderCode % 2 === 0 ? $orderCode -1 : $orderCode;
+            $orderCode = $orderCode % 2 === 0 ? $orderCode - 1 : $orderCode;
         }
         if ($sex === 0) {
-            $orderCode = $orderCode % 2 === 0 ? $orderCode : $orderCode -1;
+            $orderCode = $orderCode % 2 === 0 ? $orderCode : $orderCode - 1;
         }
+
         return $orderCode;
     }
 }
diff --git a/src/IdValidator.php b/src/IdValidator.php
@@ -103,9 +103,9 @@ public function getInfo($id)
     /**
      * * 生成假数据.
      *
-     * @param bool $eighteen 是否为 18 位
-     * @param null|string|array $address 地址
-     * @param null|string|int $sex 性别（1为男性，0位女性）
+     * @param bool                  $eighteen 是否为 18 位
+     * @param null|string|array     $address  地址
+     * @param null|string|int       $sex      性别（1为男性，0位女性）
      * @param null|string|int|array $birthday 出生日期
      *
      * @return string
@@ -131,5 +131,4 @@ public function fakeId($eighteen = true, $address = null, $birthday = null, $sex
 
         return $body.$checkBit;
     }
-
 }
diff --git a/tests/IdValidatorTest.php b/tests/IdValidatorTest.php
@@ -27,8 +27,6 @@ public function testFakeId()
         $this->assertEquals(true, $idValidator->isValid($idValidator->fakeId(true, '上海市', '2000', 1)));
         $this->assertEquals(true, $idValidator->isValid($idValidator->fakeId(true, '江苏省', '20000101', 1)));
         $this->assertEquals(true, $idValidator->isValid($idValidator->fakeId(true, '台湾省', '20131010', 0)));
-
-
     }
 
     public function testGetInfo()

Original file line number	Diff line number	Diff line change
`@@ -336,10 +336,9 @@ private function _generatorAddressCode($address)`
`336`	`336`	`private function _generatorBirthdayCode($birthday)`
`337`	`337`	`{`
`338`	`338`	`if ($birthday && is_numeric($birthday)) {`
`339`		`- $year = $this->_getStrPad(substr($birthday, 0,4), 4);`
	`339`	`+ $year = $this->_getStrPad(substr($birthday, 0, 4), 4);`
`340`	`340`	`$month = $this->_getStrPad(substr($birthday, 4, 2), 2);`
`341`	`341`	`$day = $this->_getStrPad(substr($birthday, 6, 2), 2);`
`342`		`-`
`343`	`342`	`}`
`344`	`343`	`if (!isset($year) \|\| empty($year) \|\| $year < 1800 \|\| $year > date('Y')) {`
`345`	`344`	`$year = $this->_getStrPad($this->_generatorRandInt(99, 50), 2, '0');`
`@@ -373,11 +372,12 @@ private function _generatorOrderCode($sex)`
`373`	`372`	`{`
`374`	`373`	`$orderCode = $this->_getStrPad($this->_generatorRandInt(999, 1), 3, '1');`
`375`	`374`	`if ($sex === 1) {`
`376`		`- $orderCode = $orderCode % 2 === 0 ? $orderCode -1 : $orderCode;`
	`375`	`+ $orderCode = $orderCode % 2 === 0 ? $orderCode - 1 : $orderCode;`
`377`	`376`	`}`
`378`	`377`	`if ($sex === 0) {`
`379`		`- $orderCode = $orderCode % 2 === 0 ? $orderCode : $orderCode -1;`
	`378`	`+ $orderCode = $orderCode % 2 === 0 ? $orderCode : $orderCode - 1;`
`380`	`379`	`}`
	`380`	`+`
`381`	`381`	`return $orderCode;`
`382`	`382`	`}`
`383`	`383`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,9 @@ public function getInfo($id)`
`103`	`103`	`/**`
`104`	`104`	`* * 生成假数据.`
`105`	`105`	`*`
`106`		`- * @param bool $eighteen 是否为 18 位`
`107`		`- * @param null\|string\|array $address 地址`
`108`		`- * @param null\|string\|int $sex 性别（1为男性，0位女性）`
	`106`	`+ * @param bool $eighteen 是否为 18 位`
	`107`	`+ * @param null\|string\|array $address 地址`
	`108`	`+ * @param null\|string\|int $sex 性别（1为男性，0位女性）`
`109`	`109`	`* @param null\|string\|int\|array $birthday 出生日期`
`110`	`110`	`*`
`111`	`111`	`* @return string`
`@@ -131,5 +131,4 @@ public function fakeId($eighteen = true, $address = null, $birthday = null, $sex`
`131`	`131`
`132`	`132`	`return $body.$checkBit;`
`133`	`133`	`}`
`134`		`-`
`135`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ public function testFakeId()`
`27`	`27`	`$this->assertEquals(true, $idValidator->isValid($idValidator->fakeId(true, '上海市', '2000', 1)));`
`28`	`28`	`$this->assertEquals(true, $idValidator->isValid($idValidator->fakeId(true, '江苏省', '20000101', 1)));`
`29`	`29`	`$this->assertEquals(true, $idValidator->isValid($idValidator->fakeId(true, '台湾省', '20131010', 0)));`
`30`		`-`
`31`		`-`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`public function testGetInfo()`