Commit graph

2640 commits

Author SHA1 Message Date
Renan Gonçalves
a73e926467 Make String::wrap() unicode aware. Solves #3981. 2013-10-01 22:35:11 +02:00
mark_story
314ae1c8b4 Merge branch 'master' of github.com:cakephp/cakephp 2013-10-01 15:12:34 -04:00
Simon Males
c998888fe7 Do not assume CONTENT_TYPE is available.
In some server environments notably the CLI server, _SERVER['CONTENT_TYPE'] is not available.
In these cases, fall back to the HTTP_CONTENT_TYPE header.

Refs #GH-1661
2013-10-01 15:10:33 -04:00
ovidiupruteanu
dd3b1e41bc Test case for DboSource::flushMethodCache 2013-10-01 21:34:40 +03:00
mark_story
e96fe515a1 Rename config class used in test cases.
Having a separate classname for testing allows the testsuite to not
provide a classname that the application would. This allows composer to
generate the correct classmap when CakePHP is installed with composer.

Fixes #4112
2013-09-27 22:22:23 -04:00
Frank de Graaf
3e8af8b180 Merge pull request #1689 from dereuromark/master-cakephp-name
Cake to CakePHP name
2013-09-27 12:16:25 -07:00
Frank de Graaf
ceb78fee9c Merge pull request #1671 from ADmad/bugfix/auth-infinite-redirect
Fixed infinite redirects when authenticated user tried to access login p...
2013-09-27 12:13:36 -07:00
euromark
9a86f7e883 correct spelling mistake 2013-09-27 20:28:03 +02:00
ADmad
4dbf9107a8 Fixed infinite redirects for authenticated users accessing login page. 2013-09-27 22:33:07 +05:30
Mark Story
355e2efbc6 Merge pull request #1685 from dereuromark/master-autolink
Test to prove that autoLink has issues with umlauts.
2013-09-27 06:53:38 -07:00
Mark Story
066e0b6677 Merge pull request #1684 from dereuromark/master-shell
Bugfix: Assert own tasks are loaded before trying to access taskNames.
2013-09-27 06:52:12 -07:00
euromark
bd87ef45f2 complete autoLinkEmail() 2013-09-27 15:01:46 +02:00
euromark
205f7a504b also fix autoLinkEmail() 2013-09-27 14:56:53 +02:00
Frank de Graaf
41a7739b69 Merge pull request #1686 from andydhobbs/ticket-4108
Fixes bad merge of #1683.

Refs #4108.
2013-09-27 05:53:10 -07:00
euromark
2a954b6095 Make TextHelper::autoLink() work properly with umlauts. 2013-09-27 14:48:57 +02:00
Andy Hobbs
56f1c9b8b5 Ticket 4108
- updated DboSourceTest::testFieldsCacheKeyWithSchemanameChange() to skip for Postgres and Sqlserver
2013-09-27 13:03:32 +01:00
Renan Gonçalves
bd1c0b18ff Merge pull request #1679 from dereuromark/master-cleanup-tests
Don't use comp. wrappers anymore.
2013-09-27 04:10:39 -07:00
euromark
c23531e806 Assert own tasks are loaded before trying to access taskNames. 2013-09-27 12:53:18 +02:00
Andy Hobbs
0f7d6a90a1 Ticket 4108
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
2013-09-26 11:56:14 +01:00
Bryan Crowe
ab4bc16463 Updated Controller:: doc block and ControllerMergeVarsTest:: 2013-09-25 22:53:23 -04:00
Bryan Crowe
915b51b239 Updated JavaScript casing and JsHelper references in doc blocks 2013-09-25 22:46:38 -04:00
euromark
0b45a2eca8 correct order of params 2013-09-25 22:07:52 +02:00
euromark
9844da8e99 Don't use comp. wrappers anymore. 2013-09-25 20:58:29 +02:00
euromark
2455af09c5 Resolves ticket #4100 2013-09-25 14:01:35 +02:00
Bryan Crowe
3e05ab897c Missed a couple instanceOf asserations 2013-09-24 22:12:51 -04:00
Bryan Crowe
9a1170cd2b Replaced true asserations with instanceOf asserations in test cases 2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18 Replaced all is_a() calls with instanceof operator 2013-09-24 21:08:06 -04:00
mark_story
a30f861f2c Use array_key_exists instead of isset()
This allows contains() to work with null values.

