adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 19:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6531 commits 7 branches 0 tags 44 MiB
Commit graph

2641 commits

Author SHA1 Message Date
mark_story
8c4d389760 Implementing the ability to use custom Route classes when connecting routes. Tests added. 2009-12-03 20:50:13 -05:00
mark_story
aff7d61277 Merge branch '1.3-misc' into 1.3-router 2009-12-03 19:13:28 -05:00
AD7six
9cd7888991 removing reference to unused variable __bare 2009-12-03 21:33:56 +01:00
mark_story
3b74c93582 Changing how helpers are extracted, fixes issues with view variables not overwriting local helper variables. Fixes #381 2009-12-03 09:55:49 -05:00
mark_story
0806545f35 Adding passthrough to localized Validation class for Validation::ssn. Tests added. Fixes #378 2009-12-02 20:57:14 -05:00
mark_story
16f6d4d408 Making the various SecurityComponent::requireXX methods accept a single array or a list of strings as their arguments. Unifies the use of these functions with AuthComponent. Fixes #354 2009-12-02 17:56:52 -05:00
mark_story
0b13e3d5b9 Removing whitespace. 2009-12-02 11:37:43 -05:00
Phally
324b479b1c Refactored test case. 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-12-02 11:23:17 -05:00
Phally
bb92a47ddb Added support for numeric values in expectation of assertTags(). 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-12-02 09:10:56 -05:00
mark_story
494875cca2 Renaming RouterRouter::$params to $options. 2009-12-02 00:20:51 -05:00
mark_story
e741e0e4cb Adding test for previously broken reverse routing feature, where parameters that only partially passed the pattern would be accepted. 2009-12-01 15:04:53 -05:00
mark_story
21dd7fd4ca Fixing connection of plugin routes, the were being connected in the wrong spot. 
Moving admin route + plugin tests to correct place.
Fixing order of methods in tests. parse() should only be called after routes are connected otherwise the default routes will precede the custom routes.
 2009-12-01 14:39:23 -05:00
mark_story
a5a02925d8 Adding test for previous commit. 2009-12-01 13:38:32 -05:00
mark_story
a8f79f9fe5 Removing defaults that are also keys this makes the actions with the default index key work much better. Also things can't be both a variable and a constant routing parameter. 2009-12-01 13:37:03 -05:00
mark_story
0293a840c5 Adding test to disprove #368. FormHelper::year() is working correctly and includes model name in the input name attribute. 2009-11-30 13:43:26 -05:00
mark_story
393038816c More tests passing in RouterTest now. 2009-11-30 10:15:39 -05:00
mark_story
cd46f4db2e Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370 2009-11-30 09:19:25 -05:00
mark_story
11dd7898c4 Fixing tests + adding tests for passed args order preservation when passed args are part of default route parameters. 2009-11-30 00:23:41 -05:00
mark_story
e41c408378 Adding parameter pattern matching back into RouterRoute::match(), fixes failing tests in RouterRoute test case. 2009-11-29 23:46:02 -05:00
mark_story
5999264f10 Most of RouterRoute::match() working now. Failing tests for params with patterns included. 2009-11-29 22:57:10 -05:00
mark_story
de0b90db4a Moving addition of plugin and controller keys to Router instead of RouterRoute. 2009-11-29 16:21:33 -05:00
mark_story
9e9559b350 Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults. 2009-11-29 16:09:45 -05:00
mark_story
b242dc9531 Moving parameter persist to RouterRoute. 
Tests updated.
 2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling. 2009-11-29 09:49:19 -05:00
mark_story
889e367510 Expanding and correcting doc block for router::connect. 2009-11-28 23:37:40 -05:00
mark_story
5b4d15dc3b Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on. 2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47 More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together. 2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters. 2009-11-27 17:12:35 -05:00
mark_story
26aa3731e0 Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367 2009-11-27 14:27:32 -05:00
phpnut
8bc84948f0 Adding more tests for theme assets 2009-11-27 10:27:15 -06:00
mark_story
49c6cd3f9f Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition. 2009-11-27 09:58:51 -05:00
phpnut
43fdde2dad Removing unneeded code in Dispatcher::cached(); 
Fixing path search for themes
 2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76 Expanding tests on Router and RouterRoute. 2009-11-26 23:46:42 -05:00
