http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72984
Revision: 72984
Author: jeroendedauw
Date: 2010-09-14 15:53:54 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Changes for 0.4 - some fixes and removed ValidationManager class
Modified Paths:
--------------
trunk/extensions/Validator/Validator.php
trunk/extensions/Validator/includes/ListParameter.php
trunk/extensions/Validator/includes/Parameter.php
Removed Paths:
-------------
trunk/extensions/Validator/includes/ValidationManager.php
Modified: trunk/extensions/Validator/Validator.php
===================================================================
--- trunk/extensions/Validator/Validator.php 2010-09-14 15:53:28 UTC (rev
72983)
+++ trunk/extensions/Validator/Validator.php 2010-09-14 15:53:54 UTC (rev
72984)
@@ -63,7 +63,6 @@
$wgAutoloadClasses['Validator'] = $incDir .
'Validator.php';
$wgAutoloadClasses['TopologicalSort'] = $incDir .
'TopologicalSort.php';
$wgAutoloadClasses['ValidationFormats'] = $incDir .
'ValidationFormats.php';
-$wgAutoloadClasses['ValidationManager'] = $incDir .
'ValidationManager.php'; // TODO: remove
$wgAutoloadClasses['ValidationError'] = $incDir .
'ValidationError.php';
$wgAutoloadClasses['ValidationErrorHandler'] = $incDir .
'ValidationErrorHandler.php';
Modified: trunk/extensions/Validator/includes/ListParameter.php
===================================================================
--- trunk/extensions/Validator/includes/ListParameter.php 2010-09-14
15:53:28 UTC (rev 72983)
+++ trunk/extensions/Validator/includes/ListParameter.php 2010-09-14
15:53:54 UTC (rev 72984)
@@ -74,7 +74,9 @@
$default =
null, array $aliases = array(), array $criteria = array() ) {
$itemCriteria = array();
$listCriteria = array();
-
+
+ $this->cleanCriteria( $criteria );
+
foreach ( $criteria as $criterion ) {
if ( $criterion->isForLists() ) {
$listCriteria[] = $criterion;
@@ -83,13 +85,13 @@
$itemCriteria[] = $criterion;
}
}
+
+ $this->listCriteria = $listCriteria;
parent::__construct( $name, $type, $default, $aliases,
$itemCriteria );
$this->delimiter = $delimiter;
- $this->cleanCriteria( $listCriteria );
- $this->listCriteria = $listCriteria;
}
/**
@@ -113,7 +115,7 @@
if ( $this->lowerCaseValue ) {
foreach ( $this->value as &$item ) {
- $item = strtolower( $this->value );
+ $item = strtolower( $item );
}
}
}
Modified: trunk/extensions/Validator/includes/Parameter.php
===================================================================
--- trunk/extensions/Validator/includes/Parameter.php 2010-09-14 15:53:28 UTC
(rev 72983)
+++ trunk/extensions/Validator/includes/Parameter.php 2010-09-14 15:53:54 UTC
(rev 72984)
@@ -174,7 +174,7 @@
*/
public static function newFromArray( $name, array $definition ) {
$isList = false;
- $delimiter = false;
+ $delimiter = ListParameter::DEFAULT_DELIMITER;
if ( array_key_exists( 'type', $definition ) ) {
if ( is_array( $definition['type'] ) ) {
Deleted: trunk/extensions/Validator/includes/ValidationManager.php
===================================================================
--- trunk/extensions/Validator/includes/ValidationManager.php 2010-09-14
15:53:28 UTC (rev 72983)
+++ trunk/extensions/Validator/includes/ValidationManager.php 2010-09-14
15:53:54 UTC (rev 72984)
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Class for parameter handling.
- *
- * @deprecated
- *
- * @file ValidationManager.php
- * @ingroup Validator
- *
- * @author Jeroen De Dauw
- *
- * FIXME: missing required params should result in a no-go, no matter of the
error level, as they can/are not defaulted.
- * TODO: make a distinction between fatal errors and regular errors by using 2
seperate error levels.
- */
-class ValidationManager {
-
- /**
- * @var Validator
- */
- protected $validator;
-
- /**
- * Parses and validates the provided parameters, and corrects them
depending on the error level.
- *
- * @param array $rawParameters The raw parameters, as provided by the
user.
- * @param array $parameterInfo Array containing the parameter
definitions, which are needed for validation and defaulting.
- * @param array $defaultParams
- *
- * @return array or false The valid parameters or false when the output
should not be shown.
- */
- public function manageParameters( array $rawParameters, array
$parameterInfo, array $defaultParams = array() ) {
- global $egValidatorErrorLevel;
-
- $this->validator = new Validator();
-
- $this->validator->parseAndSetParams( $rawParameters,
$parameterInfo, $defaultParams );
- $this->validator->validateAndFormatParameters();
-
- if ( $this->validator->hasErrors() && $egValidatorErrorLevel <
Validator_ERRORS_STRICT ) {
- $this->validator->correctInvalidParams();
- }
-
- return !$this->validator->hasFatalError();
- }
-
- /**
- * Validates the provided parameters, and corrects them depending on
the error level.
- *
- * @since 3.x
- *
- * @param $parameters Array
- * @param $parameterInfo Array
- */
- public function manageParsedParameters( array $parameters, array
$parameterInfo ) {
- global $egValidatorErrorLevel;
-
- $this->validator = new Validator();
-
- $this->validator->setParameters( $parameters, $parameterInfo );
- $this->validator->validateAndFormatParameters();
-
- if ( $this->validator->hasErrors() && $egValidatorErrorLevel <
Validator_ERRORS_STRICT ) {
- $this->validator->correctInvalidParams();
- }
-
- return !$this->validator->hasFatalError();
- }
-
- /**
- * Returns an array with the valid parameters.
- *
- * @since 3.x
- *
- * @param boolean $includeMetaData
- *
- * @return array
- */
- public function getParameters( $includeMetaData = true ) {
- return $this->validator->getValidParams( $includeMetaData );
- }
-
-}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
