Commit graph

3930 commits

Author SHA1 Message Date
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
Jose Lorenzo Rodriguez
b75bb8ece7 Update version number to 2.3.0-beta 2012-10-28 23:17:25 +01:00
ADmad
1e50ead75b Fix coding standard error 2012-10-29 02:19:24 +05:30
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
mark_story
f8d602cd7b Fix coding standard. 2012-10-28 15:59:34 -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
8538c0e8ea Avoiding problems with relative paths in shell dispatcher 2012-10-28 12:57:44 +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
0f978195d6 coding standards regarding whitespaces 2012-10-27 00:46:12 +02: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
Rachman Chavik
e61483126c CakeSchema: adds empty line between tables 2012-10-26 13:27:47 +07:00
mark_story
559130b87b Try and make test less likely to fail. 2012-10-25 21:56:00 -04:00
mark_story
50a4b792be Clean up code in FormHelper::dateTime()
Remove $$ variables and split a huge method into smaller pieces.
2012-10-25 21:28:01 -04:00
mark_story
c359e4b689 Fix issue with array based values and interval.
Fixes #3299
2012-10-25 20:46:54 -04:00
Mark Story
d051b69312 Merge pull request #914 from dereuromark/2.3-i18n-extract
Normalize paths in generate pot files to always use /

Fixes #3306
2012-10-25 17:12:55 -07:00
Renan Gonçalves
02cfacec41 Make app/Console/cake pwd insensitive on Mac OS X.
Follow up of [36e15a065b].
2012-10-26 01:14:09 +02:00
Ber Clausen
c741f60367 Make Model::find('first') always return an array. 2012-10-25 17:57:37 -03:00
Ber Clausen
d269588e78 Avoid duplicating RequestHandler component. 2012-10-25 14:57:16 -03:00
euromark
cc436146be making tests pass on windows again 2012-10-25 17:37:35 +02:00
euromark
f3bbe89ede solves ticket 3306 2012-10-25 17:08:52 +02:00
mark_story
528671f468 Replace Set with Hash. 2012-10-25 10:07:39 -04: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
Mark Story
2841611c0f Merge pull request #911 from dogmatic69/type-checks
Type checks
2012-10-24 17:26:30 -07:00
Ceeram
6fc019e74d afterRender should not be triggered when callbacks is false 2012-10-25 01:16:16 +02: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
euromark
2ac08bf024 fix whitespace 2012-10-23 19:04:52 +02: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
euromark
9a9ac6f3a7 allow input type=number to also be magic 2012-10-23 15:11:22 +02:00
ADmad
3ee267d7ef Moving the mb_* functions to bootstrap.php 2012-10-23 16:58:07 +05:30
ADmad
1763f46340 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
ADmad
922d9865fa Moving multibyte encoding setting to bootstrap.php. Closes #3290 2012-10-23 13:20: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
AD7six
35686c9293 use the right language domain
these messages are for developers, not end users
2012-10-22 10:55:40 +02:00
Jose Lorenzo Rodriguez
c00d58b4ef Fixed problems with resetSequence() not using the correct sequence name
in postgres
2012-10-21 16:32:52 +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
mark_story
f457f07b5c Force field validation to use sha1
When using blowfish as your application's hashing strategy, form field
validation would fail horribly.  Forcing sha1 fixes this and restores
behavior consistent with 2.2.x

Fixes #3280
2012-10-18 21:26:26 -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
ea467e72d7 Swap isset() for array_key_exists()
Fixes #3283
2012-10-17 17:23:08 -04: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
2a803ea412 Add missing import
Refs GH-877
2012-10-14 22:22:46 -04:00
mark_story
3e0fa0009b Show the last 200 queries instead of the first 200.
Fixes #3273
2012-10-14 21:30:28 -04:00
Graham Weldon
41ae19b5bc Removed spaces at the end of lines. 2012-10-15 11:44:31 +11: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
mark_story
513851d1c1 Update skel directory logging configuration. 2012-10-13 02:29:25 -04:00
euromark
17be6d0472 remove default value for debug's first argument 2012-10-12 16:14:17 +02:00
euromark
7bf08fdcc7 default value null makes more sense. add test cases for false. 2012-10-12 16:03:05 +02:00
ADmad
8bc17996dc Update docblock 2012-10-11 20:00:30 +05:30
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
f06bdde8c6 Fix docblock 2012-10-11 12:33:46 +05:30
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
Mark Story
4acc687dcd Merge pull request #890 from dereuromark/master-not-empty-validation
Fix validation error domain for notEmpty
2012-10-09 14:52:11 -07:00
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
Mark Story
2e15689d19 Merge pull request #892 from dereuromark/router-fix
avoid offset -1 error on tests etc
2012-10-09 05:01:06 -07:00
euromark
0197700e4f simplify check 2012-10-09 12:24:10 +02:00