File tree Expand file tree Collapse file tree 1 file changed +31
-23
lines changed
Expand file tree Collapse file tree 1 file changed +31
-23
lines changed Original file line number Diff line number Diff line change @@ -115,40 +115,48 @@ public static function isPrice($variable)
115115 * 判断小数
116116 *
117117 * @param $variable
118- * @param int $min
119- * @param int $max
118+ * @param null $min
119+ * @param null $max
120120 * @return bool
121121 */
122- public static function isFloat ($ variable , $ min = 0 , $ max = 999999 )
122+ public static function isFloat ($ variable , $ min = null , $ max = null )
123123 {
124- $ int_options = array (
125- "options " => array (
126- "min_range " => $ min ,
127- "max_range " => $ max
128- )
129- );
130-
131- return filter_var ($ variable , FILTER_VALIDATE_FLOAT , $ int_options ) !== false ;
124+ if (!is_null ($ min ) && !is_null ($ max )){
125+ $ int_options = array (
126+ "options " => array (
127+ "min_range " => $ min ,
128+ "max_range " => $ max
129+ )
130+ );
131+
132+ return filter_var ($ variable , FILTER_VALIDATE_FLOAT , $ int_options ) !== false ;
133+ }else {
134+ return filter_var ($ variable , FILTER_VALIDATE_FLOAT ) !== false ;
135+ }
132136 }
133137
134138 /**
135139 * 判断整数
136140 *
137141 * @param $number
138- * @param int $min
139- * @param int $max
140- * @return mixed
142+ * @param null $min
143+ * @param null $max
144+ * @return bool
141145 */
142- public static function isInt ($ number , $ min = 0 , $ max = 999999 )
146+ public static function isInt ($ number , $ min = null , $ max = null )
143147 {
144- $ int_options = array (
145- "options " => array (
146- "min_range " => $ min ,
147- "max_range " => $ max
148- )
149- );
150-
151- return filter_var ($ number , FILTER_VALIDATE_INT , $ int_options ) !== false ;
148+ if (!is_null ($ min ) && !is_null ($ max )){
149+ $ int_options = array (
150+ "options " => array (
151+ "min_range " => $ min ,
152+ "max_range " => $ max
153+ )
154+ );
155+
156+ return filter_var ($ number , FILTER_VALIDATE_INT , $ int_options ) !== false ;
157+ }else {
158+ return filter_var ($ number , FILTER_VALIDATE_INT ) !== false ;
159+ }
152160 }
153161
154162
You can’t perform that action at this time.
0 commit comments