adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-12-04 20:57:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
19646 commits 7 branches 0 tags 44 MiB
Commit graph

4028 commits

Author SHA1 Message Date
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
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04: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
Mark Story
ce9f547175 Merge pull request #1655 from dereuromark/2.5-inlist-clean 
2.5 inList(), multiple() and case sensitivity
 2013-09-25 11:45:29 -07: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
euromark
f7e507145c Case insensitive validation inList option. Resolves ticket 3521. Added two tests to proof the faulty behavior of $strict here. Also address the faulty behavior in multiple() and replace it with case sensitivity. 2013-09-24 02:01:50 +02:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -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
Kamisama
7c83f7140f Rename serializer to serialize 2013-09-19 18:40:41 -04:00
Kamisama
0a704cc288 Fix test 2013-09-19 18:38:02 -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
Kamisama
5d509e23c2 Throw exception when selected serializer is not installed 2013-09-18 00:46:21 -04:00
Kamisama
bd3f005ab6 Add serializer option to Memcached Cache engine 
Add option to select a serializer engine among php, json or igbinary
 2013-09-18 00:29:48 -04:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-17 10:11:24 -04: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
José Lorenzo Rodríguez
d40f9f7f67 Merge pull request #1574 from dereuromark/2.5-logging 
2.5 logging - deprecate/disallow magic logging
 2013-09-13 00:29:22 -07:00
euromark
61b05c40c6 remove autologging 2013-09-13 02:28:25 +02: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
mark_story
a2bd91638e Merge branch 'master' into 2.5 2013-09-12 19:47:13 -04:00
euromark
a796b26f13 fix renderLayout and update deprecated and outdated code 2013-09-13 00:09:31 +02:00
Simon Males
50ad043092 View::get() default param test 2013-09-11 22:22:50 +08: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
ADmad
c27aa99af9 Merge branch 'master' into 2.5 2013-09-08 20:36:40 +05:30
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
mark_story
f22c4cf90b Merge branch 'master' into 2.5 2013-09-05 10:21:41 -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
59bb05b433 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-02 11:35:09 -04:00
Renan Gonçalves
6750a65e1b Merge pull request #1568 from markstory/2.5-encrypt 
2.5 - Add Security::encrypt() and Security::decrypt()
 2013-09-02 01:19:47 -07: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
mark_story
9b0e26cc21 Deprecate MemcacheEngine and update defaults for Memcached 
People should switch to Memcached instead. The underlying extension is
better maintained and provides improved features and performance.

Collapse the persistent and persistentId settings, while also making
non-persistent connections the default. Persistent connections should be
an opt-in feature as having them enabled by default could go very wrong
on shared hosting environments.
 2013-08-31 13:29:54 -04:00
mark_story
9e8c4ad285 Rename persistent_id to persistentId. 
The new name is more consistent with other settings in CakePHP.
 2013-08-31 13:15:53 -04:00
Mark Story
0f9560c5cf Merge pull request #1562 from kamisama/feature/2.5-memcached-cache-engine 
2.5: Add Memcached storage engine for cache 

Fixes #3511
 2013-08-31 10:12:16 -07: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
95ad5f5c78 Add hmac to encrypted data. 
Using an HMAC ensures that the ciphertext has not been
modified.
 2013-08-29 14:40:01 -04:00
Gilles Wittenberg
a54e8f238e Add y/yes option to schema create and update subcommands 2013-08-29 09:13:54 +02: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
130ccf4714 Merge branch '2.4' into 2.5 2013-08-28 12:35:17 -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
c5092851d1 Fix compatibility with PHP 5.2 2013-08-27 23:03:08 -04:00
mark_story
215d43eb06 Add encrypt() and decrypt() methods. 
These methods use AES-256 and provide a simple to use API with easy to
remember names.
 2013-08-27 21:20:22 -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
Kamisama
244df0764f Coding standard and readability 2013-08-27 14:22:45 -04:00
Kamisama
bdd00c2307 Throw an exception if attempting to use authentication without SASL support installed 2013-08-27 13:57:57 -04:00
Calin
075bf37030 Added test case for param with options detector. 
Fix coding standards errors.
 2013-08-27 09:38:46 -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
Kamisama
2b20ddc81c Drop backup/restore Configure values 2013-08-26 20:55:38 -04:00
Kamisama
e315f563be Add MemcachedEngine 2013-08-26 18:26:33 -04:00
Mark van Driel
88d7fbeb53 Extract category strings to separate .po files 2013-08-25 23:04:05 +02:00
mark_story
499212a86e Merge branch '2.4' into 2.5 2013-08-24 21:51:51 -04: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
Chen Cohen
a0014e7a30 Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert() 2013-08-24 02:02:01 +03:00
mark_story
6d45953525 Merge branch '2.4' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-08-23 12:57:08 -04:00
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
k-halaburda
9ad75e078a Successfully :) 2013-08-19 08:29:39 +02:00
k-halaburda
9536b3cacd Successfully 2013-08-19 08:11:45 +02: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
k-halaburda
2166b397bc Successfully 2013-08-18 17:43:26 +02:00
k-halaburda
39f9d40be4 Fixed formaiing and Successfully 2013-08-18 17:41:43 +02:00
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
Mark Story
054668f149 Merge pull request #1194 from dereuromark/2.4-file-improvements 
Allow creating of missing tmp directories in debug (development) mode
 2013-08-07 09:52:07 -07:00
euromark
f5859ca719 allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files 2013-08-07 13:24:45 +02:00
ADmad
339cd00fec Merge pull request #1482 from ADmad/2.4-l10n 
L10n cleanup
 2013-08-07 00:42:09 -07:00
Mark Story
dc15c78710 Merge pull request #1483 from tigrang/debugger-fix 
Added case for `unknown` type.

Fixes #3966
 2013-08-06 19:39:13 -07:00
mark_story
9efad54e31 Fix missing expiry times on cookies. 
When writing multiple cookies in a single request with the default
expiry time, cookies after the first should continue to have the default
expiry time used.

Fixes #3965
 2013-08-06 22:01:13 -04:00
Juan Basso
330f8d168d Merge pull request #1228 from jrbasso/2.4-router-parse 
Supoprt query parameters on Router::parse.
 2013-08-06 18:57:37 -07:00
Tigran Gabrielyan
2150e8dce5 Added case for unknown type. Fixes #3966 2013-08-06 18:30:00 -07:00
Mark Story
33af7e2e52 Merge pull request #1426 from dereuromark/2.4-currency-fraction 
Fix currency output for fraction values.

Fixes #1329
 2013-08-06 18:19:01 -07:00
euromark
ad6fcd43d7 Fix currency output for fraction values using fractionExponent option. 2013-08-07 00:36:37 +02:00
ADmad
18cd3729e4 Deprecated DEFAULT_LANGUAGE constant and config value 'Config.language' is not used for default. 
Cleaned up L10n::_setLanguage(). Removed unused L10n::$found
 2013-08-07 03:37:26 +05:30
Tigran Gabrielyan
34d848d0ca Fixed order of assert params 2013-08-06 12:59:36 -07:00
U-Zyn Chua
3559aa35af Removed a stray tab. 2013-08-06 17:13:53 +08:00
Tigran Gabrielyan
a6e3bb37a6 Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself 
Added ability to send multiple values with the same type of header in CakeResponse
 2013-08-06 01:35:45 -07:00
Alexander Hofbauer
8601e0078a Implement a Helper method to generate confirm() links 
This allows for overriding the default behavior of showing
confirm()-dialogs in Html and Form helpers.
 2013-08-06 10:04:44 +02:00
José Lorenzo Rodríguez
a54c92fc0f Merge pull request #1475 from cakephp/feature/2.4-mock-app-model 
Make mocking random models easier
 2013-08-05 00:22:53 -07:00
ADmad
04fb1eb614 Added more tests to db related tests group 2013-08-04 23:38:30 +05:30
ADmad
f68701d647 Created new test group for all db related tests 2013-08-04 21:23:45 +05:30
ADmad
38b050a711 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
 2013-08-04 19:26:55 +05:30
AD7six
ff856b7ebb bark if the model doesn't exist 
Getting the following warning:

    ReflectionException: Class Mock_Foo_e187b1d1 does not have a
constructor, so you cannot pass any constructor arguments

Is a much less obvious way of saying "the class you're trying to mock
doesn't exist". Be more explicit
 2013-08-03 16:00:34 +00:00
AD7six
35b4ac0286 make it possible to run this test on its own 
Without setting up paths to the test_app - two of the tests will fail

Verify/demonstrate how to mock a model without a model existing
 2013-08-03 16:00:04 +00:00
Juan Basso
cda1a1e6c9 Added test for relative path using app asset configuration 2013-08-03 11:04:52 -04:00
Juan Basso
db6d0a748b Fix for relative protocol on assets 2013-08-03 10:36:19 -04:00
Juan Basso
316c6582ea Fixed pathPrefix for css and script methods 2013-08-03 10:36:19 -04:00
Christian Winther
cd44c2afae Merge pull request #1472 from ADmad/bugfix/3948 
Fixed bug when using multi model fieldList and whitelists for all models...
 2013-08-03 05:56:22 -07:00
Andy Dawson
f34388c53a Merge pull request #1471 from cakephp/feature/2.4-pretty-print 
pretty print json and xml responses in debug mode
 2013-08-03 01:35:56 -07:00
euromark
a5531f7419 fix casing 2013-08-03 04:32:39 +02:00
euromark
6c1e60953b fix cs 2013-08-03 03:02:52 +02:00
mark_story
b3860b3992 Fix clearing files in multiple groups. 
When using multiple groups on a cache config, clearing was not working
properly. Clearing un-used cache configs also failed when the
directories did not exist.

Fixes #3930
 2013-08-02 17:56:27 -04:00
ADmad
473e4f991f Fixed bug when using multi model fieldList and whitelists for all models are not provided. 
Fixes #3948
 2013-08-03 02:49:41 +05:30
mark_story
8209a298f7 Make CakeRoute::persistParams() more tolerant 
Subclasses and instances may not always define persist options.
CakeRoute should be accepting of these differences.

Fixes #3957
 2013-08-02 13:28:58 -04:00
AD7six
1643e10c74 pretty print json and xml responses in debug mode 2013-08-02 15:17:24 +00:00
U-Zyn Chua
585ac157c0 CS fix. 2013-08-02 18:19:13 +08:00
Christian Winther
227f9aaa88 Merge pull request #1440 from Phally/master-postgres-fails 
Adds order to the test models to make the results more predictable.
 2013-08-01 02:38:33 -07:00
ADmad
61bf8df454 Renaming base url config keys and methods for better uniformity. 2013-08-01 00:44:36 +05:30
ADmad
b22b39f158 Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead. 2013-07-31 18:31:26 +05:30
ADmad
b7cee8ff57 Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key. 
Fixes #3874
 2013-07-31 17:24:36 +05:30
Mark Story
4c7bc11a08 Merge pull request #1461 from thegallagher/master 
Required fields not recognised by FormHelper when only using ModelValidator::add()
 2013-07-29 18:33:28 -07:00
David Gallagher
37ab0611ae Fix whitespace 2013-07-30 11:26:49 +10:00
David Gallagher
35cc737261 Add for required fields when using only ModelValidator::add() 2013-07-30 11:11:49 +10:00
Mark Story
7269568ae6 Merge pull request #1460 from ravage84/cakeschematest-setup+teardown 
Removed unused setup & teardown methods
 2013-07-28 17:54:33 -07:00
Marc Würth
3a4f7815e8 Removed unused setup & teardown methods from MyAppSchema in CakeSchemaTest 2013-07-29 01:55:32 +02:00
Marc Würth
1cac1846a3 Added missing calls to setUp & tearDown in tests 2013-07-29 01:52:39 +02:00
mark_story
8a81903e37 Fix FileEngine not clearing keys when groups are used. 
Fixes #3930
 2013-07-27 22:20:40 -04:00
mark_story
17b25388b3 Throw exceptions when '' is used as translation domain. 
'' is never a good translation domain and often indicates developer
error. Treat it as a mistake and throw an exception.

Fixes #3939
 2013-07-27 21:41:22 -04:00
mark_story
76aab0a635 Add failing test for #3930 2013-07-27 17:15:15 -04:00
Phally
933013f808 Test case to prove base urls are stripped. 
Refs #3938, #3916.
 2013-07-26 19:57:12 +02:00
Phally
6b41eaa950 Merge branch 'master' into 2.4 2013-07-26 19:44:11 +02:00
Phally
f7eab23a5c Strips the base off the generated URL from the AuthComponent. 
Fixes #3922.
 2013-07-26 15:18:28 +02:00
euromark
8b21710c95 whitespace correction 2013-07-25 13:26:21 +02:00
euromark
24fa926ff9 remove private in favor of protected visibility 2013-07-22 21:08:05 +02:00
Phally
5953171c7b Fixes cake bake all. Refs #1443. 2013-07-20 20:21:35 +02:00
Phally
6d6be87f8f Replaces deprecated paginate() calls in controller bake templates. 
Fixes #3895.
 2013-07-20 16:59:39 +02:00
Mark Story
1402796047 Merge pull request #1441 from ravage84/ViewTestsCleanup 
Added missing test + minor cleanup of ViewTests.php
 2013-07-19 19:40:09 -07:00
Marc Würth
da8e50a48a Added missing test + minor cleanup of ViewTests.php 
Added missing block reset test through assign().
Also made some minor cleanup in ViewTests.php. Mostly docblocks (params, returns) but also some unused variables.
 2013-07-20 01:43:07 +02:00
Phally
db1876d837 Adds order to the test models to make the results more predictable. 
Even though there was some code in place to prevent results in random
order from PostgreSQL we were still experiencing this with Jenkins
and Travis.

This commit removes the old code that handled this. From now on this
will be handled differently. Every test model will order by its
primary key. You can disable this by changing the order property
of the model to `null`: `$testModel->order = null`.
 2013-07-19 22:31:09 +02:00
Phally
36cac116d0 Fixes errors in tests with APC installed but not enabled in CLI. 2013-07-19 17:04:54 +02:00
Phally
32b818d2d8 Fixes bug in the first link of PaginatorHelper::numbers(). 
The link was the current URL instead of a link to the first
page. This only happened with named parameters. This commit
also includes a test for querystring parameters.

Refs #1432.
 2013-07-18 19:32:41 +02:00
mark_story
f725779a17 Better support various ranges as described in RFC2616 
Refs #3914
 2013-07-18 11:26:55 -04:00
mark_story
3f9e8e8113 Add missing calls to parent. 2013-07-18 11:04:09 -04:00
mark_story
e03d3df0fe Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/View/HelperTest.php
	lib/Cake/VERSION.txt
 2013-07-17 22:40:09 -04:00
Mark Story
204fb4b864 Merge pull request #1428 from markstory/2.4-location 
2.4 location
 2013-07-17 18:19:13 -07:00
Christian Winther
4416f2e796 Merge pull request #1427 from dereuromark/2.4-paginator-page1 
fixes #700
 2013-07-17 09:26:08 -07:00
mark_story
7b5122adb1 Fix pluralization of Objective. 
Fixes #3921
 2013-07-17 10:04:29 -04:00
mark_story
6c18f6a231 Add failure messages to test assertions. 2013-07-17 09:47:10 -04:00
euromark
22d6625872 fix test 2013-07-17 12:18:06 +02:00
mark_story
2df873412c Add CakeResponse::location() 
This method provides an easy to use interface to get/set the location
header in a response object. This is primarily to facilitate future
development in 3.x
 2013-07-16 23:38:57 -04:00
euromark
05415dd83f do not display page:1 or ?page=1 to avoid duplicate content in paginator helper output 2013-07-17 00:45:27 +02:00
mark_story
d4db64ff26 Ignore asset requests containing %2e in them. 
urldecode URI's early to avoid issues with encoded `.` characters.
 2013-07-16 13:14:27 -04:00
mark_story
b873186468 Fix being unable to sort on custom synthetic columns. 
If a sort field whitelist is used we should trust its data and also
trust that the developer wanted what they asked for. This solves issues
where it was impossible to sort on synthetic columns added in custom
find types.

Fixes #3919
 2013-07-16 10:19:18 -04:00
euromark
b412e2cbb1 provide ability for rounding - closes #1986 2013-07-16 15:42:08 +02:00
euromark
13ee5b7338 ability to provide custom strings for timeAgoInWords() 2013-07-16 15:16:30 +02:00
mark_story
4d6258adeb Correct off by one error. 
Refs #3914
 2013-07-15 21:48:03 -04:00
Christian Winther
532b2099e5 Merge pull request #1410 from Phally/2.x-3814 
LH#3814 CakeNumber::toPercentage() should return percentage
 2013-07-15 10:44:41 -07:00
Adam Taylor
5a6f1259e3 Fix the "testAssetUrlNoRewrite" test 
When running the test in the browser from somewhere other than
http://localhost (e.g. http://foo.dev), the test was failing.
 2013-07-13 23:38:55 -06:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
 2013-07-14 10:58:55 +05:30
Majna
1ce9fc537f Pages controller should render 404 on missing view file 2013-07-13 17:41:16 +02:00
mark_story
e016f1156f Revert previous changes. 
Adding this parameter was a mistake. Remove it.
 2013-07-12 21:37:22 -04:00
mark_story
52be365598 Introduce the strip argument to Router. 
This allows callers to request that the basepath *not* be stripped off
when normalizing string URL's. This is important in AuthComponent when
handling redirect URL's as the redirect location could point to
a controller that shares a name with the base path.

Refs #3897
Refs #3916
 2013-07-12 21:16:18 -04:00
Mark
f9fdc1e6e0 Merge pull request #1408 from dereuromark/master-cleanup 
remove @access and unnecessary $name
 2013-07-12 07:10:23 -07:00
mark_story
494fd05de6 Fix downloading Ranges in files. 
Correctly handle ranges that don't terminate at the end of the file.
Also reject invalid ranges as described in RFC-2616.

Thanks to Kim Biesbjerg for the initial patch.

Fixes #3914
 2013-07-11 23:20:12 -04:00
Mark Story
d992d3a626 Merge pull request #1385 from LeaseWeb/2.4 
Add option to send email attachment from string (not only from file).
 2013-07-10 10:12:07 -07:00
Mark Story
1ecc921e13 Merge pull request #1412 from wernerhp/master 
Inflector pluralize and singularize update
 2013-07-10 08:59:03 -07:00
Werner Pieterson
3d83c628eb Added more words to InflectorTest 2013-07-10 17:49:18 +02:00
Werner Pieterson
a27499d88a Updated Inflector's 'pluralize and singularize to correctly handle addisional words. 
Updated InflectorTest to test new words.
 2013-07-10 17:46:01 +02:00
Phally
e35bd80dfb Adds option to multiply decimal percentages. Fixes #3814 2013-07-10 14:37:57 +02:00
Charles Burgess
fa3d4a0bb5 Updating the phone validation routine. 
According to NANPA, there are area codes and exchanges that are invalid or reserved and not available for assignment. This would make those phone numbers invalid. For example:

- area-codes: 555, N11, N9X, 37X, 96X
- exchanges: N11
- numbers: 555-0100 thru 555-0199

You could also say 555-1212 is invalid as it is assigned as information for the US.

I changed the tests where 555 as an area code was being used as the assertion will give it a false on the area code and not the exchange as intended.
 2013-07-09 09:54:18 -06:00
euromark
a643295e4c remove @access and unnecessary $name 2013-07-08 15:50:50 +02:00
ADmad
4ded269549 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
 2013-07-07 12:22:12 +05:30
Rachman Chavik
0555895de3 Remove leftover temp file 2013-07-07 11:20:37 +07:00
Rachman Chavik
4bb0a1228a Fix I18n to extract plugin model validation messages 2013-07-07 11:20:14 +07:00
Christian Winther
cbb4f7db90 allow serialize in json and xml alias 2013-07-06 16:57:46 +00:00
euromark
af455b4121 correct return types in doc blocks 2013-07-05 17:19:22 +02:00
euromark
ba02678693 doc block corrections 2013-07-05 16:17:23 +02:00
euromark
e7f380d2b7 doublespace to single space 2013-07-05 14:36:40 +02:00
mark_story
22a198a8ba Merge branch 'master' into 2.4 2013-07-04 21:40:51 -04:00
euromark
a620fbbbb8 fix cs 2013-07-04 13:30:08 +02:00
euromark
f680c763b2 ticket-3902 - paginator and display of order via model default order 2013-07-04 13:07:14 +02:00
mark_story
c597855fe4 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/Network/CakeRequestTest.php
 2013-07-03 14:21:09 -04:00
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
mark_story
521c293eb1 Fix coding standards. 2013-07-01 22:56:00 -04:00
Mark Story
9a08aeafcf Merge pull request #1377 from ravage84/fix-for-3318 
Trim off webroot/index.php when determining base and url.

Trimming off index.php from url and webroot/index.php from base url allows the correct values to be created when a path contains index.php in it.

Fixes #3318
 2013-07-01 19:51:34 -07:00
Mark Story
2219991d3b Merge pull request #1386 from nojimage/cakeemail-custom-email-validation 
CakeEmail class be able to setting custom email validation rule.
 2013-07-01 07:36:34 -07:00
Mark Story
da033cbed7 Merge pull request #1375 from dereuromark/master-cake-email 
Move boundary calculation inside _render()
 2013-07-01 06:12:24 -07:00
Mark Story
94db8fbed6 Merge pull request #1380 from ceeram/2.4-ext 
Set extension with multiple accept based on order in parseExtensions.
 2013-06-30 19:42:50 -07:00
nojimage
f6a011215c change emailRegex to emailPattern 2013-07-01 00:03:18 +09:00
Marc Würth
f930a50805 Fix for #3318 
Fixes https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3318

It seems fixing this in the htaccess file(s) isn't going to work even though a url rewriting based solution was more clean. On the plus side this works for any web server.
If a url is called with "index.php" in it then the CakeRequest swallows this part and fixes the path. Any linked url from the requested page will have a clean url. Thus after following one of these urls this problem is gone anyway.

Some code docblock improvements to CakeRequestTest.php
Added test case for fix
Also now you can call just index.php even if you have url rewriting enabled
 2013-06-30 05:38:58 +02:00
mark_story
f09693f6e8 Merge branch 'master' into 2.4 2013-06-29 23:26:26 -04:00
mark_story
1d18a4f702 Fix issue where redirectURLs were not generated correctly. 
When the first path segment matches the base path an incorrect URL was
generated. Trimming slashes off makes Router normalize the URL correctly
as the leading / implies that the base is already prepended.

Fixes #3897
 2013-06-29 23:26:13 -04:00
