Commit graph

1813 commits

Author SHA1 Message Date
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
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