From 14da95a96a08f4b1c3adba772282bd084e85ff2f Mon Sep 17 00:00:00 2001 From: kohanamin Date: Thu, 28 Apr 2011 18:37:41 -0700 Subject: [PATCH 1/3] corrected typo --- guide/kohana/mvc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/kohana/mvc.md b/guide/kohana/mvc.md index 2ee854983..d57b75120 100644 --- a/guide/kohana/mvc.md +++ b/guide/kohana/mvc.md @@ -1,3 +1,3 @@ -Discus the MVC pattern, as it pertains to Kohana. Perhaps have an image, etc. \ No newline at end of file +Discuss the MVC pattern, as it pertains to Kohana. Perhaps have an image, etc. \ No newline at end of file From 88a9dd2f33ceec9e6d5fa9946e60afc0327e0040 Mon Sep 17 00:00:00 2001 From: kohanamin Date: Thu, 28 Apr 2011 22:54:51 -0700 Subject: [PATCH 2/3] Looks like the Kohana class is loaded in bootstrap and not index? --- guide/kohana/flow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guide/kohana/flow.md b/guide/kohana/flow.md index 96c55cb02..81a2e54b1 100644 --- a/guide/kohana/flow.md +++ b/guide/kohana/flow.md @@ -6,9 +6,9 @@ Every application follows the same flow: 1. The application, module, and system paths are set. (`APPPATH`, `MODPATH`, and `SYSPATH`) 2. Error reporting levels are set. 3. Install file is loaded, if it exists. - 4. The [Kohana] class is loaded. - 5. The bootstrap file, `APPPATH/bootstrap.php`, is included. + 4. The bootstrap file, `APPPATH/bootstrap.php`, is included. 2. Once we are in `bootstrap.php`: + 6. The [Kohana] class is loaded. 7. [Kohana::init] is called, which sets up error handling, caching, and logging. 8. [Kohana_Config] readers and [Kohana_Log] writers are attached. 9. [Kohana::modules] is called to enable additional modules. From eb81bec8d154cb182a070d2af996f53d9cae8d62 Mon Sep 17 00:00:00 2001 From: joelpittet Date: Mon, 11 Jul 2011 17:24:20 +0100 Subject: [PATCH 3/3] Fixes #4053 - fixing references to old Validate class --- classes/kohana/valid.php | 2 +- classes/kohana/validation/exception.php | 2 +- guide/kohana/security/validation.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/kohana/valid.php b/classes/kohana/valid.php index a2d0a7ea7..10974825e 100644 --- a/classes/kohana/valid.php +++ b/classes/kohana/valid.php @@ -224,7 +224,7 @@ public static function ip($ip, $allow_private = TRUE) * @param integer credit card number * @param string|array card type, or an array of card types * @return boolean - * @uses Validate::luhn + * @uses Valid::luhn */ public static function credit_card($number, $type = NULL) { diff --git a/classes/kohana/validation/exception.php b/classes/kohana/validation/exception.php index db1240419..d2c839935 100644 --- a/classes/kohana/validation/exception.php +++ b/classes/kohana/validation/exception.php @@ -14,7 +14,7 @@ class Kohana_Validation_Exception extends Kohana_Exception { public $array; /** - * @param Validate Validate object + * @param Validation Validation object * @param string error message * @param array translation variables * @param int the exception code diff --git a/guide/kohana/security/validation.md b/guide/kohana/security/validation.md index ddd137f3c..d18531601 100644 --- a/guide/kohana/security/validation.md +++ b/guide/kohana/security/validation.md @@ -2,7 +2,7 @@ *This page needs to be reviewed for accuracy by the development team. Better examples would be helpful.* -Validation can be performed on any array using the [Validation] class. Labels and rules can be attached to a Validate object by the array key, called a "field name". +Validation can be performed on any array using the [Validation] class. Labels and rules can be attached to a Validation object by the array key, called a "field name". labels : A label is a human-readable version of the field name. @@ -32,7 +32,7 @@ Rule name | Function [Valid::max_length] | Maximum number of characters for value [Valid::exact_length] | Value must be an exact number of characters [Valid::email] | An email address is required -[Validate::email_domain] | Check that the domain of the email exists +[Valid::email_domain] | Check that the domain of the email exists [Valid::url] | Value must be a URL [Valid::ip] | Value must be an IP address [Valid::phone] | Value must be a phone number @@ -180,7 +180,7 @@ Next, we need a controller and action to process the registration, which will be { $user = Model::factory('user'); - $post = Validate::factory($_POST) + $post = Validation::factory($_POST) ->rule('username', 'not_empty') ->rule('username', 'regex', array(':value', '/^[a-z_.]++$/iD')) ->rule('username', array($user, 'unique_username'))