mark_story
0d76bfe325 Add an additional test for CakeRequest::referer(). 
Trying to track down the issue for #3897. This test coverage was
missing, so fix that.
 2013-06-29 23:26:13 -04:00
ADmad
75e7797a26 Allow escaping only attributes of a link and not it's title 2013-06-29 20:51:52 +05:30
euromark
b346c4af8e Test to proof that render itself should handle the boundary. 2013-06-29 15:16:58 +02:00
nojimage
175280ad79 CakeEmail be able to setting custom email validation rule 2013-06-29 02:55:16 +09:00
nojimage
202b753c63 Add emailRegex property to CakeEmail 2013-06-29 02:44:55 +09:00
Maurits van der Schee
cd71a8439c Add option to send email attachment from string (not only from file). 
I would be very pleased if this option would be available in some
future version. Thank you.
 2013-06-28 02:12:28 +02:00
Marc Würth
9591f55394 Annotated testReconnect 2013-06-27 17:15:56 +02:00
Mark Story
6fdbdf508f Merge pull request #1368 from planardothum/url-conformance 
Url conformance
 2013-06-27 06:31:42 -07:00
Ceeram
6a0185d7e6 Set extension with multiple accept based on order in parseExtensions, currently with multiple accepted types, no extension is set at all 2013-06-27 14:34:00 +02:00
Marc Würth
2609016dfe Changed http links to lighthouse, groups.google and github to https 
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
 2013-06-25 22:58:30 +02:00
euromark
ee5e8c95dd fix issue with FormHelper and undefined variable and extract 2013-06-25 12:11:10 +02:00
euromark
290c343a74 tests to disprove that input date and partial dateFormat does not work 2013-06-25 11:54:29 +02:00
Juan Basso
19c94d0211 Fixed default datestyle for postgres tests 2013-06-25 00:15:03 -04:00
Juan Basso
accc98f55d Resetting the datestyle to not affect other tests 2013-06-24 23:36:40 -04:00
euromark
d6c25bd0e3 add convenience method param() for PaginatorHelper 2013-06-24 00:03:08 +02:00
José Lorenzo Rodríguez
fb111d6fd6 Merge pull request #1366 from dereuromark/2.4-unify-engine 
unify engine to not require the suffix
 2013-06-23 14:42:13 -07:00
mark_story
dcf7df39d2 Merge branch 'master' into 2.4 2013-06-21 17:47:37 -04:00
mark_story
94815a74f1 Add ordering to prevent occasional pgsql failures. 2013-06-21 17:47:08 -04:00
Harold Putman
7acf162268 HTTP_HOST is not available in CLI 
use FULL_BASE_URL instead.
 2013-06-21 16:37:39 -04:00
Harold Putman
2fd36bdedc Router::url should passthru //example.com/file.ext 
The function allows ://example.com/file.ext but was treating //example.com as cake-relative URL. The updated regex matches URI schemes as defined in RFC2396. Will passthru any of these formats:
* Starts with a valid URI scheme  (javascript:, https:, itunes:, ftp:)
* Starts with a '#'
* [NEW] Starts with a '?' which may be meaningless, but is as valid as starting with '#' (RFC1808)
* starts with //, or :// (:// is not technically valid, but included for compatibilty)
 2013-06-21 15:10:11 -04:00
Harold Putman
cfdac5e32d Allow plus signs in URL's to pass unscathed in Helper functions. 
According to  RFC 1738 the plus sign does not have special meaning outisde of the query part of a URL.
 2013-06-21 14:24:39 -04:00
euromark
8141dd2d5d unify other log types as well 2013-06-21 16:43:01 +02:00
euromark
24506dcc2c update test for FileLog config 2013-06-21 16:39:51 +02:00
euromark
cb24dbb084 unify engine to not require the suffix (as Cache and other places do). 2013-06-21 15:04:27 +02:00
mark_story
68db74d32d Cleanup from previous commit. 
Refs #GH-1352
 2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0 Fix to the date input year field 
Create the field if no value is informed only to the maxYear and not to
the current date.
 2013-06-19 15:05:15 -04:00
Rachman Chavik
0d486bdab4 AuthComponent: Allow suppressing authError message 
When unauthenticated users accesses protected areas, they are greeted
with the default 'You are not allowed to access that location' which is
not desired in some cases.

This patch allows applications to suppress this message by setting
AuthComponent::authError to false bypassing the call to
SessionComponent::setFlash() altogether.

Refs: https://github.com/croogo/croogo/pull/175#discussion_r4714240
 2013-06-17 09:33:59 +07:00
ADmad
12da3b1f27 Merge branch 'master' into 2.4 2013-06-16 13:07:44 +05:30
mark_story
111bfa43d4 Fix incorrect autolinking when urls end at HTML tags. 
Fixes #3879
 2013-06-15 22:01:29 -04:00
mark_story
1c358c0f53 Add tests for Model::clear() 2013-06-14 09:21:20 -04:00
euromark
4671f235ad duplicate line removed 2013-06-13 14:15:00 +02:00
José Lorenzo Rodríguez
2f93d781ad Merge pull request #1349 from renansaddam/smtpTransportReturnPath 
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport
 2013-06-13 05:05:36 -07:00
Renan Gonçalves
796e4b45dd Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport. 
The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery.
Quote RFC2821:
> When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.
 2013-06-12 11:31:49 +02:00
Rik van der Heijden
e7d2892e81 Fixed unit-test locales 2013-06-11 20:18:40 +02:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
euromark
6ed85f2d5d doc block 2013-06-10 15:10:32 +02:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
euromark
4518624187 more whitespace coding standard corrections 2013-06-09 17:39:48 +02:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +02:00
ADmad
405c5b0280 Fix test 2013-06-09 18:57:09 +05:30
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
mark_story
e5b1182a0d Only delete files that have a matching group + prefix. 
Fixes #3873
 2013-06-08 22:42:41 -04:00
Aymeric Derbois
0cfdb87cdf Fix a problem of tag values which is not taken into account 
(when equal to zero) when passing an array to XML object.
 2013-06-09 00:52:06 +02:00
mark_story
e527eab5aa Add missing call to parent::setUp() 2013-06-08 09:47:46 -04:00
Mark Story
5cdd11cb38 Merge pull request #1336 from djbobke/caketimetest-locale 
Fix locale for CakeTimeTest when configured different locale in app
 2013-06-08 06:45:20 -07:00
Rik van der Heijden
0946a7799a Fix locale for CakeTimeTest when configured different locale in app 2013-06-08 10:25:28 +02:00
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29:08 +02:00
Jose Lorenzo Rodriguez
f14c55916f Repeating previous change for SQLite, so it passes on PHP 5.5 2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez
04a6bfbda6 Fixing postgres test for PHP 5.5 2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez
51af8800f2 Rewriting assertion to account for the actual case and not breaking in 
PHP 5.5
 2013-06-06 17:45:52 +02:00
José Lorenzo Rodríguez
3b4a4fde31 Merge pull request #1317 from lorenzo/feature/full-base-url 
Adding App.fullbaseURL as a recognized Configure value
 2013-06-05 15:12:27 -07:00
Jose Lorenzo Rodriguez
7b746ccb57 Overwriting App.fullBaseURL if changed using Router::baseURL() 2013-06-05 23:57:16 +02:00
Kim Egede Jakobsen
6c3a63ea9b Correct small typos. 2013-06-05 09:57:18 +02:00
Mark Story
59646aa30a Merge pull request #1326 from fahad19/http-patch 
convenience wrapper for HTTP PATCH in HttpSocket class.
 2013-06-04 20:54:45 -07:00
Fahad Ibnay Heylaal
679177b8f3 convenience wrapper for HTTP PATCH in HttpSocket class. 2013-06-04 22:46:15 +02:00
mark_story
3aa189eb3a Fix cookie expiry time calculation on 32bit systems. 
strtotime() misbehaves on 32bit systems when the resulting timestamp
would overflow an integer. Use a DateTime to workaround this issue.

Fixes #3868
 2013-06-03 20:16:18 -04:00
mark_story
027cfe9496 Fix typo. 2013-06-02 18:12:51 -04:00
mark_story
cbf3228c34 Fix inconsistent name/alias usage. 
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.

Thanks to Joost de Keijzer for providing the initial patch.

Fixes #3865
 2013-06-02 13:50:23 -04: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
Saleh Souzanchi
ca44413689 fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options 2013-06-01 14:16:23 +04:30
mark_story
be2a252345 Fix coding standards. 2013-05-31 10:37:20 -04:00
Mark Story
4b7c128f04 Merge pull request #1320 from ravage84/docblock-improvements 
Improved the DocBlocks and other code cleanup
 2013-05-31 07:36:04 -07:00
Mark
525bf3b362 Merge pull request #1297 from dereuromark/master-email-wrapping 
enforce a better email wrapping to send valid emails
 2013-05-31 07:30:32 -07:00
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
Jose Lorenzo Rodriguez
4bc92b822e Adding App.fullbaseURL as a recognized Configure value 2013-05-30 16:07:26 +02:00
Sebastián Marcos Arce
bf6c3854e5 Update HttpSocketTest.php 
Update tests.
 2013-05-30 10:13:31 -03:00
Marc Würth
2bbd391972 Synced PHP version annotations 
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
 2013-05-29 20:19:14 +02:00
Mark Story
bed60b5d82 Merge pull request #1312 from ravage84/package-fixes 
Fixed or removed some package/subpackage definitions to reflect director...
 2013-05-29 10:14:00 -07:00
Marc Würth
e7eb09bc23 Renamed ...Controller package to ...View 
Probably a leftover from splitting in 09e7f1d491
 2013-05-29 17:20:41 +03:00
Marc Würth
29cc6b3652 Fixed or removed some package/subpackage definitions to reflect directory structure 
Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
 2013-05-29 15:00:18 +02:00
mark_story
cce9e84907 Merge branch 'master' into 2.4 2013-05-28 22:40:32 -04:00
mark_story
06cf62aefe Fix failing tests. 
Refs GH-1307
 2013-05-28 22:38:01 -04:00
Mark Story
b111750494 Merge pull request #1308 from Jippi/hotfix/sql-bug-with-not-in-with-one-key 
Hotfix/sql bug with NOT in with one key
 2013-05-28 10:21:21 -07:00
Christian Winther
ef8603e1a7 Add unit test 2013-05-28 12:02:58 +00:00
euromark
bebb8ec416 do not translate error message in test case 2013-05-28 03:25:52 +02:00
mark_story
7334643b55 Fix issues with getting Xml as SimpleXmlElement and invalid Xml. 
Fixes #3855
 2013-05-27 13:22:14 -04:00
ADmad
dd2892ad8d Added password hasher 2013-05-26 11:29:06 +05:30
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
mark_story
9ee610757e Throw exceptions when invalid permission keys are used. 
Silently 'failing' to save permissions is bad, throw exceptions instead.

Fixes #3851
 2013-05-24 21:47:22 -04:00
Rachman Chavik
a63b54c34b Fix: Incorrect model being used as Controller::$modelClass 
We cannot be sure that Controller::$uses have not been iterated, so
reset the array to use the first value.
 2013-05-24 17:50:43 +07:00
euromark
75b5a323e4 enforce a better email wrapping to send valid emails 2013-05-23 18:34:39 +02:00
mark_story
ca1f9e800e Make CakeEmail::config() merge configuration. 
This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.

Fixes #3848
 2013-05-23 09:47:24 -04:00
ADmad
eccdf3bf60 Ensure passing empty array to SmtpTransport::config() does not reset existing config. 
Synced args and return value with AbstractTransport::config().

Fixes #3840
 2013-05-22 11:36:31 +05:30
Gilles Wittenberg
6d996d52ce Allow setting different type on scriptStart + scriptEnd 2013-05-21 20:14:44 +02:00
Gilles Wittenberg
f19615a3be Allow setting different type on scriptBlock 2013-05-21 20:14:44 +02:00
Mark Story
28a3b73bdc Merge pull request #1292 from openam/HtmlHelper 
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
 2013-05-21 08:44:08 -07:00
TAKAHASHI Kunihiko
05473fe7d0 Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST 2013-05-21 10:50:46 +09:00
Michael Tuttle
0d082b599a changed HtmlHelper::tag() just return $text when empty($name) 2013-05-20 17:36:51 -06:00
Michael Tuttle
12462b2e51 make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false 2013-05-19 22:00:27 -06:00
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
mark_story
f8c6138ad7 Fix incorrect exception type when double slash paths are used. 
Fixes #3838
 2013-05-18 12:20:06 -04:00
mark_story
e23c4ffad9 Fix empty response bodies when redirect URL's are empty. 
When redirecting XHR requests to an empty URL the response body should
not be overwritten.

Fixes #3835
 2013-05-17 16:33:08 -04:00
Mark Story
9147f545fe Merge pull request #1286 from kunit/master 
CakeEmail::_wrap does not operate correctly by the character string of specific Japanese.
 2013-05-17 13:17:13 -07:00
TAKAHASHI Kunihiko
f541260350 Add TestCase for Network/Email/CakeEmail.php 2013-05-17 18:56:52 +09:00
TAKAHASHI Kunihiko
a562d9c04e The assembly of the message was not correctly completed in specific Japanese. 2013-05-17 18:36:53 +09:00
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
mark_story
72b75660e5 Merge branch 'master' into 2.4 2013-05-16 21:31:27 -04:00
José Lorenzo Rodríguez
e466af05b9 Removing copy pasted extra line 2013-05-16 17:25:39 +02:00
Jose Lorenzo Rodriguez
018e5d0659 Adding Sylog as a logging engine 2013-05-14 23:21:38 +02:00
euromark
9fd2af96a8 add test case 2013-05-14 10:38:10 +02:00
mark_story
f7d106a386 Fix FormHelper::tagIsInvalid with saveMany forms. 
When saving multiple records validation errors were not correctly shown.
Fudge the entity path so it matches the validation errors set in the
models.

Fixes #3828
 2013-05-13 21:09:31 -04:00
mark_story
bd3428e456 Remove Asset.x Configure values. 
Having Asset.timestamp on can fail tests accidentally.
 2013-05-13 21:09:31 -04:00
mark_story
c1b2ca581c Use terser assertions. 2013-05-13 21:09:31 -04:00
ADmad
4d434ec9f3 Fix CS errors 2013-05-13 23:51:32 +05:30
mark_story
df872dde28 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-05-10 21:58:48 -04:00
mark_story
6017db9dc8 Add missing urlencoding to base/webroot. 
This fixes URL generation when PHP_SELF or the request path contains
special characters.
 2013-05-10 11:04:46 -04:00
mark_story
cdede82b7e Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Core/Object.php
 2013-05-07 22:22:48 -04:00
Mark Story
94ff1b20e2 Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem 
Fix bug in Xml::_toArray Method
 2013-05-07 19:03:18 -07:00
Mark Story
293ba4cdb9 Merge pull request #1261 from dereuromark/2.4-bake-fixtures 
add schema param and skip interactive prompts if unnecessary
 2013-05-07 18:59:42 -07:00
Derbois Aymeric
ca6612bc8b Fix a problem of tag values which is not taken into account 
(when equal to zero) when passing an XML object to an array.
 2013-05-08 00:56:17 +02:00
ADmad
91319bbe7b Fix disabled attribute check. 
Fixes #3818
 2013-05-08 01:43:27 +05:30
ADmad
372089797f Fix test 2013-05-07 23:23:07 +05:30
ADmad
36a51bdad5 Avoid fail due to postgres ordering 2013-05-06 22:03:45 +05:30
ADmad
a10275fb8b Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
 2013-05-05 14:36:46 +05:30
Rik van der Heijden
dddf8aafb9 Fixed curly brackets at a few class definitions 2013-05-04 13:23:58 +02:00
ADmad
db26e24cb7 Remove error setting when reading/deleting non-existent key. 
Fixes #3813
 2013-05-04 03:16:33 +05:30
Angel S. Moreno
2c4e9dc8f6 Added Aliasing of Tasks in the TaskCollection() class and added tests 2013-05-03 01:53:37 -04:00
mark_story
d4036310e4 Update limit() for Postgres 
It should work like the parent class.
 2013-05-02 23:27:26 -04:00
mark_story
00569ea405 Update limit() for Sqlite. 
It should behave as the parent class does.
 2013-05-02 23:25:13 -04:00
mark_story
2096d3f632 Clamp limit values to be unsigned integers. 
This solves large page numbers potentially turning into scientific
notation when being formatted into queries. It also further safeguards
against SQL manipulation.

Refs #GH-1263
 2013-05-02 22:36:50 -04:00
Rob McVey
bd3be2877d Test case for loooong page numbers in paginated results seems to cause SQL error 2013-05-02 09:57:04 +01:00
euromark
0959c7008f add schema param and skip interactive prompts if unnecessary 2013-05-02 00:19:46 +02:00
Rachman Chavik
5682907a88 Add Cache::groupConfigs() to get group->config map 2013-05-01 12:03:15 +07:00
mark_story
41d124d4de Fix autoLinkUrls() not autolinking URL's without a /. 
Refs #GH-1259
 2013-04-30 17:02:07 -04:00
mark_story
37ce6dfc81 Only allow sort fields that match the current object alias. 
Instead of modifying aliases that do not match, only allow aliases that
do match.

Refs #3803
 2013-04-30 12:41:42 -04:00
euromark
fab5a6f4d9 spelling corrections 2013-04-30 14:11:50 +02:00
Mark
faa6292f15 Merge pull request #1255 from dereuromark/master-copyright-noise-removed 
Remove copyright noise from test files
 2013-04-30 02:24:25 -07:00
mark_story
2b0e10eebb Exclude domain names starting with - 
Related to 479aefc438

Refs #3414
 2013-04-29 21:31:30 -04:00
Mark Story
ac94d11e65 Merge pull request #1254 from dereuromark/master-spelling-corrections 
spelling corrections (a url to an URL, unify URL)
 2013-04-29 09:27:48 -07:00
euromark
5b298c1306 remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway 2013-04-29 17:16:53 +02:00
Mark
eb9b80e63a Merge pull request #1192 from dereuromark/master-templated-emails 
fix line length for templated emails
 2013-04-29 07:34:06 -07:00
euromark
ff0aa70b59 fix line length for templated emails 2013-04-29 16:18:00 +02:00
euromark
09d9efe235 spelling corrections (a url to an URL, unify URL) 2013-04-29 11:05:17 +02:00
Mark Story
619f66178b Merge pull request #1233 from spiliot/patch-1 
Money validation should accept one decimal place.
 2013-04-28 18:06:49 -07:00
spiliot
dbe90cae71 removed duplicate test case 
```$this->assertFalse(Validation::money('text'));```
is now tested only once
 2013-04-29 00:20:35 +03:00
mark_story
62186ac8da Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-04-28 17:00:30 -04:00
mark_story
65b1a94e63 Simplify how fullBase is calculated. 
Using FULL_BASE_URL fixes URL generation when URL rewriting is
disabled.

Fixes #3777
 2013-04-27 23:03:25 -04:00
mark_story
c327bdc4bd Enforce model aliases when generating order by clauses. 
Invalid SQL could be created by sorting on an invalid alias, with
a field that exists on the model.

Fixes #3797
 2013-04-27 13:29:29 -04:00
ADmad
e11d0f829a Added html5 required attribute for select tags too 2013-04-27 18:39:53 +05:30
ADmad
8135d405a3 Merge branch 'master' into 2.4 2013-04-27 18:39:30 +05:30
Mark
372cd6f952 Merge pull request #1250 from dereuromark/master-form-input-require 
dont add required class on wrapper div
 2013-04-26 07:07:17 -07:00
Mark Story
cfda4e5c43 Merge pull request #1248 from zoghal/fix-router1 
fix currentRoute() when $_currentRoute is empty, return false
 2013-04-26 07:00:33 -07:00
euromark
67cc7f66da dont add required class on wrapper div 2013-04-26 15:41:35 +02:00
Saleh Souzanchi
4aabf72e1f fix currentRoute() when $_currentRoute is empty, return false 2013-04-26 13:36:35 +04:30
Rachman Chavik
03e5207aa1 Fix: write() after clearGroup() does not actually write to file 
Although clearGroup() does not use $this->_File, it needs to be null-ed
so that subsequent write() call do not see stale object.
 2013-04-26 14:43:36 +07:00
ADmad
3c036e9ebf Merge pull request #1249 from DiegoMax/master 
Fixed CakeResponse Tests
 2013-04-26 00:37:18 -07:00
Diego Massanti
03b6c3fa61 Fixed test case for CakeResponse 2013-04-26 04:32:44 -03:00
ADmad
19f8274a95 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-04-25 03:06:04 +05:30
Jose Lorenzo Rodriguez
db6dd18f86 Fixing case where it was possible to pass array data to FormAuthenticate 
fields
 2013-04-24 22:33:24 +02:00
ADmad
3db632732c Avoid unnecessary overhead if user record already available from session. 2013-04-23 01:35:04 +05:30
euromark
48fa358260 Remove leftover param that is now wrongly triggering "strict" 2013-04-22 11:36:17 +02:00
spiliot
2d7f6fc707 Added tests 2013-04-22 03:42:19 +03:00
mark_story
c2c096428c Uncomment test. 
I missed this earlier, because I'm a doofus.
 2013-04-21 11:29:25 -04:00
ADmad
06a5c509c0 Merge branch 'master' into 2.4 2013-04-21 19:15:55 +05:30
mark_story
f6c3015705 Add additional tests and fix incorrect meridian selection 
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.

Refs #GH-1237
 2013-04-20 14:39:47 -04:00
Majna
78ea4da681 Add test for time input with interval on first hour of the day 2013-04-20 17:51:50 +02:00
Ceeram
842b1802d9 add assert that habtm save does not return false 2013-04-19 19:37:23 +02:00
mark_story
efd86a498a Do type checks when looking for models in Controller::$uses. 
This solves issues with models not being added when $uses = true.

Fixes #3774
 2013-04-19 12:20:46 -04:00
mark_story
0f3d28c6ea Fix condition parsing in mysql specific cases. 
When using collation + array values the incorrect operator would be
used. IN should be used over =.

Fixes #3772
 2013-04-18 21:52:22 -04:00
mark_story
4d8dd12449 Add support for key => value cookies. 
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.

Fixes #3771
 2013-04-18 21:22:50 -04:00
ADmad
79ad8ab95a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Utility/File.php
 2013-04-14 00:05:18 +05:30
ADmad
ba56fb7064 Fixed issue where incorrect cached filesize was reported when appending to file. 2013-04-13 19:45:20 +05:30
Juan Basso
ce5563ff83 Supoprt query parameters on Router::parse. It will increase the symmetry of parse and reverse methods 2013-04-12 23:28:23 +00:00
mark_story
ed435870ae Fix secure field lists when select elements have custom name attributes. 
When a select element had a custom name attribute the secured field name
was incorrect.

