Commit graph

1982 commits

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