OKINAKA Kenshin
8c008ad97d
Update.
2014-12-11 13:55:41 +09:00
OKINAKA Kenshin
5cff6aa746
Fixing Mysql::describe() for timestamp.
2014-12-11 10:31:19 +09:00
mark_story
ac6d5cc70f
Fix incorrect pluralization of Human.
...
Human should become humans, unlike other words ending in man.
Fixes #5370
2014-12-09 21:51:42 -05:00
Mark Story
1a1583a832
Merge pull request #5360 from ADmad/i18n-arabic
...
Fix plural calculation for Arabic
2014-12-09 12:54:02 -05:00
Mark Story
0ce38029d0
Merge pull request #5362 from cakephp/master-sniff
...
Consolidate with conditions sniff.
2014-12-08 22:23:25 -05:00
euromark
e1c128bb99
Consolidate with conditions sniff.
2014-12-09 03:17:35 +01:00
mark_story
ef28b42b2b
Update version number to 2.5.7
2014-12-08 20:50:35 -05:00
ADmad
31c7b01c3a
Add reference links to docblock
2014-12-09 00:03:24 +05:30
ADmad
850edf47a0
Fix plural calculation for Arabic.
...
Refs #5348
2014-12-08 23:58:27 +05:30
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
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
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
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
2990c2143c
Correct assert argument order.
2014-11-11 01:49:19 +01:00
José Lorenzo Rodríguez
b5eb51deee
Merge pull request #5123 from cakephp/issue-4993
...
Remove singularization on schema class names
2014-11-10 09:04:16 +01: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
Mark Story
c1063dcd81
Merge pull request #5119 from ndm2/fix-unset-email-pattern
...
Make unsetting the email pattern work as expected.
2014-11-09 13:25:45 -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
c151ea585d
Update version number to 2.5.6
2014-11-07 20:35:12 -05:00