Fixes #3753
 2013-04-12 12:30:05 -04:00
mark_story
8bd1980dd4 DateTime::getTimestamp() is PHP5.3+ 2013-04-11 13:39:05 -04:00
ADmad
548cccbbe2 "maxlength" is not a valid attribute for input element of type "number" in html5. 2013-04-11 21:06:52 +05:30
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
ADmad
e55877d171 Merge branch 'master' into 2.4 2013-04-06 00:57:46 +05:30
ADmad
431ab2aebd Fix CS errors 2013-04-04 17:37:51 +05:30
mark_story
d8d8e9644d Fix array('disabled') and array('disabled' => true) working differently. 
The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.

Fixes #3734
 2013-04-03 12:46:39 -04:00
Rémi Dewitte
c70a3868a9 schema update CREATEs non-existing tables instead of ALTER 2013-04-03 17:37:09 +02:00
Mark Story
bb776cfa72 Merge pull request #1213 from markstory/improve-request-is 
Improve CakeRequest::is()

Fixes #3714
 2013-04-02 10:20:13 -07:00
José Lorenzo Rodríguez
0b73c8b6ac Merge pull request #1171 from remidewitte/feature/filelog-mask2 
Add mask setting to FileLog
 2013-04-01 23:44:02 -07:00
mark_story
2d6ee3cdb1 Remove pointless code. 
Add a missing call to parent::setUp() and remove code that it takes
care of.
 2013-04-01 22:30:27 -04:00
mark_story
ce04d6afa1 Add CakeRequest::isAll(). 
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.

Refs #3714
 2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f Add support for is() with multiple types. 
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.

Refs #3714
 2013-04-01 21:52:15 -04:00
ADmad
d809b1480e Fix CS errors 2013-04-01 02:16:52 +05:30
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
mark_story
3fc627c5f8 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-03-30 22:12:27 -04:00
ADmad
7b90542230 Fix CS error 2013-03-31 00:23:03 +05:30
mark_story
ceb46b5d2c Try to fix random test failures on postgres. 
Sorting in postgres is undefined and no based on the primary key when
sorting is not supplied.
 2013-03-30 13:38:47 -04:00
Mark Story
84c0de7e2d Merge pull request #1203 from cincodenada/patch_httpsocket 
Add a bit of backwards compatibility for specifying auth in the config.

Restore compatibility with older versions when providing auth data in the
request data.
 2013-03-29 18:19:46 -07:00
Joel Bradshaw
ece6ac3663 Backwards compat for auth in the config array of HttpSocket::request() 
Brings functionality back in line with docs as well
 2013-03-29 15:46:42 -07:00
Renan Gonçalves
96c9174ee2 Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true. 
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
 2013-03-29 15:24:08 +01:00
Mark
42ea6895b2 Merge pull request #1107 from TeckniX/patch-1 
Added autoParagraph functionality to 2.4 Branch
 2013-03-28 03:30:15 -07:00
ADmad
342bf65811 Ensure referrer is saved in session even when AuthComponent::$loginRedirect is set. 
Clarified redirectUrl() docblock.
 2013-03-27 15:11:02 +05:30
mark_story
041c2d289f Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Shell.php
 2013-03-26 20:31:54 -04:00
José Lorenzo Rodríguez
8c9a16ab9f Merge pull request #1186 from ceeram/2.4-blacklist 
2.4 blacklist
 2013-03-26 07:35:43 -07:00
Ceeram
6bf9363217 Add option to skip exception types for logging. 
add blacklisting for logging exceptions

add test for skipping exception logging, and fix typo and cs

add example to docblock in core.php for skipLog

remove app_error.php skips, those are no longer used in 2.x

use assertContains instead of assertRegExp

check for instanceof, instead of matching names
 2013-03-26 15:11:39 +01:00
Loki
d260f4a5b3 Added autoParagraph to TextHelper with proper test cases and made it non-static 2013-03-25 11:00:37 -04:00
euromark
3a1ff36d5e correct coding standards 2013-03-25 13:06:38 +01:00
mark_story
a7708c914f Remove test case that is no longer useful. 
It is impossible for the current test to ever fail in the test suite, as
PHPUnit will always be loaded.
 2013-03-22 21:36:11 -04:00
José Lorenzo Rodríguez
c3222f746f Merge pull request #1185 from ceeram/2.4-unauthenticated 
stop execution when unauthenticated, to prevent the page to show when ca...
 2013-03-22 05:09:47 -07:00
mark_story
5d6a6fa203 Fix error when generating Xml. 
Fix warnings/un-escaped entities with deeply nested elements.

Fixes #3718
 2013-03-21 21:12:21 -04:00
Mark
a13f7e1f8a Merge pull request #1178 from dereuromark/2.4-bake-behaviors 
Allow behaviors to be added for baked models
 2013-03-21 06:16:19 -07:00
mark_story
729ef8fe58 Fix default null not being reflected by SqlServer 
Apply patch from 'Josh Rehm' to fix null default values from being
stomped on when reflecting table schema.

Fixes #3615
 2013-03-19 21:02:27 -04:00
mark_story
b821505014 Merge branch 'phantom-master' 
Refs GH-1182
 2013-03-18 21:40:14 -04:00
mark_story
37532389d6 Add test cases for GH-1182 
Add tests for afternoon times with an interval and 12 hour time format.
 2013-03-18 21:37:38 -04:00
Ceeram
89ecd95e55 fix failing tests 2013-03-18 18:47:05 +01:00
Ceeram
99fba8c601 more coding standards fixes, minor rectaoring of testcase 2013-03-18 11:38:50 +01:00
Ceeram
89100f9476 fix coding standards 2013-03-18 11:12:28 +01:00
mark_story
83de70efcf Tighten Canadian postal code validation. 
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.

Fixes #3708
 2013-03-17 18:14:56 -04:00
ADmad
7becd58237 Add test for Auth.redirect session var clearing. 2013-03-15 17:50:05 +05:30
euromark
dab0c5e753 Allow behaviors to be added to bake templates and improve doc blocks 2013-03-15 12:14:06 +01:00
mark_story
e97b3acebb Merge branch 'master' into 2.4 2013-03-14 20:54:42 -04:00
Mark Story
6d301394f4 Merge pull request #1183 from cincodenada/patch-1 
Fix bug where differing key-ordering in fixtures causes errors.

When a fixtures first and last records differed data should be
inserted correctly.
 2013-03-14 17:52:06 -07:00
Joel Bradshaw
9d7148e16f Restructuring Strings test so that it is compatible with this change 2013-03-14 14:51:54 -07:00
Mark Story
76ea0803d5 Merge pull request #1174 from psparrow/master 
Fixed issue with including including PHPUnit's Autoload script.
 2013-03-14 14:36:16 -07:00
mark_story
246c09ae40 Allow character classes in attribute patterns. 
Fixes #3706
 2013-03-14 12:55:03 -04:00
Mark Story
60f9131940 Merge pull request #1177 from yuya-takeyama/fix-alphaNumeric-validation 
Fix alphaNumeric validation
 2013-03-14 07:23:51 -07:00
Ceeram
18095ed42d fix failing test with webrunner 2013-03-14 12:44:11 +01:00
Yuya Takeyama
14c81fe052 Fix alphaNumeric validation 2013-03-14 20:10:17 +09:00
ADmad
8e299fc404 Move 'Auth.redirect' session value clearing from AuthComponent::shutdown() to prevent unnecessary session start. 
Closes #3702
 2013-03-14 12:42:21 +05:30
mark_story
0900c32c03 Merge branch 'master' into 2.4 2013-03-13 21:01:03 -04:00
mark_story
f1d192f282 Fix issue with midnight hour & 12hr formats. 
No hour would be selected in the case of 12hr formats and a time like
00:xx:yy
 2013-03-13 20:56:04 -04:00
mark_story
81dc4c1e85 Merge branch 'master' into 2.4 2013-03-13 20:30:25 -04:00
mark_story
274a146b24 Move tests around. 
Try to fix timing issues in formhelper tests.
 2013-03-13 20:29:45 -04:00
Ceeram
8374eb92cc fix failing tests. test and mocked sources would cause exceptions 2013-03-13 22:31:23 +01:00
José Lorenzo Rodríguez
abe6511d78 Merge pull request #1169 from ADmad/2.4-auth-take-2 
Implemented stateless login for Auth
 2013-03-13 14:22:18 -07:00
pjskeptic
9b9cf3d165 Fixed code formatting. 2013-03-13 12:18:32 -04:00
Ceeram
f6477d58df change formatOutput option name to pretty 2013-03-13 15:44:59 +01:00
pjskeptic
294dff7a26 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-13 10:13:48 -04:00
Ceeram
fc34d9fe7f Add formatoutput option to Xml::fromArray 2013-03-13 13:07:36 +01:00
pjskeptic
b17d8c9124 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-12 23:34:30 -04:00
euromark
f633241775 fix spacing error 2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6 fix coding standards 2013-03-10 18:11:50 +01:00
ADmad
b7834a2b16 Implemented stateless login for Auth 2013-03-10 00:11:35 +05:30
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
Rémi Dewitte
5b5180f661 code style in FileLog and FileLogTest 2013-03-08 09:32:46 +01:00
Rémi Dewitte
ab510d1700 Add settings array to connection parameters that executes SET statements once connected 2013-03-07 23:45:42 +01:00
Rémi Dewitte
278700677a Add mask setting to FileLog 2013-03-07 21:40:06 +01:00
Mark
b105318bcc Merge pull request #1148 from dereuromark/2.4-currency 
Top 6 world currencies - UTF-8
 2013-03-06 15:29:59 -08:00
euromark
eb874f87a3 Top 6 world currencies and make them utf8 per default 2013-03-06 23:35:18 +01:00
Mark Story
69f416da1e Merge pull request #1165 from cakephp/master-year-range 
Fix FormHelper year range for ranges outside of 1901-2038
 2013-03-05 17:36:47 -08:00
euromark
a07c9f0c3c Fix FormHelper year range for ranges outside of 1901-2038 2013-03-05 22:11:23 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
mark_story
cfc10a7c68 Fix failing test and unskip tests in SchemaShell::create() 
The tests were accidentally skipped when tests for --exclude were added
& fixed. Restore the gist of the previous tests.
 2013-03-04 22:37:48 -05:00
mark_story
4a0df83783 Fix failing tests. 
When the app did not have the correct models, tests would fail.
 2013-03-04 22:13:45 -05:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-03-04 21:55:29 -05:00
Alexander Hofbauer
c920209f58 SchemaShell: Implement "exclude" parameter 
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652.
 2013-03-04 22:37:44 +01:00
Jad Bitar
f1b815a9bb Add scope to email logging. 2013-03-01 22:24:02 -05:00
Renan Gonçalves
fd72f894ad Expanding year range based on the provided value. 
This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.
 2013-03-01 13:45:55 +01:00
Kyle Robinson Young
85862bbb9f Lazy load models in shells. 2013-02-28 20:30:06 -08:00
mark_story
1d529c1dd2 Add type hints in SchemaShell. 
I'm trying to figure out what's going on in the failing travis builds.
 2013-02-28 22:54:31 -05:00
mark_story
00edc594bf Fix failing test. 2013-02-28 21:31:09 -05:00
mark_story
92d215df4d Merge branch 'pr-cli' into 2.4 
From pull request 1142
 2013-02-28 21:23:03 -05:00
mark_story
15d01bf901 Fix tests for cli runner. 2013-02-28 21:22:01 -05:00
mark_story
33bd7a571a Restore whitelist when save fails. 
Fixes whitelist not being restored when save fails due to no data.

Fixes #3646
 2013-02-25 20:57:56 -05:00
mark_story
3d0920a405 Fix failing tests. 
Two buffers are needed now that handleFatalError() is blowing one up.
Related to pull request #1158
 2013-02-25 14:19:13 -05:00
mark_story
d1c88ebf8a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-02-24 20:24:26 -05:00
ADmad
b32e855a3d Fixing behavior prioritizing 2013-02-24 22:52:31 +05:30
Mark Story
51d2cb60fa Merge pull request #1139 from ADmad/2.3-dispatcher 
Prevent response object being set as response body
 2013-02-24 09:07:15 -08:00
Mark Story
b870d5d004 Merge pull request #1138 from ravage84/date-validation 
Added 'ym'- & 'y'-date validation.
 2013-02-21 19:21:47 -08:00
nojimage
84725993e5 Postgres datasource support regular expression operators. 2013-02-22 10:14:06 +09:00
mark_story
9f25da49ef Attempt to get more tests passing on travis ci. 2013-02-19 22:17:47 -05:00
mark_story
27dc666c8d Fix incorrect method names. 2013-02-19 22:04:44 -05:00
mark_story
3e34a09e8b Make skips more permissive. 
Hopefully this fixes issues on travisci.
 2013-02-19 21:05:05 -05:00
mark_story
341c0d17f0 Attempt to fix failures in travisci. 
Network tests have recently started failing, make those skip conditions
instead. Convert SocketExceptions in Xml::build() into XmlExceptions.
This is the documented behavior so we should try to honour that.
 2013-02-19 20:53:28 -05:00
ADmad
4ab27ca840 Implemented log file rotation. 2013-02-19 00:36:18 +05:30
ADmad
484801ecf4 Prevent response object being set as response body 2013-02-16 02:07:02 +05:30
Marc Würth
33fbace4c7 Added 'ym'- & 'y'-date validation 
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
 2013-02-15 14:35:20 +01:00
Mark
3b02013f7d Merge pull request #1127 from dereuromark/master-strict-comparison 
Strict comparison for strings where applicable
 2013-02-14 01:10:48 -08:00
mark_story
f104bd3504 Use simpler asserts. 
Refs #3622
 2013-02-13 22:43:18 -05:00
nojimage
fbb1a812dd Create rename field statements in postgres 
Refs #3622
 2013-02-13 22:24:21 -05:00
ADmad
f6215129f6 Fix type casting of string scopes to array in log engines 2013-02-13 00:10:32 +05:30
mark_story
0d9ef854ff Fix FULLTEXT column generation 
Fixes #3618
 2013-02-12 09:00:57 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Marc Würth
019c3aa721 Fixed small typo 2013-02-11 22:21:50 +01:00
euromark
23ef13f9c7 adding Kazakh and correcting some locales 2013-02-10 20:07:09 +01:00
mark_story
974ac44fb4 Use random iv values in rijndael. 
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
 2013-02-09 20:48:27 -05:00
ADmad
74b9cdb36f Fix failing tests caused by previous commit 2013-02-09 18:24:27 +05:30
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
ADmad
431e610317 Fix broken tests 2013-02-08 19:04:41 +05:30
Graham Weldon
a3702fcf2b More copyright updates 2013-02-08 21:29:18 +09:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09: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
euromark
d522f412db Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105 2013-02-07 15:36:00 +01:00
mark_story
1ceb17589a Merge branch 'master' into 2.4 2013-02-06 21:05:03 -05:00
ADmad
0b46b042b9 Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script(). 
Closes #3593
 2013-02-05 23:22:24 +05:30
ADmad
afb62959ef Added JSONP support for JsonView 2013-02-04 23:20:49 +05:30
mark_story
103bbbc375 Add CakeRequest::param() 
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
 2013-02-03 22:09:52 -05:00
Mark Story
e0ce0ac8e3 Merge pull request #1103 from perrywky/master 
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery

Fixes #3579
 2013-02-01 06:36:06 -08:00
Ceeram
fa1d22dc5e added test to disprove #3588 2013-01-31 16:21:01 +01:00
ADmad
fb7fbcf01b Added option to disable counter caches updating. 
Closes #3109
 2013-01-31 18:14:39 +05:30
ADmad
8ff59586f6 Merge branch 'master' into 2.4 2013-01-31 18:12:01 +05:30
Perry
5ac5e784de fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery 2013-01-31 17:01:59 +08:00
euromark
ee08fe5c1f BC fixes for disabled checkboxes 
see: d504642
see: #3545

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
 2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd Merge branch '2.2' 2013-01-31 09:42:55 +07:00
euromark
d504642c9b BC fixes for habtm. Closes #3545. 
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
 2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31 Fix issue with inputs() and plugin models. 
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.

Fixes #3571
 2013-01-29 22:02:21 -05:00
Rik van der Heijden
e331ae64ee Fix CrudAuthorizeTest, added Router::reload() in setUp 2013-01-29 21:35:29 +01:00
ADmad
bb767408d3 Fix cs errors 2013-01-27 23:03:06 +05:30
ADmad
04ec9dd614 Renamed AuthComponent::redirect() to AuthComponent::redirectUrl(). 
Closes #3268
 2013-01-27 21:22:11 +05:30
ADmad
422ceaff85 Added "tel" and "email" input type guessing. 
Closes #3557
 2013-01-27 08:59:54 +05:30
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
1fc9641af3 Merge pull request #1089 from majna/2.3-sort-natural 
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
 2013-01-25 18:49:16 -08:00
mark_story
ce7f85abe8 Fix Token fields being added to GET forms. 
They are not used so there is not much point in appending them.

Fixes #3565
 2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51 Merge pull request #864 from dereuromark/2.3-radio-multiple-between 
allow between to be an array of strings

Fixes #2859
 2013-01-25 12:06:55 -08:00
Majna
5250c92635 Fix Hash::sort() 'natural' type fallback on PHP < 5.4 2013-01-25 01:07:45 +01:00
mark_story
e4f241dd23 Merge branch 'pr-1075' 
Merge changes in pull request 1075.
 2013-01-23 21:19:53 -05:00
mark_story
0b659d513e Add tests for #3545 
Fix included in GH-1075

Closes #3545
 2013-01-23 21:19:37 -05:00
Mark Story
6ade91e83b Merge pull request #1083 from ceeram/2.3-pmdvars 
Remove unused local vars.
 2013-01-23 14:51:11 -08:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
ADmad
82f34c4cb3 Don't set "required" attribute for checkboxes (unless explicitly specified). 
Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field.
Closes #3560
 2013-01-23 20:38:24 +05:30
mark_story
0cdef75060 Fix failing tests. 
I have no idea why the updated session test was expected to fail as the
data was written to the session.

Refs #3551
 2013-01-21 21:13:35 -05:00
mark_story
75495705a6 Fix Hash::get($data, '0') 
Fixes #3555
 2013-01-21 20:50:46 -05:00
mark_story
7790bcacff Allow afterFind() to fully remove an associated record. 
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.

Fixes #3541
 2013-01-17 20:35:37 -05:00
mark_story
773666ddad Fix coding standards and save a function call. 2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f Merge pull request #1039 from bfanger/master 
Fixes an issue with urls as GET parameters
 2013-01-17 17:31:59 -08:00
Renan Gonçalves
23d4807933 Fixing expected value from find when it results in failure. 
When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().
 2013-01-17 13:00:56 +01:00
Mark Story
70171f5403 Merge pull request #1073 from cakephp/issue-3533 
Partially revert default niceShortFormat

The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.

Fixes #3533
 2013-01-16 18:08:44 -08:00
mark_story
95ed471c41 Reduce duplication in code. 
This will result in all tests being skipped when any of the required
models pre-exists.
 2013-01-16 12:59:13 -05:00
mark_story
5a6a45d0d1 Add support for --admin to bake controller all. 
I missed this when originally implementing bake controller all.

Fixes #3536
 2013-01-16 12:57:18 -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
mark_story
9c29fab4a4 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Network/Http/HttpResponse.php
 2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108 Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531 2013-01-15 09:17:24 +08:00
ADmad
d8551c49e5 Improve messages logged for exceptions 2013-01-12 11:30:25 +05:30
ADmad
676872d623 Allow AuthComponent::$unauthorizedRedirect to be an url. 
Closes #3494
 2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585 Merge pull request #1067 from ceeram/paginatecount 
Avoid calling paginateCount when there are no results.
 2013-01-11 18:09:32 -08:00
José Lorenzo Rodríguez
d571b056f4 Merge pull request #1063 from ADmad/2.3-cakeplugin 
Added feature to ignore include errors for CakePlugin
 2013-01-11 15:13:54 -08:00
dogmatic69
bcb3eb89dc Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string 
version while doing calculations will normally end up as floats.

This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.

	Number::currency(0.00, 'GBP') -> &#163;0.00
	Number::currency('0.00', 'GBP') -> 0p

Both versions will return `&#163;0.00` (or whatever 0 is configured to return).
 2013-01-11 17:00:06 +00:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
Ceeram
92d9b11aee fix double semicolon 2013-01-11 11:15:15 +01:00
Ceeram
d3f9cc10b5 fix failing test 2013-01-10 18:10:24 +01:00
mark_story
7008b812be Fix string '0' not being exported correctly. 
Fixes #3518
 2013-01-09 23:04:58 -05:00
mark_story
735517ade1 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/VERSION.txt
 2013-01-08 22:27:17 -05:00
mark_story
e3692225ff Fix lint errors. 2013-01-08 22:26:43 -05:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
mark_story
c2e087dc9b Add test for recursion issues in Hash::expand(). 
Refs #3080
 2013-01-08 19:42:12 -05:00
ADmad
970fdca89d Added feature to ignore include errors for CakePlugin 2013-01-09 01:08:42 +05:30
euromark
a266d8bede add test case 2013-01-08 13:06:02 +01:00
mark_story
3f21d09c1d Fix radio() and boolean values. 
Boolean values should be cast to integer equivalents, which allows
for correct handling of boolean columns and their string equivalents
used in form options.

Fixes #3512
 2013-01-07 21:12:53 -05:00
mark_story
e132a7c856 Remove duplicated assertions. 
These assertions are effectively duplicated in the next test method.
 2013-01-07 21:00:14 -05:00
mark_story
6d743971e9 Consistently inflect theme names. 
Themes should be consistently converted into CamelCase, this
makes the camelization consitent with the treatment in App::themePath().

Fixes #3508
 2013-01-03 21:06:46 -05:00
mark_story
75f654b87b Fix double encoding in JsHelper request methods. 
The urls were being HTML & URL encoded, this causes issues with URL's
containing query string parameters.  Remove HTML entities as they aren't
required in the Javascript context.

Fixes #3495
 2013-01-02 23:09:37 -05:00
mark_story
83abced287 Add tests for save() and multiple locales. 
Refs #3498
 2012-12-29 11:57:52 -05:00
mark_story
4c98e39c1f Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Controller/Component/SecurityComponent.php
 2012-12-29 11:44:59 -05:00
mark_story
1117ad2f1c Blackhole requests when the action is the blackhole callback. 
When a user requests the blackhole callback as an action we should
blackhole that request. The blackhole callback should not be URL
accessible.

