update

recca0120 · Nov 10, 2024 · c787b7e · c787b7e
1 parent f1c5109
commit c787b7e
Show file tree

Hide file tree

Showing 16 changed files with 121 additions and 189 deletions.
diff --git a/src/Address.php b/src/Address.php
@@ -28,7 +28,7 @@ class Address
     public $tokens = [];
 
     /**
-     * @param  static|array  $address
+     * @param  static|string  $address
      */
     public function __construct($address = '')
     {

diff --git a/src/Normalizer.php b/src/Normalizer.php
@@ -7,8 +7,6 @@
 class Normalizer extends JString
 {
     /**
-     * normalizeAddress.
-     *
      * @return static
      */
     public function normalizeAddress()
@@ -49,8 +47,6 @@ public function normalizeAddress()
     }
 
     /**
-     * normalize.
-     *
      * @return static
      */
     public function normalize()
@@ -59,8 +55,6 @@ public function normalize()
     }
 
     /**
-     * digitize.
-     *
      * @return static
      */
     public function digitize()
@@ -71,8 +65,6 @@ public function digitize()
     }
 
     /**
-     * regularize.
-     *
      * @return static
      */
     public function regularize()

diff --git a/src/Point.php b/src/Point.php
@@ -4,23 +4,13 @@
 
 class Point
 {
-    /**
-     * $x.
-     *
-     * @var int
-     */
+    /** @var int */
     public $x = 0;
 
-    /**
-     * $y.
-     *
-     * @var int
-     */
+    /** @var int */
     public $y = 0;
 
     /**
-     * __construct.
-     *
      * @param  int  $x
      * @param  int  $y
      */
@@ -31,8 +21,6 @@ public function __construct($x = 0, $y = 0)
     }
 
     /**
-     * empty.
-     *
      * @return bool
      */
     public function isEmpty()
@@ -41,8 +29,6 @@ public function isEmpty()
     }
 
     /**
-     * compare.
-     *
      * @param  string  $operator
      * @return bool
      */

diff --git a/src/Rule.php b/src/Rule.php
@@ -7,37 +7,19 @@
 
 class Rule
 {
-    /**
-     * $zip3.
-     *
-     * @var string
-     */
+    /** @var string */
     public $zip3;
 
-    /**
-     * $zip5.
-     *
-     * @var string
-     */
+    /** @var string */
     public $zip5;
 
-    /**
-     * $address.
-     *
-     * @var Address
-     */
+    /** @var Address */
     public $address;
 
-    /**
-     * $tokens.
-     *
-     * @var array
-     */
+    /** @var array */
     public $tokens;
 
     /**
-     * __construct.
-     *
      * @param  string  $rule
      */
     public function __construct($rule)
@@ -54,8 +36,6 @@ public function __construct($rule)
     }
 
     /**
-     * zip5.
-     *
      * @return string
      */
     public function zip5()
@@ -64,8 +44,6 @@ public function zip5()
     }
 
     /**
-     * zip.
-     *
      * @return string
      */
     public function zip()
@@ -74,8 +52,6 @@ public function zip()
     }
 
     /**
-     * zip3.
-     *
      * @return string
      */
     public function zip3()
@@ -84,8 +60,6 @@ public function zip3()
     }
 
     /**
-     * match.
-     *
      * @param  Address|string  $address
      * @return bool
      */
@@ -123,16 +97,16 @@ public function match($address)
                 ($token === '以上' && $addressPoint->compare($left, '>=') === false) ||
                 ($token === '以下' && $addressPoint->compare($left, '<=') === false) ||
                 ($token === '至' && (
-                    ($right->compare($addressPoint, '<=') && $addressPoint->compare($left, '<=')) ||
-                    ($currentTokens->includes('含附號全') === true && ($addressPoint->x === $left->x))
-                ) === false) ||
+                        ($right->compare($addressPoint, '<=') && $addressPoint->compare($left, '<=')) ||
+                        ($currentTokens->includes('含附號全') === true && ($addressPoint->x === $left->x))
+                    ) === false) ||
                 ($token === '含附號' && ($addressPoint->x === $left->x) === false) ||
                 ($token === '附號全' && ($addressPoint->x === $left->x && $addressPoint->y > 0) === false) ||
                 ($token === '及以上附號' && $addressPoint->compare($left, '>=') === false) ||
                 ($token === '含附號以下' && (
-                    $addressPoint->compare($left, '<=') ||
-                    $addressPoint->x === $left->x
-                ) === false)
+                        $addressPoint->compare($left, '<=') ||
+                        $addressPoint->x === $left->x
+                    ) === false)
             ) {
                 return false;
             }
@@ -142,8 +116,6 @@ public function match($address)
     }
 
     /**
-     * tokens.
-     *
      * @return JArray
      */
     public function tokens()
@@ -152,8 +124,6 @@ public function tokens()
     }
 
     /**
-     * tokenize.
-     *
      * @param  string  $rule
      * @return array
      */
@@ -168,23 +138,22 @@ private function tokenize($rule, Closure $addressResolver)
             '[連至單雙全](?=[\d全]|$)',
         ];
 
-        $addressResolver($this->normalize($rule)->replace('/'.implode('|', $pattern).'/u', function ($m) use (&$tokens) {
-            $token = &$m[0];
-            if ($token === '連') {
-                return '';
-            }
+        $addressResolver($this->normalize($rule)->replace('/'.implode('|', $pattern).'/u',
+            function ($m) use (&$tokens) {
+                $token = &$m[0];
+                if ($token === '連') {
+                    return '';
+                }
 
-            $tokens[] = $token;
+                $tokens[] = $token;
 
-            return $token === '附號全' ? '號' : '';
-        }));
+                return $token === '附號全' ? '號' : '';
+            }));
 
         return $tokens;
     }
 
     /**
-     * normalize.
-     *
      * @param  string  $rule
      * @return Normalizer
      */
@@ -208,8 +177,6 @@ private function normalize($rule)
     }
 
     /**
-     * normalizeAddress.
-     *
      * @return Address
      */
     private function normalizeAddress(Address $address, JArray $ruleAddressTokens)
@@ -220,16 +187,15 @@ private function normalizeAddress(Address $address, JArray $ruleAddressTokens)
 
         return new Address(
             new JArray($address->tokens()->filter(function ($token) use ($removeUnits) {
-                return isset($token[Address::UNIT]) === true && in_array($token[Address::UNIT], $removeUnits, true) === false;
+                return isset($token[Address::UNIT]) === true && in_array($token[Address::UNIT], $removeUnits,
+                        true) === false;
             })->map(function ($token) {
                 return implode('', $token);
             }))
         );
     }
 
     /**
-     * equalsToken.
-     *
      * @param  JArray  $ruleAddressTokens
      * @param  JArray  $addressTokens
      * @param  int  $cur

diff --git a/src/Rules.php b/src/Rules.php
@@ -15,8 +15,6 @@ class Rules
     private $storage;
 
     /**
-     * __construct.
-     *
      * @param  Storage  $storage
      */
     public function __construct(Storage $storage = null)
@@ -25,8 +23,6 @@ public function __construct(Storage $storage = null)
     }
 
     /**
-     * match.
-     *
      * @param  Address|string  $address
      * @return string|void
      */