adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18251 commits 7 branches 0 tags 44 MiB
Commit graph

3543 commits

Author SHA1 Message Date
mark_story
a6aefdd4d3 Fix null path in Hash::get() causing exceptions. 
This was a regression introduced in 2.6.x

Refs #6297
 2015-04-09 07:50:29 -04:00
Mark van Driel
4a7344ae80 Keep only test for null value as path 2015-04-09 07:49:35 -04:00
Mark van Driel
900fd3e7e5 Test to demonstrate issue with non-string paths in Hash::get 2015-04-09 07:47:25 -04:00
mark_story
f55111bdc1 Allow empty headers to be read. 
Allow headers with '' and '0' as their values to be read.

Fixes #6299
 2015-04-08 16:33:28 -04:00
José Lorenzo Rodríguez
405e725767 Merge pull request #6238 from cakephp/issue-6224 
Fix maxDimensions() for empty/1 dimensional arrays.
 2015-04-01 09:26:50 +02:00
Justin Yost
f32d1c1362 Updates Inflector For Irregular Case Sieves 
Sieves incorrectly singualrized as sief.
Adds sieve, sieves as an irregular case and test cases to
match for the Inflector class.
Closes Issue #6240 in CakePHP 2.6 Branch

Signed-off-by: Justin Yost <justin.yost@yostivanich.com>
 2015-03-31 22:21:05 -07:00
mark_story
69971505a2 Fix maxDimensions() for empty/1 dimensional arrays. 
maxDimensions() should not emit warnings or mis-calculate an array's
dimensions.

Fixes #6224
 2015-03-31 22:21:15 -04:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
Richard van den Berg
1d0d20e974 Account for SNI changes in HttpSocketTest 2015-03-23 22:31:08 -04:00
mark_story
5a6a74e2f8 Fix failing tests. 
The test was taking the wrong index when creating mock path choices.

Refs #6125
 2015-03-20 20:35:43 -04:00
mark_story
744952e344 Fix FormHelper::create() dropping 0 value parameter. 
When 0 is the first passed parameter we shouldn't drop it.

Fixes #6107
 2015-03-19 21:15:20 -04:00
Walther Lalk
359c0ab816 Fix issue with memcache and domains starting with letter "u" 2015-03-19 11:42:14 +02:00
José Lorenzo Rodríguez
277f641108 Merge pull request #6064 from robmcvey/jsonView 
2.6 jsonView should throw exception if json_encode fails
 2015-03-18 10:01:40 +01:00
mark_story
6df7bf9c21 Fix notice errors in pagination link generation. 
No errors should be emitted when creating links for models that were not
paginated.

Refs #6090
 2015-03-17 22:19:17 -04:00
Rob McVey
4741abcd63 Remove whitespace 2015-03-15 11:14:49 +00:00
Rob McVey
d94e05cf76 Assert exception msg contains UTF-8 
The different versions of PHP throw several various messages for UTF-8
sequences, so this just performs a basic regex check
 2015-03-15 11:01:51 +00:00
Rob McVey
a59a057133 assert correct exception msg thrown 2015-03-15 10:36:06 +00:00
mark_story
827465fa30 Merge branch 'postgres_altercolum_error' into master 
Merge changes from #5512 into master. This fixes changing columns in
postgres to integer from string types.
 2015-03-14 22:23:43 -04:00
mark_story
c32e5559bb Add test to ensure column was converted to integer. 
Refs #5512
 2015-03-14 22:23:17 -04:00
Rob McVey
fe0ddf2171 Assert exception is thrown, reset error handler in tearDown 2015-03-14 13:27:34 +00:00
Rob McVey
56c6f02efc Remove tabs 2015-03-14 13:16:05 +00:00
Rob McVey
d3c24be84b add a custom error handler for tests of json_encode 2015-03-14 13:12:09 +00:00
Rob McVey
2ba9f3b8fb Encoding false is OK - should return string null 2015-03-13 16:21:54 +00:00
Rob McVey
ddfcb06d02 Coding standards 2015-03-13 16:13:29 +00:00
Rob McVey
08620704be Handle json_encode failure 2015-03-13 16:12:21 +00:00
Rob McVey
05aba7afb6 Assert CakeException throw when json_encode fails 2015-03-13 15:52:22 +00:00
mark_story
0b916cedbb Merge branch 'master' into 2.7 2015-03-09 21:55:20 -04:00
Mark Story
43f16f38f0 Merge pull request #5905 from davidsteinsland/fix_file_response_dots 
Fix file response dots
 2015-03-09 21:54:02 -04:00