Fixes #3496
 2012-12-29 11:43:06 -05:00
Majna
6d75d90c25 Code cleanup 
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
 2012-12-28 23:37:58 +01:00
ADmad
fd16b8a1e5 Throw exception if requested page number is out of range. 
Closes #3459
 2012-12-28 01:37:25 +05:30
Graham Weldon
a9293aa385 Merge remote-tracking branch 'origin/master' into 2.3 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/core.php
 2012-12-27 22:42:18 +09:00
Jose Lorenzo Rodriguez
9cc4371246 Revert "Merge pull request #1050 from rynop/2.3" 
This reverts commit f3f1e1ab52, reversing
changes made to 9fc4678fa3.
 2012-12-27 13:55:25 +01:00
mark_story
965f0e87c5 Fix SQL errors in TreeBehavior. 
SQL errors were caused by escapeField() usage in TreeBehavior. Quoted
fields were not correctly unquoted.

Fixes #3491
 2012-12-26 20:55:07 -05:00
Ryan
1881ff1664 Fix testClear() case 
After clear of memcache config, all keys should be gone. So a read on a key should return false.
 2012-12-26 16:34:23 -06:00
ADmad
367463f4c1 Added disabledTag option. 
Closes #3108
 2012-12-24 20:48:44 +05:30
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678 Merge pull request #961 from dereuromark/2.3-unify-object-collection 
2.3 unify object collection
 2012-12-22 14:24:26 -08:00
ADmad
fce07bd5b8 Fix failing test 2012-12-23 03:32:25 +05:30
José Lorenzo Rodríguez
29f6e13a28 Merge pull request #1007 from dereuromark/2.3-response-charset 
not just json should send the charset
 2012-12-22 14:00:58 -08:00
José Lorenzo Rodríguez
9f5549a7eb Merge pull request #1037 from ADmad/2.3-formhelper 
Added "required" attribute to input element based on validation rules fo...
 2012-12-22 13:51:40 -08:00
ADmad
a340c19c08 Added support for php.ini style values 2012-12-23 02:25:59 +05:30
Bob Fanger
13dc397172 Added unittest for REQUEST_URI with multiple FQDNs. 2012-12-21 19:59:55 +01:00
ADmad
8ef2c22c29 Added "required" attribute to input element based on validation rules for field 2012-12-21 23:20:40 +05:30
Bob Fanger
b7b6859c27 Fixes corrupted CakeRequests when a $_GET value contains "://" 2012-12-21 16:12:51 +01:00
euromark
910e21e65e a few more application contents should send the charset 
adding content type tests as dataprovider
 2012-12-21 12:32:32 +01:00
mark_story
554d5794ce Merge branch 'master' into 2.3 2012-12-19 21:18:52 -05:00
mark_story
08cde9f5a2 Fix foreach error when useTable = false. 
When calling model->create() with useTable = false, an error should not
be triggered.

Fixes #3480
 2012-12-19 21:18:34 -05:00
ADmad
d16a9ab98e Fix error when no model scope is set 2012-12-20 02:32:24 +05:30
mark_story
7ad11f59bb Change line length in emails. 
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.

Fixes #3151
Fixes #3473
 2012-12-17 20:54:38 -05:00
Vinícius Krolow
00ea427383 When you are showing a related model field in paginator sort it will display more friendly. eg: $this->Paginator->sort('Text.label') will retorn as Text Label 2012-12-17 01:55:03 -02:00
mark_story
4bdaa2b5a0 Merge branch 'master' into 2.3 2012-12-16 13:32:38 -05:00
mark_story
1528b5c382 Don't return true when there is nothing to save. 
Model::save() should not return true when no work has been done.

Fixes #3469
 2012-12-16 13:19:14 -05:00
Mark Story
408f9dd3b0 Merge pull request #1018 from dereuromark/2.3-postlink-target 
Put target attr on correct element when using postLink()
 2012-12-15 06:58:14 -08:00
dogmatic69
2266292594 fixing bug in Hash where array is not similar to the path required 2012-12-14 22:45:52 +00:00
mark_story
6f5ff4d7dd Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
 2012-12-13 20:20:42 -05:00
Mark Story
45f6ade800 Merge pull request #997 from rhelms/2.2.5-text-index-in-fixture 
Cater for length part of TEXT field in indexes for MySQL'

Fixes #3428
 2012-12-12 17:27:30 -08:00
Reuben Helms
07dbc4a527 Cater for length part of TEXT field in indexes for MySQL 
Cater for length on TEXT column in index for _alterIndexes

Handle nested arrays in schemas

Used when writing indexes containg TEXT field for MySQL

Change comment style from code review

Remove stray space

Only generate length part of TEXT index column field when necessary

Override buildIndex() in Mysql instead of name()
Revert DboSource::buildIndex to previous state
Update Mysql::_alterIndexes for code reuse
Update MysqlTest to handle quoted index names.

Make code clearer, as per code review

Adjust function comments, as per code review
 2012-12-13 08:33:43 +10:00
euromark
ae7f629eff correct target attribute for postLinks 2012-12-12 11:23:41 +01:00
mark_story
b20f6e132d Add test for options with 0 value. 2012-12-10 22:10:00 -05:00
Ceeram
a8eca60fc5 fix coding standards 2012-12-10 17:40:12 +01:00
Ceeram
a15481bbe9 starting refactor Form->input 2012-12-10 10:51:39 +01:00
mark_story
2a8ebcea60 Exclude value attribute from generated file inputs. 
Having a value attribute present causes HTML validation errors in HTML5
doctypes. It has no effect in other doctypes, and excluding it is always
valid.

Fixes #3440
 2012-12-09 13:31:01 -05:00
mark_story
1e49be3472 Fix stack traces not being highlighted correctly. 
Fixes #3439
 2012-12-08 20:48:45 -05:00
mark_story
b1aa75bec0 Fix coding standards. 2012-12-07 22:06:15 -05:00
mark_story
8b0a7ee13d Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/VERSION.txt
 2012-12-07 20:53:10 -05:00
dogmatic69
85de93a4a7 fixing issue where merge is renumbering array keys 2012-12-07 01:26:14 +00:00
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00
mark_story
002700071d Fix incorrectly quoted fields when using the || operator. 
Fixes #3404
 2012-12-02 20:59:56 -05:00
Saleh Souzanchi
d5283af818 fixed utf-8 pattern in router option 2012-12-02 16:30:45 +03:30
Jose Lorenzo Rodriguez
c1551d9828 Merge branch 'master' into 2.3 2012-12-02 00:34:55 +01:00
Jose Lorenzo Rodriguez
da4fdbac3a Fixing failing test case 2012-12-02 00:34:26 +01:00
Jose Lorenzo Rodriguez
0f5fa290ed Merge remote-tracking branch 'origin/master' into 2.3 2012-12-01 23:19:53 +01:00
José Lorenzo Rodríguez
99e84b8a08 Merge pull request #930 from LiquidityC/2.3_3315_viewblock_startifempty 
Added: View::startIfEmpty($name)
 2012-12-01 14:06:55 -08:00
José Lorenzo Rodríguez
dfb154464e Merge pull request #994 from dereuromark/2.3-missing-elements 
make View trigger notice if elements are missing.
 2012-12-01 13:38:54 -08:00
José Lorenzo Rodríguez
dc370826af Merge pull request #918 from bar/2.3-form-empty-error 
Calling Form->input() with 'errorMessage'=> false should trigger field error, but not render error element.
 2012-12-01 13:09:35 -08:00
mark_story
479aefc438 Update TLD validation to accept gTLD variations 
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.

Fixes #3414
 2012-11-30 22:11:57 -05:00
mark_story
889c1ebc09 Fix sorting empty data with Hash & Set. 
Fixes #3420
 2012-11-30 13:05:14 -05:00
euromark
e1e4d93134 make View trigger notice by default if elements are missing 
and add elementExists() method
 2012-11-30 14:11:45 +01:00
ADmad
4a6ebaa07b Added Helper::$settings 2012-11-30 12:19:40 +05:30
ADmad
1de8ed18de Avoiding specifying 'maxLimit' too when setting 'limit' greater than default 'maxLimit' in code. 2012-11-30 11:26:10 +05:30
Mark Story
68976a028e Merge pull request #990 from beeman/minor-js-fix 
Minor js fix, makes two files in test suite valid JavaScript
 2012-11-29 18:10:40 -08:00
Thomas Ploch
7f0085cd4e Added type hinting to Model::validator() 
Added missing param and fixed typo in method's phpdoc.

Used 'assertSame' and 'assertNotSame'. Removed piped NULL type from phpdoc.

Simplify condition in Model::validator()
 2012-11-28 21:32:00 -05:00
mark_story
ffcf71c810 Merge branch 'master' into 2.3 2012-11-28 21:30:15 -05:00
mark_story
f250592fee Fix multi-model validators with deep & atomic. 
Apply patch from 'Christian Buffin' to fix validateMany() and
validateAssociated() when atomic=false & deep=true are used in
conjunction. Using Hash to flatten the nested set of validation results
yields the correct results.

Fixes #3352
 2012-11-28 21:26:40 -05:00
mark_story
35d67bf4a8 Merge branch 'master' into 2.3 2012-11-28 21:00:30 -05:00
Bram Borggreve
f69fe20376 Makes sure these two files are valid JavaScript by adding comment marks 
to them, this way editors (NetBeans 7.3 for instance) stop marking them
invalid.
 2012-11-28 15:29:50 +01:00
mark_story
966c69cb98 Fix missing plugin parameters in scaffolding. 
Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.

Fixes #3396
 2012-11-27 21:59:06 -05:00
Schlaefer
94a17d40da fix ticket 3400: url string with # in it is not routed 
See: http://cakephp.lighthouseapp.com/projects/42648/tickets/3400-url-string-with-in-it-is-not-routed
 2012-11-26 16:43:47 +01:00
mark_story
739982addb Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/View/Helper.php
 2012-11-25 23:33:16 -05:00
mark_story
1f35d82c81 URL encode image/script/css/video paths. 
Properly urlencode urls used in HTML attributes. This solves issues with
invalid HTML being generated when paths contain special characters.

Fixes #3395
 2012-11-25 23:31:22 -05:00
mark_story
869d556d07 Fix typos & strict errors. 2012-11-24 22:42:14 -05:00
mark_story
3ba2db738f Re-work MediaViewTest 
it was duplicating many of the tests in CakeResponse, and missing a
few of the cases in MediaView itself.
 2012-11-24 16:29:39 -05:00
mark_story
82d20ed948 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/View/MediaViewTest.php
 2012-11-24 15:44:52 -05:00
mark_story
e04e0a0ec8 Use non-mocked methods for tests 
This makes reducing off by 1 second errors much easier.
 2012-11-24 13:34:12 -05:00
Mark Story
780b6f01b4 Merge pull request #962 from srwebs/feature/empty-bool-operators 
Fix: check if bool operators in find conditions are empty.
 2012-11-24 10:14:22 -08:00
mark_story
0d29861423 Fix order for finds 
This should solve more occasional errors in postgres on travis.
 2012-11-21 21:52:23 -05:00
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
 2012-11-20 23:02:33 -05:00
mark_story
587c7071b4 Fix incorrect order of arguments when added out of sequence. 
Fixes #3385
 2012-11-20 22:42:44 -05:00
Mark Story
04d4abfa53 Merge pull request #965 from frederikweber/patch-1 
Send charset in Content-Type when Content is JSON.
 2012-11-19 17:08:57 -08:00
ceeram
4611c987db Merge pull request #959 from ceeram/phpcsw 
Make phpcs pass
 2012-11-19 15:10:47 -08:00
mark_story
fb275c5fa2 Fix warnings from file_get_contents() in Xml::build() 
Use HttpSocket to get proper exceptions when trying to load XML from
remote servers.

Fixes #3379
 2012-11-19 14:46:45 -05:00
mark_story
6b4afb989e Fix Set::merge() failing to merge correctly. 
When merging 3 values, and the 2nd was empty, the resulting
merge was incorrect.

Fixes #3384
 2012-11-19 14:03:03 -05:00
ADmad
165035faa8 Merge pull request #963 from sarce/paginator-tag 
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
 2012-11-18 22:41:10 -08:00
frederikweber
58df515a6d Add test for Content-Type JSON and charset. 2012-11-18 23:44:37 +01:00
Linus Probert
d6bf0dc003 Added additional test for View::startIfEmpty($name) 2012-11-18 16:30:47 +01:00
Nicolas
a77e46cbfd Added accidentally removed tests back in. 2012-11-17 23:14:40 +01:00
mark_story
c504fcfdf0 I'm a tool, fix test and remove debug(). 2012-11-17 14:57:03 -05:00
mark_story
a3ddff4aa7 Fix failing test & simplify code. 2012-11-17 14:51:57 -05:00
Mark Story
c752b75904 Merge pull request #958 from planardothum/feather 
Frameworks compatible Breadcrumbs.
 2012-11-17 11:23:43 -08:00
Nicolas
1b704fb7cf Unit tests added. 2012-11-17 19:34:02 +01:00
Sebastián Arce
d0d15701b3 prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper. 2012-11-17 15:26:08 -03:00
Mark Story
26e31848c6 Merge pull request #954 from rhelms/feature/2.3-mock-model 
Add CakeTestCase::getMockForModel convenience method

Fixes #3364
 2012-11-16 10:03:35 -08:00
Ber Clausen
1c281c9a2b Calling Form->input() with 'errorMessage'=>false should trigger field 
error, but not render error message (HTML element).
 2012-11-16 15:02:01 -03:00
planardothum
4351b78639 Change more spacing issues. 2012-11-16 06:39:13 -05:00
euromark
8acdb129b2 unify object load/unload and loaded methods 2012-11-16 12:14:28 +01:00
planardothum
bed9ba22cc Fix spaces around operators. 2012-11-15 20:15:49 -05:00
Ceeram
6d0e32e642 fix coding standards, remove break after return/continue 2012-11-15 12:09:14 +01:00
ADmad
f7e66da6fc Fix derpness of fieldset and legend options being mashed inside $fields param array. 2012-11-15 11:22:04 +05:30
mark_story
a7f192c606 Merge branch 'master' into 2.3 2012-11-14 21:50:29 -05:00
mark_story
374631dc8c Fix skip condition. 2012-11-14 21:42:40 -05:00
mark_story
9011b42bb4 Add skip if response is invalid. 2012-11-14 21:35:58 -05:00
mark_story
58de6702bc Fix notice errors when creating fields named 0. 
Fixes #3371
 2012-11-14 21:27:12 -05:00
Mark Story
7206254166 Merge pull request #955 from dereuromark/master-tree-fixes 
Asserting that tree behavior generates valid sql in recover

Fixes #3366
 2012-11-14 18:03:05 -08:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
euromark
b7e75a6399 more whitespace coding standards 2012-11-14 12:36:55 +01:00
euromark
b48f105b3f fix tabs to spaces 2012-11-14 09:55:33 +01:00
planardothum
a0f323eb4c Add frameworks compatible Breadcrumbs. 
New options in HtmlHelper::getCrumbList() to make it compatible with Twitter Bootstrap, Zurb foundation or other CSS frameworks.
 2012-11-13 20:19:29 -05:00
euromark
354069d229 cascade false for recover 2012-11-13 21:12:46 +01:00
ADmad
ac087ec938 Fix rules set being updated with array instead of CakeValidationRule objects. Closes #3367 2012-11-13 22:13:15 +05:30
euromark
22f65f7cb5 asserting that tree behavior generates valid sql in recover 2012-11-13 11:18:17 +01:00
Mark Story
bfbd05576b Merge pull request #947 from cakephp/2.3-http-socket 
2.3 HttpSocket enhancements
 2012-11-12 19:13:31 -08:00
Reuben Helms
4d87abfcdc Add CakeTestCase::getMockForModel convenience method 
This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.
 2012-11-13 13:07:18 +10:00
mark_story
9ef9b8b662 Remove off by a second errors. 2012-11-12 21:47:05 -05:00
mark_story
12e2e1363d Skip more tests when openssl is not enabled. 
5.2 environments on travis-ci don't have openssl enabled.
 2012-11-11 22:53:13 -05:00
mark_story
593cfc05d5 Skip tests if openssl is not enabled. 2012-11-11 22:28:23 -05:00
mark_story
e0586da808 Fix tests that occasionally fail on postgres. 2012-11-11 22:14:59 -05:00
mark_story
d95ef5d5e8 Fix failing tests. 2012-11-11 21:57:52 -05:00
mark_story
240c8718eb Implement SSL peer verification in HttpSocket 
Use the stream API and enable SSL certificate validation. This
increases the security features of HttpSocket, and provides easy access
to the stream context options.  SSL related configuration should be
prefixed with 'ssl_'.

Refs #2270
 2012-11-11 14:23:17 -05:00
mark_story
9e725641ad Add context() to CakeSocket. 
This will help enable peer verification for HttpSocket later on.
 2012-11-10 22:58:36 -05:00
mark_story
e0aab77dab Merge branch 'master' into 2.3 
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
 2012-11-10 21:33:26 -05:00
mark_story
644d47c843 Fix ordering on another query that was failing on travis-ci. 2012-11-10 14:24:30 -05:00
mark_story
8b7b139353 Fix failing tests using chr(226) instead of unicode codes. 2012-11-09 22:32:29 -05:00
Lawrence Barsanti
a60a730e7e XmlView: configure top level element name 
Allow the top level element name to be configured by setting
XmlView.RootNodeName.
 2012-11-04 21:21:35 -05:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
ADmad
fa5ccf46d0 Fix coding standard errors 2012-11-04 02:52:00 +05:30
ADmad
084636bf9d Add App::uses() 2012-11-03 21:55:46 +05:30
Jose Lorenzo Rodriguez
f04259d195 Fixing broken test 2012-11-03 14:51:39 +09:00
Ryan Morris
fa759231da Update checkRequired to simply check if an array key is present rather than isset (which fails if the value is null) 2012-11-03 14:41:06 +09:00
mark_story
9007406b9d Fix another test that sometimes fails on travis. 2012-11-02 22:07:24 -04:00
Ber Clausen
8b2b077119 Set::flatten() fails to generate keys when 'tip' value is an empty 
array.
 2012-11-02 19:23:55 -03:00
mark_story
ce3aa692b5 Use set order for test that failed on travis. 2012-11-02 18:06:59 -04:00
mark_story
60f9626838 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
 2012-11-02 16:52:51 -04:00
mark_story
9ce70044b0 Fix missing query arguments in array urls. 
Adding documented features that previously wasn't implemented.

Fixes #3328
 2012-11-02 16:46:36 -04:00
Linus Probert
03176c6c8c Added test for View::startIfEmpty($name) 2012-11-02 21:29:31 +01:00
Ceeram
093275aef6 Use correct value when using virtualFields in conditions and IN (), refs PR#897 
Squashed commit of the following:

commit 6a986953e16601fb34a132df24ae16f882f218cf
Merge: babd714 118dd8c
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 13:02:15 2012 +0100

    Merge branch 'master' into virtualcondition

commit babd714d80178c68b0e3fbcc21fc53b846484fd8
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 00:22:43 2012 +0100

    fix incorrect tests

commit 9a46c13e1aa13905b8e5474947933676e03009ce
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Nov 1 11:44:19 2012 +0100

    add test for regular fields and conditionKeysToString with IN

commit 3aa62e5cb93aa0c7bbb47e874fc1446873dd0d27
Merge: a8f0c3d 1f31340
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Nov 1 11:37:01 2012 +0100

    Merge branch 'master' into virtualcondition

commit a8f0c3d918761ff2c456cc3a53f1e3ee5b1c6173
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Oct 11 16:46:10 2012 +0200

    use correct value when using virtualFields in conditions and IN ()
 2012-11-02 14:29:38 +01:00
Ceeram
b18550c667 fix incorrect tests 2012-11-02 12:16:32 +01:00
Ceeram
b8607ca2ed fix fieldlist, refs PR808 and PR851 
Squashed commit of the following:

commit 7007dba0eb836f852aaca95fada103bc4ba993a9
Merge: 3ca4d23 7d84486
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 10:53:39 2012 +0100

    Merge branch '2.3' into calinseciu-2.3

commit 3ca4d231bf80d2bb1c0572196f633da68c1a0db7
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Sep 23 12:45:00 2012 +0200

    more tests added

commit e6b12532655671aff2b966a9be89b2625a715e8f
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Sep 18 09:18:32 2012 +0200

    change methodname and visbilty

commit 70396265025190ab2fbc159911ec3e064cc44fb2
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 17:26:52 2012 +0200

    fix fieldlist, refs PR #808

commit e9db96bfe163609eeefba430d8353c822aabacb0
Merge: 99b798f adb8142
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 16:26:40 2012 +0200

    Merge branch '2.3' of git://github.com/calinseciu/cakephp into calinseciu-2.3

commit adb8142d2694692ec71a063ac2ad1b275f3a67c9
Author: calinseciu <calinseciu@gmail.com>
Date:   Thu Aug 30 17:57:50 2012 +0300

    Add foreignKey to whitelist in saveAssociated()

    Association's foreignKey doesn't get saved when saving hasMany associations since it's not in the model's whitelist after validation.
    This happens if you don't send the foreignKey with the associated records data.
 2012-11-02 10:56:49 +01:00
Rachman Chavik
7d844866f0 RedisEngine: authenticate connection if 'password' is set 2012-11-02 09:38:18 +07:00
mark_story
118dd8c534 Make fragile test less fragile. 2012-11-01 21:36:14 -04:00
mark_story
ddd3baf703 Fix null column errors in SQLite and Postgres. 2012-11-01 21:07:29 -04:00
ADmad
cc6b699db4 Added missing App::uses() statement. Closes #3331 2012-11-02 02:16:02 +05:30
Ceeram
0196c6f686 code optimizing and simplify _crypt(), see PR #853 2012-11-01 14:15:52 +01:00
mark_story
1f31340a2a Fix issue with Model::saveAssociated() and TranslateBehavior 
When combining saveAssociated() with validate=first and
TranslateBehavior. Saving data for multiple locales was not done
correctly.

Fixes #3272
 2012-10-31 23:13:56 -04:00
mark_story
414e0a3484 Fix totally incorrect test. 
TranslateBehavior should never be overlapped with real fields.
It should only be used to add fields that don't exist on the parent
table.
 2012-10-31 22:51:37 -04:00
mark_story
8035b37df2 Only set $request->data with PUT/DELETE when it can be decoded. 
Setting $request->data to the raw put data isn't overly useful unless it
can be decoded.  Generally $request->data is expected to be an array,
when its a string things can go funny.

Fixes #3320
 2012-10-31 21:02:47 -04:00