Fixes #4083
2013-09-19 21:44:09 -04:00
euromark
f62f46562c add missing create() for creating a new record. 2013-09-19 00:23:56 +02:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
ADmad
1d89ee1c6d Fixed TreeBehavior::recover() when using scope. Fixes #4062. 2013-09-19 00:39:19 +05:30
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00
euromark
e3a3946e89 address casting cs 2013-09-17 15:15:25 +02:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf Fix label element for attributes not matching their inputs.
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().

Fixes #4071
2013-09-16 22:38:28 -04:00
spiliot
37c9832dc1 removed duplicate test case
Was exact duplicate of case starting line 692
2013-09-17 00:48:09 +03:00
euromark
c8b18164c5 fix test 2013-09-16 00:49:01 +02:00
mark_story
7379d32b59 Simplify & fix phone number validation.
The changes made in fa3d4a0bb5 tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.

Fixes #4066
2013-09-13 23:05:40 -04:00
mark_story
ba4afcc074 Fix incorrectly encoded address fields.
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.

Fixes #4058
2013-09-12 20:14:11 -04:00
euromark
a796b26f13 fix renderLayout and update deprecated and outdated code 2013-09-13 00:09:31 +02:00
Mark Story
fd50c5277e Merge pull request #1624 from ADmad/fix-paginator-order
Fix setting of order in Paginator options when using model's order. 

Refs #3902
2013-09-10 13:41:51 -07:00
euromark
beff12d8a5 add missing params for parent call 2013-09-10 21:19:30 +02:00
ADmad
1d0c785725 Fixed setting of order in Paginator options when using model's order. Refs f680c76, #3902 2013-09-10 22:47:31 +05:30
Ber Clausen
0a52061d86 Update afterFind() callback signature to be PHP5.4+ compliant. 2013-09-10 14:15:01 -03:00
Mark
994a5b00b6 Merge pull request #1622 from bar/php54-afterSave
Update Model/Behavior afterSave() callback signature to be PHP5.4+ compliant.
2013-09-10 04:04:04 -07:00
mark_story
fc2e1fac4e Fix clearing groups with FileCache and no prefix.
If you used FileCache + groups + an empty prefix cached files would not
be cleared as strpos() would fail.
2013-09-09 22:24:18 -04:00
Ber Clausen
867d4b312d Update afterSave() callback signature to be PHP5.4+ compliant. 2013-09-09 21:34:11 -03:00
Ber Clausen
98a32c334a Fix CS. 2013-09-09 21:25:22 -03:00
mark_story
5210f831c8 Add test for insertMulti with id in the last spot.
Both tests work, so there are no changes to the implementation.

Closes #4048
2013-09-09 19:43:15 -04:00
mark_story
2fc3222322 Fix whitespace. 2013-09-09 12:20:54 -04:00
ovidiupruteanu
7019c79b81 Quoting test for null value and string column 2013-09-09 17:14:09 +03:00
Ber Clausen
c3ee9a2058 JsonView should return null if no data is set, regardless of the type of '_serialize'.
It should also honor true/false/0/'' values.
2013-09-07 02:38:52 -03:00
euromark
959988cfa1 Remove last yoda conditions as per coding standards guidelines. 2013-09-06 18:36:57 +02:00
Mark Story
66394f2201 Merge pull request #1610 from bar/php54-callback-signatures
Update Model/Behaviors callback signature to be PHP5.4+ compliant.

This may require updates to userland behaviours.
2013-09-05 11:11:15 -07:00
mark_story
6a6371b2d4 Fix CROSS JOINs
While seldomly used, CROSS joins should not generate invalid SQL.

Fixes #4050
2013-09-05 12:45:48 -04:00
mark_story
e3e4efba0a Add test for issue #3936
radio() method should accept an array for the label element.

Refs #3936
2013-09-05 11:04:47 -04:00
Ber Clausen
c524645738 Update Model/Behaviors callback signature to be PHP5.4+ compliant. 2013-09-05 11:17:02 -03:00
Rob McVey
7f44cc01b5 Plural of breif is breifs not breives 2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada Reorder inflection rules.
Place rules for words like 'archives' and 'relatives' before words like
'knives'.