mark_story
a9519d39f7 Fix whitelist being empty during afterSave. 
whitelist should only be reset after afterSave event.

Refs #6028
 2015-03-08 13:51:46 -04:00
Mark van Driel
ed5da19d10 Fixed return type of toQuarter in CakeTime and TimeHelper 2015-03-02 12:08:11 +01:00
José Lorenzo Rodríguez
a6ceec149a Merge pull request #5981 from cakephp/issue-5973 
Make maxLimit and limit settings independent.
 2015-03-01 19:48:26 +01:00
mark_story
02c9dda9a7 Make maxLimit and limit settings independent. 
Having maxLimit infer what it should be based on limit was not a very
transparent default behavior. The documentation states that maxLimit
will default to 100, but the code would default it to 'limit' if set.
This created confusing behavior when only one setting was defined.

Refs #5973
 2015-02-27 22:35:52 -05:00
mark_story
8dba9879d4 Don't generate maxlength properties for decimal columns. 
Int casting the decimal scale isn't going to work in a number of
situations as users may end up trying to include decimal points, commas
or spaces in larger amounts.

Fixes #5977
 2015-02-27 21:08:54 -05:00
KullTC
a7c2f26599 Make sure default datasource is not used for mock 
When a non-default datasource is used for a model and no test_ version of
that datasource is available, the getMockForModel method used the
models standard datasource, rahter than 'test'.
 2015-02-27 15:26:49 +01:00
Mark Story
19f28c419e Merge pull request #5954 from cakephp/issue-5948 
Check line length to account for fence post.
 2015-02-26 19:58:06 -05:00
mark_story
63769ae4a6 Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/VERSION.txt
 2015-02-26 12:50:35 -05:00
mark_story
c92cfb413f Allow numeric sorts in PaginatorComponent. 
When paginating data, we should not ignore numerically indexed order
conditions. Instead they should be handled similar to Model::find().

This creates a slightly different behavior when model's have default
sorting applied as more default sort options forms will be honoured.

Refs #5964
 2015-02-25 21:38:56 -05:00
mark_story
ea79cf5d13 Fix words with WWW in them being autolinked. 
Don't autolink words that don't have `www.` in them.

Fixes #5968
 2015-02-25 20:52:35 -05:00
mark_story
b80a8947d7 Check line length to account for fence post. 
When we have exactly 998 bytes CakeEmail should not emit an error.

Refs #5948
 2015-02-24 21:52:34 -05:00
AD7six
d7d2516dc1 Remove unwanted whitespace 2015-02-23 17:22:55 +00:00
AD7six
5066bc33b4 Fix whitespace for paginator counter call 2015-02-23 16:46:43 +00:00
AD7six
b151295f1b Add a better test for the index being correct 2015-02-23 16:46:23 +00:00
mark_story
831fe53f79 Ignore LC_TIME category when extracting messages. 
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.

Refs #5933
 2015-02-22 22:39:38 -05:00
ADmad
2a57d9b65f Avoid reloading config file and recreating config instance. 2015-02-20 08:48:25 +05:30
David Steinsland
463fa660bc Updated test 2015-02-19 17:28:32 +01:00
Jan Dorsman
e3b5306521 Fixing issue #5764 2015-02-19 12:19:27 +05:30
David Steinsland
960ddd0eb8 Added DocBlock 2015-02-15 19:34:28 +01:00
David Steinsland
5fd7396e47 Fixed downloading of files with dots 2015-02-15 19:32:33 +01:00
ADmad
204f50bb97 Allow level field to be null for pqsql and sqlite. 2015-02-15 23:04:13 +05:30
ADmad
e095885dc4 Fix test case 2015-02-15 22:35:42 +05:30
ADmad
6ad68ae1e2 Allow setting level (depth) of tree nodes on save. 
Backported from 3.0.
 2015-02-15 22:29:19 +05:30
