http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72423
Revision: 72423
Author: jeroendedauw
Date: 2010-09-05 13:20:52 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Changes for 0.4 - copied criteria validation functions over to new criteria
classes
Modified Paths:
--------------
trunk/extensions/Validator/includes/ParameterCriterion.php
trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
Modified: trunk/extensions/Validator/includes/ParameterCriterion.php
===================================================================
--- trunk/extensions/Validator/includes/ParameterCriterion.php 2010-09-05
13:16:23 UTC (rev 72422)
+++ trunk/extensions/Validator/includes/ParameterCriterion.php 2010-09-05
13:20:52 UTC (rev 72423)
@@ -20,6 +20,8 @@
* @param string $value
*
* @since 0.4
+ *
+ * @return boolean
*/
public abstract function validate( $value );
Modified: trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
2010-09-05 13:16:23 UTC (rev 72422)
+++ trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
2010-09-05 13:20:52 UTC (rev 72423)
@@ -18,7 +18,7 @@
*
* @since 0.4
*/
- public function __construct( ) {
+ public function __construct() {
parent::__construct();
}
@@ -26,7 +26,7 @@
* @see ParameterCriterion::validate
*/
public function validate( $value ) {
-
+ return preg_match( '/^\d+(\.\d+)?$/', $value );
}
}
\ No newline at end of file
Modified: trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
2010-09-05 13:16:23 UTC (rev 72422)
+++ trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
2010-09-05 13:20:52 UTC (rev 72423)
@@ -26,7 +26,7 @@
* @see ParameterCriterion::validate
*/
public function validate( $value ) {
-
+ return ctype_digit( (string)$value );
}
}
\ No newline at end of file
Modified: trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
2010-09-05 13:16:23 UTC (rev 72422)
+++ trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
2010-09-05 13:20:52 UTC (rev 72423)
@@ -26,7 +26,7 @@
* @see ParameterCriterion::validate
*/
public function validate( $value ) {
-
+ return is_numeric( $value );
}
}
\ No newline at end of file
Modified: trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
2010-09-05 13:16:23 UTC (rev 72422)
+++ trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
2010-09-05 13:20:52 UTC (rev 72423)
@@ -14,19 +14,32 @@
class CriterionMatchesRegex extends ParameterCriterion {
/**
+ * The pattern to match against.
+ *
+ * @since 0.4
+ *
+ * @var string
+ */
+ protected $pattern;
+
+ /**
* Constructor.
*
+ * @param string $pattern
+ *
* @since 0.4
*/
- public function __construct( ) {
+ public function __construct( $pattern ) {
parent::__construct();
+
+ $this->pattern = $pattern;
}
/**
* @see ParameterCriterion::validate
*/
public function validate( $value ) {
-
+ return (bool)preg_match( $this->pattern, $value );
}
}
\ No newline at end of file
Modified: trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
2010-09-05 13:16:23 UTC (rev 72422)
+++ trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
2010-09-05 13:20:52 UTC (rev 72423)
@@ -18,7 +18,7 @@
*
* @since 0.4
*/
- public function __construct( ) {
+ public function __construct() {
parent::__construct();
}
@@ -26,7 +26,7 @@
* @see ParameterCriterion::validate
*/
public function validate( $value ) {
-
+ return strlen( trim( $value ) ) > 0;
}
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