ADmad
26d8351af4 Fixing "required" field detection again. Closes #3305 2012-11-01 05:04:37 +05:30
mark_story
b9ee4fc9f1 URL decode redirect urls. 
Some servers send url encoded Location headers. Decode location headers
before processing a redirect.

Fixes #3310
 2012-10-29 22:29:13 -04:00
Kyle Robinson Young
f10c669813 Code standards fixes 2012-10-29 08:14:17 -07:00
mark_story
478461d301 Merge branch 'master' into 2.3 2012-10-28 21:42:48 -04:00
mark_story
d9a3ab844f Fix another test that fails on postgres sometimes. 2012-10-28 21:16:50 -04:00
mark_story
94bd2cedcf Fix more off by a second errors 2012-10-28 16:15:20 -04:00
mark_story
ab2ce29bd6 Fix a few more tests that sometimes fail on postgres. 2012-10-28 16:11:07 -04:00
Jose Lorenzo Rodriguez
8bca041066 Revert "Fixing failing test case in RssHelper" 
This reverts commit 7715689523.
 2012-10-28 20:48:31 +01:00
Jose Lorenzo Rodriguez
7715689523 Fixing failing test case in RssHelper 2012-10-28 11:52:30 +01:00
mark_story
c794e295a0 Merge branch 'master' into 2.3 2012-10-27 22:50:02 -04:00
mark_story
667dfd308f DateTime::getTimestamp() only exists in PHP > 5.3.0 2012-10-27 22:49:43 -04:00
mark_story
c24bec679b Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
 2012-10-27 21:13:53 -04:00
mark_story
e8f727fe68 Using fixed points in time. 
This avoids lulz when the United Kingdom changes change to/from DST at
a different time than your local timezone.
 2012-10-27 21:12:34 -04:00
euromark
5324a8ca9c cleanup 2012-10-27 00:26:54 +02:00
Ber Clausen
a7d9422c09 Test all empty array with assertSame() because assertEquals() does not check the type. 2012-10-26 19:21:51 -03:00
Ceeram
870d77c89e Make the test more accurate on type of result 2012-10-26 20:49:04 +02:00
Ceeram
f4f4aa4a2a Squashed commit of the following: 
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Oct 26 14:40:24 2012 +0200

    Merge branch '2.3' into currency

commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 23:53:03 2012 +0200

    NumberHelper now also uses the default currency from CakeNumber, instead of default argument value

commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 18:01:35 2012 +0200

    Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
 2012-10-26 19:32:39 +02:00
Ceeram
39dcb80b45 Fix failing test, find('first') now returns empty array when no record was found 2012-10-26 16:32:15 +02:00
Mark Story
a0665feac4 Merge pull request #917 from bar/master-find 
Make Model::find('first') always return an array.
 2012-10-26 07:00:48 -07:00
ADmad
0ddd130833 Improved "required" field detection. Closes #3305. 2012-10-26 12:58:24 +05:30
mark_story
559130b87b Try and make test less likely to fail. 2012-10-25 21:56:00 -04:00
mark_story
c359e4b689 Fix issue with array based values and interval. 
Fixes #3299
 2012-10-25 20:46:54 -04:00
Ber Clausen
c741f60367 Make Model::find('first') always return an array. 2012-10-25 17:57:37 -03:00
euromark
cc436146be making tests pass on windows again 2012-10-25 17:37:35 +02:00
Mark Story
555bfc32ea Merge pull request #909 from dereuromark/master-magic-input-bc 
Master magic input bc

Fixes #3295
 2012-10-25 07:05:31 -07:00
mark_story
83d307e545 Try to set order on more things. 2012-10-24 22:38:15 -04:00
mark_story
9e0778951a Add some fixed orders. 
Hopefully this makes tests in postgres more reliable.
 2012-10-24 21:27:01 -04:00
mark_story
5786245832 Fix lint error. 2012-10-24 21:21:11 -04:00
mark_story
c4b9fa6c7a Fix failing tests. 2012-10-24 21:00:56 -04:00
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks 
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
 2012-10-24 19:03:44 +01:00
mark_story
d2010308d4 Merge branch 'master' into 2.3 2012-10-23 20:20:52 -04:00
mark_story
3729ac1f2f Fix issue where the incorrect meridian would be selected. 
When combining 12 hour format, interval and afternoon times, the
incorrect meridian would be selected.  Moving the hour math into
FormHelper::hour() makes that method generally more correct and lenient
on its input.

Fixes #3299
 2012-10-23 12:47:12 -04:00
euromark
044cf60b69 move the test case to its own method 2012-10-23 16:07:43 +02:00
euromark
5064601c6f adding test case 2012-10-23 15:11:23 +02:00
ADmad
1763f46340 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/bootstrap.php
 2012-10-23 16:53:01 +05:30
Mark Story
746eaf9389 Merge pull request #894 from dereuromark/comp-fix-save-all 
BC mod for saveAll()
 2012-10-22 18:40:38 -07:00
Mark Story
d75bd48c25 Merge pull request #905 from dereuromark/2.3-ini 
allow ini files to have separators between sections for better readability
 2012-10-22 18:38:49 -07:00
mark_story
ed6ff92296 Remove bad test. 2012-10-22 20:55:56 -04:00
mark_story
a0a61b5980 Fix issue where createSchema() would omit primary keys sometimes. 
Fix missing primary key SQL when using the primary flag + other indexes.

Fixes #3292
 2012-10-22 20:46:10 -04:00
Jose Lorenzo Rodriguez
1c0c8604c8 Pushed before fxing error in test case, I suck. Refs #3291 2012-10-22 23:09:31 +02:00
Jose Lorenzo Rodriguez
9dc3b243ac Correct inflection rules for cookies, fixes fixes #3291 2012-10-22 23:07:42 +02:00
mark_story
d4631a6ead Remove bad test. 2012-10-20 21:03:38 -04:00
mark_story
0b0b361e48 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
 2012-10-20 20:48:11 -04:00
mark_story
08556ab879 Fix saveAssociated() with validate=first, atomic=false 
When using the above options & validation errors on the associated
models, saving would not be aborted.

Fixes #3285
 2012-10-20 15:12:05 -04:00
mark_story
888b1f4795 Fix issue with using contain() and query[contain] 
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
 2012-10-20 14:51:52 -04:00
euromark
5a8092fc1b allow ini files to have separators between sections for better readability 
dump now makes spaces between sections in init files
 2012-10-18 17:20:15 +02:00
mark_story
307759516b Try to make tests less fragile. 2012-10-15 22:54:03 -04:00
mark_story
1cc82ff39f Merge branch 'master' into 2.3 2012-10-15 21:48:55 -04:00
mark_story
6d3ae3b83c Fix missed use of VERSION. 2012-10-15 21:48:36 -04:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
 2012-10-15 21:46:49 -04:00
mark_story
f6c5ceb77a Use id() as VERSION doesn't exist in phpunit 3.6 2012-10-15 21:38:10 -04:00
mark_story
f89fe0e1ef Fix tests that fail in PHPUnit 3.7 
Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
 2012-10-15 21:36:12 -04:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments 
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
 2012-10-15 18:19:37 -06:00
mark_story
59f84024e5 Handle REQUEST_URI with domain names properly. 
Don't depend on parse_url() as it fails with corrupted urls.  Instead
use FULL_BASE_URL to prepare an absolute path.

Fixes #3270
 2012-10-14 11:58:07 -04:00
ADmad
56a0eb04b7 Fix incomplete patch 61dd1098d3 2012-10-14 18:44:10 +05:30
Mark Story
7ea3ee466d Merge pull request #899 from dereuromark/2.3-more-tests 
default value null makes more sense. add test cases for false.
 2012-10-13 18:28:34 -07:00
ADmad
61dd1098d3 Allow specifying tag for current page number. Closes #2892 2012-10-13 12:34:00 +05:30
euromark
7bf08fdcc7 default value null makes more sense. add test cases for false. 2012-10-12 16:03:05 +02:00
euromark
2dfb40bac0 remove duplicate line 2012-10-11 14:54:11 +02:00
mark_story
1110e26483 Fix 0'th index file not being copied to $_FILES. 
Fixes #3256
 2012-10-11 08:39:46 -04:00
mark_story
8800d7bdec Reduce duplication in test case. 2012-10-11 08:28:59 -04:00
mark_story
b1dfab87e4 Fix autoLinkUrls so it re-capture query strings. 
Fixes #3296
 2012-10-11 08:28:59 -04:00
euromark
1e2ac0b9c8 comp mod for saveAll() 
better approach

test case to assert saveAll still behaves like previous versions
 2012-10-11 14:03:59 +02:00
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
ADmad
33a879ff41 Fix find('count') with 'group' when result has only one group. Closes #1677 2012-10-09 10:43:27 +05:30
mark_story
9a66768aa4 Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
mark_story
72f4d4fac0 Fix issue with logging scopes 
Logging scopes should be exclusive and not allow messages matching on
level alone to be logged.  By using scopes + levels you opt-in to new
behavior so grabbing all messages by level should not occur.

Fixes #3264
 2012-10-08 12:57:02 -04:00
ADmad
a1aa73c1a2 Cache character set names 2012-10-07 21:58:49 +05:30
AD7six
fa6defea37 url encode nested named parameters in unmatched routes 
reference: #2988
and 31033239bd
 2012-10-05 11:40:58 +02:00
AD7six
5140baf83d Load routes as late as possible. 
As a concequence - routes will also work by default in the cli
 2012-10-04 21:41:12 +02:00
ADmad
1c0492eb8b Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591 2012-10-04 18:40:57 +05:30
mark_story
a3ae58da09 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/View/View.php
 2012-10-01 21:20:25 -04:00
ADmad
47708c52cd Allow content to be added before existing content in view block. 2012-10-02 00:11:54 +05:30
ADmad
ce9ad1f2ed Fix failing tests 2012-10-01 20:22:41 +05:30
euromark
7383298410 making messages() and errors() reset themselves by default 2012-10-01 14:20:53 +02:00
mark_story
c94886a988 Add missing import that causes tests to fail in isolation. 2012-09-30 22:51:19 -04:00
mark_story
affb3192ad Fix issue where including elements + extending views fails. 
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248
 2012-09-30 22:44:27 -04:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks 
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
 2012-10-01 02:08:00 +01:00
dogmatic69
095e8df995 fixing a error in the tests 2012-10-01 00:49:39 +01:00
ADmad
035f727686 Replace Model::read() with Model::find('first') in baked controller 
Removed references to Ajax and Javascript helpers
 2012-09-30 14:41:37 +05:30
mark_story
80c355baa5 Make minutes/hours wrap around correctly. 
Also account for times around midnight that roll over days/months/years.

Fixes #3242
 2012-09-28 22:50:46 -04:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
mark_story
853d866c35 Remove port numbers from Message-id domains. 
Fixes #3244
 2012-09-28 21:20:14 -04:00
Mark Story
51245ce41d Merge pull request #874 from dereuromark/2.3-languages 
after correcting nld the iso standard should be enforced for all langs
 2012-09-28 17:55:02 -07:00
Mark Story
87fc86133c Merge pull request #873 from dereuromark/coding-standards 
correcting coding-standards
 2012-09-28 17:49:32 -07:00
euromark
032704346a after correcting nld the iso standard should be enforced for all languages 2012-09-28 14:46:29 +02:00
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
mark_story
eed59a95ad Fix whitespace. 2012-09-27 21:42:15 -04:00
mark_story
393849a9ba Make exception rendererer more resiliant 
Exceptions in beforeRender() should render correct error pages.

Fixes #3235
 2012-09-27 21:39:22 -04:00
mark_story
99edef0abc Re-order assertions. 
Group the true/false assertions.
 2012-09-27 21:39:14 -04:00
Mark Story
9c78aae87e Merge pull request #871 from dereuromark/2.3-dispatch 
move charset/App.encoding into CakeResponse
 2012-09-27 17:38:58 -07:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
euromark
c87b53a7d8 correcting iso standard for nld (dutch) - making dut the alias 2012-09-27 10:10:40 +02:00
mark_story
76d21c6d56 Try to fix another test failure caused by blowfish. 
travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
 2012-09-26 22:25:05 -04:00
mark_story
ea784f68dc Try skipping blowfish tests if hashes are wrong. 
Another attempt at fixing failing tests on travisci.
 2012-09-26 22:00:52 -04:00
Jose Lorenzo Rodriguez
047ffd1530 Removing variable from dump test as it does not exist anymore 2012-09-25 17:01:06 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3 
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
 2012-09-25 16:36:03 +02:00
Jose Lorenzo Rodriguez
b0822d2246 Introducing failing test case to prove issue in CakeTime 2012-09-25 15:23:19 +02:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4 Merge pull request #859 from dereuromark/2.3-format-delta 
adding CakeNumber::formatDelta() and fixing issue with format()
 2012-09-21 00:18:35 -07:00
dogmatic69
6d4f4b57d7 adding a plugin propery to models wwith tests for ticket #85 
Merge pull request #696
 2012-09-20 21:31:31 -04:00
mark_story
268e58956d Attempt to make tests pass when OpenSSL is not enabled. 2012-09-20 21:28:29 -04:00
mark_story
d3ba9703a5 Try to make some time related test failures go away. 2012-09-20 21:07:14 -04:00
euromark
7aa78c40f3 test case to proof that less between strings also work and do not error 2012-09-21 02:57:10 +02:00
Ber Clausen
aaefbf1c2f Add MySQL FULLTEXT support. 
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext

Fixes #262
 2012-09-20 20:42:30 -04:00
mark_story
a9750264e4 Revert "Add MySQL FULLTEXT support." 
This reverts commit 36c99a358f.
 2012-09-20 20:39:02 -04:00
Mark Story
f4a639cbfa Merge pull request #862 from bar/mysql-fulltext 
Add MySQL FULLTEXT support.

Fixes #262
 2012-09-20 17:20:23 -07:00
euromark
490bbf836d remove debug statement 2012-09-21 00:09:42 +02:00
euromark
bfaed32e58 allow between to be an array of strings 2012-09-21 00:06:26 +02:00
Mark Story
e931211fcc Merge pull request #858 from dereuromark/2.3-request 
adding query() for CakeRequest
 2012-09-20 06:40:23 -07:00
Ber Clausen
36c99a358f Add MySQL FULLTEXT support. 
Minor optimizations and testing added.
 2012-09-20 00:35:42 -03:00
euromark
0be1943bcd adding basic test 2012-09-20 01:56:52 +02:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
euromark
3fa6b96ad0 adding CakeNumber::formatDelta() and fixing issue with near-zero values and format() 2012-09-20 01:41:41 +02:00
mark_story
0f0b5e7668 Fix incorrect radio selection with falsey values. 
Use strval() to work around 0 == '' type issues.
Cleanup some tests.

Fixes #3221
 2012-09-19 10:14:29 -04:00
euromark
60385d1d28 test the query() method with arrays passed via $_GET 2012-09-19 03:14:55 +02:00
mark_story
da6d49e554 Fix code conventions. 2012-09-18 14:50:03 -04:00
mark_story
5d830d7adb Fix multiple selects always failing post validation. 
Fixes #3218
 2012-09-18 14:41:51 -04:00
Mark Story
5d4a6fd6b6 Merge pull request #856 from ceeram/2.3-cakenumber 
Simplify and improve fromReadableSize().
 2012-09-18 10:55:28 -07:00
euromark
e8cfac0eec adding query() for CakeRequest 2012-09-18 19:38:53 +02:00
Ceeram
ff676b5ea4 allow for lowercase as well, also strip the unit part off before pow() 2012-09-18 17:15:33 +02:00
Mark Story
144761c0b2 Merge pull request #852 from cakephp/2.3-reset-sequence 
Implement resetSequence()

Fixes #3206
 2012-09-18 07:42:11 -07:00
Tigran Gabrielyan
d30e092966 Fixed test case 2012-09-18 00:46:06 -07:00
Tigran Gabrielyan
f1a344eee4 Added test case for view block default value 2012-09-18 00:41:33 -07:00
Mark Story
07c5102de5 Merge pull request #850 from ceeram/2.2-filesize 
Add CakeNumber::fromReadableSize() and Validation::filesize()
 2012-09-17 17:55:23 -07:00
mark_story
55dcb9c3b3 Implement resetSequence() 
This is an optional method in DboSource that allows datasources to
resetSequence values in tables.  This is useful for datasources like
Postgres, and makes using fixtures much easier.

Fixes #3026
 2012-09-17 20:50:05 -04:00
Ceeram
9530e68ae6 add default return value as parameter to use when size can not be determined 2012-09-17 13:21:50 +02:00
Mark Story
cdfead0feb Merge pull request #849 from dogmatic69/rijndael-fatal-error 
skipping the rijndael test if mcrypt_encrypt() is not available
 2012-09-15 18:00:07 -07:00
dogmatic69
26934236b1 skipping the rijndael test if mcrypt_encrypt() is not available 2012-09-15 11:43:39 +01:00
dogmatic69
4899b5b91b changing is_writeable() to is_writable() 2012-09-15 11:17:35 +01:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
mark_story
ccd33782da Fix whitespace errors. 2012-09-14 22:37:39 -04:00
Mark Story
89c98233b5 Merge pull request #843 from dereuromark/2.3-ticket-3172 
check() for CookieComponent and Configure
 2012-09-14 18:22:34 -07:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
Renan Gonçalves
d33f676ddd Handling a fatal error on console should call Shell::_stop(1). 
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
 2012-09-14 14:17:07 +02:00
mark_story
7d2cbec79d Revert "Fix null not stopping model callbacks." 
This reverts commit 82a8400def.

The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
 2012-09-13 22:49:17 -04:00
mark_story
82a8400def Fix null not stopping model callbacks. 
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks.  This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.

Fixes #3123
 2012-09-13 22:11:46 -04:00
Mark Story
5081be171f Merge pull request #821 from dereuromark/2.3-folder-merge 
allow Folder to merge recursivly and add scheme option
 2012-09-13 18:00:02 -07:00
mark_story
fb9360767e Make connection exceptions more helpful. 
Fixes #3204
 2012-09-12 22:31:07 -04:00
Rachman Chavik
0cae19a14e enable PluginDot for routeClass parameter 2012-09-12 21:24:56 +07:00
mark_story
99a9cc9669 Fix required field detection. 
Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.

Fixes #3194
 2012-09-11 21:59:46 -04:00
euromark
2d9d400ecb correct spelling 2012-09-10 23:08:14 +02:00
euromark
f7acab7cae doc block update 2012-09-10 19:20:15 +02:00
euromark
37068539bd allow Folder to merge recursivly and add scheme option 2012-09-10 10:23:52 +02:00
Ceeram
ce1b387de2 fix incorrect docblock 2012-09-10 09:17:29 +02:00
mark_story
4f637ed4c4 Revert "Fix failing tests in PHPUnit 3.7.0-RC2" 
This reverts commit d26040e3aa.
This change causes tests to fail in PHPUnit 3.6, this will have to wait
until 3.7.0 stable.
 2012-09-09 21:36:33 -04:00
mark_story
d26040e3aa Fix failing tests in PHPUnit 3.7.0-RC2 2012-09-09 21:25:53 -04:00
mark_story
e8c1140fc8 Fix notice error. 2012-09-09 21:08:21 -04:00
mark_story
a934f700f1 Fix parsing '0' as a url. 
Fixes #3198
 2012-09-09 20:56:40 -04:00
Jose Lorenzo Rodriguez
9ac5cbed36 Added MailTransport test class refs #2824 2012-09-09 15:48:14 +02:00
mark_story
6664acba79 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/VERSION.txt
 2012-09-05 20:15:36 -04:00
Kyle Robinson Young
a214fcd992 Remove never reached code in Debugger::trimPath and test more results 2012-09-05 15:57:53 -07:00
mark_story
c7647b775f Attempt to fix build error in travis. 2012-09-04 17:25:02 -04:00
ADmad
28951865c6 Hidden divs created by FormHelper can now be customized. 2012-09-04 23:56:30 +05:30
mark_story
0d826528e1 Supress fewer errors. 
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
 2012-09-03 20:13:30 -04:00
mark_story
771cfde196 Fix coding standards. 2012-09-03 20:09:13 -04:00
euromark
2170d87488 check() for CookieComponent and Configure (similar to CakeSession::check()) 2012-09-04 01:04:48 +02:00
Mark Story
eb33929829 Merge pull request #731 from dereuromark/2.3-fix-rss-test 
2.3 fix rss test
 2012-09-03 15:03:44 -07:00
mark_story
3cb501f1c5 Fix issue created in [e8b5d81fd7] 
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.

Fixes #3178
 2012-09-03 13:24:38 -04:00
brq
fca98e39f9 Allow postLink() to support other HTTP methods; it defaults to POST 2012-09-02 12:57:35 -05:00
mark_story
21a51a374a Revert "Make test a bit more solid." 
This reverts commit 072991d0da.
 2012-09-01 14:43:11 +01:00
mark_story
072991d0da Make test a bit more solid. 2012-09-01 14:34:10 +01:00
mark_story
571c8bc08c Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
 2012-09-01 13:51:40 +01:00
mark_story
474e42cc08 Switch File::info() tests to use a different file. 
text/php files are not detected reliably across platforms. Use a plain
text file instead.  This should fix builds on travis.ci
 2012-09-01 12:40:05 +01:00
mark_story
d3105332dc Fix coding standards errors. 2012-09-01 12:14:15 +01:00
mark_story
e8b5d81fd7 Fix quoting of field names containing -. 
Fixes #3165
 2012-08-31 14:25:02 +01:00
mark_story
894fc1256a Add test cases for strings containing quotes. 
Show that both double and single quoted strings are
handled correctly by ExtractTask.

Closes #3155
 2012-08-30 23:48:32 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
mark_story
d92ff9cc10 Merge branch '2.3' of github.com:cakephp/cakephp into 2.3 2012-08-30 19:42:46 +01:00
mark_story
e64f5f15e2 Fix big int lengths on SQLserver 
SQLserver big ints aren't as big as other database servers.
 2012-08-30 19:18:25 +01:00
mark_story
d4ee62be61 Add support for biginteger on SQLserver. 2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d Add bigint support for Sqlite. 
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
 2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e Add bigint support for postgres 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
ec35e3158c added tests for bigints 2012-08-30 14:48:59 +01:00
Juan Basso
fd2f3aed46 Changed to accept language do not return the qualifiers and order the values by the qualifier. Also, making the test case insensitive 2012-08-28 23:52:05 -04:00
Ber Clausen
63548267e9 Refactor Validator::decimal() to be more flexible with decimal 
separators and PHP magic.
Lots of testing added.
 2012-08-27 23:25:17 -03:00