Fixes #4040
2013-09-03 12:50:02 -04:00
mark_story
800ffa804b Fix invalid CSS in fixture files.
Fixes #4041
2013-09-03 09:55:04 -04:00
mark_story
229c824da6 Remove a default helper from View.
This goes back to the days of yore and combined with
b8320fdbb7 it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
2013-09-01 21:39:59 -04:00
euromark
eb71eeeac5 add scope for generateTreeList - resolves ticket 4028 2013-09-01 01:02:26 -07:00
Ceeram
84c980f1f4 avoid notices when loading locale file
Conflicts:

	lib/Cake/Test/Case/I18n/I18nTest.php
2013-09-01 06:05:40 +02:00
Phally
28dbc5b89b PHPCS fixes. 2013-08-31 13:30:05 +02:00
ADmad
75e8facd2f Remove JS constant use from tests. 2013-08-31 11:45:59 +05:30
mark_story
4f237e6a93 Merge branch '2.4' making 2.4 into the master branch.
Conflicts:
	lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
mark_story
7bd2174c5b Refactor tests to use a data provider. 2013-08-30 15:36:18 -04:00
mark_story
94b602b684 Merge pull request #1456 'fix-for-3515' into 2.4
Conflicts:
	lib/Cake/Test/Case/View/ViewTest.php

Fixes #3515
2013-08-30 15:27:49 -04:00
Mark Story
824a6f700b Merge pull request #1563 from mvdriel/fix-i18n-extract
Extract category strings to separate .po files
2013-08-30 12:19:17 -07:00
Mark Story
a902529702 Merge pull request #1570 from cakephp/issue-4030
2.4 - Load helpers at View construction.
2013-08-28 14:28:00 -07:00
mark_story
c03edd9d1a Don't load Helpers in dataviews when _serialize is set.
Loading helpers when they aren't going to be used is wasteful.
2013-08-28 15:47:44 -04:00
mark_story
f18d354f55 Merge branch 'master' into 2.4 2013-08-28 12:35:07 -04:00
mark_story
b8320fdbb7 Load helpers at View construction.
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.

This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.

Refs #4030
2013-08-28 12:27:07 -04:00
mark_story
c1ae41da51 Correctly generate bigint primary keys in sqlite.
generate bigint primary keys correctly. Autoincrement cannot be set as
it only works with INTEGER columns[1]. I decided to use some string
manipulations as the entire SQL generation bits are a bit janky and I've
already re-written them for 3.0.

[1] https://www.sqlite.org/autoinc.html

Closes #GH-1552
2013-08-27 18:11:04 -04:00
Mark van Driel
c4ec8bedd0 Fixed category constant values: constants in Cake don't use the same values as PHP (Linux) 2013-08-27 12:30:39 +02:00
Mark van Driel
88d7fbeb53 Extract category strings to separate .po files 2013-08-25 23:04:05 +02:00
mark_story
42feb8dff6 Fix failing test.
Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
2013-08-24 21:51:42 -04:00
mark_story
ceb35ac39a Merge branch 'master' into 2.4 2013-08-24 21:50:02 -04:00
Saleh Souzanchi
e157d8a7e6 convert forbidden character in filename(Windows) with underline 2013-08-25 02:09:13 +04:30
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
Renan Gonçalves
703d9881e9 Adding files to be compared against bake generated files, fixing bake templates in the meantime.
Writing assertContains() or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult.

Things like:
 ```
 } else {
 }
 ```

Are very easy to happen (which was the case) and was not being covered by the test.
2013-08-21 23:44:07 +02:00
mark_story
24123e2374 Add test for postLink with escape false + confirm option.
Closes #4008
2013-08-21 13:09:47 -04:00
euromark
036954b52d remove duplicate newlines according to CS 2013-08-20 20:27:06 +02:00
AD7six
09cf69c452 Pass Controller:$components config to mocked components
Otherwise there can be significant differences in behavior between using
an unmodifiedcomponent in testAction and using a mock as the config will not be
propogated from the controller
2013-08-19 10:33:16 +00:00
mark_story
0f2d59d987 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
mark_story
675f828e16 Remove insertQuery and deleteQuery.
These properties were never implemented and are misleading when people
try to use them.

Closes #3997
2013-08-18 21:37:37 -04: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
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
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