Commit graph

17538 commits

Author SHA1 Message Date
euromark
2937ea9ba5 Make comparison stricter. 2014-12-08 11:39:15 +01:00
euromark
f302d8c4d3 Extract being less verbose until explicitly asked for. 2014-12-08 11:36:24 +01:00
mark_story
ad2d6edda9 Merge branch 'master' into 2.6 2014-12-06 21:28:59 -05:00
euromark
11981f80fa Correct doc block. 2014-12-06 04:54:22 +01:00
Mark Story
7bd0a3b32b Merge pull request #5307 from shin1x1/add-binary-option-in-memcached-engine
SASL with Memcached is only supported with binary protocol
2014-12-02 11:01:03 -05:00
shin1x1
a5843dbe87 add binary protocol option in MemcachedEngine 2014-12-02 19:56:30 +09:00
mark_story
bbfe3170dc Fix incorrect hardcoded database name. 2014-12-01 23:03:47 -05:00
Mark Story
dcbfead855 Merge pull request #5299 from guywarner/add-trigger-doc-2.5
Add @trigger to doc blocks of methods triggering CakeEvent
2014-12-01 21:29:24 -05:00
Guy Warner
327fcb4846 Fix some missed doc block issues 2014-11-30 14:50:11 -07:00
Guy Warner
fb61d9393b Add @trigger doc blocks of methods triggering CakeEvent 2014-11-30 14:45:40 -07:00
Mark Story
7e8c3c4ccf Merge pull request #5293 from ADmad/phpcs-composer
Use composer instead of PEAR to get codesniffer.
2014-11-30 15:33:47 -05:00
ADmad
b29cd2f200 Use composer instead of PEAR to get codesniffer. 2014-11-30 23:02:51 +05:30
mark_story
543f05e3d0 Merge branch 'master' into 2.6 2014-11-29 22:00:00 -05:00
Mark Story
868f5047ec Merge pull request #5270 from cakephp/2.6-rlike
Allow RLIKE in conditions.
2014-11-26 17:00:32 -05:00
euromark
d0f75a03af Allow RLIKE in conditions. 2014-11-26 19:56:58 +01:00
Mark Story
ac02350f41 Merge pull request #5261 from sadapon2008/2.x-response-ob_flush
an unnecessary E_NOTICE caused by CakeResponse::download()
2014-11-26 07:40:29 -05:00
Tsuyoshi Sadakata
1f4402cd4c check ob_get_level() before ob_flush() 2014-11-26 17:25:10 +09:00
José Lorenzo Rodríguez
5a9bef2cba Merge pull request #5253 from cakephp/issue-5234
Make the version option function as intended.
2014-11-25 08:11:16 +01:00
mark_story
1e6d22b8cb Make the version option function as intended.
The version option is documented but does not work. While this 'breaks'
behavior, it also fixes what I think is a more important issue.

Refs #5234
2014-11-24 22:38:00 -05:00
Mark Story
1fed92d94c Merge pull request #5248 from larryb82/phpunit_as_phar
PHPUnit can be included as a phar file.
2014-11-24 20:38:14 -05:00
Lawrence Barsanti
9631b54244 remove space 2014-11-24 16:36:43 -05:00
Lawrence Barsanti
bb5088cda3 PHPUnit can be included as a phar file.
No need to install phpunit in order to run unit tests.  Simply place
'phpunit.phar' in the vendors folder.
2014-11-24 14:51:36 -05:00
José Lorenzo Rodríguez
08674bae2b Merge pull request #5239 from cakephp/issue-5229
Fix file_map being regenerated on every request.
2014-11-23 03:31:26 +01:00
mark_story
b6caddcf49 Fix file_map being regenerated on every request.
A mistake a few months ago caused the file_map to always be regenerated
as Configure::write() would cause both Configure and Hash to be loaded,
invalidating the file map. By entering bootstrap mode earlier we can
avoid that.

Refs #5229
2014-11-22 12:21:28 -05:00
mark_story
21b52335e5 Add sslmode support for postgres.
While 2.6 is in RC this pull request was open well before that, and
I simply forgot to merge it in.

Refs #5173
2014-11-20 22:37:55 -05:00
Stephen Cuppett
9a0b6ada38 Update database.php.default to include sslmode 2014-11-20 22:37:39 -05:00
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
José Lorenzo Rodríguez
54ee34af1f Merge pull request #5205 from rchavik/2.6-fix-html-helper-regression
2.6 Fix html helper regression
2014-11-19 11:31:09 +01: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
23c5805763 Fix mistake with previous commit.
I forgot to put the correct variable into the query like a doofus.

Refs #4168
2014-11-18 22:03:30 -05:00
Mark Story
5dab175aa9 Merge pull request #5196 from cakephp/issue-5140
Gracefully handle invalid chunks in HttpSocket
2014-11-18 21:58:41 -05:00
Mark Story
9f5d99c9cb Merge pull request #5204 from tersmitten/memcached-engine-segfaults-with-memcached-client-version-200
Bugfix for: Memcached Engine segfaults with memcached client version < 2.0.0
2014-11-18 16:25:31 -05:00
Mischa ter Smitten
f2c84602b9 Bugfix for: Memcached Engine segfaults with memcached client version < 2.0.0
Fixes #5028
2014-11-18 21:26:57 +01:00
Mark Story
30f8073537 Merge pull request #5202 from ndm2/email-zero-only-lines-fix
Prevent zero only lines from being emptied
2014-11-18 12:50:44 -05:00
ndm2
bae556e73f Prevent zero only lines from being emptied 2014-11-18 17:26:31 +01:00
mark_story
ddc3eee84c Use name() instead of hand quoting sequence names.
By using name() we can easily accomodate postgres sequences that exist
out side of sequences.

Fixes #4168
2014-11-17 22:47:07 -05:00
mark_story
8cbf975943 Gracefully handle invalid chunks in HttpSocket
When invalid chunks are detected we should assume the server is
incorrect and handle the remaining content as a single large chunk.

Refs #5140
2014-11-17 22:23:46 -05: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
68a2ae5974 Merge pull request #5146 from cakephp/issue-3972
Fix SQLite result sets failing with nested queries or unions
2014-11-13 21:24:19 -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
Mark Story
2addee9808 Merge pull request #5137 from watermark/patch-1
Cleanup of isUnique
2014-11-11 17:27:09 -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