Commit graph

14525 commits

Author SHA1 Message Date
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
eb3e5095cd Merge pull request #948 from sitedyno/blowfish-updates
Blowfish Clarifications.
2012-11-12 18:32:37 -08:00
Heath Nail
895fcac0cd Improve Blowfish Docblocks 2012-11-12 14:36:43 -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
7a5dfdf4ba Add mozilla root CA bundle.
This will enable SSL peer verification in HttpSocket.
2012-11-11 14:18:07 -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
3e3af1f998 Rename HttpResponse to HttpSocketResponse.
This fixes long standing issues with pecl/http

Fixes #2765
2012-11-10 22:36:38 -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
6378aab439 Call a few fewer methods. 2012-11-09 22:59:55 -05:00
mark_story
8b7b139353 Fix failing tests using chr(226) instead of unicode codes. 2012-11-09 22:32:29 -05:00
Mark Story
7e00be8f76 Merge pull request #945 from aleho/2.3
Use bytcode sequence for unicode ellipsis

Fixes #3356
2012-11-09 09:01:32 -08:00
ADmad
7360abb0fe Added query logging to DboSource::insertMulti(). Closes #3354 2012-11-09 16:51:51 +05:30
Alexander Hofbauer
c7fda5674e Use bytcode sequence for unicode ellipsis
The codepoint for "horizontal ellipsis" is 0x2026, which enables a more
robust display of that character on different systems.
2012-11-09 09:38:28 +01:00
mark_story
ec3e85e31d Update docs for the escape option in CakeNumber::currency()
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
2012-11-08 22:20:17 -05:00
mark_story
fe4f9f246a Update docs for the escape option in CakeNumber::currency()
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
2012-11-08 22:19:51 -05:00
mark_story
3de72baeb1 Remove int cast from authentication adapters.
Forcing an int cast makes using the contain option difficult as you are
also required to manually set the recursive option. Omitting the
cast allows recursive to be set to null.

Fixes #3347
2012-11-06 20:27:28 -05:00
Renan Gonçalves
929ed57844 Fixed TestShell options, removed space which caused the option to not be recognized. 2012-11-06 01:44:51 +01:00
mark_story
f53153b812 Fix whitespace. 2012-11-04 21:24:23 -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
José Lorenzo Rodríguez
c7f2a64ede Merge pull request #940 from ceeram/phpcs-errors
fix remaining cs errors
2012-11-04 09:55:00 -08:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
Ceeram
138098f327 only run codesniff on php files 2012-11-04 13:25:50 +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
ADmad
1476ccbe7e Revert "Merge pull request #937 from bar/master-controlelr-test"
This reverts commit ba8f278075, reversing
changes made to 4c6c3b0554.
2012-11-03 21:54:00 +05:30
ADmad
570acfa77b Remove duplicate App::uses() statement 2012-11-03 17:20:55 +05:30
Graham Weldon
ac61bd4964 Merge pull request #938 from lorenzo/2.3-new-home
Helping newcomers find useful plugins
2012-11-03 04:06:37 -07:00
José Lorenzo Rodríguez
c60237e25e Merge pull request #936 from ceeram/phpcs
add phpcs to travis
2012-11-03 02:14:40 -07:00
Jose Lorenzo Rodriguez
6c1bed3d26 Adding warning to home.ctp when DebugKit is not installed
Adding a list of official plugins to home.ctp
Removing old link to live.cakephp.org and replacing it with
plugins.cakephp.org
2012-11-03 15:57:22 +09:00
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
Mark Story
ba8f278075 Merge pull request #937 from bar/master-controlelr-test
Revert "Removing unneeded App::uses() call" as it causes ControllerTest to fail.
2012-11-02 17:32:48 -07:00
Ber Clausen
670bf3c47c Revert "Removing unneeded App::uses() call" as it causes ControllerTest
to fail.

This reverts commit 0fb4d1d3d8.
2012-11-02 21:01:57 -03:00
Ceeram
0dfe373f92 add phpcs to travis 2012-11-03 00:03:16 +01:00
Mark Story
4c6c3b0554 Merge pull request #935 from bar/master-hash-flatten
Set::flatten() fails to generate keys when 'tip' value is an empty array.
2012-11-02 15:45:52 -07: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
Linus Probert
43d766f45c Added View::startIfEmpty($name) 2012-11-02 21:29:28 +01:00