Mark Story
9f1f158cc0 Merge pull request #5855 from tanuck/2.7-custom-flash-message 
Backport of 3.x flash messages #5823
 2015-02-14 22:07:30 -05:00
mark_story
b3c9c1615e Fix doubly linking URLs starting with // 
Fixes #5889
 2015-02-13 21:40:50 -05:00
mark_story
eb85a875c0 Merge branch 'master' into 2.7 2015-02-10 23:00:43 -05:00
mark_story
3dfa22b021 Fix order of hasOne assocation. 
This should fix non-deterministic failures.
 2015-02-10 22:46:53 -05:00
mark_story
b974daac7b Don't create invalid maxlength attributes for decimal columns. 
Converting the maxlength to an int avoids any commas from decimal
columns.

Refs #5832
 2015-02-05 22:53:40 -05:00
James Tancock
e173c29d33 Fix for phpcs 2015-02-04 15:31:50 +00:00
James Tancock
b8b6b67abd Tests for ported Flash component & helper 2015-02-04 15:05:40 +00:00
Rachman Chavik
acd32b71fe Fix: "bake plugin" generates incorrect directory for View/Layouts 2015-02-04 15:47:01 +07:00
ADmad
54fe7ed204 Add method to get depth of tree's node. 
Backported from 3.0.
 2015-02-01 17:27:46 +05:30
Mark Story
151f6e90e0 Merge pull request #5673 from davidsteinsland/fix_exception_handler_nesting 
Fixed nesting when ExceptionRenderer throws exception
 2015-01-28 22:00:57 -05:00
Mark Scherer
611889235a Fix clear(). Add test cases. 2015-01-28 23:54:32 +01:00
Mark Story
35e0dc2bbd Merge pull request #5760 from cakephp/master 
Merge master into 2.7
 2015-01-27 20:48:15 -05:00
Mark Story
b5cbe4de58 Merge pull request #5744 from cakephp/master-hotfix-testing 
Fix ControllerTestCase redirect assert by always using 302 for redirect()
 2015-01-26 20:27:36 -05:00
Mark Scherer
76f7754014 Adding a status code test. 2015-01-26 10:29:52 +01:00
mark_story
a8ae12a700 Fix warnings when php://output is used with ConsoleOutput. 
The php://output stream is not compatible with posix functions.

Refs #4901
 2015-01-25 22:24:24 -05:00
AD7six
f9ba950ad4 Skip Sqlite 
Sqlite will accept an insert with duplicate primary keys and silently
drop the query. There is no exception, or indication that the insert
failed.
 2015-01-23 08:47:05 +00:00
AD7six
838d23300b Remove some exists checks by not validating 2015-01-23 08:29:59 +00:00
AD7six
51bd1d0a2b If a PDOException is thrown, try again. 
This can occur if the exists check returns no rows, but before this
request inserts into the database a _different_ thread inserts a
session record.
 2015-01-23 08:28:08 +00:00
AD7six
e86365ca0f Add a failing test for session concurrency problems 2015-01-22 23:04:34 +00:00
mark_story
58334996a2 Fix PHPCS errors. 2015-01-21 23:32:08 -05:00
Ceeram
9ce75e6fd6 No need to get the datasource if column is defined in schema. Fixes #5712 2015-01-22 00:46:55 +01:00
Robert
c755d9b5e5 Updated comments 2015-01-19 08:55:40 +01:00
Robert
db1442573d Fix failing tests 2015-01-19 08:51:57 +01:00
Robert
dedb2e4191 Added short plugin alias in shells 2015-01-19 08:51:57 +01:00
mark_story
3078a1eb52 Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/VERSION.txt
 2015-01-16 22:22:26 -05:00
Mark Story
2a9f2d4b58 Merge pull request #5668 from cakephp/issue-5649 
Fix numeric values not being quoted for MySQL set columns.
 2015-01-15 21:29:57 -05:00
