Stephen Cuppett
ffb7e86641
Enable sslmode for PostgreSQL connections
...
By default, PHP 5.5 and PostgreSQL PDO will not allow SSL connections. This adds the default of "allow", but also the user may override the setting to "require" or any of the other potential values.
See: http://php.net/manual/en/function.pg-connect.php
2014-11-20 22:37:39 -05:00
Rachman Chavik
a37e007d9f
BC fix for css() and script() with identical resource names
2014-11-19 11:20:37 +07:00
Rachman Chavik
7bea96f534
Add test for css() and script() with the same resource identifier
2014-11-19 11:20:37 +07:00
mark_story
e00aa596b1
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-11-14 21:25:24 -05:00
mark_story
decce4daf2
Merge branch 'master' into 2.6
2014-11-14 21:25:09 -05:00
Mark Story
f570f931ce
Merge pull request #5159 from cakephp/issue-5155
...
Add order=>false to all treebehavior queries.
Refs #5155
2014-11-14 10:02:17 -05:00
mark_story
4b6dba0c0a
Add order=>false to all treebehavior queries.
...
Models can define default order conditions that will cause issues with
postgres. By setting order=>false on all the queries emitted by
TreeBehavior, we can avoid this issue and not have issues with models
that define a default ordering.
Refs #5155
2014-11-13 21:21:47 -05:00
Bryan Crowe
e3e54d40fa
Fix CS, remove extra space
2014-11-13 16:47:10 -05:00
mark_story
6092c168a9
Fix issues with sqlite field parsing.
...
The previous attempt would still fail on unions or derived table join
queries. This new approach is a bit slower but more robust.
Refs #3972
2014-11-12 20:49:19 -05:00
mark_story
93a6fd5648
Fix SQLite parsing fields incorrectly when using subqueries.
...
When using subqueries or joining against tables containing FROM the
results were bizzare and unexpected. By tokenizing the entire query we
can more accurately grab the fields.
Refs #3972
2014-11-11 23:16:08 -05:00
watermark
8712dc01df
Cleanup of isUnique
...
isUnique takes the count of the args multiple times. Store the count in a variable to cut down on overhead.
2014-11-11 16:13:16 -05:00
euromark
8e18e5a1c7
Correct argument order for assert.
2014-11-11 01:51:46 +01:00
euromark
2990c2143c
Correct assert argument order.
2014-11-11 01:49:19 +01:00
mark_story
3095187952
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-11-10 19:38:31 -05:00
mark_story
7718d473c4
Remove singularization on schema class names.
...
Using camelize() does the transformation we want without also
singularizing the name. This makes user input more transparent and fixes
issues around plugin schemas with plural names.
Refs #4993
2014-11-09 21:52:10 -05:00
mark_story
9ce3d89c81
Clean up formatting and make a failure exit non-zero.
...
Console tools should exit non-zero when a comman fails.
Refs #4993
2014-11-09 21:21:42 -05:00
ndm2
f0b6657113
Make unsetting the email pattern work as expected.
...
When set to `null`, only `filter_var()` should be used. This is a
partial backport of #5111
2014-11-09 16:33:57 +01:00
Mark Story
4242ce453f
Merge pull request #5093 from cakephp/2.6-returns
...
Simplify return types.
Update code to use documented return types where possible, and reduce number of return types.
2014-11-08 14:58:22 -05:00
euromark
41c646c5a1
Simplification of return types. No need to return more mixed than necessary.
2014-11-08 20:07:47 +01:00
mark_story
cc1fd33d0b
Update version number to 2.6.0-RC1
2014-11-07 20:36:25 -05:00
mark_story
c151ea585d
Update version number to 2.5.6
2014-11-07 20:35:12 -05:00
mark_story
0e4fb9d648
Merge branch 'master' into 2.6
2014-11-07 15:13:46 -05:00
mark_story
6aaac6b7e2
Fix HttpSocket mishandling encoded URIs
...
The HTTP specs seem to indicate that the Location header should contain
an 'absoluteURI' which includes encoded data. In order to avoid
a regression with the issue fixed in b9ee4fc9f1Fixes #5076
2014-11-05 22:18:48 -05:00
mark_story
dac8b7b644
Update return type for Model::saveField().
...
Fixes #5086
2014-11-05 20:37:43 -05:00
euromark
345a18f15f
Merge branch 'master' into 2.6
2014-11-05 23:29:06 +01:00
euromark
0d5d6b19b5
Wording correction.
2014-11-05 13:14:45 +01:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
mark_story
07c91d4b3e
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-11-04 22:44:28 -05:00
mark_story
48101e6bf5
Merge branch 'master' into 2.6
2014-11-04 22:44:11 -05:00
Mark Story
96b82e4226
Merge pull request #5021 from dereuromark/master-mysql
...
Fix IN replacement in virtual fields for MYSQL.
2014-11-04 08:24:03 -05:00
euromark
a6bd133413
Correct typos.
2014-11-02 22:41:17 +01:00
euromark
e7f76a983a
Add a method for generating pagination meta links.
2014-11-02 22:29:02 +01:00
euromark
00432fa427
Show stack trace for fatal errors if xdebug is loaded.
2014-11-02 20:44:17 +01:00
Sebastien Barre
2995d9319c
Prepend model alias for safety
2014-11-01 09:36:59 -04:00
Sebastien Barre
417c137d11
Fix DigestAuthenticate test
2014-10-31 21:42:18 -04:00
Sebastien Barre
544ddac08c
Fix indentation
2014-10-31 16:38:09 -04:00
Sebastien Barre
60917974bf
Add test for userFields and related models
2014-10-31 16:35:55 -04:00
Sebastien Barre
f6c71024c5
Add test for the 'contain' setting, which was missing (unrelated to feature)
2014-10-31 16:04:09 -04:00
Sebastien Barre
2f62ee2cde
ticket #5017 add userFields setting to BaseAuthenticate
2014-10-31 15:00:19 -04:00
mark_story
579b16d90b
Merge branch 'master' into 2.6
2014-10-30 21:20:53 -04:00
euromark
0f9890720e
Correct test
2014-10-31 01:45:41 +01:00
euromark
bb67df4305
Simplify test
2014-10-31 01:18:08 +01:00
Mark Story
a8c5b70b22
Merge pull request #4489 from busgurlu/patch-1
...
to correctly return SET() type
2014-10-30 19:56:47 -04:00
euromark
70acd2fe3f
doc block update.
2014-10-30 19:15:23 +01:00
euromark
e5b45bcdea
Fix IN replacement in virtual fields for MYSQL.
2014-10-30 19:14:04 +01:00
mark_story
1e8f12f9f5
Bump the depth of variables in stack traces to 4.
...
Giving more context allows developer to look at request/response data
more easily.
Fixes #5005
2014-10-29 21:43:18 -04:00
Mark Story
94d56a3d74
Merge pull request #4985 from fixon/issue-2172
...
Make CakeResponse::file() accept ranges even when download option is fal...
2014-10-29 07:52:09 -04:00
José Lorenzo Rodríguez
9d0390ca63
Merge pull request #4953 from jrbasso/2.6-route-set-state
...
Implementing __set_state for CakeRoute
2014-10-28 09:36:42 +01:00
Juan Basso
6171ef69c3
Update test cases for CakeRoute::__set_state
...
It removes the eval and test the __set_state more explicitly.
2014-10-27 23:45:46 -04:00
mark_story
d228d83b1e
Relative paths should be created relative to pwd.
...
If create() is called with a relative directory and the path does not
exist, it should be created inside of the folder->pwd() and not inside
the process' cwd.
Refs #4990
2014-10-27 21:32:28 -04:00
