diff --git a/classes/Arr.php b/classes/Arr.php index 376cb97f5..320612925 100644 --- a/classes/Arr.php +++ b/classes/Arr.php @@ -1,3 +1,3 @@ array('level2a' => 'value 1', 'level2b' => 'value 2')); * Arr::extract($data, array('level1.level2a', 'password')); @@ -617,4 +617,4 @@ public static function flatten($array) return $flat; } -} // End arr +} // End Arr diff --git a/classes/Kohana/Config.php b/classes/Kohana/Config.php index 8a9798d57..5066de2d1 100644 --- a/classes/Kohana/Config.php +++ b/classes/Kohana/Config.php @@ -3,7 +3,7 @@ * Wrapper for configuration arrays. Multiple configuration readers can be * attached to allow loading configuration from files, database, etc. * - * Configuration directives cascade across config sources in the same way that + * Configuration directives cascade across config sources in the same way that * files cascade across the filesystem. * * Directives from sources high in the sources list will override ones from those @@ -74,9 +74,9 @@ public function detach(Kohana_Config_Source $source) } /** - * Load a configuration group. Searches all the config sources, merging all the - * directives found into a single config group. Any changes made to the config - * in this group will be mirrored across all writable sources. + * Load a configuration group. Searches all the config sources, merging all the + * directives found into a single config group. Any changes made to the config + * in this group will be mirrored across all writable sources. * * $array = $config->load($name); * @@ -146,7 +146,7 @@ public function load($group) /** * Copy one configuration group to all of the other writers. - * + * * $config->copy($name); * * @param string $group configuration group name @@ -181,7 +181,7 @@ public function _write_config($group, $key, $value) { continue; } - + // Copy each value in the config $source->write($group, $key, $value); } @@ -189,4 +189,4 @@ public function _write_config($group, $key, $value) return $this; } -} // End Kohana_Config +} // End Config diff --git a/classes/Kohana/Config/File.php b/classes/Kohana/Config/File.php index 8d514f697..4b4c3d7f1 100644 --- a/classes/Kohana/Config/File.php +++ b/classes/Kohana/Config/File.php @@ -9,7 +9,7 @@ * @copyright (c) 2009-2012 Kohana Team * @license http://kohanaframework.org/license */ -class Kohana_Config_File extends Kohana_Config_File_Reader +class Kohana_Config_File extends Kohana_Config_File_Reader { // @see Kohana_Config_File_Reader } diff --git a/classes/Kohana/Config/File/Reader.php b/classes/Kohana/Config/File/Reader.php index 2e75e2ef3..9283bf753 100644 --- a/classes/Kohana/Config/File/Reader.php +++ b/classes/Kohana/Config/File/Reader.php @@ -53,4 +53,4 @@ public function load($group) return $config; } -} // End Kohana_Config +} // End Config_File_Reader diff --git a/classes/Kohana/Config/Group.php b/classes/Kohana/Config/Group.php index ad32cf8da..37bd2fb82 100644 --- a/classes/Kohana/Config/Group.php +++ b/classes/Kohana/Config/Group.php @@ -4,7 +4,7 @@ * The group wrapper acts as an interface to all the config directives * gathered from across the system. * - * This is the object returned from Kohana_Config::load + * This is the object returned from Kohana_Config::load * * Any modifications to configuration items should be done through an instance of this object * @@ -31,7 +31,7 @@ class Kohana_Config_Group extends ArrayObject { protected $_group_name = ''; /** - * Constructs the group object. Kohana_Config passes the config group + * Constructs the group object. Kohana_Config passes the config group * and its config items to the object here. * * @param Kohana_Config $instance "Owning" instance of Kohana_Config @@ -77,7 +77,7 @@ public function group_name() { return $this->_group_name; } - + /** * Get a variable from the configuration or return the default value. * @@ -110,7 +110,7 @@ public function set($key, $value) /** * Overrides ArrayObject::offsetSet() - * This method is called when config is changed via + * This method is called when config is changed via * * $config->var = 'asd'; * @@ -127,4 +127,5 @@ public function offsetSet($key, $value) return parent::offsetSet($key, $value); } -} + +} // End Config_Group diff --git a/classes/Kohana/Config/Reader.php b/classes/Kohana/Config/Reader.php index 6b08a3b99..3ccd271c2 100644 --- a/classes/Kohana/Config/Reader.php +++ b/classes/Kohana/Config/Reader.php @@ -11,7 +11,7 @@ */ interface Kohana_Config_Reader extends Kohana_Config_Source { - + /** * Tries to load the specificed configuration group * @@ -21,5 +21,5 @@ interface Kohana_Config_Reader extends Kohana_Config_Source * @return boolean|array */ public function load($group); - -} + +} // End Config_Reader diff --git a/classes/Kohana/Config/Writer.php b/classes/Kohana/Config/Writer.php index 5c666a166..ef82ca58c 100644 --- a/classes/Kohana/Config/Writer.php +++ b/classes/Kohana/Config/Writer.php @@ -3,8 +3,8 @@ /** * Interface for config writers * - * Specifies the methods that a config writer must implement - * + * Specifies the methods that a config writer must implement + * * @package Kohana * @author Kohana Team * @copyright (c) 2008-2012 Kohana Team @@ -15,7 +15,7 @@ interface Kohana_Config_Writer extends Kohana_Config_Source /** * Writes the passed config for $group * - * Returns chainable instance on success or throws + * Returns chainable instance on success or throws * Kohana_Config_Exception on failure * * @param string $group The config group @@ -24,4 +24,5 @@ interface Kohana_Config_Writer extends Kohana_Config_Source * @return boolean */ public function write($group, $key, $config); -} + +} // End Config_Writer diff --git a/classes/Kohana/Controller.php b/classes/Kohana/Controller.php index b2c95b300..03e37767d 100644 --- a/classes/Kohana/Controller.php +++ b/classes/Kohana/Controller.php @@ -51,15 +51,15 @@ public function __construct(Request $request, Response $response) /** * Executes the given action and calls the [Controller::before] and [Controller::after] methods. - * + * * Can also be used to catch exceptions from actions in a single place. - * + * * 1. Before the controller action is called, the [Controller::before] method * will be called. * 2. Next the controller action will be called. * 3. After the controller action is called, the [Controller::after] method * will be called. - * + * * @throws HTTP_Exception_404 * @return Response */ @@ -105,7 +105,7 @@ public function before() * Automatically executed after the controller action. Can be used to apply * transformation to the response, add extra output, and execute * other custom code. - * + * * @return void */ public function after() @@ -131,9 +131,9 @@ public static function redirect($uri = '', $code = 302) * Checks the browser cache to see the response needs to be returned, * execution will halt and a 304 Not Modified will be sent if the * browser cache is up to date. - * + * * $this->check_cache(sha1($content)); - * + * * @param string $etag Resource Etag * @return Response */ @@ -142,4 +142,4 @@ protected function check_cache($etag = NULL) return HTTP::check_cache($this->request, $this->response, $etag); } -} // End Controller \ No newline at end of file +} // End Controller diff --git a/classes/Kohana/Cookie.php b/classes/Kohana/Cookie.php index 239d8c81c..a39b9168c 100644 --- a/classes/Kohana/Cookie.php +++ b/classes/Kohana/Cookie.php @@ -158,4 +158,4 @@ public static function salt($name, $value) return sha1($agent.$name.$value.Cookie::$salt); } -} // End cookie +} // End Cookie diff --git a/classes/Kohana/Core.php b/classes/Kohana/Core.php index 227da3298..291bcce51 100644 --- a/classes/Kohana/Core.php +++ b/classes/Kohana/Core.php @@ -521,7 +521,7 @@ public static function auto_load($class, $directory = 'classes') /** * Provides auto-loading support of classes that follow Kohana's old class * naming conventions. - * + * * This is included for compatibility purposes with older modules. * * @param string $class Class name @@ -1037,7 +1037,7 @@ public static function shutdown_handler() /** * Generates a version string based on the variables defined above. - * + * * @return string */ public static function version() diff --git a/classes/Kohana/Date.php b/classes/Kohana/Date.php index 2c2ce397c..166c664ae 100644 --- a/classes/Kohana/Date.php +++ b/classes/Kohana/Date.php @@ -600,4 +600,4 @@ public static function formatted_time($datetime_str = 'now', $timestamp_format = return $time->format($timestamp_format); } -} // End date +} // End Date diff --git a/classes/Kohana/Debug.php b/classes/Kohana/Debug.php index 9d1efdf52..f07769726 100644 --- a/classes/Kohana/Debug.php +++ b/classes/Kohana/Debug.php @@ -462,4 +462,4 @@ public static function trace(array $trace = NULL) return $output; } -} +} // End Debug diff --git a/classes/Kohana/File.php b/classes/Kohana/File.php index b4fff2de9..a50390a59 100644 --- a/classes/Kohana/File.php +++ b/classes/Kohana/File.php @@ -238,4 +238,4 @@ public static function join($filename) return $pieces; } -} // End file +} // End File diff --git a/classes/Kohana/Form.php b/classes/Kohana/Form.php index 6cf529bc0..8cf6b4671 100644 --- a/classes/Kohana/Form.php +++ b/classes/Kohana/Form.php @@ -431,4 +431,4 @@ public static function label($input, $text = NULL, array $attributes = NULL) return ''.$text.''; } -} // End form +} // End Form diff --git a/classes/Kohana/HTML.php b/classes/Kohana/HTML.php index 171856c43..f6e1d7e05 100644 --- a/classes/Kohana/HTML.php +++ b/classes/Kohana/HTML.php @@ -342,4 +342,4 @@ public static function attributes(array $attributes = NULL) return $compiled; } -} // End html +} // End HTML diff --git a/classes/Kohana/HTTP.php b/classes/Kohana/HTTP.php index 2dec59f00..5df417a58 100644 --- a/classes/Kohana/HTTP.php +++ b/classes/Kohana/HTTP.php @@ -44,7 +44,7 @@ public static function redirect($uri = '', $code = 302) * Checks the browser cache to see the response needs to be returned, * execution will halt and a 304 Not Modified will be sent if the * browser cache is up to date. - * + * * @param Request $request Request * @param Response $response Response * @param string $etag Resource ETag @@ -214,4 +214,5 @@ public static function www_form_urlencode(array $params = array()) return implode('&', $encoded); } -} // End Kohana_HTTP \ No newline at end of file + +} // End HTTP diff --git a/classes/Kohana/HTTP/Exception.php b/classes/Kohana/HTTP/Exception.php index 0c878d739..24b33d431 100644 --- a/classes/Kohana/HTTP/Exception.php +++ b/classes/Kohana/HTTP/Exception.php @@ -4,7 +4,7 @@ abstract class Kohana_HTTP_Exception extends Kohana_Exception { /** * Creates an HTTP_Exception of the specified type. - * + * * @param integer $code the http status code * @param string $message status message, custom content to display with error * @param array $variables translation variables @@ -13,7 +13,7 @@ abstract class Kohana_HTTP_Exception extends Kohana_Exception { public static function factory($code, $message = NULL, array $variables = NULL, Exception $previous = NULL) { $class = 'HTTP_Exception_'.$code; - + return new $class($message, $variables, $previous); } @@ -44,7 +44,7 @@ public function __construct($message = NULL, array $variables = NULL, Exception /** * Store the Request that triggered this exception. - * + * * @param Request $request Request object that triggered this exception. * @return Response */ @@ -52,7 +52,7 @@ public function request(Request $request = NULL) { if ($request === NULL) return $this->_request; - + $this->_request = $request; return $this; @@ -60,7 +60,7 @@ public function request(Request $request = NULL) /** * Generate a Response for the current Exception - * + * * @uses Kohana_Exception::response() * @return Response */ @@ -69,4 +69,4 @@ public function get_response() return Kohana_Exception::response($this); } -} // End Kohana_HTTP_Exception \ No newline at end of file +} // End HTTP_Exception diff --git a/classes/Kohana/HTTP/Exception/300.php b/classes/Kohana/HTTP/Exception/300.php index cc5a45020..d8f730d75 100644 --- a/classes/Kohana/HTTP/Exception/300.php +++ b/classes/Kohana/HTTP/Exception/300.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_300 extends HTTP_Exception_Redirect { */ protected $_code = 300; -} \ No newline at end of file +} // End HTTP_Exception_300 diff --git a/classes/Kohana/HTTP/Exception/301.php b/classes/Kohana/HTTP/Exception/301.php index 9cef69ec2..4218463f2 100644 --- a/classes/Kohana/HTTP/Exception/301.php +++ b/classes/Kohana/HTTP/Exception/301.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_301 extends HTTP_Exception_Redirect { */ protected $_code = 301; -} \ No newline at end of file +} // End HTTP_Exception_301 diff --git a/classes/Kohana/HTTP/Exception/302.php b/classes/Kohana/HTTP/Exception/302.php index d5f3b352a..d6bd2cae7 100644 --- a/classes/Kohana/HTTP/Exception/302.php +++ b/classes/Kohana/HTTP/Exception/302.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_302 extends HTTP_Exception_Redirect { */ protected $_code = 302; -} \ No newline at end of file +} // End HTTP_Exception_302 diff --git a/classes/Kohana/HTTP/Exception/303.php b/classes/Kohana/HTTP/Exception/303.php index f22262578..e462ce36d 100644 --- a/classes/Kohana/HTTP/Exception/303.php +++ b/classes/Kohana/HTTP/Exception/303.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_303 extends HTTP_Exception_Redirect { */ protected $_code = 303; -} \ No newline at end of file +} // End HTTP_Exception_303 diff --git a/classes/Kohana/HTTP/Exception/304.php b/classes/Kohana/HTTP/Exception/304.php index 27b64b57a..8e736234f 100644 --- a/classes/Kohana/HTTP/Exception/304.php +++ b/classes/Kohana/HTTP/Exception/304.php @@ -6,5 +6,5 @@ class Kohana_HTTP_Exception_304 extends HTTP_Exception_Expected { * @var integer HTTP 304 Not Modified */ protected $_code = 304; - -} \ No newline at end of file + +} // End HTTP_Exception_304 diff --git a/classes/Kohana/HTTP/Exception/305.php b/classes/Kohana/HTTP/Exception/305.php index ccfcb8307..bc551e29a 100644 --- a/classes/Kohana/HTTP/Exception/305.php +++ b/classes/Kohana/HTTP/Exception/305.php @@ -9,7 +9,7 @@ class Kohana_HTTP_Exception_305 extends HTTP_Exception_Expected { /** * Specifies the proxy to replay this request via - * + * * @param string $location URI of the proxy */ public function location($uri = NULL) @@ -24,7 +24,7 @@ public function location($uri = NULL) /** * Validate this exception contains everything needed to continue. - * + * * @throws Kohana_Exception * @return bool */ @@ -38,4 +38,5 @@ public function check() return TRUE; } -} \ No newline at end of file + +} // End HTTP_Exception_305 diff --git a/classes/Kohana/HTTP/Exception/307.php b/classes/Kohana/HTTP/Exception/307.php index 1294f2782..b4a3a4de8 100644 --- a/classes/Kohana/HTTP/Exception/307.php +++ b/classes/Kohana/HTTP/Exception/307.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_307 extends HTTP_Exception_Redirect { */ protected $_code = 307; -} \ No newline at end of file +} // End HTTP_Exception_307 diff --git a/classes/Kohana/HTTP/Exception/400.php b/classes/Kohana/HTTP/Exception/400.php index cf04e9fee..b04d379e8 100644 --- a/classes/Kohana/HTTP/Exception/400.php +++ b/classes/Kohana/HTTP/Exception/400.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_400 extends HTTP_Exception { */ protected $_code = 400; -} \ No newline at end of file +} // End HTTP_Exception_400 diff --git a/classes/Kohana/HTTP/Exception/401.php b/classes/Kohana/HTTP/Exception/401.php index c00258a54..01999691c 100644 --- a/classes/Kohana/HTTP/Exception/401.php +++ b/classes/Kohana/HTTP/Exception/401.php @@ -9,14 +9,14 @@ class Kohana_HTTP_Exception_401 extends HTTP_Exception_Expected { /** * Specifies the WWW-Authenticate challenge. - * + * * @param string $challenge WWW-Authenticate challenge (eg `Basic realm="Control Panel"`) */ public function authenticate($challenge = NULL) { if ($challenge === NULL) return $this->headers('www-authenticate'); - + $this->headers('www-authenticate', $challenge); return $this; @@ -24,7 +24,7 @@ public function authenticate($challenge = NULL) /** * Validate this exception contains everything needed to continue. - * + * * @throws Kohana_Exception * @return bool */ @@ -35,4 +35,5 @@ public function check() return TRUE; } -} + +} // End HTTP_Exception_401 diff --git a/classes/Kohana/HTTP/Exception/402.php b/classes/Kohana/HTTP/Exception/402.php index 54d9ff1d5..948418cfe 100644 --- a/classes/Kohana/HTTP/Exception/402.php +++ b/classes/Kohana/HTTP/Exception/402.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_402 extends HTTP_Exception { */ protected $_code = 402; -} \ No newline at end of file +} // End HTTP_Exception_402 diff --git a/classes/Kohana/HTTP/Exception/403.php b/classes/Kohana/HTTP/Exception/403.php index 5ce7f3d4b..c17d8455a 100644 --- a/classes/Kohana/HTTP/Exception/403.php +++ b/classes/Kohana/HTTP/Exception/403.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_403 extends HTTP_Exception { */ protected $_code = 403; -} \ No newline at end of file +} // End HTTP_Exception_403 diff --git a/classes/Kohana/HTTP/Exception/404.php b/classes/Kohana/HTTP/Exception/404.php index 4debe5a38..9b3dadad7 100644 --- a/classes/Kohana/HTTP/Exception/404.php +++ b/classes/Kohana/HTTP/Exception/404.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_404 extends HTTP_Exception { */ protected $_code = 404; -} \ No newline at end of file +} // End HTTP_Exception_404 diff --git a/classes/Kohana/HTTP/Exception/405.php b/classes/Kohana/HTTP/Exception/405.php index 19f11955f..acea29ca1 100644 --- a/classes/Kohana/HTTP/Exception/405.php +++ b/classes/Kohana/HTTP/Exception/405.php @@ -9,7 +9,7 @@ class Kohana_HTTP_Exception_405 extends HTTP_Exception_Expected { /** * Specifies the list of allowed HTTP methods - * + * * @param array $methods List of allowed methods */ public function allowed($methods) @@ -26,7 +26,7 @@ public function allowed($methods) /** * Validate this exception contains everything needed to continue. - * + * * @throws Kohana_Exception * @return bool */ @@ -38,4 +38,4 @@ public function check() return TRUE; } -} \ No newline at end of file +} // End HTTP_Exception_405 diff --git a/classes/Kohana/HTTP/Exception/406.php b/classes/Kohana/HTTP/Exception/406.php index b23861a41..9260c4d9d 100644 --- a/classes/Kohana/HTTP/Exception/406.php +++ b/classes/Kohana/HTTP/Exception/406.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_406 extends HTTP_Exception { */ protected $_code = 406; -} \ No newline at end of file +} // End HTTP_Exception_406 diff --git a/classes/Kohana/HTTP/Exception/407.php b/classes/Kohana/HTTP/Exception/407.php index 5b325ceb2..fb3bc39bc 100644 --- a/classes/Kohana/HTTP/Exception/407.php +++ b/classes/Kohana/HTTP/Exception/407.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_407 extends HTTP_Exception { */ protected $_code = 407; -} \ No newline at end of file +} // End HTTP_Exception_407 diff --git a/classes/Kohana/HTTP/Exception/408.php b/classes/Kohana/HTTP/Exception/408.php index 84011d3e3..2dfa04ced 100644 --- a/classes/Kohana/HTTP/Exception/408.php +++ b/classes/Kohana/HTTP/Exception/408.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_408 extends HTTP_Exception { */ protected $_code = 408; -} \ No newline at end of file +} // End HTTP_Exception_408 diff --git a/classes/Kohana/HTTP/Exception/409.php b/classes/Kohana/HTTP/Exception/409.php index 9b1ddb219..b295ff55c 100644 --- a/classes/Kohana/HTTP/Exception/409.php +++ b/classes/Kohana/HTTP/Exception/409.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_409 extends HTTP_Exception { */ protected $_code = 409; -} \ No newline at end of file +} // End HTTP_Exception_409 diff --git a/classes/Kohana/HTTP/Exception/410.php b/classes/Kohana/HTTP/Exception/410.php index e62d6d03a..6988f977e 100644 --- a/classes/Kohana/HTTP/Exception/410.php +++ b/classes/Kohana/HTTP/Exception/410.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_410 extends HTTP_Exception { */ protected $_code = 410; -} \ No newline at end of file +} // End HTTP_Exception_410 diff --git a/classes/Kohana/HTTP/Exception/411.php b/classes/Kohana/HTTP/Exception/411.php index 67ddb4f44..cf3c94e9b 100644 --- a/classes/Kohana/HTTP/Exception/411.php +++ b/classes/Kohana/HTTP/Exception/411.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_411 extends HTTP_Exception { */ protected $_code = 411; -} \ No newline at end of file +} // End HTTP_Exception_411 diff --git a/classes/Kohana/HTTP/Exception/412.php b/classes/Kohana/HTTP/Exception/412.php index ae17eb5aa..8dfe6b2e9 100644 --- a/classes/Kohana/HTTP/Exception/412.php +++ b/classes/Kohana/HTTP/Exception/412.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_412 extends HTTP_Exception { */ protected $_code = 412; -} \ No newline at end of file +} // End HTTP_Exception_412 diff --git a/classes/Kohana/HTTP/Exception/413.php b/classes/Kohana/HTTP/Exception/413.php index edc3c3549..c97ae3729 100644 --- a/classes/Kohana/HTTP/Exception/413.php +++ b/classes/Kohana/HTTP/Exception/413.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_413 extends HTTP_Exception { */ protected $_code = 413; -} \ No newline at end of file +} // End HTTP_Exception_413 diff --git a/classes/Kohana/HTTP/Exception/414.php b/classes/Kohana/HTTP/Exception/414.php index 533a3e974..6ac87eb68 100644 --- a/classes/Kohana/HTTP/Exception/414.php +++ b/classes/Kohana/HTTP/Exception/414.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_414 extends HTTP_Exception { */ protected $_code = 414; -} \ No newline at end of file +} // End HTTP_Exception_414 diff --git a/classes/Kohana/HTTP/Exception/415.php b/classes/Kohana/HTTP/Exception/415.php index 3bc591ce2..b5f6ef32f 100644 --- a/classes/Kohana/HTTP/Exception/415.php +++ b/classes/Kohana/HTTP/Exception/415.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_415 extends HTTP_Exception { */ protected $_code = 415; -} \ No newline at end of file +} // End HTTP_Exception_415 diff --git a/classes/Kohana/HTTP/Exception/416.php b/classes/Kohana/HTTP/Exception/416.php index 0ad127b2d..69345f955 100644 --- a/classes/Kohana/HTTP/Exception/416.php +++ b/classes/Kohana/HTTP/Exception/416.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_416 extends HTTP_Exception { */ protected $_code = 416; -} \ No newline at end of file +} // End HTTP_Exception_416 diff --git a/classes/Kohana/HTTP/Exception/417.php b/classes/Kohana/HTTP/Exception/417.php index 14f88a7bf..a205a3698 100644 --- a/classes/Kohana/HTTP/Exception/417.php +++ b/classes/Kohana/HTTP/Exception/417.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_417 extends HTTP_Exception { */ protected $_code = 417; -} \ No newline at end of file +} // End HTTP_Exception_417 diff --git a/classes/Kohana/HTTP/Exception/500.php b/classes/Kohana/HTTP/Exception/500.php index 9a5c9181a..beb561684 100644 --- a/classes/Kohana/HTTP/Exception/500.php +++ b/classes/Kohana/HTTP/Exception/500.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_500 extends HTTP_Exception { */ protected $_code = 500; -} \ No newline at end of file +} // End HTTP_Exception_500 diff --git a/classes/Kohana/HTTP/Exception/501.php b/classes/Kohana/HTTP/Exception/501.php index 4b4088648..d556d3e3b 100644 --- a/classes/Kohana/HTTP/Exception/501.php +++ b/classes/Kohana/HTTP/Exception/501.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_501 extends HTTP_Exception { */ protected $_code = 501; -} \ No newline at end of file +} // End HTTP_Exception_501 diff --git a/classes/Kohana/HTTP/Exception/502.php b/classes/Kohana/HTTP/Exception/502.php index 2f4565412..c3717bdf0 100644 --- a/classes/Kohana/HTTP/Exception/502.php +++ b/classes/Kohana/HTTP/Exception/502.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_502 extends HTTP_Exception { */ protected $_code = 502; -} \ No newline at end of file +} // End HTTP_Exception_502 diff --git a/classes/Kohana/HTTP/Exception/503.php b/classes/Kohana/HTTP/Exception/503.php index 8d56abddd..1be66fea2 100644 --- a/classes/Kohana/HTTP/Exception/503.php +++ b/classes/Kohana/HTTP/Exception/503.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_503 extends HTTP_Exception { */ protected $_code = 503; -} \ No newline at end of file +} // End HTTP_Exception_503 diff --git a/classes/Kohana/HTTP/Exception/504.php b/classes/Kohana/HTTP/Exception/504.php index a708baa6c..9e9e2c868 100644 --- a/classes/Kohana/HTTP/Exception/504.php +++ b/classes/Kohana/HTTP/Exception/504.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_504 extends HTTP_Exception { */ protected $_code = 504; -} \ No newline at end of file +} // End HTTP_Exception_504 diff --git a/classes/Kohana/HTTP/Exception/505.php b/classes/Kohana/HTTP/Exception/505.php index f61a7b66d..12277dd77 100644 --- a/classes/Kohana/HTTP/Exception/505.php +++ b/classes/Kohana/HTTP/Exception/505.php @@ -7,4 +7,4 @@ class Kohana_HTTP_Exception_505 extends HTTP_Exception { */ protected $_code = 505; -} \ No newline at end of file +} // End HTTP_Exception_505 diff --git a/classes/Kohana/HTTP/Exception/Expected.php b/classes/Kohana/HTTP/Exception/Expected.php index 448a0a9ef..d5def39b8 100644 --- a/classes/Kohana/HTTP/Exception/Expected.php +++ b/classes/Kohana/HTTP/Exception/Expected.php @@ -1,8 +1,8 @@ _response; } -} // End Kohana_HTTP_Exception \ No newline at end of file +} // End HTTP_Excepected diff --git a/classes/Kohana/HTTP/Exception/Redirect.php b/classes/Kohana/HTTP/Exception/Redirect.php index e065289f8..d00811dde 100644 --- a/classes/Kohana/HTTP/Exception/Redirect.php +++ b/classes/Kohana/HTTP/Exception/Redirect.php @@ -2,7 +2,7 @@ /** * Redirect HTTP exception class. Used for all [HTTP_Exception]'s where the status * code indicates a redirect. - * + * * Eg [HTTP_Exception_301], [HTTP_Exception_302] and most of the other 30x's * * @package Kohana @@ -15,14 +15,14 @@ abstract class Kohana_HTTP_Exception_Redirect extends HTTP_Exception_Expected { /** * Specifies the URI to redirect to. - * + * * @param string $location URI of the proxy */ public function location($uri = NULL) { if ($uri === NULL) return $this->headers('Location'); - + if (strpos($uri, '://') === FALSE) { // Make the URI into a URL @@ -36,7 +36,7 @@ public function location($uri = NULL) /** * Validate this exception contains everything needed to continue. - * + * * @throws Kohana_Exception * @return bool */ @@ -48,4 +48,4 @@ public function check() return TRUE; } -} // End Kohana_HTTP_Exception_Redirect \ No newline at end of file +} // End HTTP_Exception_Redirect diff --git a/classes/Kohana/HTTP/Header.php b/classes/Kohana/HTTP/Header.php index 5850537c6..ecfbe22dd 100644 --- a/classes/Kohana/HTTP/Header.php +++ b/classes/Kohana/HTTP/Header.php @@ -946,4 +946,4 @@ protected function _send_headers_to_php(array $headers, $replace) return $this; } -} // End Kohana_HTTP_Header +} // End HTTP_Header diff --git a/classes/Kohana/HTTP/Message.php b/classes/Kohana/HTTP/Message.php index 096a20ada..501af5d4c 100644 --- a/classes/Kohana/HTTP/Message.php +++ b/classes/Kohana/HTTP/Message.php @@ -53,4 +53,5 @@ public function body($content = NULL); * @return string */ public function render(); -} \ No newline at end of file + +} // End HTTP_Message diff --git a/classes/Kohana/HTTP/Request.php b/classes/Kohana/HTTP/Request.php index 2ee97f322..26b5aebec 100644 --- a/classes/Kohana/HTTP/Request.php +++ b/classes/Kohana/HTTP/Request.php @@ -61,4 +61,4 @@ public function query($key = NULL, $value = NULL); */ public function post($key = NULL, $value = NULL); -} \ No newline at end of file +} // End HTTP_Request diff --git a/classes/Kohana/HTTP/Response.php b/classes/Kohana/HTTP/Response.php index 9ed00fca1..791616a4e 100644 --- a/classes/Kohana/HTTP/Response.php +++ b/classes/Kohana/HTTP/Response.php @@ -28,4 +28,4 @@ interface Kohana_HTTP_Response extends HTTP_Message { */ public function status($code = NULL); -} \ No newline at end of file +} // End HTTP_Response diff --git a/classes/Kohana/I18n.php b/classes/Kohana/I18n.php index 0856da038..4a28adf7f 100644 --- a/classes/Kohana/I18n.php +++ b/classes/Kohana/I18n.php @@ -145,7 +145,7 @@ public static function load($lang) * __('Welcome back, :user', array(':user' => $username)); * * [!!] The target language is defined by [I18n::$lang]. - * + * * @uses I18n::get * @param string $string text to translate * @param array $values values to replace in the translated text diff --git a/classes/Kohana/Kohana/Exception.php b/classes/Kohana/Kohana/Exception.php index 2955bec75..8f6df7517 100644 --- a/classes/Kohana/Kohana/Exception.php +++ b/classes/Kohana/Kohana/Exception.php @@ -230,7 +230,7 @@ public static function response(Exception $e) } } } - + if (isset(Kohana_Exception::$php_errors[$code])) { // Use the human-readable error name @@ -251,13 +251,13 @@ public static function response(Exception $e) // Instantiate the error view. $view = View::factory(Kohana_Exception::$error_view, get_defined_vars()); - + // Prepare the response object. $response = Response::factory(); // Set the response status $response->status(($e instanceof HTTP_Exception) ? $e->getCode() : 500); - + // Set the response headers $response->headers('Content-Type', Kohana_Exception::$error_view_content_type.'; charset='.Kohana::$charset); diff --git a/classes/Kohana/Log.php b/classes/Kohana/Log.php index d06b07cc4..b1867d82f 100644 --- a/classes/Kohana/Log.php +++ b/classes/Kohana/Log.php @@ -80,7 +80,7 @@ public function attach(Log_Writer $writer, $levels = array(), $min_level = 0) { $levels = range($min_level, $levels); } - + $this->_writers["{$writer}"] = array ( 'object' => $writer, @@ -225,4 +225,4 @@ public function write() } } -} // End Kohana_Log +} // End Log diff --git a/classes/Kohana/Log/File.php b/classes/Kohana/Log/File.php index f603cf20d..6c18c8d62 100644 --- a/classes/Kohana/Log/File.php +++ b/classes/Kohana/Log/File.php @@ -91,4 +91,4 @@ public function write(array $messages) } } -} // End Kohana_Log_File \ No newline at end of file +} // End Log_File diff --git a/classes/Kohana/Log/StdErr.php b/classes/Kohana/Log/StdErr.php index 6e6486fb2..c24444e48 100644 --- a/classes/Kohana/Log/StdErr.php +++ b/classes/Kohana/Log/StdErr.php @@ -26,4 +26,4 @@ public function write(array $messages) } } -} // End Kohana_Log_StdErr +} // End Log_StdErr diff --git a/classes/Kohana/Log/StdOut.php b/classes/Kohana/Log/StdOut.php index 3fb5e1d0a..9bd3b1c9a 100644 --- a/classes/Kohana/Log/StdOut.php +++ b/classes/Kohana/Log/StdOut.php @@ -27,4 +27,4 @@ public function write(array $messages) } } -} // End Kohana_Log_StdOut +} // End Log_StdOut diff --git a/classes/Kohana/Log/Syslog.php b/classes/Kohana/Log/Syslog.php index 809629c4e..c6daff821 100644 --- a/classes/Kohana/Log/Syslog.php +++ b/classes/Kohana/Log/Syslog.php @@ -62,4 +62,4 @@ public function __destruct() closelog(); } -} // End Kohana_Log_Syslog +} // End Log_Syslog diff --git a/classes/Kohana/Log/Writer.php b/classes/Kohana/Log/Writer.php index 4449958f4..5fd789c83 100644 --- a/classes/Kohana/Log/Writer.php +++ b/classes/Kohana/Log/Writer.php @@ -12,21 +12,21 @@ abstract class Kohana_Log_Writer { /** * @var string timestamp format for log entries. - * + * * Defaults to Date::$timestamp_format */ public static $timestamp; /** * @var string timezone for log entries - * + * * Defaults to Date::$timezone, which defaults to date_default_timezone_get() */ public static $timezone; /** * Numeric log level to string lookup table. - * @var array + * @var array */ protected $_log_levels = array( LOG_EMERG => 'EMERGENCY', @@ -68,7 +68,7 @@ final public function __toString() /** * Formats a log entry. - * + * * @param array $message * @param string $format * @return string @@ -92,4 +92,4 @@ public function format_message(array $message, $format = "time --- level: body i return $string; } -} // End Kohana_Log_Writer +} // End Log_Writer diff --git a/classes/Kohana/Num.php b/classes/Kohana/Num.php index d07fd0596..4f83b32e6 100644 --- a/classes/Kohana/Num.php +++ b/classes/Kohana/Num.php @@ -231,4 +231,4 @@ public static function bytes($size) return $bytes; } -} // End num +} // End Num diff --git a/classes/Kohana/Request/Client.php b/classes/Kohana/Request/Client.php index d23b15fe9..0655fd2cf 100644 --- a/classes/Kohana/Request/Client.php +++ b/classes/Kohana/Request/Client.php @@ -421,4 +421,4 @@ public static function on_header_location(Request $request, Response $response, return NULL; } -} \ No newline at end of file +} // End Request_Client diff --git a/classes/Kohana/Request/Client/Curl.php b/classes/Kohana/Request/Client/Curl.php index c5c85d310..f7232ece1 100644 --- a/classes/Kohana/Request/Client/Curl.php +++ b/classes/Kohana/Request/Client/Curl.php @@ -2,7 +2,7 @@ /** * [Request_Client_External] Curl driver performs external requests using the * php-curl extention. This is the default driver for all external requests. - * + * * @package Kohana * @category Base * @author Kohana Team @@ -63,7 +63,7 @@ public function _send_message(Request $request, Response $response) $this->_options[CURLOPT_RETURNTRANSFER] = TRUE; $this->_options[CURLOPT_HEADER] = FALSE; - // Apply any additional options set to + // Apply any additional options set to $options += $this->_options; $uri = $request->uri(); @@ -132,4 +132,4 @@ public function _set_curl_request_method(Request $request, array $options) return $options; } -} // End Kohana_Request_Client_Curl \ No newline at end of file +} // End Request_Client_Curl diff --git a/classes/Kohana/Request/Client/External.php b/classes/Kohana/Request/Client/External.php index 7bd754f0b..4376f9c9c 100644 --- a/classes/Kohana/Request/Client/External.php +++ b/classes/Kohana/Request/Client/External.php @@ -3,25 +3,25 @@ * [Request_Client_External] provides a wrapper for all external request * processing. This class should be extended by all drivers handling external * requests. - * + * * Supported out of the box: * - Curl (default) * - PECL HTTP * - Streams - * + * * To select a specific external driver to use as the default driver, set the * following property within the Application bootstrap. Alternatively, the * client can be injected into the request object. - * + * * @example - * + * * // In application bootstrap * Request_Client_External::$client = 'Request_Client_Stream'; - * + * * // Add client to request * $request = Request::factory('http://some.host.tld/foo/bar') * ->client(Request_Client_External::factory('Request_Client_HTTP)); - * + * * @package Kohana * @category Base * @author Kohana Team @@ -36,7 +36,7 @@ abstract class Kohana_Request_Client_External extends Request_Client { * - Request_Client_Curl (default) * - Request_Client_HTTP * - Request_Client_Stream - * + * * @var string defines the external client to use by default */ public static $client = 'Request_Client_Curl'; @@ -45,7 +45,7 @@ abstract class Kohana_Request_Client_External extends Request_Client { * Factory method to create a new Request_Client_External object based on * the client name passed, or defaulting to Request_Client_External::$client * by default. - * + * * Request_Client_External::$client can be set in the application bootstrap. * * @param array $params parameters to pass to the client @@ -204,4 +204,4 @@ public function options($key = NULL, $value = NULL) */ abstract protected function _send_message(Request $request, Response $response); -} // End Kohana_Request_Client_External \ No newline at end of file +} // End Request_Client_External diff --git a/classes/Kohana/Request/Client/HTTP.php b/classes/Kohana/Request/Client/HTTP.php index c74f5c1a7..57249f4c3 100644 --- a/classes/Kohana/Request/Client/HTTP.php +++ b/classes/Kohana/Request/Client/HTTP.php @@ -3,12 +3,12 @@ * [Request_Client_External] HTTP driver performs external requests using the * php-http extention. To use this driver, ensure the following is completed * before executing an external request- ideally in the application bootstrap. - * + * * @example - * + * * // In application bootstrap * Request_Client_External::$client = 'Request_Client_HTTP'; - * + * * @package Kohana * @category Base * @author Kohana Team @@ -118,4 +118,4 @@ public function _send_message(Request $request, Response $response) return $response; } -} // End Kohana_Request_Client_HTTP +} // End Request_Client_HTTP diff --git a/classes/Kohana/Request/Client/Internal.php b/classes/Kohana/Request/Client/Internal.php index 6afe224c7..f84b37086 100644 --- a/classes/Kohana/Request/Client/Internal.php +++ b/classes/Kohana/Request/Client/Internal.php @@ -125,4 +125,5 @@ public function execute_request(Request $request, Response $response) // Return the response return $response; } -} // End Kohana_Request_Client_Internal + +} // End Request_Client_Internal diff --git a/classes/Kohana/Request/Client/Recursion/Exception.php b/classes/Kohana/Request/Client/Recursion/Exception.php index 3029a8fd1..dd6016f8e 100644 --- a/classes/Kohana/Request/Client/Recursion/Exception.php +++ b/classes/Kohana/Request/Client/Recursion/Exception.php @@ -7,4 +7,4 @@ * @copyright (c) 2009-2012 Kohana Team * @license http://kohanaframework.org/license */ -class Kohana_Request_Client_Recursion_Exception extends Kohana_Exception {} \ No newline at end of file +class Kohana_Request_Client_Recursion_Exception extends Kohana_Exception {} diff --git a/classes/Kohana/Request/Client/Stream.php b/classes/Kohana/Request/Client/Stream.php index 1ea025581..f027730fd 100644 --- a/classes/Kohana/Request/Client/Stream.php +++ b/classes/Kohana/Request/Client/Stream.php @@ -3,12 +3,12 @@ * [Request_Client_External] Stream driver performs external requests using php * sockets. To use this driver, ensure the following is completed * before executing an external request- ideally in the application bootstrap. - * + * * @example - * + * * // In application bootstrap * Request_Client_External::$client = 'Request_Client_Stream'; - * + * * @package Kohana * @category Base * @author Kohana Team @@ -106,4 +106,4 @@ public function _send_message(Request $request, Response $response) return $response; } -} // End Kohana_Request_Client_Stream \ No newline at end of file +} // End Request_Client_Stream diff --git a/classes/Kohana/Request/Exception.php b/classes/Kohana/Request/Exception.php index 7b7636b23..69ff9a4f2 100644 --- a/classes/Kohana/Request/Exception.php +++ b/classes/Kohana/Request/Exception.php @@ -6,4 +6,4 @@ * @copyright (c) 2009-2012 Kohana Team * @license http://kohanaframework.org/license */ -class Kohana_Request_Exception extends Kohana_Exception {} \ No newline at end of file +class Kohana_Request_Exception extends Kohana_Exception {} diff --git a/classes/Kohana/Response.php b/classes/Kohana/Response.php index d9ab5fc5a..917749762 100644 --- a/classes/Kohana/Response.php +++ b/classes/Kohana/Response.php @@ -270,10 +270,10 @@ public function content_length() /** * Set and get cookies values for this response. - * + * * // Get the cookies set to the response * $cookies = $response->cookie(); - * + * * // Set a cookie to the response * $response->cookie('session', array( * 'value' => $value, @@ -710,4 +710,5 @@ protected function _calculate_byte_range($size) return array($start, $end); } -} // End Kohana_Response + +} // End Response diff --git a/classes/Kohana/Security.php b/classes/Kohana/Security.php index 826347f69..73a9e4cbc 100644 --- a/classes/Kohana/Security.php +++ b/classes/Kohana/Security.php @@ -100,4 +100,4 @@ public static function encode_php_tags($str) return str_replace(array(''), array('<?', '?>'), $str); } -} // End security +} // End Security diff --git a/classes/Kohana/Session/Exception.php b/classes/Kohana/Session/Exception.php index a6adc4f1b..99ebbed62 100644 --- a/classes/Kohana/Session/Exception.php +++ b/classes/Kohana/Session/Exception.php @@ -7,5 +7,7 @@ * @license http://kohanaframework.org/license */ class Kohana_Session_Exception extends Kohana_Exception { + const SESSION_CORRUPT = 1; -} \ No newline at end of file + +} // End Session_Exception diff --git a/classes/Kohana/Text.php b/classes/Kohana/Text.php index 5209586aa..96d168d34 100644 --- a/classes/Kohana/Text.php +++ b/classes/Kohana/Text.php @@ -235,8 +235,8 @@ public static function random($type = NULL, $length = 8) /** * Uppercase words that are not separated by spaces, using a custom * delimiter or the default. - * - * $str = Text::ucfirst('content-type'); // returns "Content-Type" + * + * $str = Text::ucfirst('content-type'); // returns "Content-Type" * * @param string $string string to transform * @param string $delimiter delemiter to use @@ -683,4 +683,4 @@ public static function user_agent($agent, $value) return FALSE; } -} // End text +} // End Text diff --git a/classes/Kohana/URL.php b/classes/Kohana/URL.php index 390a6a076..dff3675a8 100644 --- a/classes/Kohana/URL.php +++ b/classes/Kohana/URL.php @@ -122,7 +122,7 @@ public static function site($uri = '', $protocol = NULL, $index = TRUE) /** * Callback used for encoding all non-ASCII characters, as per RFC 1738 * Used by URL::site() - * + * * @param array $matches Array of matches from preg_replace_callback() * @return string Encoded string */ @@ -210,4 +210,4 @@ public static function title($title, $separator = '-', $ascii_only = FALSE) return trim($title, $separator); } -} // End url +} // End URL diff --git a/classes/Kohana/Upload.php b/classes/Kohana/Upload.php index dca82794d..1551dd1f5 100644 --- a/classes/Kohana/Upload.php +++ b/classes/Kohana/Upload.php @@ -253,4 +253,4 @@ public static function image(array $file, $max_width = NULL, $max_height = NULL, return FALSE; } -} // End upload +} // End Upload diff --git a/classes/Kohana/Validation/Exception.php b/classes/Kohana/Validation/Exception.php index 9a60c6709..0491e9a15 100644 --- a/classes/Kohana/Validation/Exception.php +++ b/classes/Kohana/Validation/Exception.php @@ -26,4 +26,4 @@ public function __construct(Validation $array, $message = 'Failed to validate ar parent::__construct($message, $values, $code, $previous); } -} // End Kohana_Validation_Exception +} // End Validation_Exception diff --git a/classes/Kohana/View/Exception.php b/classes/Kohana/View/Exception.php index 536c550ca..461e9367c 100644 --- a/classes/Kohana/View/Exception.php +++ b/classes/Kohana/View/Exception.php @@ -6,4 +6,4 @@ * @copyright (c) 2009-2012 Kohana Team * @license http://kohanaframework.org/license */ -class Kohana_View_Exception extends Kohana_Exception { } +class Kohana_View_Exception extends Kohana_Exception {} diff --git a/classes/Log.php b/classes/Log.php index 286a57389..44ad17c42 100644 --- a/classes/Log.php +++ b/classes/Log.php @@ -1,3 +1,3 @@ TRUE, ), -); \ No newline at end of file +); diff --git a/config/curl.php b/config/curl.php index ae015b5f1..6a79da529 100644 --- a/config/curl.php +++ b/config/curl.php @@ -1,8 +1,10 @@ 'Mozilla/5.0 (compatible; Kohana v'.Kohana::VERSION.' +http://kohanaframework.org/)', CURLOPT_CONNECTTIMEOUT => 5, CURLOPT_TIMEOUT => 5, CURLOPT_HEADER => FALSE, -); \ No newline at end of file + +); diff --git a/config/inflector.php b/config/inflector.php index ea28db14f..c9cfd6239 100644 --- a/config/inflector.php +++ b/config/inflector.php @@ -50,49 +50,49 @@ ), 'irregular' => array( - 'appendix' => 'appendices', - 'cactus' => 'cacti', - 'calf' => 'calves', - 'child' => 'children', - 'crisis' => 'crises', - 'criterion' => 'criteria', - 'curriculum' => 'curricula', - 'diagnosis' => 'diagnoses', - 'elf' => 'elves', - 'ellipsis' => 'ellipses', - 'foot' => 'feet', - 'goose' => 'geese', - 'hero' => 'heroes', - 'hoof' => 'hooves', - 'hypothesis' => 'hypotheses', - 'is' => 'are', - 'knife' => 'knives', - 'leaf' => 'leaves', - 'life' => 'lives', - 'loaf' => 'loaves', - 'man' => 'men', - 'mouse' => 'mice', - 'nucleus' => 'nuclei', - 'oasis' => 'oases', - 'octopus' => 'octopi', - 'ox' => 'oxen', - 'paralysis' => 'paralyses', + 'appendix' => 'appendices', + 'cactus' => 'cacti', + 'calf' => 'calves', + 'child' => 'children', + 'crisis' => 'crises', + 'criterion' => 'criteria', + 'curriculum' => 'curricula', + 'diagnosis' => 'diagnoses', + 'elf' => 'elves', + 'ellipsis' => 'ellipses', + 'foot' => 'feet', + 'goose' => 'geese', + 'hero' => 'heroes', + 'hoof' => 'hooves', + 'hypothesis' => 'hypotheses', + 'is' => 'are', + 'knife' => 'knives', + 'leaf' => 'leaves', + 'life' => 'lives', + 'loaf' => 'loaves', + 'man' => 'men', + 'mouse' => 'mice', + 'nucleus' => 'nuclei', + 'oasis' => 'oases', + 'octopus' => 'octopi', + 'ox' => 'oxen', + 'paralysis' => 'paralyses', 'parenthesis' => 'parentheses', - 'person' => 'people', - 'phenomenon' => 'phenomena', - 'potato' => 'potatoes', - 'quiz' => 'quizzes', - 'radius' => 'radii', - 'scarf' => 'scarves', - 'stimulus' => 'stimuli', - 'syllabus' => 'syllabi', - 'synthesis' => 'syntheses', - 'thief' => 'thieves', - 'tooth' => 'teeth', - 'was' => 'were', - 'wharf' => 'wharves', - 'wife' => 'wives', - 'woman' => 'women', - 'release' => 'releases', + 'person' => 'people', + 'phenomenon' => 'phenomena', + 'potato' => 'potatoes', + 'quiz' => 'quizzes', + 'radius' => 'radii', + 'scarf' => 'scarves', + 'stimulus' => 'stimuli', + 'syllabus' => 'syllabi', + 'synthesis' => 'syntheses', + 'thief' => 'thieves', + 'tooth' => 'teeth', + 'was' => 'were', + 'wharf' => 'wharves', + 'wife' => 'wives', + 'woman' => 'women', + 'release' => 'releases', ), ); diff --git a/config/mimes.php b/config/mimes.php index 70084f396..2e31b0b43 100644 --- a/config/mimes.php +++ b/config/mimes.php @@ -7,221 +7,220 @@ * http://kohanaphp.com/trac/newticket. Be sure to give the filename and * expected MIME type, as well as any additional information you can provide. */ -return array -( - '323' => array('text/h323'), - '7z' => array('application/x-7z-compressed'), - 'abw' => array('application/x-abiword'), - 'acx' => array('application/internet-property-stream'), - 'ai' => array('application/postscript'), - 'aif' => array('audio/x-aiff'), - 'aifc' => array('audio/x-aiff'), - 'aiff' => array('audio/x-aiff'), - 'amf' => array('application/x-amf'), - 'asf' => array('video/x-ms-asf'), - 'asr' => array('video/x-ms-asf'), - 'asx' => array('video/x-ms-asf'), - 'atom' => array('application/atom+xml'), - 'avi' => array('video/avi', 'video/msvideo', 'video/x-msvideo'), - 'bin' => array('application/octet-stream','application/macbinary'), - 'bmp' => array('image/bmp'), - 'c' => array('text/x-csrc'), - 'c++' => array('text/x-c++src'), - 'cab' => array('application/x-cab'), - 'cc' => array('text/x-c++src'), - 'cda' => array('application/x-cdf'), - 'class' => array('application/octet-stream'), - 'cpp' => array('text/x-c++src'), - 'cpt' => array('application/mac-compactpro'), - 'csh' => array('text/x-csh'), - 'css' => array('text/css'), - 'csv' => array('text/x-comma-separated-values', 'application/vnd.ms-excel', 'text/comma-separated-values', 'text/csv'), - 'dbk' => array('application/docbook+xml'), - 'dcr' => array('application/x-director'), - 'deb' => array('application/x-debian-package'), - 'diff' => array('text/x-diff'), - 'dir' => array('application/x-director'), - 'divx' => array('video/divx'), - 'dll' => array('application/octet-stream', 'application/x-msdos-program'), - 'dmg' => array('application/x-apple-diskimage'), - 'dms' => array('application/octet-stream'), - 'doc' => array('application/msword'), - 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document'), - 'dvi' => array('application/x-dvi'), - 'dxr' => array('application/x-director'), - 'eml' => array('message/rfc822'), - 'eps' => array('application/postscript'), - 'evy' => array('application/envoy'), - 'exe' => array('application/x-msdos-program', 'application/octet-stream'), - 'fla' => array('application/octet-stream'), - 'flac' => array('application/x-flac'), - 'flc' => array('video/flc'), - 'fli' => array('video/fli'), - 'flv' => array('video/x-flv'), - 'gif' => array('image/gif'), - 'gtar' => array('application/x-gtar'), - 'gz' => array('application/x-gzip'), - 'h' => array('text/x-chdr'), - 'h++' => array('text/x-c++hdr'), - 'hh' => array('text/x-c++hdr'), - 'hpp' => array('text/x-c++hdr'), - 'hqx' => array('application/mac-binhex40'), - 'hs' => array('text/x-haskell'), - 'htm' => array('text/html'), - 'html' => array('text/html'), - 'ico' => array('image/x-icon'), - 'ics' => array('text/calendar'), - 'iii' => array('application/x-iphone'), - 'ins' => array('application/x-internet-signup'), - 'iso' => array('application/x-iso9660-image'), - 'isp' => array('application/x-internet-signup'), - 'jar' => array('application/java-archive'), - 'java' => array('application/x-java-applet'), - 'jpe' => array('image/jpeg', 'image/pjpeg'), - 'jpeg' => array('image/jpeg', 'image/pjpeg'), - 'jpg' => array('image/jpeg', 'image/pjpeg'), - 'js' => array('application/javascript'), - 'json' => array('application/json'), - 'latex' => array('application/x-latex'), - 'lha' => array('application/octet-stream'), - 'log' => array('text/plain', 'text/x-log'), - 'lzh' => array('application/octet-stream'), - 'm4a' => array('audio/mpeg'), - 'm4p' => array('video/mp4v-es'), - 'm4v' => array('video/mp4'), - 'man' => array('application/x-troff-man'), - 'mdb' => array('application/x-msaccess'), - 'midi' => array('audio/midi'), - 'mid' => array('audio/midi'), - 'mif' => array('application/vnd.mif'), - 'mka' => array('audio/x-matroska'), - 'mkv' => array('video/x-matroska'), - 'mov' => array('video/quicktime'), - 'movie' => array('video/x-sgi-movie'), - 'mp2' => array('audio/mpeg'), - 'mp3' => array('audio/mpeg'), - 'mp4' => array('application/mp4','audio/mp4','video/mp4'), - 'mpa' => array('video/mpeg'), - 'mpe' => array('video/mpeg'), - 'mpeg' => array('video/mpeg'), - 'mpg' => array('video/mpeg'), - 'mpg4' => array('video/mp4'), - 'mpga' => array('audio/mpeg'), - 'mpp' => array('application/vnd.ms-project'), - 'mpv' => array('video/x-matroska'), - 'mpv2' => array('video/mpeg'), - 'ms' => array('application/x-troff-ms'), - 'msg' => array('application/msoutlook','application/x-msg'), - 'msi' => array('application/x-msi'), - 'nws' => array('message/rfc822'), - 'oda' => array('application/oda'), - 'odb' => array('application/vnd.oasis.opendocument.database'), - 'odc' => array('application/vnd.oasis.opendocument.chart'), - 'odf' => array('application/vnd.oasis.opendocument.forumla'), - 'odg' => array('application/vnd.oasis.opendocument.graphics'), - 'odi' => array('application/vnd.oasis.opendocument.image'), - 'odm' => array('application/vnd.oasis.opendocument.text-master'), - 'odp' => array('application/vnd.oasis.opendocument.presentation'), - 'ods' => array('application/vnd.oasis.opendocument.spreadsheet'), - 'odt' => array('application/vnd.oasis.opendocument.text'), - 'oga' => array('audio/ogg'), - 'ogg' => array('application/ogg'), - 'ogv' => array('video/ogg'), - 'otg' => array('application/vnd.oasis.opendocument.graphics-template'), - 'oth' => array('application/vnd.oasis.opendocument.web'), - 'otp' => array('application/vnd.oasis.opendocument.presentation-template'), - 'ots' => array('application/vnd.oasis.opendocument.spreadsheet-template'), - 'ott' => array('application/vnd.oasis.opendocument.template'), - 'p' => array('text/x-pascal'), - 'pas' => array('text/x-pascal'), - 'patch' => array('text/x-diff'), - 'pbm' => array('image/x-portable-bitmap'), - 'pdf' => array('application/pdf', 'application/x-download'), - 'php' => array('application/x-httpd-php'), - 'php3' => array('application/x-httpd-php'), - 'php4' => array('application/x-httpd-php'), - 'php5' => array('application/x-httpd-php'), - 'phps' => array('application/x-httpd-php-source'), - 'phtml' => array('application/x-httpd-php'), - 'pl' => array('text/x-perl'), - 'pm' => array('text/x-perl'), - 'png' => array('image/png', 'image/x-png'), - 'po' => array('text/x-gettext-translation'), - 'pot' => array('application/vnd.ms-powerpoint'), - 'pps' => array('application/vnd.ms-powerpoint'), - 'ppt' => array('application/powerpoint'), - 'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation'), - 'ps' => array('application/postscript'), - 'psd' => array('application/x-photoshop', 'image/x-photoshop'), - 'pub' => array('application/x-mspublisher'), - 'py' => array('text/x-python'), - 'qt' => array('video/quicktime'), - 'ra' => array('audio/x-realaudio'), - 'ram' => array('audio/x-realaudio', 'audio/x-pn-realaudio'), - 'rar' => array('application/rar'), - 'rgb' => array('image/x-rgb'), - 'rm' => array('audio/x-pn-realaudio'), - 'rpm' => array('audio/x-pn-realaudio-plugin', 'application/x-redhat-package-manager'), - 'rss' => array('application/rss+xml'), - 'rtf' => array('text/rtf'), - 'rtx' => array('text/richtext'), - 'rv' => array('video/vnd.rn-realvideo'), - 'sea' => array('application/octet-stream'), - 'sh' => array('text/x-sh'), - 'shtml' => array('text/html'), - 'sit' => array('application/x-stuffit'), - 'smi' => array('application/smil'), - 'smil' => array('application/smil'), - 'so' => array('application/octet-stream'), - 'src' => array('application/x-wais-source'), - 'svg' => array('image/svg+xml'), - 'swf' => array('application/x-shockwave-flash'), - 't' => array('application/x-troff'), - 'tar' => array('application/x-tar'), - 'tcl' => array('text/x-tcl'), - 'tex' => array('application/x-tex'), - 'text' => array('text/plain'), - 'texti' => array('application/x-texinfo'), +return array( + '323' => array('text/h323'), + '7z' => array('application/x-7z-compressed'), + 'abw' => array('application/x-abiword'), + 'acx' => array('application/internet-property-stream'), + 'ai' => array('application/postscript'), + 'aif' => array('audio/x-aiff'), + 'aifc' => array('audio/x-aiff'), + 'aiff' => array('audio/x-aiff'), + 'amf' => array('application/x-amf'), + 'asf' => array('video/x-ms-asf'), + 'asr' => array('video/x-ms-asf'), + 'asx' => array('video/x-ms-asf'), + 'atom' => array('application/atom+xml'), + 'avi' => array('video/avi', 'video/msvideo', 'video/x-msvideo'), + 'bin' => array('application/octet-stream','application/macbinary'), + 'bmp' => array('image/bmp'), + 'c' => array('text/x-csrc'), + 'c++' => array('text/x-c++src'), + 'cab' => array('application/x-cab'), + 'cc' => array('text/x-c++src'), + 'cda' => array('application/x-cdf'), + 'class' => array('application/octet-stream'), + 'cpp' => array('text/x-c++src'), + 'cpt' => array('application/mac-compactpro'), + 'csh' => array('text/x-csh'), + 'css' => array('text/css'), + 'csv' => array('text/x-comma-separated-values', 'application/vnd.ms-excel', 'text/comma-separated-values', 'text/csv'), + 'dbk' => array('application/docbook+xml'), + 'dcr' => array('application/x-director'), + 'deb' => array('application/x-debian-package'), + 'diff' => array('text/x-diff'), + 'dir' => array('application/x-director'), + 'divx' => array('video/divx'), + 'dll' => array('application/octet-stream', 'application/x-msdos-program'), + 'dmg' => array('application/x-apple-diskimage'), + 'dms' => array('application/octet-stream'), + 'doc' => array('application/msword'), + 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document'), + 'dvi' => array('application/x-dvi'), + 'dxr' => array('application/x-director'), + 'eml' => array('message/rfc822'), + 'eps' => array('application/postscript'), + 'evy' => array('application/envoy'), + 'exe' => array('application/x-msdos-program', 'application/octet-stream'), + 'fla' => array('application/octet-stream'), + 'flac' => array('application/x-flac'), + 'flc' => array('video/flc'), + 'fli' => array('video/fli'), + 'flv' => array('video/x-flv'), + 'gif' => array('image/gif'), + 'gtar' => array('application/x-gtar'), + 'gz' => array('application/x-gzip'), + 'h' => array('text/x-chdr'), + 'h++' => array('text/x-c++hdr'), + 'hh' => array('text/x-c++hdr'), + 'hpp' => array('text/x-c++hdr'), + 'hqx' => array('application/mac-binhex40'), + 'hs' => array('text/x-haskell'), + 'htm' => array('text/html'), + 'html' => array('text/html'), + 'ico' => array('image/x-icon'), + 'ics' => array('text/calendar'), + 'iii' => array('application/x-iphone'), + 'ins' => array('application/x-internet-signup'), + 'iso' => array('application/x-iso9660-image'), + 'isp' => array('application/x-internet-signup'), + 'jar' => array('application/java-archive'), + 'java' => array('application/x-java-applet'), + 'jpe' => array('image/jpeg', 'image/pjpeg'), + 'jpeg' => array('image/jpeg', 'image/pjpeg'), + 'jpg' => array('image/jpeg', 'image/pjpeg'), + 'js' => array('application/javascript'), + 'json' => array('application/json'), + 'latex' => array('application/x-latex'), + 'lha' => array('application/octet-stream'), + 'log' => array('text/plain', 'text/x-log'), + 'lzh' => array('application/octet-stream'), + 'm4a' => array('audio/mpeg'), + 'm4p' => array('video/mp4v-es'), + 'm4v' => array('video/mp4'), + 'man' => array('application/x-troff-man'), + 'mdb' => array('application/x-msaccess'), + 'midi' => array('audio/midi'), + 'mid' => array('audio/midi'), + 'mif' => array('application/vnd.mif'), + 'mka' => array('audio/x-matroska'), + 'mkv' => array('video/x-matroska'), + 'mov' => array('video/quicktime'), + 'movie' => array('video/x-sgi-movie'), + 'mp2' => array('audio/mpeg'), + 'mp3' => array('audio/mpeg'), + 'mp4' => array('application/mp4','audio/mp4','video/mp4'), + 'mpa' => array('video/mpeg'), + 'mpe' => array('video/mpeg'), + 'mpeg' => array('video/mpeg'), + 'mpg' => array('video/mpeg'), + 'mpg4' => array('video/mp4'), + 'mpga' => array('audio/mpeg'), + 'mpp' => array('application/vnd.ms-project'), + 'mpv' => array('video/x-matroska'), + 'mpv2' => array('video/mpeg'), + 'ms' => array('application/x-troff-ms'), + 'msg' => array('application/msoutlook','application/x-msg'), + 'msi' => array('application/x-msi'), + 'nws' => array('message/rfc822'), + 'oda' => array('application/oda'), + 'odb' => array('application/vnd.oasis.opendocument.database'), + 'odc' => array('application/vnd.oasis.opendocument.chart'), + 'odf' => array('application/vnd.oasis.opendocument.forumla'), + 'odg' => array('application/vnd.oasis.opendocument.graphics'), + 'odi' => array('application/vnd.oasis.opendocument.image'), + 'odm' => array('application/vnd.oasis.opendocument.text-master'), + 'odp' => array('application/vnd.oasis.opendocument.presentation'), + 'ods' => array('application/vnd.oasis.opendocument.spreadsheet'), + 'odt' => array('application/vnd.oasis.opendocument.text'), + 'oga' => array('audio/ogg'), + 'ogg' => array('application/ogg'), + 'ogv' => array('video/ogg'), + 'otg' => array('application/vnd.oasis.opendocument.graphics-template'), + 'oth' => array('application/vnd.oasis.opendocument.web'), + 'otp' => array('application/vnd.oasis.opendocument.presentation-template'), + 'ots' => array('application/vnd.oasis.opendocument.spreadsheet-template'), + 'ott' => array('application/vnd.oasis.opendocument.template'), + 'p' => array('text/x-pascal'), + 'pas' => array('text/x-pascal'), + 'patch' => array('text/x-diff'), + 'pbm' => array('image/x-portable-bitmap'), + 'pdf' => array('application/pdf', 'application/x-download'), + 'php' => array('application/x-httpd-php'), + 'php3' => array('application/x-httpd-php'), + 'php4' => array('application/x-httpd-php'), + 'php5' => array('application/x-httpd-php'), + 'phps' => array('application/x-httpd-php-source'), + 'phtml' => array('application/x-httpd-php'), + 'pl' => array('text/x-perl'), + 'pm' => array('text/x-perl'), + 'png' => array('image/png', 'image/x-png'), + 'po' => array('text/x-gettext-translation'), + 'pot' => array('application/vnd.ms-powerpoint'), + 'pps' => array('application/vnd.ms-powerpoint'), + 'ppt' => array('application/powerpoint'), + 'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation'), + 'ps' => array('application/postscript'), + 'psd' => array('application/x-photoshop', 'image/x-photoshop'), + 'pub' => array('application/x-mspublisher'), + 'py' => array('text/x-python'), + 'qt' => array('video/quicktime'), + 'ra' => array('audio/x-realaudio'), + 'ram' => array('audio/x-realaudio', 'audio/x-pn-realaudio'), + 'rar' => array('application/rar'), + 'rgb' => array('image/x-rgb'), + 'rm' => array('audio/x-pn-realaudio'), + 'rpm' => array('audio/x-pn-realaudio-plugin', 'application/x-redhat-package-manager'), + 'rss' => array('application/rss+xml'), + 'rtf' => array('text/rtf'), + 'rtx' => array('text/richtext'), + 'rv' => array('video/vnd.rn-realvideo'), + 'sea' => array('application/octet-stream'), + 'sh' => array('text/x-sh'), + 'shtml' => array('text/html'), + 'sit' => array('application/x-stuffit'), + 'smi' => array('application/smil'), + 'smil' => array('application/smil'), + 'so' => array('application/octet-stream'), + 'src' => array('application/x-wais-source'), + 'svg' => array('image/svg+xml'), + 'swf' => array('application/x-shockwave-flash'), + 't' => array('application/x-troff'), + 'tar' => array('application/x-tar'), + 'tcl' => array('text/x-tcl'), + 'tex' => array('application/x-tex'), + 'text' => array('text/plain'), + 'texti' => array('application/x-texinfo'), 'textinfo' => array('application/x-texinfo'), - 'tgz' => array('application/x-tar'), - 'tif' => array('image/tiff'), - 'tiff' => array('image/tiff'), - 'torrent' => array('application/x-bittorrent'), - 'tr' => array('application/x-troff'), - 'tsv' => array('text/tab-separated-values'), - 'txt' => array('text/plain'), - 'wav' => array('audio/x-wav'), - 'wax' => array('audio/x-ms-wax'), - 'wbxml' => array('application/wbxml'), - 'webm' => array('video/webm'), - 'wm' => array('video/x-ms-wm'), - 'wma' => array('audio/x-ms-wma'), - 'wmd' => array('application/x-ms-wmd'), - 'wmlc' => array('application/wmlc'), - 'wmv' => array('video/x-ms-wmv', 'application/octet-stream'), - 'wmx' => array('video/x-ms-wmx'), - 'wmz' => array('application/x-ms-wmz'), - 'word' => array('application/msword', 'application/octet-stream'), - 'wp5' => array('application/wordperfect5.1'), - 'wpd' => array('application/vnd.wordperfect'), - 'wvx' => array('video/x-ms-wvx'), - 'xbm' => array('image/x-xbitmap'), - 'xcf' => array('image/xcf'), - 'xhtml' => array('application/xhtml+xml'), - 'xht' => array('application/xhtml+xml'), - 'xl' => array('application/excel', 'application/vnd.ms-excel'), - 'xla' => array('application/excel', 'application/vnd.ms-excel'), - 'xlc' => array('application/excel', 'application/vnd.ms-excel'), - 'xlm' => array('application/excel', 'application/vnd.ms-excel'), - 'xls' => array('application/excel', 'application/vnd.ms-excel'), - 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'), - 'xlt' => array('application/excel', 'application/vnd.ms-excel'), - 'xml' => array('text/xml', 'application/xml'), - 'xof' => array('x-world/x-vrml'), - 'xpm' => array('image/x-xpixmap'), - 'xsl' => array('text/xml'), - 'xvid' => array('video/x-xvid'), - 'xwd' => array('image/x-xwindowdump'), - 'z' => array('application/x-compress'), - 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed') + 'tgz' => array('application/x-tar'), + 'tif' => array('image/tiff'), + 'tiff' => array('image/tiff'), + 'torrent' => array('application/x-bittorrent'), + 'tr' => array('application/x-troff'), + 'tsv' => array('text/tab-separated-values'), + 'txt' => array('text/plain'), + 'wav' => array('audio/x-wav'), + 'wax' => array('audio/x-ms-wax'), + 'wbxml' => array('application/wbxml'), + 'webm' => array('video/webm'), + 'wm' => array('video/x-ms-wm'), + 'wma' => array('audio/x-ms-wma'), + 'wmd' => array('application/x-ms-wmd'), + 'wmlc' => array('application/wmlc'), + 'wmv' => array('video/x-ms-wmv', 'application/octet-stream'), + 'wmx' => array('video/x-ms-wmx'), + 'wmz' => array('application/x-ms-wmz'), + 'word' => array('application/msword', 'application/octet-stream'), + 'wp5' => array('application/wordperfect5.1'), + 'wpd' => array('application/vnd.wordperfect'), + 'wvx' => array('video/x-ms-wvx'), + 'xbm' => array('image/x-xbitmap'), + 'xcf' => array('image/xcf'), + 'xhtml' => array('application/xhtml+xml'), + 'xht' => array('application/xhtml+xml'), + 'xl' => array('application/excel', 'application/vnd.ms-excel'), + 'xla' => array('application/excel', 'application/vnd.ms-excel'), + 'xlc' => array('application/excel', 'application/vnd.ms-excel'), + 'xlm' => array('application/excel', 'application/vnd.ms-excel'), + 'xls' => array('application/excel', 'application/vnd.ms-excel'), + 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'), + 'xlt' => array('application/excel', 'application/vnd.ms-excel'), + 'xml' => array('text/xml', 'application/xml'), + 'xof' => array('x-world/x-vrml'), + 'xpm' => array('image/x-xpixmap'), + 'xsl' => array('text/xml'), + 'xvid' => array('video/x-xvid'), + 'xwd' => array('image/x-xwindowdump'), + 'z' => array('application/x-compress'), + 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed') ); diff --git a/config/session.php b/config/session.php index c13004425..1b858ae49 100644 --- a/config/session.php +++ b/config/session.php @@ -1,7 +1,9 @@ array( 'encrypted' => FALSE, ), + ); diff --git a/config/user_agents.php b/config/user_agents.php index 7960f5e52..f4b92eac4 100644 --- a/config/user_agents.php +++ b/config/user_agents.php @@ -105,4 +105,5 @@ 'infoseek' => 'InfoSeek Robot 1.0', 'lycos' => 'Lycos', ), + ); diff --git a/config/userguide.php b/config/userguide.php index b240d7a60..ff759688b 100644 --- a/config/userguide.php +++ b/config/userguide.php @@ -9,15 +9,16 @@ // Whether this modules userguide pages should be shown 'enabled' => TRUE, - + // The name that should show up on the userguide index page 'name' => 'Kohana', // A short description of this module, shown on the index page 'description' => 'Documentation for Kohana core/system.', - + // Copyright message, shown in the footer for this module 'copyright' => '© 2008–2012 Kohana Team', - ) - ) -); \ No newline at end of file + ), + ), + +); diff --git a/i18n/es.php b/i18n/es.php index 70eac925e..f2f5b16b6 100644 --- a/i18n/es.php +++ b/i18n/es.php @@ -1,7 +1,8 @@ 'Español', 'Hello, world!' => '¡Hola, mundo!', -); \ No newline at end of file + +); diff --git a/i18n/fr.php b/i18n/fr.php index a2e86fab6..a4ab94464 100644 --- a/i18n/fr.php +++ b/i18n/fr.php @@ -1,7 +1,8 @@ 'Français', 'Hello, world!' => 'Bonjour, monde!', -); \ No newline at end of file + +); diff --git a/messages/tests/validation/error_type_check.php b/messages/tests/validation/error_type_check.php index 554b6c362..6c5a5fda3 100644 --- a/messages/tests/validation/error_type_check.php +++ b/messages/tests/validation/error_type_check.php @@ -1,7 +1,9 @@ array( 'custom' => 'very nice email address you have there', ), + ); diff --git a/messages/validation.php b/messages/validation.php index 2d79cb440..236c2abc6 100644 --- a/messages/validation.php +++ b/messages/validation.php @@ -1,6 +1,7 @@ ':field must contain only letters', 'alpha_dash' => ':field must contain only numbers, letters and dashes', 'alpha_numeric' => ':field must contain only letters and numbers', @@ -24,4 +25,5 @@ 'range' => ':field must be within the range of :param2 to :param3', 'regex' => ':field does not match the required format', 'url' => ':field must be a url', + ); diff --git a/utf8/ltrim.php b/utf8/ltrim.php index c49e131d5..a4ac84333 100644 --- a/utf8/ltrim.php +++ b/utf8/ltrim.php @@ -19,4 +19,4 @@ function _ltrim($str, $charlist = NULL) $charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist); return preg_replace('/^['.$charlist.']+/u', '', $str); -} \ No newline at end of file +} diff --git a/utf8/ord.php b/utf8/ord.php index 41b8227b8..28a5254ec 100644 --- a/utf8/ord.php +++ b/utf8/ord.php @@ -69,4 +69,4 @@ function _ord($chr) ':ordinal' => $ord0, )); } -} \ No newline at end of file +} diff --git a/utf8/rtrim.php b/utf8/rtrim.php index 9dfca8e7e..a116af327 100644 --- a/utf8/rtrim.php +++ b/utf8/rtrim.php @@ -19,4 +19,4 @@ function _rtrim($str, $charlist = NULL) $charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist); return preg_replace('/['.$charlist.']++$/uD', '', $str); -} \ No newline at end of file +} diff --git a/utf8/str_pad.php b/utf8/str_pad.php index 1ef11876b..1812a3037 100644 --- a/utf8/str_pad.php +++ b/utf8/str_pad.php @@ -49,4 +49,4 @@ function _str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_R throw new UTF8_Exception("UTF8::str_pad: Unknown padding type (:pad_type)", array( ':pad_type' => $pad_type, )); -} \ No newline at end of file +} diff --git a/utf8/str_split.php b/utf8/str_split.php index 97cfa2452..dfc6d92e9 100644 --- a/utf8/str_split.php +++ b/utf8/str_split.php @@ -24,4 +24,4 @@ function _str_split($str, $split_length = 1) preg_match_all('/.{'.$split_length.'}|[^\x00]{1,'.$split_length.'}$/us', $str, $matches); return $matches[0]; -} \ No newline at end of file +} diff --git a/utf8/strcasecmp.php b/utf8/strcasecmp.php index 402d4bd7f..6e4dc5ff5 100644 --- a/utf8/strcasecmp.php +++ b/utf8/strcasecmp.php @@ -16,4 +16,4 @@ function _strcasecmp($str1, $str2) $str1 = UTF8::strtolower($str1); $str2 = UTF8::strtolower($str2); return strcmp($str1, $str2); -} \ No newline at end of file +} diff --git a/utf8/strcspn.php b/utf8/strcspn.php index c36a65d4f..9f1f71ba1 100644 --- a/utf8/strcspn.php +++ b/utf8/strcspn.php @@ -27,4 +27,4 @@ function _strcspn($str, $mask, $offset = NULL, $length = NULL) preg_match('/^[^'.$mask.']+/u', $str, $matches); return isset($matches[0]) ? UTF8::strlen($matches[0]) : 0; -} \ No newline at end of file +} diff --git a/utf8/stristr.php b/utf8/stristr.php index d79e28ea5..11797270d 100644 --- a/utf8/stristr.php +++ b/utf8/stristr.php @@ -25,4 +25,4 @@ function _stristr($str, $search) return substr($str, strlen($matches[1])); return FALSE; -} \ No newline at end of file +} diff --git a/utf8/strlen.php b/utf8/strlen.php index 540a3c9e2..147b33759 100644 --- a/utf8/strlen.php +++ b/utf8/strlen.php @@ -14,4 +14,4 @@ function _strlen($str) return strlen($str); return strlen(utf8_decode($str)); -} \ No newline at end of file +} diff --git a/utf8/strpos.php b/utf8/strpos.php index 82cb5762d..bbc632129 100644 --- a/utf8/strpos.php +++ b/utf8/strpos.php @@ -24,4 +24,4 @@ function _strpos($str, $search, $offset = 0) $str = UTF8::substr($str, $offset); $pos = UTF8::strpos($str, $search); return ($pos === FALSE) ? FALSE : ($pos + $offset); -} \ No newline at end of file +} diff --git a/utf8/strrev.php b/utf8/strrev.php index bbf9b929b..6e2f0cacc 100644 --- a/utf8/strrev.php +++ b/utf8/strrev.php @@ -15,4 +15,4 @@ function _strrev($str) preg_match_all('/./us', $str, $matches); return implode('', array_reverse($matches[0])); -} \ No newline at end of file +} diff --git a/utf8/strrpos.php b/utf8/strrpos.php index d23091983..0565dbf37 100644 --- a/utf8/strrpos.php +++ b/utf8/strrpos.php @@ -24,4 +24,4 @@ function _strrpos($str, $search, $offset = 0) $str = UTF8::substr($str, $offset); $pos = UTF8::strrpos($str, $search); return ($pos === FALSE) ? FALSE : ($pos + $offset); -} \ No newline at end of file +} diff --git a/utf8/strspn.php b/utf8/strspn.php index 524b8a00a..e95fe85da 100644 --- a/utf8/strspn.php +++ b/utf8/strspn.php @@ -27,4 +27,4 @@ function _strspn($str, $mask, $offset = NULL, $length = NULL) preg_match('/^[^'.$mask.']+/u', $str, $matches); return isset($matches[0]) ? UTF8::strlen($matches[0]) : 0; -} \ No newline at end of file +} diff --git a/utf8/strtolower.php b/utf8/strtolower.php index 67c39fd71..fd1cc94bf 100644 --- a/utf8/strtolower.php +++ b/utf8/strtolower.php @@ -78,4 +78,4 @@ function _strtolower($str) } return UTF8::from_unicode($uni); -} \ No newline at end of file +} diff --git a/utf8/strtoupper.php b/utf8/strtoupper.php index c3895db28..a69568d64 100644 --- a/utf8/strtoupper.php +++ b/utf8/strtoupper.php @@ -78,4 +78,4 @@ function _strtoupper($str) } return UTF8::from_unicode($uni); -} \ No newline at end of file +} diff --git a/utf8/substr.php b/utf8/substr.php index efb008dbb..bf17dccf8 100644 --- a/utf8/substr.php +++ b/utf8/substr.php @@ -69,4 +69,4 @@ function _substr($str, $offset, $length = NULL) preg_match('/'.$regex.'/us', $str, $matches); return $matches[1]; -} \ No newline at end of file +} diff --git a/utf8/substr_replace.php b/utf8/substr_replace.php index 494521f9a..b3a896c34 100644 --- a/utf8/substr_replace.php +++ b/utf8/substr_replace.php @@ -19,4 +19,4 @@ function _substr_replace($str, $replacement, $offset, $length = NULL) array_splice($str_array[0], $offset, $length, $replacement_array[0]); return implode('', $str_array[0]); -} \ No newline at end of file +} diff --git a/utf8/to_unicode.php b/utf8/to_unicode.php index 1fe6c9b9c..d03eb626c 100644 --- a/utf8/to_unicode.php +++ b/utf8/to_unicode.php @@ -142,4 +142,4 @@ function _to_unicode($str) } return $out; -} \ No newline at end of file +} diff --git a/utf8/transliterate_to_ascii.php b/utf8/transliterate_to_ascii.php index 33dc05ce6..898862d03 100644 --- a/utf8/transliterate_to_ascii.php +++ b/utf8/transliterate_to_ascii.php @@ -74,4 +74,4 @@ function _transliterate_to_ascii($str, $case = 0) } return $str; -} \ No newline at end of file +} diff --git a/utf8/trim.php b/utf8/trim.php index 9003ce08b..aca558ea3 100644 --- a/utf8/trim.php +++ b/utf8/trim.php @@ -14,4 +14,4 @@ function _trim($str, $charlist = NULL) return trim($str); return UTF8::ltrim(UTF8::rtrim($str, $charlist), $charlist); -} \ No newline at end of file +} diff --git a/utf8/ucfirst.php b/utf8/ucfirst.php index 6e739521a..37bb956ae 100644 --- a/utf8/ucfirst.php +++ b/utf8/ucfirst.php @@ -15,4 +15,4 @@ function _ucfirst($str) preg_match('/^(.?)(.*)$/us', $str, $matches); return UTF8::strtoupper($matches[1]).$matches[2]; -} \ No newline at end of file +} diff --git a/utf8/ucwords.php b/utf8/ucwords.php index 7d285e091..1411ff1d4 100644 --- a/utf8/ucwords.php +++ b/utf8/ucwords.php @@ -20,4 +20,4 @@ function _ucwords($str) 'UTF8::strtoupper(\'$0\')', $str ); -} \ No newline at end of file +}