Mark Story
7135ff29fb Merge pull request #773 from bar/master-fix-inireader 
Add plugin support to IniReader, and harden tests.
 2012-08-27 12:36:57 -07:00
Ber Clausen
bdac857293 Add plugin support to IniReader, and harden tests. 
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
 2012-08-27 10:04:26 -03:00
Ceeram
f1ce3f9ae5 remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed 2012-08-27 11:42:57 +02:00
mark_story
cbb64bd082 Fix blackhole requests with empty select boxes. 
When a select box was entirely empty (no option element)
secured form submission should not fail.

Fixes #3153
 2012-08-26 22:53:48 -04:00
mark_story
934838f77c Fix whitespace. 2012-08-26 22:17:36 -04:00
Ceeram
abe74adf8a partial remove onlyAllow from baked code, only keep in delete to be rfc compliant 2012-08-26 15:00:49 +02:00
James Hall
20baeb83db Change to match coding standards 2012-08-26 02:11:43 +01:00
James Hall
a3b5065f8a Make sure the environment variable is set 2012-08-26 00:33:32 +01:00
James Hall
6c4ba233ba Fix testSendRenderWithImage when non running on port 80 2012-08-26 00:23:32 +01:00
Jose Lorenzo Rodriguez
f6278488af Ensuring list of behavior methods are refreshed between calls of 
validates() in the model, fixes #3071
 2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf Fixing issues with validation rules not being reset after calling 
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
 2012-08-25 13:29:16 +02:00
Ceeram
27d83eedfe use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included 2012-08-25 09:38:40 +02:00
Tigran Gabrielyan
0441c9f6c3 Added tests for bake shell cache prefix generation 2012-08-24 22:52:02 -04:00
mark_story
d66d37c92b Merge branch 'master' into 2.3 2012-08-24 22:50:29 -04:00
Ber Clausen
b75a6b440a Treat float numbers with trailing zeroes removed by PHP, accordingly. 
Revert #2800 (28bd6880df) regex changes. Also add more tests.

Signed-off-by: mark_story <mark@mark-story.com>
 2012-08-24 22:22:12 -04:00
Ceeram
cb80338c7d avoid duplication in return value when saving habtm 2012-08-24 00:50:46 +02:00
Mark Story
064fef1a15 Merge pull request #779 from dereuromark/2.3-ellipsis-html 
use html ellipsis if possible
 2012-08-23 13:20:38 -07:00
Mark Story
fe3d99cdfc Merge pull request #775 from sitedyno/BlowfishAuthenticate 
Add BlowfishAuthenticate adapter.
 2012-08-23 13:16:34 -07:00
Heath Nail
d24bbcb255 Add BlowfishAuthenticate adapter. 2012-08-23 11:23:51 -04:00
Ceeram
c5ebbc991c Revert "Merge pull request #784 from ceeram/habtmmerge" 
This reverts commit fa5aa6278f, reversing
changes made to 88604ac757.
 2012-08-23 16:00:41 +02:00
ceeram
973670ca1c Merge pull request #749 from ceeram/2.3-allow 
Add allowed() to CakeRequest, to check if the request method matches the...
 2012-08-22 16:44:11 -07:00
Ceeram
d730acba59 Add onlyAllow() to CakeRequest, to check if the request method matches the allowed ones. 
Throws exception if not matched, using the required Allow response header.
 2012-08-22 17:23:24 +02:00
Ceeram
e7dc23b920 Ensure callbacks are triggered when using Xml/Json view with view templates. 
PaginatorHelper for instance needs this to correctly set options
 2012-08-22 13:13:49 +02:00
Ceeram
fb0053753e avoid duplication in returned results for habtm 2012-08-22 13:03:47 +02:00
Renan Gonçalves
172e4bed5d Fix STRICT warnings on PHP 5.4 2012-08-21 13:08:43 +02:00
mark_story
d5333a2ff1 Merge branch 'master' into 2.3 2012-08-20 16:20:27 -04:00
mark_story
e75fdd21ee Add tests to show caseinsensitive nature of detectors. 
Closes #3132
 2012-08-20 11:43:10 -04:00
euromark
07d92ef678 correcting test 2012-08-17 14:02:20 +02:00
euromark
7969062614 legacy support with test cases 2012-08-17 13:57:47 +02:00
euromark
40398429ff coding standards 2012-08-17 13:37:04 +02:00
euromark
f201684873 use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length) 2012-08-17 13:31:01 +02:00
Mark Story
9e96c473f4 Merge pull request #752 from dereuromark/2.3-truncate-tail 
String::tail()
 2012-08-16 11:02:06 -07:00
Mark Story
08e4362d40 Merge pull request #772 from bar/master-fix-phpreader 
The actual config file must always have .php extension.
 2012-08-16 11:00:27 -07:00
mark_story
c83e941497 Merge branch 'master' into 2.3 2012-08-15 21:00:49 -04:00
mark_story
b0f2cfd1d1 Fix coding standards. 2012-08-15 20:19:08 -04:00
ADmad
7ac01154f7 Merge branch '2.2-configure' 2012-08-15 20:09:25 +05:30
ADmad
18c5a4aee5 Make file extension optional for Configure reader adapter's dump function. 2012-08-15 19:38:58 +05:30
mark_story
e183e91b17 Make CakeRequest work with content-type headers that include a charset. 
Refs #3113
 2012-08-14 12:42:05 -04:00
ber clausen
0dec093f48 The actual config file must always have .php extension. 2012-08-13 23:50:58 -03:00
euromark
e1fbfcef00 fix contain for find method 2012-08-13 08:10:51 +02:00
ADmad
65e63c51c8 More missing parent calls. 2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3 Adding missing calls to parent. 2012-08-12 02:13:10 +05:30
ADmad
4a483b4897 If cache is disabled in app and js cache file is not written don't return script tag with file url. 
Instead return script block with inline js content.
 2012-08-12 01:08:05 +05:30
mark_story
11227f5490 Fix coding standards. 2012-08-10 21:50:37 -04:00
Mark Story
7dae12456a Merge pull request #759 from dereuromark/2.3-cake-schema 
2.3 cake schema
 2012-08-10 18:11:50 -07:00
Ceeram
ab7dd99e43 add missing docblock, remove unneeded code 2012-08-10 11:05:19 +02:00
Ceeram
7ea1a59035 adding test for viewClass mapping 2012-08-10 10:33:37 +02:00
mark_story
6f7557898d Fix whitespace and comment errors. 2012-08-09 20:51:29 -04:00
mark_story
4487673060 Merge branch 'master' into 2.3 2012-08-09 20:43:47 -04:00
Ceeram
d4986b5f24 add responseHeader() method to new base exception class, ExceptionRenderer will pass the headers to the response. 
Tests added.
 2012-08-09 14:52:05 +02:00
José Lorenzo Rodríguez
596f2c0d91 Merge pull request #734 from steinkel/feature/smtp-tls 
Adding TLS support to SmtpTransport
 2012-08-08 23:36:13 -07:00
mark_story
dca050fbd6 Fix errors with recursion in debug() 
Fixes #3102
 2012-08-08 22:30:27 -04:00
euromark
5190b9f2c9 asserting that under_scored names result in valid ClassNames 2012-08-08 16:35:59 +02:00
euromark
62dee78ca5 adding models for schema generate 2012-08-08 14:15:28 +02:00
José Lorenzo Rodríguez
1ff63758ad Merge pull request #750 from tigrang/security-component-enhancement 
Added `disabledActions` feature to SecurityComponent
 2012-08-06 12:05:17 -07:00
mark_story
57c495f53a Enabled Debugger::exportVar() to display private & protected properties. 
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
 2012-08-06 13:32:52 -04:00
ADmad
8931b74ba2 Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074 2012-08-05 02:36:29 +05:30
mark_story
b32273e713 Fix whitespace errors. 2012-08-04 15:57:04 -04:00
euromark
2a570e639c ellipsis instead of ending/beginning for core wide consistency 2012-08-04 19:58:23 +02:00
mark_story
e59555a66f Merge branch 'master' into 2.3 2012-08-03 22:45:56 -04:00
mark_story
788cf52572 Fix saving empty values for translated fields with multiple locales 2012-08-03 22:40:38 -04:00
Christopher Vrooman
bbd0b9dd8b Tweaked DocBlocks 
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
 2012-08-03 22:40:28 -04:00
Christopher Vrooman
de1450763b Added a failing test to testSavePartialFields 
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
 2012-08-03 21:19:44 -04:00
Tigran Gabrielyan
617d470427 Renamed disabledActions to unlockedActions 2012-08-03 11:01:19 -07:00
euromark
a208eb6cb1 fixes disabled attribute for multiple checkboxes 2012-08-02 21:35:05 -04:00
Tigran Gabrielyan
df8ec17626 Added disabledActions feature to SecurityComponent 2012-08-02 18:27:52 -07:00
euromark
917d912a43 String::tail() 2012-08-02 13:21:31 +02:00
euromark
64ba8c6b6e remove debug statement 2012-08-02 10:18:14 +02:00
mark_story
cffc36e4e0 Fix notice error when impossible conditions are created. 
Fixes #3084
 2012-08-01 23:05:56 -04:00
euromark
319658e9d3 asserting escaped output for sms protocol 2012-08-01 12:48:21 +02:00
euromark
b6fe8af701 adding sms as protocol 2012-08-01 12:38:06 +02:00
euromark
2a674fc461 adding a test for the yet untested javascript protocol 2012-08-01 12:14:46 +02:00
euromark
f0ffe098d3 adding html helper tests for special protocols 2012-08-01 12:11:05 +02:00
euromark
b73be3139f allowing tel protocol for mobile devices 2012-08-01 12:02:50 +02:00
Schlaefer
af8c5716fc Added test for RSS to allow namespace tags if namespace is specified 
If a namespace prefix is defined it's prefix should not be stripped
from the tag: `<dc:creator>` stays `<dc:creator>`.

Other prefixes are still stripped from the tag name.

This test is missing in 19f0e72d58
 2012-07-30 10:10:19 +02:00
mark_story
7b939186a1 Fix ( and ) not being correctly handled by autoLinkUrls 
Fixes #3077
 2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58 fix #2858 RSS helper bug with namedspaced keys 
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
 2012-07-29 14:24:46 +02:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
mark_story
27e2132a13 Generated SQL should not contain multi-column primary keys 
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.

Fixes #3069
 2012-07-27 22:31:49 -04:00
ADmad
99813e97b3 Implemented feature to allow individual "empty" values for date time select elements 2012-07-28 01:47:21 +05:30
mark_story
f963e378b5 Fix coding standards errors. 2012-07-26 21:22:50 -04:00
mark_story
6e0cf0dab7 Fix failing test. 2012-07-26 21:19:20 -04:00
Kyle Robinson Young
cbf5328b33 Fix failing test with controller task listAll 2012-07-25 22:12:55 -07:00
Mark Story
4dd532d3a9 Merge pull request #724 from SimonEast/h_encoding 
Prevent booleans from being encoded (converted to strings) by h() function
 2012-07-25 18:17:12 -07:00
Mark Story
b99be9878a Merge pull request #738 from zpencerq/authcomponentproblem 
Auth Component can't return false from user($key)
 2012-07-25 16:05:29 -07:00
Spencer Ellinor
6c1b05a5d4 Modify test case to show the issue. 2012-07-25 15:06:56 -04:00
mark_story
70c714d600 Fix incorrect context being used for excerpt. 
Fixes #3064
 2012-07-24 23:37:37 -04:00
euromark
2a553dcfd1 unified doctype for browser related layout templates 2012-07-24 18:06:39 +02:00
Jorge González
f9f380d401 using annotations for catching exceptions in tests 2012-07-24 14:09:48 +01:00
mark_story
162d3bcb29 Fix whitespace errors. 2012-07-23 22:44:05 -04:00
mark_story
35bf3097cd Fixing missing imports in generated tests. 
Fixes #3059
 2012-07-23 21:25:55 -04:00
Jorge González
17db6f9d23 Merge branch '2.3' of https://github.com/cakephp/cakephp into feature/smtp-tls 2012-07-23 22:24:10 +01:00
mark_story
2359fb7e2e Simplify number formatting. 2012-07-22 21:28:49 -04:00
Heath Nail
434d3a7137 Add bcrypt support to Security::hash() 2012-07-22 21:15:00 -04:00
mark_story
ed19821168 Merge branch 'master' into 2.3 2012-07-22 21:01:28 -04:00
mark_story
e6ef218600 Fix associated translations being inserted. 
Due to changes introduced in [1c0b6c076a]
associated translations would incorrectly be saved with a value of ''.

Fixes #3057
 2012-07-22 20:59:24 -04:00
euromark
15cf55d444 different approach on the failing test 2012-07-22 03:59:59 +02:00
euromark
93957bc3e4 fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself 2012-07-22 03:55:13 +02:00
mark_story
6ce4a3a1ec Add tests for contentDisposition flag. 
Fixes #3042
 2012-07-21 21:22:04 -04:00
mark_story
468302b526 Merge branch 'master' into 2.3 2012-07-21 20:59:56 -04:00
mark_story
6286b43329 Make tests pass on windows. 
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.

Refs #3055
 2012-07-21 20:59:05 -04:00
Jorge González
f1250a3609 Merge branch '2.3', remote-tracking branch 'origin' into feature/smtp-tls 2012-07-21 20:49:46 +01:00
Jorge González
55c92065c6 adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010 2012-07-21 20:28:38 +01:00
mark_story
2e71ef8f26 Add CakeSession Fixture 
CakePHP should provide a fixture for the default session table name so
developers don't need to add the same fixture to each application.

Fixes #3054
 2012-07-21 14:08:10 -04:00
Jorge González
27a895d7d8 adding enableCrypto() method to CakeSocket class 2012-07-21 14:23:47 +01:00
Simon East
1ea457e40e Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9 2012-07-20 12:48:57 +10:00
José Lorenzo Rodríguez
a7865b5d1d Removing some new by reference calls 2012-07-19 14:24:12 -05:30
Mark Story
f65b52bf11 Merge pull request #722 from uzyn/bugfix/url-validation 
Fix URL validation to allow underscores in subdomain.
 2012-07-19 12:40:30 -07:00
Christian Winther
bce82a2322 Better custom find for pagination 
Instead of shuffling the paginator settings you can now simply add a new "findType" key and it will automatically change the find() type accordingly
 2012-07-19 15:57:51 +02:00
U-Zyn Chua
e7c4064a69 Fix URL validation to allow underscores in subdomain. 2012-07-19 20:51:33 +08:00
mark_story
473d55f091 Allow 1 second of slip. 2012-07-18 22:22:57 -04:00
mark_story
3c6b50953b Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/VERSION.txt
 2012-07-18 22:12:51 -04:00
mark_story
7979ee5fa0 Remove test that is no longer needed for validation. 2012-07-17 23:18:25 -04:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
mark_story
a63dd9ee9d Fix incorrect formatting in TreeBehavior. 
Fixes #3045
 2012-07-17 21:06:41 -04:00
mark_story
928de97338 Add additional tests for error triggering on missing validator. 
Closes #3039
 2012-07-15 19:47:28 -04:00
mark_story
fb92bde0fe Loosen exception types. 2012-07-14 16:18:21 -04:00
mark_story
22d4cb3794 Allow warnings for Xml entities. 
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
 2012-07-14 16:08:54 -04:00
mark_story
a7c79e5da2 Fix warnings when deleting records that do not exist. 
Fixes #3037
 2012-07-14 15:54:07 -04:00
mark_story
6c905411ba Fix XML decoding attack via external entities. 2012-07-14 11:53:37 -04:00
Jose Lorenzo Rodriguez
39715bcd89 Adding missing afterValidate callback to behaviors, Fixes #3024 2012-07-10 20:35:26 -04:30
ADmad
69eba678f4 Deprecated MediaView and updated MediaView::render() to use CakeResponse::file() 2012-07-11 01:40:42 +05:30
ADmad
c5d1260421 Added CakeResponse::file() for serving files as response 2012-07-11 01:24:00 +05:30
mark_story
5e680cb292 Add tests for translate + partial fields. 
Refs #3009
 2012-07-07 12:03:29 -04:00
mark_story
369bbcc964 Fix failing tests. 
* New properties on view caused fails in Debugger.
* Element cache keys have changed with the new refactoring.
 2012-07-07 01:08:39 -04:00
Jose Lorenzo Rodriguez
ed4493da0c Automatic console logging streams were not respecting --quiet 2012-07-06 16:05:15 -04:30
AD7six
2967a4db23 text/javascript is not the correct mime for js 2012-07-06 13:17:15 +02:00
mark_story
591022f182 Make test case use SERVER_NAME conditionally. 2012-07-05 22:56:45 -04:00
Mark Story
ae01d473c3 Merge pull request #707 from SimonEast/fix_CakeEmailTest 
Fix for CakeEmailTest.php that failed unless using 'localhost'
 2012-07-05 19:40:54 -07:00
Rodrigo Moyle
e10f6f57a3 Fix notice error when parsing input data. 
Prevent error in CakeRequest from parsing input data in
PUT and DELETE requests.

Fixes #3002

Signed-off-by: mark_story <mark@mark-story.com>
 2012-07-05 22:06:02 -04:00
Simon East
de703a2692 Fix for CakeEmailTest.php that failed unless using 'localhost' 2012-07-06 11:59:39 +10:00
mark_story
e61f636bc7 Fix double base dir in image() with fullBase. 
Fixes #2991
 2012-07-03 20:48:17 -04:00
Rachman Chavik
22373868bb if blackHoleCallback is set, requests _must_ get blackholed 2012-07-03 19:27:02 +07:00
Rachman Chavik
86a74e3887 fix: windows console may not have ansi color support 2012-07-03 12:41:29 +07:00
mark_story
31033239bd Add missing urlencoding to nested named parameters. 
Fixes #2988
 2012-07-02 23:34:53 -04:00
Ceeram
6ec0afcf5d Add CakeNumber::fromReadableSize() and Validation::filesize() 2012-06-26 12:17:25 +02:00
mark_story
ad5345887a Refactor tests. 
Use generators to reduce some duplication.
 2012-06-24 21:57:00 -04:00
mark_story
3f78216e96 Revert changes in behavior made to timeAgoInWords() 
Changes made in [0729aca706] changed
the generated text to not match the behavior in 2.1.
 2012-06-24 20:54:47 -04:00
mark_story
eb7b66b37c Revert default value of allowEmpty. 
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods.  Move some tests around and update tests that
probably should have been failing before.

Fixes #2983
 2012-06-24 20:06:14 -04:00
ADmad
b2ccdd46e5 Fixed test failing when server's timezone is not UTC 2012-06-24 23:11:52 +05:30
mark_story
3e28326d9c Fix Controller::beforeRedirect() and array return. 
Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.

Fixes #2973
 2012-06-24 12:03:31 -04:00
Jelle Henkens
db7d5426ec CakeTime no longer sets the timezone out of its scope on the date object 2012-06-24 11:10:55 +01:00
mark_story
5e54be4e5a Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Error/exceptions.php
 2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303 better error message in MissingConnectionException when driver is not enabled 2012-06-23 11:42:26 +02:00
mark_story
13077a8f2f Add tests for previous commit. 2012-06-22 21:44:37 -04:00
dogmatic69
058f48fc7b Showing the list of shells grouped by plugin 
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.

Core and app shells are always listed last.
 2012-06-22 20:53:44 -04:00
Ceeram
2f5f1b28bc Merge branch '2.2-validatorrules' into 2.2 2012-06-20 15:01:26 +02:00
Ceeram
60c611fa47 Parse rules in getField() 2012-06-20 14:54:32 +02:00
Jose Lorenzo Rodriguez
03d31b57f7 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099 Avoid using LC_ALL, on some installs this would cause error: 
"setlocale(): Specified locale name is too long"
 2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7 Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error: 
"setlocale(): Specified locale name is too long"
 2012-06-19 18:33:51 +02:00
mark_story
89b2eddf0b Try regexp as not all locales are available. 2012-06-18 23:45:44 -04:00
mark_story
6a1e9e80b2 Try LC_ALL instead. 2012-06-18 23:31:10 -04:00
mark_story
77fc8a9d33 Switch to de_DE 
nl_NL doesn't seem to exist on the ci server.
 2012-06-18 23:25:42 -04:00
mark_story
001e89bf3f Fix formatting with locales using , as decimal separator 
Fixes #2958
 2012-06-18 23:13:09 -04:00
AD7six
d5cf2765dd remove referencers to fixtures that don't exist 2012-06-18 16:40:37 +02:00
Ceeram
0df1e90eed show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925 2012-06-18 14:20:53 +02:00
mark_story
54679023f9 Add support for DELETE + form encoded data. 
Much like PUT, DELETE requests will automatically parse
form-urlencoded request bodies and set them as $this->data.
 2012-06-17 20:03:45 -04:00
Ceeram
c5b19b658a Merge commit '74a0bd98c28991664fc0a3b0e8b34dc4f9dbf009' into 2.2 2012-06-15 09:42:22 +02:00
Ceeram
74a0bd98c2 throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype 2012-06-14 19:01:41 +02:00
AD7six
d01f0e9f67 correct tests to match desired behavior 
by default we don't want fixtures pulled in from a different scope than
that of the test being baked
 2012-06-14 13:38:17 +02:00
mark_story
5413143178 Don't modify app/Config/bootstrap when running tests. 2012-06-12 22:10:55 -04:00
euromark
ba62ecd21a whitespace 2012-06-12 16:59:16 +02:00
euromark
b32edfe378 fix double-encoding of external urls 2012-06-12 16:30:37 +02:00
Kyle Robinson Young
54745aada9 Fix custom validation methods with CakeValidationSet 2012-06-11 23:28:45 -07:00
mark_story
f6b50a948e Small fixes for validation formatting. 
* Remove additional out() calls.
* Remove extra punctuation.
* Fix code standards.
* Fix failing test.
 2012-06-10 21:57:15 -04:00
mark_story
76dd49145a Merge branch '2.1' into 2.2 2012-06-10 20:34:20 -04:00
mark_story
b2e82871f1 Attempt to fix failing build. 2012-06-10 20:08:17 -04:00
mark_story
7ae660c779 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Cache/Engine/XcacheEngine.php
 2012-06-10 20:05:25 -04:00
mark_story
0a182b918f Fix $depth being decremented by 2. 
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.

Fixes #2946
 2012-06-10 20:00:34 -04:00
mark_story
454fae9bd0 Fix Validation::ip() not respecting type. 
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.

Fixes #2944
 2012-06-10 19:37:44 -04:00
ADmad
9ce216b09d Revert "Fix missing view variables." 
Commit 7416c53 shows error message from last exception instead of first one
and also displays framework specific error messages instead of generic ones with debug off.
We don't want either.

