Commit graph

84 commits

Author SHA1 Message Date
bancer
e845e8876d Add unit test 2019-01-25 13:04:41 +01:00
bancer
009d69b3f7 Fix code style errors 2019-01-25 12:21:34 +01:00
bancer
044e8f24af Fix timezone conversion 2019-01-25 12:05:44 +01:00
bancer
7911bb9052 Remove unnecessary timezone offset manipulation 2019-01-24 15:43:11 +01:00
Val Bancer
c269ae29e6
Add timezone conversion unit test 2019-01-20 21:54:41 +01:00
bancer
4eb42e0b05 Add unit test for timezone conversion 2019-01-18 17:07:05 +01:00
Marc Würth
da8414e13b Use HTTPS for the opensource.org MIT license URL 2017-06-11 00:23:22 +02:00
Marc Würth
04efc7ba50 Use HTTPS for the book.cakephp.org URL 2017-06-11 00:15:36 +02:00
Marc Würth
10b89b51a9 Use HTTPS for the cakefoundation.org URL 2017-06-11 00:10:59 +02:00
mark_story
e8d63725d8 Merge branch '2.x' into 2.next 2016-09-04 23:54:22 -04:00
mark_story
2ffde69d5b Skip test that always fails on PHP5.3 2016-08-29 21:56:30 -04:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
mark_story
234f732d6d Attempt to get tests passing on travis.
Also attempt to get stickler to ignore the 2.x branch.
2016-07-01 17:52:02 -04:00
mark_story
d816ea6e16 Add test showing that niceShort translates month names.
Refs #8968
2016-07-01 17:51:23 -04:00
mscherer
dda9e83ab6 Refactor Object to CakeObject for future PHP7 comp. 2016-04-08 14:33:26 +02:00
mark_story
bc977544c5 Use a more stable timezone.
Regina does not observe DST meaning this test won't fail twice a year.
2015-10-26 22:28:00 -04:00
Rachman Chavik
e6acacac03 CakeTime::listTimezones(): Add option to Display timezone abbreviations
Useful for countries that do not have many of its cities, even major ones,
listed. For eg: Indonesia, only have 4 cities listed.

For backward compatibility, abbreviations will not be shown.

Note: You might need to update timezonedb for PHP 5.3

Closes #7271
2015-08-21 10:54:33 +07:00
Marc Würth
4a131bdcbf Capitalize Windows, the OS 2015-07-09 15:54:03 +02:00
Mark van Driel
ed5da19d10 Fixed return type of toQuarter in CakeTime and TimeHelper 2015-03-02 12:08:11 +01:00
Schlaefer
fd2dd58360 code formatting, fixes PHPCS errors 2014-10-01 11:25:24 +02:00
Schlaefer
b96eb1fb46 cleans up CakeTime::timeAgoInWords and adds option for custom futures string 2014-10-01 10:35:41 +02:00
mstra001
d6abfcaf90 Update tests for strfime() in timeAgoInWords()
Add test asserts for testTimeAgoInWordsWithFormat with strftime format
2014-09-22 20:50:37 -04:00
mark_story
0400a63004 Forward port fixes for #4294 from 1.3 to 2.x
CakeTime was broken in the same way as TimeHelper was in 1.x. Getting
1969 on invalid input can be very confusing and un-helpful.

Refs #4294
2014-08-20 00:25:01 +02:00
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
mark_story
3244b9e3d7 Merge branch 'master' into 2.4 2013-08-16 14:47:01 -04:00
Mark van Driel
1595287290 Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system 2013-08-15 08:58:05 +02:00
mark_story
26769edd04 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Utility/CakeTime.php
	lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
ankr
1cb41294b8 Making CakeTime display 'about X ago' when time passed is lower than accuracy
Removing unnecessary else

Also support 'about' times for future times

Make 'about' times translateable in all languages
2013-08-12 10:01:38 -04:00
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
Marc Würth
1cac1846a3 Added missing calls to setUp & tearDown in tests 2013-07-29 01:52:39 +02:00
euromark
22d6625872 fix test 2013-07-17 12:18:06 +02:00
euromark
13ee5b7338 ability to provide custom strings for timeAgoInWords() 2013-07-16 15:16:30 +02:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
mark_story
e527eab5aa Add missing call to parent::setUp() 2013-06-08 09:47:46 -04:00
Rik van der Heijden
0946a7799a Fix locale for CakeTimeTest when configured different locale in app 2013-06-08 10:25:28 +02:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
ADmad
79ad8ab95a Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
mark_story
8bd1980dd4 DateTime::getTimestamp() is PHP5.3+ 2013-04-11 13:39:05 -04:00
mark_story
5c83bc177d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-04-09 22:09:56 -04:00
mark_story
0e646a2a4d Fix incorrect timestamp values when using fromString()
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.

Fixes #3743
2013-04-09 21:30:20 -04:00
mark_story
d28c2f8e72 Fix code & tests for isPast() and isFuture()
The methods and tests now follow coding standards and work.
2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d Adds two new time testing methods: 'isFuture' and 'isPast'
TestCases included
2013-03-30 22:24:08 -04:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
4af6039107 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
mark_story
ad0d6644c4 Partially revert default niceShortFormat
In 9fa531d6e3 the default niceShortFormat
was changed, which has been interpreted as a regression in #3533.

This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.

Refs #3533
2013-01-14 21:12:11 -05:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
mark_story
94bd2cedcf Fix more off by a second errors 2012-10-28 16:15:20 -04:00
mark_story
667dfd308f DateTime::getTimestamp() only exists in PHP > 5.3.0 2012-10-27 22:49:43 -04:00