mark_story
feb0dec970 Starting tests for RouterRouter::parse() 2009-11-26 23:01:54 -05:00
mark_story
89d0ed8f3b Route compilation tests passing again. 2009-11-26 21:42:33 -05:00
phpnut
903a1fd95a Adding new Configure::$App['www_root'] 
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
 2009-11-26 14:52:38 -06:00
mark_story
3907893263 Adding tests for incorrect function used in form.ctp. 
Fixing mistyped function name. Fixes #364
 2009-11-26 09:52:15 -05:00
mark_story
c4ceeabcf5 More tests and more passing tests for Route compilation. 
Basic route compiling complete.
 2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70 Starting to refactor RouterRoute::_writeRoute 2009-11-26 00:17:43 -05:00
phpnut
f83a024a10 Increasing code coverage for View and ThemeView 2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5 Refactored last commit changes are: 
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp

To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
 2009-11-25 22:58:02 -06:00
mark_story
0b9ae92eb9 Adding a test case for RouterRoute to increase code coverage. 2009-11-25 23:51:27 -05:00
mark_story
1d7881b16f Renaming connectDefaults to defaults(). 
Updating tests.
 2009-11-25 23:39:07 -05:00
phpnut
21eb001a96 Refactoring themes/views to use a centralized location instead of allowing plugins to have themes. 
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp

if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
 2009-11-25 22:29:54 -06:00
mark_story
52264cb61c Fixing persistent param route exiting. 
Adding test for exiting persist param routes.
 2009-11-25 23:12:48 -05:00
mark_story
35fac165b3 Merge branch '1.3-misc' into 1.3-router 
Conflicts:
	cake/libs/router.php
 2009-11-25 22:57:42 -05:00
mark_story
dc769041f3 Updating project task test case to reflect changes in skel dir. 2009-11-25 22:52:33 -05:00
mark_story
dd4fbbab45 Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img 2009-11-25 22:50:50 -05:00
mark_story
e345b2f788 Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-25 22:23:38 -05:00
phpnut
d685c18720 Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets 2009-11-25 12:41:19 -06:00
phpnut
49c11a8219 More work allowing assets in themes and plugins. 2009-11-25 11:06:28 -06:00
phpnut
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot. 
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
 2009-11-25 01:51:25 -06:00
mark_story
3b1256cefb Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-24 22:10:11 -05:00
dogmatic
53bfc8cca2 a new take on toList and more tests for passing a different separator 2009-11-24 22:00:33 -05:00
dogmatic
398113f828 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-24 20:23:23 -05:00
mark_story
c94702506d Fixing fails in Set::reverse caused by _log property being removed from Object. 2009-11-22 21:31:44 -05:00
mark_story
8cdee90b4f Merge branch '1.3-misc' into 1.3-merger 
Conflicts:
	cake/libs/view/helpers/html.php
 2009-11-22 21:28:14 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger 
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
 2009-11-22 20:38:50 -05:00
ceeram
cd6fd74caf Added -empty flag for ProjectTask to bake with empty dir files, tests included 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-22 18:18:14 -05:00
mark_story
2e0acbf505 Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304 2009-11-22 17:56:46 -05:00
mark_story
6c3bcdd7e6 Removing commented code. 2009-11-22 17:34:11 -05:00
Juan Basso
c6c7474502 Fix test of the size of lines in MagicDb (included test for it). 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-22 12:27:57 -05:00
mark_story
6b3b2a629b Removing CakeSession::__validateKeys() its no longer needed due to CakeSession using Set to manipulate the session values. Adding test case for exploit shown in https://trac.cakephp.org/ticket/2041 2009-11-21 20:44:35 -05:00
mark_story
a729fc4d62 Merge branch '1.3-cache' into 1.3-misc 2009-11-21 17:16:38 -05:00
mark_story
c11509483c Removing use of Helper::output from core helpers. 
Removing duplicated test caused by merge in form helper test.
 2009-11-21 16:43:54 -05:00
mark_story
d37dd4c49f Updating doc block for FileEngine. 
Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.
 2009-11-21 16:09:06 -05:00