This reverts commit 7416c530a2.
 2012-06-11 02:36:51 +05:30
Jose Lorenzo Rodriguez
5ba5f906e6 Adding new test case for ModelValidator 2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
0d013f8da5 Fixing CakeTime, the actual params for format() is $date and $format, 
and not the other way around :)
 2012-06-09 08:28:39 -04:30
Jelle Henkens
c8e58b50ba Adding cake core message extraction in cake extract 2012-06-07 23:55:36 +01:00
AD7six
2335ef1a13 remove pseudo-mock code 
Not required, not used by any committed code
 2012-06-06 23:08:40 +02:00
AD7six
a56ec8d6cf Correct TestTask tests 
there will not be a setUp function for Controller tests
there will not be a tearDown
there will be no returned constructor logic from generateConstructor

all because for a controller test - you'd ordinarilly just call this->testAction
 2012-06-06 23:04:18 +02:00
AD7six
b509bdb04b Automatically handle PUT requests 
make the following "just work"

    curl -X PUT -d foo=bar http://...
 2012-06-06 22:59:37 +02:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
 2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e Fixing yet another issue related to beforeValidate and 
validateAssociated
 2012-06-06 10:07:01 -04:30
Rachman Chavik
8966f1b324 create CakeRequest in View instead of in CakeEmail 2012-06-04 22:21:41 +07:00
Rachman Chavik
e821c27f54 remove unnecessary lines 2012-06-04 09:18:36 +07:00
Rachman Chavik
9bafc5a3bb CakeEmail: create request object before rendering 
Closes #2931
 2012-06-04 09:18:29 +07:00
mark_story
fceb028499 Fix code style errors. 2012-06-03 21:11:34 -04:00
mark_story
8da42dfcfa Merge branch '2.1' into 2.2 2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb Fix page 0 issue. 
Refs #2929
 2012-06-02 20:56:38 -04:00
mark_story
15a423ad70 Restrict page number passed to view. 
Limit the page number to the max page number when passing data to the
view.  This prevents the helper from generating a huge number of links.

Fixes #2929
 2012-06-02 20:26:09 -04:00
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Jelle Henkens
e5eb7b490e Preventing cache collisions by adding the the datasource key 2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605 Replacing crc32 with md5 for less collisions in method caching 2012-06-01 10:42:26 +01:00
Rachman Chavik
07d9a75fcb Helpers in custom CakeErrorController are lost 
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.

This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing.  This causes Controller::$helpers to be reset with
default values.
 2012-06-01 15:28:06 +07:00
Rachman Chavik
483d7124dd debug() may output path that is incorrectly truncated 
This happens when debug is called in core source files that resides in
a different directory to the app.
 2012-06-01 15:28:06 +07:00
mark_story
55c4ad3c1c Fix coding standards errors. 
Also remove count() calls in TreeBehavior.
 2012-05-31 21:20:11 -04:00
Mark Story
085ad0bb42 Merge pull request #672 from sitedyno/cookie-encryption-#471 
Add stronger encryption, and make it available in cookiecomponent.

Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
 2012-05-31 17:44:49 -07:00
Ceeram
6c9b2a1fec Fix user() return value for nested data 2012-05-31 15:13:24 +02:00
Mark Story
119377422e Merge pull request #674 from colares/ticket-2787 
Add table attributes per column

Fixes #2787
 2012-05-30 18:29:56 -07:00
mark_story
01b3135a63 You should be able to regex match null/'' 
Fixes #2926
 2012-05-30 21:28:18 -04:00
mark_story
9a8ceaeba6 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/View/XmlViewTest.php
 2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700 Allow Set::extract() to match null. 
Fixes #2926
 2012-05-30 21:19:46 -04:00
Tigran Gabrielyan
1367e5b927 Fixed failing test case 2012-05-30 15:26:59 -07:00
Ceeram
acbb2bebc9 adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions 2012-05-30 21:29:05 +02:00
Heath Nail
304d001dfb Implement rijndael optional cookie encryption. 2012-05-30 03:49:25 -04:00
Thiago Colares
fad7b0705f Increasing testTableHeaders case 2012-05-29 23:30:06 -03:00
Jelle Henkens
ab1f336e21 Adding timeout and port options to the redis cache engine 2012-05-29 23:39:56 +01:00
Ceeram
25c7a27495 fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed. 2012-05-29 09:46:00 +02:00
mark_story
0bfcd49249 Fix unbindTranslation not unbinding. 
There were documented use cases that have never worked.  Fix that.
Also rename a method so it better describes what it does.

Fixes #2913
 2012-05-27 21:25:55 -04:00
José Lorenzo Rodríguez
06476a22da Fixing failing tests caused by adding new validator, blind editing... hoping for the best 2012-05-27 19:48:46 -05:30
José Lorenzo Rodríguez
18c3fa79c9 Merge pull request #671 from burzum/2.2-validation 
2.2 validation methods
 2012-05-27 18:09:03 -07:00
Florian Krämer
e3a6e9e169 Adding uploadError() and mimeType() to the Validation class 2012-05-28 00:32:30 +02:00
Majna
364c293e16 Add test for belongsTo and hasOne optimization. 2012-05-27 23:16:20 +02:00
mark_story
1c0f97ea67 Fix some minor code style issues. 2012-05-27 14:20:19 -04:00
mark_story
9232df839d Fix failing tests because of new validator. 2012-05-27 14:17:34 -04:00
mark_story
233e7d6c6b Fix coding standards error. 2012-05-27 14:06:29 -04:00
Mark Story
4485f597b7 Merge pull request #662 from jellehenkens/2.2-validation-natural-number 
Adding validation rule for natural numbers
 2012-05-27 11:01:31 -07:00
mark_story
4b8c469004 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/VERSION.txt
 2012-05-26 21:11:36 -04:00
Rachman Chavik
907b3221ed logging: fix failing tests when called via webrunner 2012-05-25 23:52:33 +07:00
Jelle Henkens
5656461025 Adding overwrite option to the i18n extract task 2012-05-25 17:01:56 +01:00
mark_story
b27a3aab7b Set session.gc_maxlifetime by default. 
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings.  Always set session.gc_maxlifetime so session files are
garbage collected correctly.

Fixes #2901
 2012-05-23 22:25:19 -04:00
mark_story
ea9eee4c77 Fix array arguments being translated. 
Fixes #2902
 2012-05-23 21:02:41 -04:00
José Lorenzo Rodríguez
33eb46cd87 Merge pull request #666 from boast/patch-1 
Fixed XmlArticle and XmlUser Models associations.
 2012-05-22 21:41:04 -07:00
David Thalmann
81fedbba9c Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel test and does no longer try to use the 'default' datasource. 2012-05-23 07:19:06 +03:00
mark_story
5270721ade Remove bonus intval() 
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.

Fixes #2897
 2012-05-22 22:33:46 -04:00
José Lorenzo Rodríguez
ed15634ccb Merge pull request #663 from jellehenkens/api-docs-mixed-params 
Updating @param mixed docblock lines to proper multi type @param's
 2012-05-22 08:38:23 -07:00
Jelle Henkens
7d080ea2d1 Adding an assert to check for zero prefixed numbers 2012-05-22 16:32:16 +01:00
mark_story
0ed6752110 Fix coding standards. 2012-05-21 20:29:00 -04:00
Norio Suzuki
f816f6ae1b Supported japanese legacy charset and changed to use upper case charset in Content-Type line 2012-05-21 20:28:59 -04:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
Jelle Henkens
7546be6394 Adding a validation rule for checking natural numbers 2012-05-21 13:39:31 +01:00
José Lorenzo Rodríguez
bb368c569c Merge pull request #659 from tigrang/inputDefaults-setter 
Input defaults setter for FormHelper
 2012-05-20 16:40:20 -07:00
Jose Lorenzo Rodriguez
9cceb1553f Improving ModelValidator::add() to allow multiple rules to be defined at once 2012-05-20 18:51:00 -04:30
ADmad
cfd9d8a815 Added CakeTime::listIdentifiers() 2012-05-21 03:05:42 +05:30
Tigran Gabrielyan
1d77ad393c Added FormHelper::inputDefaults setter/getter method 2012-05-20 13:41:55 -07:00
mark_story
16a1a0ee79 Fix coding standards. 2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64 Merge branch '2.2-validator' into 2.2 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
 2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e Merge branch '2.1' into 2.2 2012-05-20 14:53:41 -04:00
Jose Lorenzo Rodriguez
dc8c731ccb Fixed failing test case 2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6 Merge branch '2.1' into 2.2-validator 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Model/models.php
 2012-05-19 15:39:44 -04:30
Ceeram
7dbd6bc3a2 make sure model data is moved to alias, even when first key in data is assoc model 
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
 2012-05-19 14:41:16 -04:30
Jelle Henkens
97ebbc8e23 Fixing coding conventions 2012-05-19 16:08:40 +01:00
Jelle Henkens
5fe22cfc8d Adding support for DateTime objects in the CakeTime Utility class 2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a CakeTime::format crashed when timezone is passed 2012-05-17 19:05:45 +07:00
mark_story
4dc07b6d39 Merge branch '2.1' into 2.2 2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c HTML escape context variables. 
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.

Clean up some internals in Debugger::outputError().  There were
a few duplicate data structures, and $$ variables.

Fixes #2884
 2012-05-16 21:07:45 -04:00
Mark Story
fd216c4dda Merge pull request #655 from jellehenkens/2.2-app-dir-tests 
Updating CakeSchema test case to test non standard app folder names
 2012-05-16 09:52:17 -07:00
Rachman Chavik
c9b801b96d making CakeLog to work with bogus $type and $scope 
closes #2881
 2012-05-16 08:16:20 +07:00
mark_story
7d9f441020 Add documentation. 2012-05-15 21:00:18 -04:00
Jelle Henkens
110536d575 Fixing CakeSchema to test APP_DIR with different names than all lowercase 2012-05-15 21:41:11 +01:00
mark_story
0faaedfff5 Split up tests. 
Fix API usage in tests.
 2012-05-14 21:32:31 -04:00
Rachman Chavik
6bb29ea03b changing CakeLog::_autoConfig for better bc 
closes #2880
 2012-05-15 08:16:55 +07:00
Jelle Henkens
ef270b95c7 Fixing test assert for APP_DIR scenarios with non standard folder names 2012-05-13 18:12:31 +01:00
Jelle Henkens
0d9506fa2e Fixing issue where nice and niceShort did not use the timezone if no dateString is passed 2012-05-13 13:43:06 +01:00
Rachman Chavik
e6860fb856 changing LOG_ERROR to LOG_ERR in core files 2012-05-13 18:51:57 +07:00
Rachman Chavik
595cad84b3 ensure that plain CakeLogInterface still works 2012-05-13 18:51:57 +07:00
Rachman Chavik
8e8763d69d change to match syslog levels & customizable levels 2012-05-13 18:51:57 +07:00
mark_story
d9244048b6 Fix hard coded date. 2012-05-12 23:25:11 -04:00
mark_story
683146de14 Add a few more tests. 2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea Fix whitespace and formatting. 2012-05-12 22:26:33 -04:00
mark_story
a80a7dadf8 Re-factor element generation. 
Add the ability for arbitrary attributes.
Use built-in methods for attribute generation.
Add tests for element generation.
 2012-05-12 22:26:33 -04:00
mark_story
4f12f254f4 Add test for element. 2012-05-12 22:26:33 -04:00
mark_story
fd5a8a8d6b Fix code standards. 
Remove failing test, and fix coding standards.
 2012-05-12 22:26:33 -04:00
Magnus Johansson
9fa531d6e3 Added test cases for new features. 2012-05-12 22:26:33 -04:00
ADmad
14b7210d2b Fixed server offset calculation 2012-05-13 06:20:29 +05:30
Jelle Henkens
c2920aa3bf Fixing small variable typo 2012-05-12 18:43:39 +01:00
mark_story
a3a2655fd5 Fix whitespace errors. 2012-05-11 21:38:21 -04:00
Mark Story
5d3291ba19 Merge pull request #645 from huoxito/2.2 
Make controller test template extends ControllerTestCase instead of CakeTestCase
 2012-05-11 17:35:34 -07:00
Washington
287c7b432a fix broken tests for TestTask class 2012-05-11 15:30:47 -03:00
Rachman Chavik
e5b33627d5 minor updates to the logging changeset 
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
 2012-05-11 21:19:45 +07:00
Rachman Chavik
be9bcfd4b5 adding convenience methods for CakeLog 2012-05-11 12:37:01 +07:00
Rachman Chavik
6040d96710 adding scoped logging 2012-05-11 12:37:01 +07:00
Rachman Chavik
05243a1c0a updating Shell tests related to Console logging 2012-05-11 12:37:01 +07:00
Rachman Chavik
e11f6b7fe4 adding tests for ConsoleLog engine 2012-05-11 12:37:01 +07:00
Rachman Chavik
70177e4dbd updating tests for CakeLog 
- ObjectCollection operations
- Selective logging
 2012-05-11 12:37:01 +07:00
Rachman Chavik
68b49950af fix ErrorHandlerTest 2012-05-11 12:37:01 +07:00
Rachman Chavik
bb090c54cf changing Shell to use ConsoleLog 2012-05-11 12:37:00 +07:00
Rachman Chavik
49bc818d36 new base class Log/Engine/BaseLog 2012-05-11 12:37:00 +07:00
Rachman Chavik
edb44aadea Merge branch '2.1' into 2.2 2012-05-11 12:34:26 +07:00
Jose Lorenzo Rodriguez
217bf85537 Implemented new method isEmptyAllowed in CakeValidationRule 2012-05-10 23:13:45 -04:30
Jose Lorenzo Rodriguez
307197da9e Merge branch '2.2' into 2.2-validator 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Model/ModelWriteTest.php
 2012-05-10 22:19:35 -04:30
Rachman Chavik
15a74722b3 use LOGS constant 2012-05-11 08:33:53 +07:00
Jose Lorenzo Rodriguez
280893155a Renaming CakeRule to CakeValidationRule 2012-05-10 21:01:44 -04:30
Rachman Chavik
539fa3a131 fixing method signature in test models 2012-05-10 20:55:47 -04:30
Rachman Chavik
a96e4397be check extension before passing to addTestFile() 2012-05-10 20:55:47 -04:30
Rachman Chavik
89959afa63 fix incorrect __construct params for mock object 2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
7db2b97f87 Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks 2012-05-10 20:55:47 -04:30
Jelle Henkens
484c3ec688 Adding support for a trailing & or &amp; in the existing queryString 2012-05-10 20:55:46 -04:30
mark_story
7592eb94ac Fix test cases with postgres. 
Setting id values confuses postgres' sequences.
 2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987 Fix additional issues with saveAll(). 
Fixes #2857
 2012-05-10 20:55:46 -04:30
Jelle Henkens
e53074dab9 Fixing order inconsistency in queryString and bug with string based existing querystring 2012-05-10 20:55:46 -04:30
mark_story
d73bc6b867 Fix error in Sqlite tests. 2012-05-10 20:55:45 -04:30
mark_story
8334ebebed Fix saving translate records with saveAll() 
Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
 2012-05-10 20:55:45 -04:30
Frank de Graaf
2be9ac8888 Fixed HTTP status codes for non-redirects which were breaking AuthComponent. 2012-05-10 20:55:45 -04:30
AD7six
6933b31be5 include plugin name in model tests 2012-05-11 00:33:10 +02:00
Rachman Chavik
73c66e2df4 fixing method signature in test models 2012-05-10 19:47:10 +07:00
Rachman Chavik
2598d17670 check extension before passing to addTestFile() 2012-05-10 19:06:04 +07:00
Rachman Chavik
5b67534acc fix incorrect __construct params for mock object 2012-05-10 13:35:01 +07:00
Jose Lorenzo Rodriguez
0fb025f6dc Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks 2012-05-09 23:51:27 -04:30
Mark Story
a4bbfc0cea Merge pull request #638 from jellehenkens/2.1-router-querystring-bugfix 
Router::queryString() order inconsistency and bug with appending to a string instead of array
 2012-05-09 17:11:19 -07:00
Jelle Henkens
07735069fa Adding support for a trailing & or &amp; in the existing queryString 2012-05-09 22:32:57 +01:00
mark_story
597913aa5b Fix test cases with postgres. 
Setting id values confuses postgres' sequences.
 2012-05-07 22:10:17 -04:00
mark_story
fbba3621b5 Fix additional issues with saveAll(). 
Fixes #2857
 2012-05-07 21:36:28 -04:00
Norio Suzuki
db20600d02 Fix SMTP Transparency (RFC5321 4.5.2. first line period) 2012-05-07 22:34:14 +00:00
Jelle Henkens
45a96ae588 Fixing order inconsistency in queryString and bug with string based existing querystring 2012-05-07 21:48:58 +01:00
Ceeram
fe0c7d348a add strict parameter to inList() and multiple() 2012-05-07 16:29:13 +02:00
Jose Lorenzo Rodriguez
52c7b2383c Added afterValidate callback to maintain consistency across all other callbacks in the model layer 2012-05-06 23:38:29 -04:30
mark_story
a1e06b9c8b Fix error in Sqlite tests. 2012-05-06 23:39:02 -04:00
Jose Lorenzo Rodriguez
d4511af27b Implemented add and remove in ModelValidator 2012-05-06 23:06:28 -04:30
Jose Lorenzo Rodriguez
a7222bccd6 Implemented removeRule in CakeValidationSet 2012-05-06 22:30:07 -04:30
mark_story
6c5255ac73 Fix saving translate records with saveAll() 
Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
 2012-05-06 22:48:15 -04:00
Jose Lorenzo Rodriguez
ff91a0909a Implemented countable interface for CakeValidationSet 2012-05-06 01:07:13 -04:30
Jose Lorenzo Rodriguez
989a8b8398 Implementing IteratorAggregate for CakeValidationSet 2012-05-05 21:13:09 -04:30
Jose Lorenzo Rodriguez
6f16a66b83 Implmenting ArrayAcces in CakeValidationSet 2012-05-05 21:00:40 -04:30
Jose Lorenzo Rodriguez
877e6c0f66 Removing the need for first param in CakeRule constructor 2012-05-05 19:41:48 -04:30
Jose Lorenzo Rodriguez
3199b9029b Implemented countable interface for ModelValidator 2012-05-05 17:46:09 -04:30
Jose Lorenzo Rodriguez
81c0c3d91d Implementing IteratorAggregate interface for ModelValidator 2012-05-05 17:34:35 -04:30
Jose Lorenzo Rodriguez
d35f8e6b00 Implementing ArrayAccess in ModelValidator 2012-05-05 15:52:02 -04:30
Jose Lorenzo Rodriguez
b6c8a345e7 Renaming CakeField to CakeValidationSet 2012-05-05 13:44:12 -04:30
Jose Lorenzo Rodriguez
843d95bb77 Renaming some methods ands removing others 2012-05-05 13:34:14 -04:30
mark_story
7416c530a2 Fix missing view variables. 
When rendering a exception caught when rendering
an exception, some view variables were missing causing fatal
errors.

Fixes #2843
 2012-05-05 13:30:18 -04:00
Frank de Graaf
7bb56e7fc3 Fixed HTTP status codes for non-redirects which were breaking AuthComponent. 2012-05-04 16:58:51 +02:00
mark_story
7b5e45b965 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/VERSION.txt
 2012-05-03 21:06:35 -04:00
mark_story
4ab6d37abb Update assertions. 
Use assertXmlStringEqualsXmlString() it gives
better error reporting.  Also update string concat
into heredocs.
 2012-05-03 21:00:52 -04:00
mark_story
73b0345ff4 Fix issue with non-sequential array keys. 
Xml::fromArray() should not cause errors with non-sequential
numeric array keys.

Fixes #2580
 2012-05-03 20:35:01 -04:00
Ceeram
3a18384929 fix failing testcase 2012-05-03 10:13:18 +02:00
mark_story
1b288b74d9 Merge branch '2.2-configure' into 2.2 2012-05-02 21:21:43 -04:00
ADmad
49f8e73ab3 Allow bulk storing/updating of mime types. Closes #2844 2012-05-03 01:39:12 +05:30
mark_story
e18200ad87 Fix assertion. 2012-05-01 21:45:06 -04:00
mark_story
e7153b5333 Add more tests 
Fix an issue in IniReader and add tests
to ensure that dumped files can be re-read.
 2012-05-01 21:43:01 -04:00
mark_story
7c4b7a2cbe Fix mistake in path. 
Remove incorrectly added file.
 2012-05-01 21:06:24 -04:00
mark_story
d43e0aa0db Update dump() to allow partial dumps. 2012-05-01 21:00:42 -04:00
mark_story
6ba923d20f Make the configure adapters responsible for persistence. 
Each adapter should be handling persistence.  This allows
different adapters to handle saving config files in different ways
or places.
 2012-05-01 21:00:41 -04:00
mark_story
9f37277dab Add Configure::dump(). 2012-05-01 21:00:41 -04:00
mark_story
578dac9259 Add dump() to PhpReader. 2012-05-01 21:00:41 -04:00
mark_story
c703a633bd Add dump() method to IniReader. 2012-05-01 21:00:41 -04:00
mark_story
004bc5b6e7 Fix overwriting of GET/POST 
ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.

Fixes #2841
 2012-04-30 20:36:19 -04:00
Graham Weldon
c77c6f3b57 Removed unncessary line to fix coding standards 2012-05-01 09:51:22 +10:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Jose Lorenzo Rodriguez
72e8992c25 Improving test coverage for CakeRule 2012-04-29 19:56:24 -04:30
Jose Lorenzo Rodriguez
d348bf6807 Refactoring again CakeRule, making all tests pass 2012-04-29 18:11:51 -04:30
mark_story
f6b33db02c Add test for accept header. 
Refs #2828
 2012-04-29 14:48:45 -04:00
AD7six
6a744b277e create tests for baking a test for a component, behavior and helper 2012-04-29 17:20:14 +02:00
Jose Lorenzo Rodriguez
deedd7a3ce Even more tests passing now, almost there 2012-04-29 02:40:08 -04:30
Jose Lorenzo Rodriguez
66a568be89 More tests passing now 2012-04-29 01:09:36 -04:30
Jose Lorenzo Rodriguez
8700f3c7a2 Fixed some validation tests 2012-04-29 01:06:24 -04:30
Jose Lorenzo Rodriguez
30761f9153 Removed more redundant lines in ModelValidation tests 2012-04-29 00:46:56 -04:30
Jose Lorenzo Rodriguez
18c26119f3 Removing redundant code, cleaning up some sentences 2012-04-29 00:39:43 -04:30
Jose Lorenzo Rodriguez
c31f87b7a1 Refactored getMethods, got rid of validationErrors property in ModelValidator, made validateAssociated and many tests 
pass
 2012-04-29 00:24:35 -04:30
