k-halaburda
2a27b37a43
New line on end
2013-08-18 17:37:34 +02:00
Phally
524aaf3449
Makes PHPCS pass again.
2013-08-18 16:12:23 +02:00
mark_story
a140b30435
Add a test for Hash::sort()
...
Closes #3956
2013-08-17 17:16:33 -04:00
Mark Story
005699eb49
Merge pull request #1533 from dereuromark/master-null-checks
...
unify null checks - avoid method call in favor of strict check
2013-08-17 12:05:52 -07:00
joostdekeijzer
7fe2395be3
RedirectRoute class does not honor persist as array with custom route elements.
...
Custom route elements like '/:lang/etc' should be persisted by redirect
routes as they are in standard routes.
Refs #GH-1531
2013-08-17 14:51:12 -04:00
Rachman Chavik
8e5a9cd7da
Accept 'connectOptions' in Router::mapResources()
2013-08-17 19:28:18 +07:00
euromark
6a14f37b74
a few more orders in test case corrected
2013-08-16 20:55:17 +02:00
euromark
47e8e0c57a
simplyfy test and correct some test param orders
2013-08-16 20:51:11 +02:00
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
k-halaburda
391d997c27
Fixed some formatting
2013-08-16 10:02:50 +02:00
k-halaburda
180ecb7929
Fixed some formatting
2013-08-16 10:02:11 +02:00
k-halaburda
f5daf1c8aa
Fixed some formatting
2013-08-16 09:51:01 +02:00
k-halaburda
d7dab3282f
Remove added fixtures and use existing. Updated one old test to add data from afterFind callback
2013-08-16 09:28:32 +02:00
ADmad
8428928fd6
Merge pull request #1528 from mvdriel/caketime-fix
...
Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
2013-08-15 10:55:03 -07:00
Mark Story
7c29aa5155
Merge pull request #1508 from fuga/feature/email-config
...
making the config method of email-transport-classes mergable
2013-08-15 08:26:11 -07: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
c040bb0cdc
Merge pull request #1523 from tersmitten/improved-tests-that-use-setlocale
...
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 16:54:50 -07:00
Frank de Graaf
33f7de0072
Merge pull request #1520 from mvdriel/cakenumber-fix
...
Cakenumber fix
2013-08-14 13:41:53 -07:00
Mischa ter Smitten
0e49a23065
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 22:32:04 +02:00
Mark van Driel
559fb5805b
Fix formatting with locales using , as decimal separator
...
No double number formatting for readable size
Fixed testPrecisionLocalized for travis (when locale is missing?)
Switched locale to nl_NL and fixed test
Skip test when locale is not available
2013-08-14 22:19:38 +02:00
Phally
6f74e1958b
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 21:00:31 +02:00
mark_story
cb6ea82fea
Allow CakeEmail::template() to disable layout rendering.
...
Fix the code to act as documented. Sending template('view', null) should
disable layout rendering.
Fixes #3983
2013-08-13 14:01:33 -04:00
k-halaburda
bb7ff48b01
Formatting issues
2013-08-13 14:03:20 +02:00
k-halaburda
8a8db72b7c
Formatting issues
2013-08-13 13:03:19 +02:00
k-halaburda
b5a8a6f946
Formatting issues
2013-08-13 13:02:33 +02:00
k-halaburda
1d9bce34d4
Formatting issues
2013-08-13 13:01:38 +02:00
k-halaburda
2235a0e677
Formatting issues
2013-08-13 13:00:12 +02:00
k-halaburda
50cf070727
Formatting issues
2013-08-13 12:59:30 +02:00
k-halaburda
a6efcae625
Deleted rows in ModelReadTest
2013-08-13 12:32:36 +02:00
fuga
245611424f
Apply ADmad's patch and update testConfig method according to a new specification.
2013-08-13 17:42:52 +09:00
Alexander Hofbauer
80e589f19d
Correctly encode confirm handlers
...
With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.
2013-08-13 10:11:22 +02:00
k-halaburda
39b202a4a9
Added some tests to related models afterFind callback
2013-08-13 10:04:17 +02:00
k-halaburda
8e40a3a3d3
Added some tests for related models afterFind callback
2013-08-13 09:29:14 +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
Mark Story
2f5963e2d3
Merge pull request #1496 from ravage84/else-clause-after-redirect
...
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07: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
José Lorenzo Rodríguez
789400ac44
Merge pull request #1409 from cdburgess/phone-validation-update
...
Phone validation update
2013-08-11 14:37:05 -07:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
José Lorenzo Rodríguez
890d4a9e2c
Merge pull request #1478 from aleho/2.4
...
Use a protected method to generate confirm() links
2013-08-11 13:51:29 -07:00
José Lorenzo Rodríguez
42bb766d92
Merge pull request #1503 from tigrang/cake-response-multi-header
...
Cake response multi header. Fixes #3960
2013-08-11 12:19:26 -07:00
Mark Story
de479cfe8d
Merge pull request #1493 from dereuromark/2.4-cleanup
...
remove undocumented code and unnecessary in_array() checks + cleanup
2013-08-11 08:06:00 -07:00
James Watts
19afed0003
Updated unit test for HTTP status codes
2013-08-10 13:32:49 +02:00
Marc Würth
2a540ff8a8
Fix for #3515 , functional extension & tests
...
https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3515
I used (string) because it is faster than strval() and there are no real benefits in this case.
Also enabled assign(), append() and prepend() to take any values convertible to string.
Removed try/catch as discussed with ADmad.
Changed the three exception expecting tests to check for PHPUnit_Framework_Error now.
2013-08-09 01:34:08 +02:00
Marc Würth
4c13a39f3e
Removed else clauses after redirects and added return before redirect() and flash() calls
2013-08-08 21:10:41 +02:00
euromark
fc2d28974b
remove undocumented code and uncessary in_array() checks + cleanup
2013-08-08 03:56:58 +02:00
euromark
e7e5f46916
prevent rtrim to remove whitespace from test
2013-08-08 01:14:31 +02:00
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
ADmad
faa4262969
Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
...
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783
Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
...
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
