Mark Story
bec99077fe
Merge pull request #5222 from burzum/feature/json-request
...
Feature/json request
2014-11-28 23:35:24 -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
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
Sebastien Barre
20e2882bf6
Remove duplicate class declaration
2014-11-23 21:49:29 -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
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
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
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
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
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
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