mark_story
396d501d1e Fix / being handled incorrect by referer() 
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'

Fixes #4812
 2015-01-15 21:26:34 -05:00
mark_story
d4a6d3f6c0 Fix numeric values not being quoted for MySQL set columns. 
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.

Refs #5649
 2015-01-15 21:10:33 -05:00
David Steinsland
a5e1be7abf Fixed tests 2015-01-15 23:11:36 +01:00
David Steinsland
ed3b15f13b Fixed phpcs 2015-01-15 20:04:06 +01:00
David Steinsland
f621bb7fe5 Fixed nesting when ExceptionRenderer throws exception 2015-01-15 19:20:28 +01:00
mark_story
d39c744c28 Fix PHPCS error. 2015-01-12 21:37:34 -05:00
mark_story
7b20884d43 Fix failing tests. 2015-01-12 21:36:28 -05:00
mark_story
ac9a212d44 Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/Utility/String.php
 2015-01-11 15:25:18 -05:00
mark_story
cd58fa0b61 Backport changes from #5635 to 2.x 
In case the path passed to the File class doesn't exists, this will
cause File::$path to be set to a partial path, that is the filename
of the passed path with a slash prepended, ex with

    $file = new File('/non/existent/file');

calling $file->pwd() will return/set /file, possibly causing that
file in the root to be accessed.
 2015-01-11 15:20:34 -05:00
mark_story
03d8c40d99 Fix PHPCS error. 2015-01-09 15:32:33 -05:00
mark_story
98909fb465 Fix radio buttons not being added to security hash. 
When some but not all inputs were disabled radio buttons were omitted
from the security hash. This caused blackhole failures as the input was
unexpected.

Refs #5603
 2015-01-08 23:25:34 -05:00
Mark Story
c4f9727720 Merge pull request #5576 from istvanp/2.7 
Prevent NULL value on NOT NULL column when value is an empty string
 2015-01-06 21:23:53 -05:00
euromark
389f745d16 Stop goofy formatting when newlines are present already. 2015-01-06 13:13:33 +01:00
Istvan Pusztai
22b0275a58 Prevent NULL value on NOT NULL column when value is an empty string (MySQL) 2015-01-05 12:04:24 -05:00
euromark
52ecccb1a2 App::uses and usage replacements for String => CakeText. 2015-01-05 01:00:57 +01:00
euromark
63093e1d30 More String CakeText replacements and a BC class. 2015-01-05 00:55:23 +01:00
euromark
274b78e44c Rename test case. 2015-01-05 00:54:36 +01:00
Mark S.
b76fbd8da1 Merge pull request #5557 from cakephp/2.7-configure-backport 
Backport of 3.0 Configure corrections.
 2015-01-04 23:57:56 +01:00
euromark
394da88d23 Stay 100% BC for 2.7 2015-01-04 10:52:18 +01:00
euromark
dabf55785f Simplify test assert. 2015-01-04 02:30:11 +01:00
euromark
a947958dc9 Fix cs 2015-01-04 02:27:40 +01:00
euromark
d848c5f327 cs 2015-01-04 02:22:37 +01:00
euromark
b936a34471 Backport of 3.0 Configure corrections. 2015-01-04 01:57:06 +01:00
euromark
39e0ce415d Backport of 3.0 Session API hardening and clear(). 2015-01-04 01:40:09 +01:00
mark_story
4cd2c8fdcb Merge branch 'master' into 2.7 2015-01-03 14:34:55 -05:00
mark_story
b6029d7ad1 Add some additional tests for autoLink. 
Refs #5544
 2015-01-03 14:30:56 -05:00
Rob McVey
76b7c8c594 More complex test case for GET params 2015-01-02 15:31:27 +00:00
Rob McVey
2bf41f3d85 Add missing double quote to link in test 2015-01-02 15:09:40 +00:00
Rob McVey
1ebcd9bf72 Test brackets are not autolinked inside href tag 2015-01-02 15:08:21 +00:00
José Lorenzo Rodríguez
fcb6520ef1 Merge pull request #5513 from cakephp/issue-4916 
Don't set content-length when serving assets.
 2014-12-30 10:12:19 +01:00