mark_story
fb7d99e6b3 Making XcacheTest use refactored Cache API. 2009-11-21 15:44:03 -05:00
mark_story
3f067ed166 Updating ApcEngine test to use the new Cache engine api. 2009-11-21 15:26:17 -05:00
mark_story
5ff2e66f75 Updating memcache test to use new Cache api. 
Removing most private access in the test case.
 2009-11-21 15:26:17 -05:00
mark_story
266cddb4db Removing whitespace. 2009-11-21 15:26:16 -05:00
mark_story
4b184ceccb Updating FileEngine test to use new Cache api methods. 2009-11-21 15:26:16 -05:00
mark_story
14d643ff99 Fixing File cache test to run with modified Cache API. 2009-11-21 15:26:16 -05:00
mark_story
95f8ed5b55 Additional refactoring and code removal. 2009-11-21 15:26:16 -05:00
mark_story
0ba622bb0e Removing debug changes. 
Updating isInitialized() to its new use.
Refactoring Cache engines to no longer be singletons with heavy settings manipulation. Instead each config() is a separate instance.
 2009-11-21 15:26:16 -05:00
mark_story
3404f1ed39 Adding documentation to Cache::config(). 
Adding tests for default configuration manipulation of config().
 2009-11-21 15:26:16 -05:00
mark_story
b1c89496c5 Fixing typo in Cache doc block. 
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
 2009-11-21 15:19:11 -05:00
Juan Basso
71df8dbbba Replace function sizeof (alias) by count. 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-21 13:50:57 -05:00
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01:00
Jippi
e6801c22e1 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 23:19:11 +00:00
Jippi
2cb0c3acb3 Changed SessionHelper::flash to return message instead of echoing it 2009-11-16 23:15:24 +00:00
mark_story
aa97daeea9 Updating test due to merge conflicts. 2009-11-15 20:09:35 -05:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger 
Conflicts:
	cake/tests/cases/libs/configure.test.php
 2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger 
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
 2009-11-15 20:05:55 -05:00
mark_story
0783176238 Replacing duplicated code with pluginSplit(). 
Updating test case.
 2009-11-15 19:55:20 -05:00
mark_story
a292ef0f16 Adding ability to provide default plugin value to pluginSplit(). 2009-11-15 19:54:33 -05:00
mark_story
20a114a1cd Adding $dotAppend to pluginSplit() 2009-11-15 19:12:00 -05:00
mark_story
db0c030557 Adding pluginSplit and test case. pluginSplit consolidates a number of repeated code blocks. 2009-11-15 18:16:12 -05:00
ceeram
7a4793a20c refactoring Configure::load() to load config files from plugins, tests and config files added 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-15 17:56:49 -05:00
mark_story
31102ad412 Adding tests for App::pluginPath that were omitted before. 2009-11-15 16:38:02 -05:00
mark_story
0b2fc5b35f Adding tests for phone() pass through to localized class. 2009-11-14 20:52:11 -05:00
mark_story
fa14f9cebc Merge branch '1.3-validation' into 1.3-misc 2009-11-14 20:46:48 -05:00
mark_story
b452e8367f Adding tests for CakeLog::drop() 2009-11-14 20:44:42 -05:00
mark_story
be9f0ec4c7 Renaming method so they match those in Cache. 
Removing method that was missed during previous refactor.
Updating tests.
 2009-11-14 20:42:57 -05:00
mark_story
b7e7eff738 Fixing doc blocks. 2009-11-14 20:24:18 -05:00
mark_story
70820e2e96 Renaming unconfig to drop. 2009-11-14 20:18:58 -05:00
mark_story
caedbdf98a Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs. 
Tests added.
 2009-11-14 20:10:40 -05:00
mark_story
b6978ab25f Adding the ability to load cache engine classes from plugins and app libs. 
Also enabled the ability for App cache classes to override core ones.
Test cases added.
Removed unnecessary subclassing of Object.
 2009-11-14 20:10:40 -05:00
ADmad
862ff82ad4 Updating Configure::store to fix escaping issues 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-14 19:38:53 -05:00
mark_story
06d4e5e553 Reformatting code in memcache. 
Adding unset() to test case to remove unnecessary keys that can cause test failure.
 2009-11-14 18:50:23 -05:00