Jose Lorenzo Rodriguez
573d292ffa Fixed more refereces to old method 2012-04-28 20:12:20 -04:30
José Lorenzo Rodríguez
d80b1ef7f6 Merge pull request #630 from shama/patch-typos 
Typos in Test Cases
 2012-04-27 07:42:40 -07:00
Kyle Robinson Young
eb059d3fa6 Fix typos in test cases 2012-04-26 20:14:52 -07:00
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
mark_story
46bce1a00f Merge branch '2.1' into 2.2 2012-04-26 22:27:44 -04:00
mark_story
6bb8b22cdb Fix space indented code. 2012-04-26 22:27:34 -04:00
Mark Story
1876b2f579 Merge pull request #627 from dereuromark/2.2-utf8-test-cases 
2.2 utf8 test cases
 2012-04-26 18:14:58 -07:00
Juan Basso
333ea29805 Renamed variable name from nested transaction 2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0 Renamed method to check if the driver supports nested transaction. 2012-04-26 20:58:25 -04:00
euromark
ba8a3c5f07 added missing utf8_encode to pass tests on windows 2012-04-27 02:39:32 +02:00
Mark Story
f150ebb9cc Merge pull request #623 from dereuromark/2.2-bake-theme-order 
Correct order of bake themes so app and plugin precede core ones

Fixes #2825
 2012-04-26 09:43:53 -07:00
Ceeram
ec9966ec6b Adding tests for Validator 2012-04-25 09:38:58 +02:00
Thomas Ploch
324684c14f Moving all validation logic into a new ModelValidator object. 2012-04-25 08:53:31 +02:00
Juan Basso
10a4b87979 Fixed tests with nested transaction in DboSource. 2012-04-24 22:28:47 -04:00
Juan Basso
5bec15d3e1 Added file that was missing in previous commit. 2012-04-24 21:43:43 -04:00
Juan Basso
5f722cb3d4 Update nested transaction test to use InnoDB table in MySQL. 2012-04-24 21:42:32 -04:00
mark_story
eefb2e81fa Fix issue where prefixes mid action would be truncated. 
If a prefix occured mid action name it would be removed,
corrupting the action name.

Fixes #2831
 2012-04-24 20:48:23 -04:00
mark_story
4ffca8457e Fix coding standards. 2012-04-24 20:09:39 -04:00
Rachman Chavik
2f87992d15 File::create() does not need to change umask 
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.

FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.

Refs: f9f1c4df5
Cherrypicked from 2.2 branch.
 2012-04-24 23:35:32 +07:00
Rachman Chavik
74830b9b93 File::create() does not need to change umask 
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.

FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.

Refs: f9f1c4df5
 2012-04-24 23:17:28 +07:00
Ceeram
0785ace172 fix error caused by non-existent fixture 2012-04-24 14:01:59 +02:00
mark_story
7e38f9d79f Fix more coding standards errors. 2012-04-23 22:27:27 -04:00
mark_story
7240286adc Fix coding standards errors. 2012-04-23 22:01:45 -04:00
mark_story
b6de177ffa Merge branch '2.1' into 2.2 2012-04-23 21:50:36 -04:00
mark_story
9e3fe633bb Remove double encoding on addresses in EmailComponent. 
CakeEmail should be handling all the encoding now, duplicating it is
silly.

Fixes #2797
 2012-04-23 21:41:31 -04:00
mark_story
13468937cc Fix singularization of databases. 
Fixes #2822
 2012-04-23 21:01:03 -04:00
euromark
acd06d6499 fixing test case 2012-04-24 02:46:20 +02:00
euromark
6353558622 bame themes now in correct order: app -> plugin -> default 2012-04-24 02:40:42 +02:00
Till Claassen
3f7e2f536f CakeTestSuite::addTestDirectory() ignore non-php 
CakeTestSuite::addTestDirectory() and addTestDirectoryRecursive()
now ignore any files that do not end in .php

This avoids any stray non-php files being parsed, especially
tilde-style backup files that end in .php~

Improves #2031

Signed-off-by: mark_story <mark@mark-story.com>
 2012-04-23 12:15:29 -04:00
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Juan Basso
7fe333ce4e Merge branch '2.2-nested-transaction' into 2.2 2012-04-22 23:04:32 -04:00
Jose Lorenzo Rodriguez
ed0c5a4746 Merge branch '2.2-lazy-helpers' into 2.2 2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
042221bbf6 Merge branch '2.2-redis-engine' into 2.2 2012-04-22 19:14:24 -04:30
Jose Lorenzo Rodriguez
9f415d012c Merge branch '2.2-cache-groups' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
 2012-04-22 18:59:22 -04:30
Jose Lorenzo Rodriguez
4b2804bb42 Fixing broken test and coding standard 2012-04-22 17:39:45 -04:30
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
ADmad
b1e7164d1a Implemented translation of validation rule arguments in validation error messages. Closes #2816 2012-04-22 23:25:07 +05:30
mark_story
7846254c63 Remove more copy + paste in tests. 2012-04-21 21:31:24 -04:00
mark_story
88465cbb47 Remove copy + paste in tests. 2012-04-21 21:17:28 -04:00
ADmad
058d57a85a Added function to convert time from user timezone to server timezone. 2012-04-22 01:59:26 +05:30
ADmad
ebf304927b Added "Config.timezone" config param to avoid having to specify timezone in each function call. 2012-04-22 01:59:26 +05:30
ADmad
d34f0c2bd8 CakeTime functions can now use timezone string or DateTimeZone object for user offsets. (Passing numeric offsets has been kept for BC) 2012-04-22 01:59:08 +05:30
Ceeram
f0bd7386e2 created, modified and updated fields now use static timestamp in testcases 2012-04-21 17:38:49 +02:00
euromark
8a52a77cbc correct argument order for phpunit asserts 2012-04-21 15:19:57 +02:00
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
mark_story
2480ee1beb Fix coding standards. 2012-04-20 20:52:10 -04:00
Mark Story
76e724e161 Merge pull request #617 from dereuromark/2.2-test-cases-fix-for-windows 
2.2 test cases fix for windows
 2012-04-20 17:03:13 -07:00
Ceeram
a0d78edb71 require models.php to avoid fatal error when running AllComponentsTest 2012-04-20 17:16:11 +02:00
euromark
da3b424838 Fixed several fails in the tests concerning windows. Especially in AllConsole 2012-04-20 16:38:50 +02:00
mark_story
fcb7714e2e Fix failing test. 2012-04-19 22:17:19 -04:00
euromark
a5c323064f domain configurable for mailing in CLI environment 2012-04-20 03:38:26 +02:00
Jose Lorenzo Rodriguez
fd8971ba06 Adding smart header checking to return 304 response in AssetDispatcher filter 2012-04-19 00:00:32 -04:30
mark_story
c15259f49c Remove useless backups. 
PHPUnit does this for us.
Fix formatting and whitespace.
 2012-04-17 21:57:07 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
ca2c122c62 Make flaky tests less flaky. 
Off by one second errors are common here.
 2012-04-17 20:51:52 -04:00
mark_story
94e83fa81c Fix invisible buttons. 
Fixes #2802
 2012-04-17 20:46:19 -04:00
Cauan Cabral
18aa5a040f Include test to .0 and .00 decimals 2012-04-17 20:22:32 -04:00
Cauan Cabral
28bd6880df Make Validation::decimal accept integers 
Fix #2800
Force locale of ValidationTests with en_US to ensure decimal dot separator
 2012-04-17 20:22:22 -04:00
Jose Lorenzo Rodriguez
826699a670 Extracting asset dispatcher and cache dispatcher into separate classes to provide examples on how to use Dispatcher 
Filters
 2012-04-17 00:42:18 -04:30
Jose Lorenzo Rodriguez
70f3cc579c Renaming a few things in dispatcher filters to maccht general naming style in CakePHP 2012-04-16 23:41:32 -04:30
Ceeram
388b20dd9d fix error in previous commit 2012-04-17 00:22:13 +02:00
Ceeram
a84597784d avoid warning when saveAll() data has empty hasMany data, fixes #2792 2012-04-16 22:46:58 +02:00
Jose Lorenzo Rodriguez
565a58f784 Introducing dispatcher filters and adding tests for them 2012-04-16 00:36:08 -04:30
mark_story
8639d5af84 Fix mistakes. 2012-04-15 22:54:13 -04:00
mark_story
72c3059d94 Add missing parent calls. 
Fixes piles of failing tests.
 2012-04-15 22:20:34 -04:00
Jose Lorenzo Rodriguez
05b88f3f0e Fixed another failing test case 2012-04-15 12:52:34 -04:30
Jose Lorenzo Rodriguez
d17a471451 Initial middelware implementation 2012-04-15 11:39:08 -04:30
mark_story
f990ecfff3 Add Configure::clear() 
Refs #2767
 2012-04-14 23:32:29 -04:00
Juan Basso
37157806b9 Removing some dup code in nested transaction tests. 2012-04-14 16:46:47 -04:00
Juan Basso
7be5349b0c Added configuration to disable nested transaction, even if the db supports it. 2012-04-14 16:43:24 -04:00
Juan Basso
b0a3a1a5aa Added test to check when driver do not support nested support. 2012-04-14 16:25:23 -04:00
Juan Basso
79f7ca7d33 Oops, forgot one change in last commit. 2012-04-14 16:23:51 -04:00
Juan Basso
a512d46679 Sqlite is failing in PHP 5.2, re-adding the check for driver support. 2012-04-14 16:23:51 -04:00
Juan Basso
ffe0a18495 ReflectionMethod::setAccessible() is not compatible with PHP 5.2, causing fatal error in CI. Assuming that the db servers support nested transaction. 2012-04-14 16:23:51 -04:00
Juan Basso
22cd65b7d8 Added tests in each datasource to test the nested transactions. 2012-04-14 16:23:51 -04:00
Juan Basso
30258ac817 Added test for nested methods sequence. 2012-04-14 16:22:36 -04:00
Juan Basso
9beaa9602f Unified error handlers. Now the regular error handler will receive the fatal errors too. 2012-04-14 16:08:36 -04:00
Juan Basso
eeec217992 Added tests to fatal error handler. 2012-04-14 16:08:35 -04:00
mark_story
f818caf47c Remove duplicate code / skipped tests. 2012-04-14 12:20:05 -04:00
Mark Story
6167529d4d Merge pull request #605 from shama/patch-datasource-test 
Add checks for startQuote & endQuote.

Fixes #2769
 2012-04-14 08:08:05 -07:00
mark_story
5bb8c3a942 Fix code standards. 2012-04-14 10:49:25 -04:00
mark_story
0f2100767b Add failing test for #2661 2012-04-14 10:24:20 -04:00
Renan Gonçalves
b0b36e8fba Defining default values for CakeRequest, those params are present anywhere except when there isn't a Route match. 2012-04-13 15:58:45 +02:00
Kyle Robinson Young
6cf73c763c Tests for a generic custom datasource 
Default startQuote and endQuote to avoid error with non-database datasources
 2012-04-11 10:08:45 -07:00
Kyle Robinson Young
8bbe250bec Correct method descriptions and remove unused property 2012-04-11 07:50:54 -07:00
mark_story
f677bfea7d Remove duplicated test code. 2012-04-10 22:26:33 -04:00
mark_story
a4f0399f74 Fix coding standards warnings. 2012-04-10 22:16:14 -04:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
 2012-04-10 21:32:37 -04:00
mark_story
45e3414d49 Add test for query string encoding. 
Closes #2768
 2012-04-10 20:08:12 -04:00
mark_story
f8966a64f2 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
 2012-04-09 21:55:02 -04:00
mark_story
81208d1fa7 Fix failing test. 2012-04-09 21:46:38 -04:00
mark_story
67743c8079 Fix missing Html escaping on string urls for assets. 
Add HTML escaping for asset paths provided as strings.
Split existing tests up.

Fixes #2766
 2012-04-09 21:20:11 -04:00
mark_story
c718a18218 Fix coding standards errors. 2012-04-08 21:01:25 -04:00
mark_story
c6d62884c1 Fix whitespace errors. 2012-04-08 20:40:30 -04:00
ADmad
1949a20b5a Ensure L10n::get() consistently returns the set language. Closes #2737 2012-04-09 00:49:24 +05:30
mark_story
15c94dee4d Fix whitespace and remove duplicate method calls. 2012-04-07 14:42:25 -04:00
mark_story
a24aca6ffc Fix a few code standards errors. 2012-04-06 22:56:01 -04:00
mark_story
ff35762e92 Fix coding standards warnings. 2012-04-06 22:34:29 -04:00
mark_story
38b7ae3c67 Coding standards cleanup. 
Fix coding standards
Simplify addition of empty.
Add doc block for new feature.
 2012-04-06 21:47:02 -04:00
Clément Hallet
613e3824e0 add tests for the 'empty radio option' feature 2012-04-06 21:37:19 -04:00
mark_story
4eea72205b Merge branch '2.1' into 2.2 2012-04-06 21:34:11 -04:00
mark_story
fe1a6d7d7e Fragments should not be urlencoded() 
encoding them breaks fragments for client side
applications like backbone.js

Fixes #2755
 2012-04-06 21:32:37 -04:00
Ceeram
c2a8fca00c Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
 2012-04-05 23:27:21 +02:00
Ceeram
8c631fa022 add test to show label options in inputDefaults 2012-04-05 17:47:08 +02:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
Ceeram
7700a0261b only use and test SORT_NATURAL on PHP 5.4 2012-04-04 18:21:52 +02:00
ADmad
1cc5206442 Merge branch '2.1-dbosource' into 2.1 2012-04-04 19:58:48 +05:30
ADmad
93639a7c43 Fixed bug where associated model's afterfind was not triggered in particular case 2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6 Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750 2012-04-04 15:07:45 +02:00
mark_story
72cb96b727 Fix a few more coding standards errors. 2012-04-02 23:23:53 -04:00
mark_story
18296d2bf6 Fix a few coding standards errors. 2012-04-02 23:19:05 -04:00
Ceeram
34a730dfd8 ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709 2012-04-02 18:48:02 +02:00
mark_story
e5ca80b711 Add additional sort flag support. 
Add natural, numeric, and string sorting to Hash.
Fixes #1700
 2012-04-01 23:09:15 -04:00
mark_story
4e67698506 Fix issues with SQLServer + boolean columns. 
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.

Fixes #2439
 2012-04-01 22:10:05 -04:00
Norio Suzuki
26b93afc3c fixed CakeEmail::reset, no initialized charset and headerCharset property 2012-04-01 23:42:18 +00:00
mark_story
475a1596b7 Merge branch '2.1' into 2.2 2012-04-01 15:37:21 -04:00
mark_story
990fbcdea0 Remove duplicated code backup. 
This restoration/backup is done in the parent class.
 2012-03-31 13:32:44 -04:00
Mark Story
54bfa4cc05 Merge pull request #587 from shama/patch-mb-number 
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
 2012-03-31 10:22:25 -07:00
mark_story
a463033ee9 Set -> Hash 2012-03-31 08:49:04 -04:00
ADmad
04c30238cb Merge pull request #585 from shama/patch-auth-redirect 
Default to loginRedirect, if set, on authError in AuthComponent
 2012-03-30 23:19:22 -07:00
ADmad
1763219053 Adding tests for getting session id when using DatabaseSession. Disproves #2734 2012-03-31 00:40:44 +05:30
Ceeram
65f25ed910 test added to show pagination conditions will not result in incorrect count, refs #2736 2012-03-30 19:06:01 +02:00
Jose Lorenzo Rodriguez
f105abde4e Implementing Redis cache engine 2012-03-28 23:30:33 -04:30
Jose Lorenzo Rodriguez
18b843467f Making lazy loader throw an exception for missing helpers 2012-03-28 22:12:46 -04:30
Ceeram
7df6477526 add test to prove #2723 2012-03-28 22:24:02 +02:00
ADmad
47558e8db5 Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723 
This reverts commit 96f73d6392, reversing
changes made to 9d017c2b5c.

Conflicts:

	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
 2012-03-29 01:33:21 +05:30
Kyle Robinson Young
4370bf280a Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4 
Fixes #2602
 2012-03-28 10:46:31 -07:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
Kyle Robinson Young
319d154aee Default to loginRedirect, if set, on authError in AuthComponent 
Implements #2390
Based on the patch written by @dereuromark
 2012-03-27 22:51:47 -07:00
Jose Lorenzo Rodriguez
c270e7ffda Adding test for lazy loading helpers in views 2012-03-27 23:43:41 -04:30
Jose Lorenzo Rodriguez
f009e96a69 Adding test for lazy loading helpers using the collection 2012-03-27 23:36:16 -04:30
Mark Story
0443fe1507 Merge pull request #584 from shama/patch-inpath-test 
Add test/doc for reverse Folder::inPath()
 2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9 Add test/doc for reverse Folder::inPath() 2012-03-27 11:55:13 -07:00
Jose Lorenzo Rodriguez
4f6f041730 Using same serialization strategy for request object in cached views, this prevents some failing tests in environments 
with different charsets
 2012-03-27 00:57:15 -04:30
Jose Lorenzo Rodriguez
e5cc7d0f73 Fixed failing test 2012-03-27 00:20:35 -04:30
Jose Lorenzo Rodriguez
2100a64ffd Prefixing group names in XcacheEngine 2012-03-27 00:00:52 -04:30
Jose Lorenzo Rodriguez
ffdd98be1b Prefixing group names in WincacheEngine 2012-03-26 23:35:15 -04:30
Jose Lorenzo Rodriguez
98b14ff144 Prefixing group names in MemcacheEgine 2012-03-26 23:34:03 -04:30
Jose Lorenzo Rodriguez
957322ec82 Prefixing group names with the cache enging prefix to avoid possible conflicts with shared servers 2012-03-26 23:02:26 -04:30
mark_story
c1531d3faa Fix a few small code standards issues. 2012-03-26 23:04:32 -04:00
mark_story
95d4549c9b Docs + coding standards. 2012-03-26 22:57:50 -04:00
mark_story
c087576f20 Port changes done to Set into Hash 
See #2722
 2012-03-26 22:39:13 -04:00
mark_story
66eabe462a Copy Set::expand into Hash class. 2012-03-26 22:32:58 -04:00
mark_story
9015d78017 Port most recent changes in Set to Hash. 
See [68eeee80d8] and
[af575027da]
 2012-03-26 22:32:56 -04:00
mark_story
0ef9adba93 Move and rename pushDiff onto Hash. 
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
 2012-03-26 22:32:54 -04:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
mark_story
8becc4c985 Fix misnamed method calls. 2012-03-26 22:25:40 -04:00
mark_story
2231087ba3 Rename Set2 -> Hash. 2012-03-26 22:25:40 -04:00
mark_story
239f52c48c Move nest() over 
Make get() able to take arrays for $path.
 2012-03-26 22:25:40 -04:00
mark_story
afa0329330 Fix incomplete test. 2012-03-26 22:25:39 -04:00
mark_story
ae66682c35 Add apply(), map() and reduce() 
Add tests as well.
 2012-03-26 22:25:39 -04:00
mark_story
8cadac3ee5 Add tests for issue #104 2012-03-26 22:25:39 -04:00
mark_story
ff5e72c9a7 Move Set::format across. 
Remove the {0} style of formatting.  Custom formatting
syntax is a bit silly. sprintf() is more than expressive enough
for this method.
 2012-03-26 22:25:39 -04:00
mark_story
e4a505797d Move combine() across. 2012-03-26 22:25:39 -04:00
mark_story
aa4dca6c0c Move Set::check across. 2012-03-26 22:25:39 -04:00
mark_story
771efd950e Fix sort() not working. 2012-03-26 22:25:38 -04:00
mark_story
3d8a955043 Add remove() and insert() 
Also add support for multi insert and multi remove.
 2012-03-26 22:25:38 -04:00
mark_story
6b69ed269a Extracting duplicate loops. 2012-03-26 22:25:38 -04:00
mark_story
e72127e359 WIP, adding sort() and remove() 2012-03-26 22:25:37 -04:00
mark_story
31181f58d6 Add attribute pattern matching. 2012-03-26 22:25:37 -04:00
mark_story
cbfa938303 Fix muliple attribute conditions. 2012-03-26 22:25:37 -04:00
mark_story
8ad4e66eba Making attributes work with any selector type. 
Attributes work with all base selectors.
 2012-03-26 22:25:37 -04:00
mark_story
9269a6dcde Added some more operators. 
Attribute + {n} is still not working.
 2012-03-26 22:25:36 -04:00
mark_story
6c87be97ef Implement presence and equality attributes. 2012-03-26 22:25:36 -04:00
mark_story
e87901ac6d Adding tests for {n} and {s} 2012-03-26 22:25:36 -04:00
mark_story
37181e99a8 Basic path selectors implemented for extract(). 2012-03-26 22:25:36 -04:00
mark_story
b3861c01dc Move numeric() into Set2. 2012-03-26 22:25:36 -04:00
mark_story
1315e0f1a1 Moving filter() into Set2. 2012-03-26 22:25:35 -04:00
mark_story
885d5dfd80 Make contains() non-recursive. 
Add a few more tests for contains().
 2012-03-26 22:25:35 -04:00
mark_story
d37e10a8a9 Move contains() across. 
Fix a few issues in contains() with nested needle values.
 2012-03-26 22:25:35 -04:00
mark_story
ad65098348 Move normalize() into Set2. 
Dropping the ability to 'normalize' string data.
 2012-03-26 22:25:34 -04:00
mark_story
e736ea3af9 Move merge() into Set2. 2012-03-26 22:25:34 -04:00
mark_story
51f45c0f28 Moving flatten() across. 
It is no longer recursive either.
 2012-03-26 22:25:34 -04:00
mark_story
51e3ee0425 Adding dimensions() and maxDimensions() 
Splitting the Set::countDim() into two methods.  This creates a simpler
API, as each method only does one job, and only has one argument.  Also
replacing recursion with iteration.
 2012-03-26 22:25:34 -04:00
mark_story
328513d35e Start Set2. 2012-03-26 22:25:33 -04:00
mark_story
6b045318d8 Merge branch '2.1' into 2.2 2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82 Fix Set::insert() not overwriting values. 
Set::insert() failed to overwrite values that were previously
defined as strings.  Remove test in SessionComponentTest that was
ensuring this bug stuck around.

Fixes #2722
 2012-03-26 21:50:53 -04:00
Thomas Ploch
ce8b10e46f Fixing cache group related test cases. 2012-03-26 14:30:01 +02:00