mark_story
a65354225e Don't set content-length when serving assets. 
Setting content-length on assets causes long pauses when fetching assets
that contain PHP code. These assets are invariably larger than their
response bodies. By not setting a content-length, we can allow the
webserver to calculate it for us.

Refs #4916
 2014-12-29 21:07:46 -05:00
Kaz Watanabe
e5fc1858f9 fix error at change type of text field to integer in PostgreSQL 2014-12-30 09:27:46 +09:00
mark_story
ec57fb4579 Fix length reflection in SQLServer 
Don't reflect TEXT column lengths in SQLServer. Because SQLServer text
columns hold ~2GB of data there is no meaningful length to them.

Refs #5506
 2014-12-29 16:47:50 -05:00
José Lorenzo Rodríguez
8a4b0e8754 Merge pull request #5478 from tranfuga25s/HtmlCodeCoverageFix 
Html Testing Renderer & Code Coverage Improvement
 2014-12-27 00:09:01 +01:00
Esteban
58eb7b80ab Added All options enabled when running test from webfrontend 
Fix failing test

Fix CS problem with new code

Fix test for code coverage generator

Fix tests

Fix CS Errors

Removed spaces in tabulation
 2014-12-26 15:49:42 -03:00
Mark Story
7bbc3dfd90 Merge pull request #5470 from cakephp/2.7-session 
Backport Session consume() to 2.x
 2014-12-26 12:22:20 -05:00
Mark S.
c7940f57ac Merge pull request #5469 from cakephp/2.7-configure 
Backport Configure::consume() to 2.x
 2014-12-25 22:23:44 +01:00
Edgaras Janušauskas
3ae61e9e16 Fix Extract task to correctly extract messages with context 2014-12-25 14:28:44 +02:00
mark_story
eba6105a52 Merge branch '2.7' of github.com:cakephp/cakephp into 2.7 
Conflicts:
	lib/Cake/TestSuite/ControllerTestCase.php
 2014-12-23 11:30:29 -05:00
mark_story
d21ae178bf Merge branch 'master' into 2.7 
Conflicts:
	lib/Cake/VERSION.txt
 2014-12-23 11:29:57 -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
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
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
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
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
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
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
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
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
ADmad
850edf47a0 Fix plural calculation for Arabic. 
Refs #5348
 2014-12-08 23:58:27 +05:30
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
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
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
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
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
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
24c4cab4f3 phpcs fix in Cake/Test/Case/Network/CakeRequestTest.php 2014-11-20 22:50:12 +01:00
Florian Krämer
728764c543 Adding a test for the refactored CakeRequest code. 2014-11-20 21:14:17 +01: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
5dab175aa9 Merge pull request #5196 from cakephp/issue-5140 
Gracefully handle invalid chunks in HttpSocket
 2014-11-18 21:58:41 -05:00
ndm2
bae556e73f Prevent zero only lines from being emptied 2014-11-18 17:26:31 +01: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
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
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
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
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
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 b9ee4fc9f1
we'll continue to replace `%2F` and no longer decode the entire URI.

Fixes #5076
 2014-11-05 22:18:48 -05:00
Sebastien Barre
4bada05028 Fix doc/style 2014-11-05 18:37:20 -05:00
Sebastien Barre
ee73c1732b Have BaseAuthenticate implement CakeEventListener instead 2014-11-05 18:03:26 -05:00
Sebastien Barre
f78e6c0621 Move App::uses() again 2014-11-05 13:46:45 -05:00
Sebastien Barre
4c59ab6eca Move App::uses(), rename helper class to avoid conflict 2014-11-05 13:36:29 -05:00
Sebastien Barre
0cdb93b265 Ticket 5041: have Auth::login() send Auth.afterIdentify event 2014-11-05 12:34:25 -05: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
euromark
e7f76a983a Add a method for generating pagination meta links. 2014-11-02 22:29:02 +01: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
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
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