predominant
ac86ad05ac Moving access modifier doc tag. 2009-11-14 23:38:52 +11:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
predominant
5092262d4d Reformatting and adding missing documentation blocks. 2009-11-14 23:18:31 +11:00
mark_story
9376826aa4 Fixing HttpSocket::buildUri when host key is empty. 
Tests added
Fixes #271
 2009-11-13 14:42:40 -05:00
mark_story
d93c94f702 Fixing failing test, picked in from 1.2. 2009-11-13 09:53:31 -05:00
mark_story
bfde6b81fe Adding test to form helper to increase code coverage. 2009-11-13 09:48:31 -05:00
mark_story
8d407ac915 Adding test to form helper to increase code coverage. 2009-11-13 09:45:25 -05:00
mark_story
d302ed1bfa Fixing comment block formatting. 2009-11-13 09:44:51 -05:00
ceeram
ea482442ff test to prove ticket #291 
Signed-off-by: Mark Story <mark@mark-story.com>
 2009-11-13 09:22:05 -05:00
mark_story
2c5fa171e0 Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes. 
Fixes #290
 2009-11-13 00:43:40 -05:00
nate
1c8a2f232b Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-11-12 14:48:03 -05:00
mark_story
63ee8f0fcd Starting pass through validation handling. 
Implemented phone, and postal pass throughs.
Adding tests.
 2009-11-10 21:20:39 -05:00
mark_story
b39b38aac9 Adding missing variable. 
Adding Test case for previous commit.
 2009-11-10 09:17:54 -05:00
mark_story
f0628d100b Fixing issues with getting values from habtm data after form posting and validation has failed. 
Tests added.
Refs #279
 2009-11-09 21:00:19 -05:00
mark_story
adaa2b689c Adding test case for previous commit. 
Fixing function for non-windows paths.
 2009-11-09 20:10:24 -05:00
mark_story
c4b493c934 Manually merging changes from ModelTask in 1.2 to FixtureTask 
Adding test cases for FixtureTask.
 2009-11-08 22:22:08 -05:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers 
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
 2009-11-08 22:21:21 -05:00
mark_story
a7a6dc8c43 Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array. 
Tests Added
Fixed #228
 2009-11-08 14:12:18 -05:00
mark_story
6db91b0f49 Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253 2009-11-07 17:43:18 -05:00
ceeram
dd0c4a64c5 Test to prove ticket #253 2009-11-07 11:02:43 -05:00
mark_story
4a08bd120d Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-07 10:41:12 -05:00
ADmad
002a01a9d8 passedArgs from current request are auto merged with url options of paginator helper 
Signed-off-by: Florian Krmer <florian.kraemer@cakedc.com>
 2009-11-06 18:31:42 +01:00
mark_story
ab76cb1217 Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
predominant
884490f1a1 Removing leftover SVN tags. 2009-11-06 18:35:14 +11:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
mark_story
4bbfcbff7e Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264 2009-11-06 00:44:21 -05:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
531eaaad4e Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-06 15:54:01 +11:00
Ernst Mayerhofer
0327f15395 paginator works with limit 0 now too 2009-11-05 23:44:02 -05:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
mark_story
e776cf1ad2 Adding tests and fixing inline parameter being converted to an attribute. 
Fixes #265
 2009-11-05 23:32:39 -05:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
c238d4d11b Adding return and test case for CakeLog::write() 2009-11-05 23:20:40 -05:00
mark_story
781d184dbd Merge branch '1.3-logging' into 1.3-misc 2009-11-05 22:03:18 -05:00
mark_story
84c8cc3f36 Adding tests for importing loggers from app/libs and plugin/libs. 
Adding tests for failed configs.
 2009-11-05 20:13:15 -05:00
mark_story
6c9f215306 Adding tests for file log path settings. 2009-11-05 19:44:50 -05:00
mark_story
01bb9e5957 Refactoring FileLog 
Adding test case for FileLog
 2009-11-05 19:41:43 -05:00
mark_story
afdcd36687 Fixing test broken by merge. 2009-11-05 19:18:38 -05:00
mark_story
d23f2f4604 Implementing CakeLog::config() adding simple tests for config(). 2009-11-05 19:16:46 -05:00
mark_story
98f0e370a1 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-logging 2009-11-05 18:40:01 -05:00
mark_story
88ef00d2d0 Removing trailing whitespace. 2009-11-04 23:05:25 -05:00