mark_story
02ca7f5fcb
Update version number to 2.6.0
2014-12-23 11:26:27 -05:00
mark_story
f4b682d384
Revert version number.
...
I forgot to merge a few pull requests before releasing.
2014-12-23 11:25:54 -05:00
Mark Story
033d968766
Merge pull request #5468 from dereuromark/2.6-i18n
...
Allow apps to overwrite translation domains from third party plugins.
2014-12-23 11:25:10 -05:00
Mark Story
96c458f300
Merge pull request #5467 from cakephp/2.6-mediaview
...
Don't send response from view.
2014-12-23 11:24:47 -05:00
mark_story
8de2877573
Update version number to 2.6.0
2014-12-23 11:22:20 -05:00
mark_story
10717d9248
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-23 11:22:00 -05:00
mark_story
667e2be2d2
Update version number to 2.5.8
2014-12-23 11:21:16 -05:00
mark_story
5cf5fe53ee
Clarify question.
...
Fixes #1870
2014-12-23 11:18:32 -05:00
euromark
22a4a2f5de
Correct argument. Should not have a default string.
2014-12-23 15:36:25 +01:00
euromark
d089341ee7
Wording.
2014-12-23 13:46:55 +01:00
euromark
53f1390b7d
Backport array support for testAction()
2014-12-23 13:42:21 +01:00
euromark
5c5fb59c8d
Allow apps to overwrite translation domains from third party plugins.
2014-12-23 13:09:53 +01:00
euromark
545ff20e1d
Add component and helper wrapper methods.
2014-12-23 03:50:35 +01:00
mark_story
6db96d5e41
Merge branch '2.6' into 2.7
2014-12-22 21:39:08 -05:00
euromark
813925abee
Backport Session consume()
2014-12-23 03:39:05 +01:00
mark_story
c540e2b798
Merge branch 'master' into 2.6
2014-12-22 21:38:58 -05:00
euromark
5af24bdb31
Correct array syntax.
2014-12-23 03:29:52 +01:00
euromark
515302528d
Backport Configure::consume() to 2.x
2014-12-23 03:26:03 +01:00
euromark
0a974dd59f
Adjust tests
2014-12-22 22:07:51 +01:00
euromark
14073dc742
Don't send response from view.
2014-12-22 21:02:52 +01:00
Mark Story
484b114e9b
Merge pull request #5384 from okinaka/fix-mysql-describe
...
2.5: Fixing Mysql::describe() for timestamp.
2014-12-21 21:27:27 -05:00
Rachman Chavik
45be270a7b
Enable use of Containable with TreeBehaviors
...
This patch allows Containable use with:
- TreeBehavior::getParentNode()
- TreeBehavior::children()
- TreeBehavior::getPath()
2014-12-20 16:32:20 +07:00
Marc Würth
e778b5dce2
Corrected/Improved DocBlock
2014-12-19 18:20:48 +01:00
Mark Story
1651e7742c
Merge pull request #5088 from sebastienbarre/ticket-5041
...
Ticket #5041 : have Auth::login() send Auth.afterIdentify event
2014-12-18 00:12:22 -05:00
mark_story
839ef73d43
Merge branch '2.6' into 2.7
2014-12-17 21:46:54 -05:00
mark_story
4d6611b328
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
mark_story
2637d35543
Don't quit bake when a table is missing.
...
When a table is missing print a warning to stderr but don't exit. This
allows people to use `bake fixture all` with non-conventional tables.
Refs #5377
2014-12-15 21:28:55 -05:00
mark_story
ae8a540101
Remove trailing whitespace.
2014-12-14 18:05:20 -05:00
mark_story
f19916bccf
Add comments for possibly confusing code.
2014-12-13 22:25:52 -05:00
mark_story
c58e7da667
Handle exception when RequestHandler::startup() fails.
...
In the case that there is a request data type parser raises an
exception, or startup() otherwise fails the error page should be created
correctly. While I'm not able to write a test case for this, manual
testing confirmed the fix.
Refs #5311
2014-12-13 15:04:11 -05:00
Walther Lalk
9be725613e
Backport helper method for view blocks from 3.0
...
Related PR is #5385
2014-12-11 16:44:11 +02:00
OKINAKA Kenshin
8c008ad97d
Update.
2014-12-11 13:55:41 +09:00
mark_story
cf108dbff3
Remove duplicate order key.
...
This was a mistake made in 4b6dba0
.
Fixes #5376
2014-12-10 22:32:59 -05:00
mark_story
23c4b7b7d5
Fix whitespace.
2014-12-10 22:17:02 -05:00
Mark Story
2228afda0e
Merge pull request #5334 from tranfuga25s/master
...
Change output to show the difference between fixture data and fields
2014-12-10 22:16:33 -05: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
tranfuga25s
360346acd0
Added PHPCS fixes
2014-12-09 09:35:12 -03:00
tranfuga25s
674af51d6b
Added PHPCS fixes
2014-12-09 09:16:34 -03:00
tranfuga25s
9ecdaf7965
Added PHPCS fixes and better array diff handling on fixture data count difference
2014-12-09 08:56:34 -03: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
1e6876b627
Fix tests
2014-12-09 03:43:35 +01:00
euromark
f63d955f73
Add additional test.
2014-12-09 03:43:35 +01:00
euromark
dc70da9d14
Only merge the _defaults keys.
2014-12-09 03:43:35 +01:00
euromark
dc41a1ff56
Fix paginator options when disabled.
2014-12-09 03:43:34 +01: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
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
c32e165052
Merge branch '2.6' into 2.7
2014-12-06 21:29:13 -05: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
tranfuga25s
b0d0143b82
Fix PHPCS problems
2014-12-05 16:14:47 -03:00
tranfuga25s
ec2530ba58
Fix PHPCS problems and a better comparation of schema and data
2014-12-05 16:01:49 -03:00
tranfuga25s
fc756ac0b8
fix some small typo changing variables names
2014-12-05 15:34:53 -03:00
tranfuga25s
a2d04589a6
Change to output the difference between fixture data and fields
2014-12-05 15:23:48 -03: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
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
1c913d29b6
Merge branch '2.6' into 2.7
2014-11-29 22:00:24 -05:00
mark_story
543f05e3d0
Merge branch 'master' into 2.6
2014-11-29 22:00:00 -05:00
Florian Krämer
e7f554cba7
Changing the direct access of super globals in Cake/Network/CakeRequest.php to use env() and fixed a typo.
2014-11-29 03:04:07 +01:00
Florian Krämer
43f7fcc735
Adding a few more ways to detect HTTP headers, extensions and the accept header.
2014-11-27 01:00:44 +01:00
euromark
d0f75a03af
Allow RLIKE in conditions.
2014-11-26 19:56:58 +01:00
Tsuyoshi Sadakata
1f4402cd4c
check ob_get_level() before ob_flush()
2014-11-26 17:25:10 +09: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
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
Sebastien Barre
20e2882bf6
Remove duplicate class declaration
2014-11-23 21:49:29 -05:00
Sebastien Barre
5ac47487f9
Merge branch 'ticket-5041' of github.com:sebastienbarre/cakephp into ticket-5041
...
Conflicts:
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
2014-11-22 13:38:11 -05:00
Sebastien Barre
a2e7896038
Fix uses, style
2014-11-22 13:31:39 -05:00
Sebastien Barre
7da48669c8
Have BaseAuthenticate implement CakeEventListener instead
2014-11-22 13:31:38 -05:00
Sebastien Barre
50e5b5e8fe
Move App::uses() again
2014-11-22 13:31:38 -05:00
Sebastien Barre
d7b353dcf9
Move App::uses(), rename helper class to avoid conflict
2014-11-22 13:31:38 -05:00
Sebastien Barre
43413f029e
Ticket 5041: have Auth::login() send Auth.afterIdentify event
2014-11-22 13:31:38 -05: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
Florian Krämer
4ff07b745a
Adding a test for the new json and xml detectors that were added to the CakeRequest class.
2014-11-22 17:30:53 +01:00
Florian Krämer
83eb8ce7de
Changes to Cake/Network/CakeRequest.php as discussed on Github for the detector code changes. Fixed the description of a few doc blocks, removed the use of getallheaders(), removed the failsafe (based on extension) for the xml and json detectors.
2014-11-22 12:55:22 +01:00
Florian Krämer
17e5d41e55
Restructuring the CakeRequest::is() code and related code a little.
2014-11-21 18:49:36 +01: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
Florian Krämer
24c4cab4f3
phpcs fix in Cake/Test/Case/Network/CakeRequestTest.php
2014-11-20 22:50:12 +01:00
Florian Krämer
3f5f8cbc15
phpcs fixes in Cake/Network/CakeRequest.php
2014-11-20 22:16:36 +01:00
Florian Krämer
728764c543
Adding a test for the refactored CakeRequest code.
2014-11-20 21:14:17 +01:00
Florian Krämer
88bfa70cad
Refactoring the detector code for CakeRequest::is() and adding default detectors for JSON and XML.
2014-11-20 21:14:07 +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
fe6d3e36d5
Bump version number to 2.7.0-dev
...
Open a branch for any development on 2.7.x which will be a 2.x API
compatible release.
2014-11-18 23:06:24 -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
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
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