Commit graph

19648 commits

Author SHA1 Message Date
Mark Story
c9e0f60423 Merge pull request #6376 from cakephp/2.6-fix-year
Fix year form field when magic input wrapper is used.
2015-04-21 08:28:54 -04:00
Mark Scherer
8cdf222cc0 Also fix hour() 2015-04-20 22:04:33 +02:00
mark_story
096a2ebb72 Merge branch '2.6' into 2.7
Conflicts:
	lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
	lib/Cake/VERSION.txt
2015-04-20 15:42:54 -04:00
Mark Scherer
3ba4308356 Use hour as field name. 2015-04-20 18:39:54 +02:00
Mark Scherer
c71a478876 Add test case. 2015-04-20 18:38:19 +02:00
Mark Scherer
a9ae7fd5bb Fix year form field when magic input wrapper is used.
s
2015-04-20 18:31:00 +02:00
mark_story
f925511a54 Update version number to 2.6.4 2015-04-19 21:10:15 -04:00
Mark Story
7e0ff46537 Merge pull request #6328 from ravage84/patch-2
Fix parameter type annotation
2015-04-13 13:16:36 -04:00
Marc Würth
b19b76b9f2 Fix parameter type annotation
https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L265
https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L293
2015-04-13 18:20:16 +02:00
Mark S.
21eb91e407 Merge pull request #6310 from cakephp/fix-ob-error
Fix errors when testing controllers that use file()
2015-04-10 18:56:17 +02:00
mark_story
5f2aa4c307 Fix errors when testing controllers that use file()
Fix errors related to ob_end_clean() closing PHPUnit's output buffer
when testing controller methods that use response->file().
2015-04-09 20:38:37 -04:00
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
846c5f13ad Merge pull request #6300 from cakephp/header-fix
Allow empty headers to be read.
2015-04-08 21:20:11 -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
mark_story
b2958dad79 Re-add call to parent destructor.
In 762ebd4 a destructor was added to DboSource, this accidentally
removed the rollback on destruct that Datasource provides. Restoring
this via a parent call allows pending transactions to be rolled back at
the end of a request.

Fixes #6251
2015-04-01 20:37:06 -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
ADmad
0249b38885 Merge pull request #6243 from jtyost2/issue-6240-cake-2.6
Closes Issue 6240 for CakePHP 2.6 branch
2015-04-01 12:39:07 +05:30
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
José Lorenzo Rodríguez
758820d7cc Merge pull request #6209 from cakephp/issue-6053
Renew the session even the session id is '0'.
2015-03-30 09:25:55 +02:00
mark_story
446dd408bb Renew the session even the session id is '0'.
This fixes AuthComponent not being able to log a user in when they
inadvertently change their session id to 0.

Refs #6053
2015-03-29 21:42:43 -04:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
mark_story
4c61b579c4 Merge branch 'issue-2057' into 2.6
Fix HttpSocket not working for SSL requests over a non-SSL proxy.

Fixes #2057
Closes #6146
2015-03-23 22:47:53 -04:00
mark_story
b80e02c114 Fix coding standards errors.
* Line lengths
* Whitespace.

Refs #2057
2015-03-23 22:31:09 -04:00
Richard van den Berg
1d0d20e974 Account for SNI changes in HttpSocketTest 2015-03-23 22:31:08 -04:00
Richard van den Berg
1f7b787236 Use $host parameter 2015-03-23 22:31:08 -04:00
Richard van den Berg
9e6b1b6930 Support for SSL Server Name Indication 2015-03-23 22:31:08 -04:00
Richard van den Berg
23d4d1155a Do not use full uri in request line for HTTPS requests via proxy 2015-03-23 22:31:08 -04:00
Richard van den Berg
15c80f7c3d Move proxy code inside if (->connected) 2015-03-23 22:31:05 -04:00
Richard van den Berg
7704efdb28 Use feof() in while loop 2015-03-23 22:31:05 -04:00
Richard van den Berg
3995c70046 Strict === and space 2015-03-23 22:31:04 -04:00
Richard van den Berg
bb8e0ae835 Use enableCrypto() 2015-03-23 22:31:01 -04:00
Richard van den Berg
54a3f8724b Addapted quick hack from issue #2057 for 2.6.3 2015-03-23 22:31:01 -04:00
mark_story
07de23a692 Fix global plugin path regression added in 2.6.3
Merge branch 'davehensley-master' into master which fixes the regression
added in 2.6.3, which was trying to fix paths for composer based
installs.

Fixes #6125
2015-03-20 20:36:06 -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
Dave Hensley
0003296f42 Add CAKE directory fallthrough for plugins/vendors
Fixes issue #6124.
2015-03-20 17:35:19 -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
ceeram
af65067b50 Merge pull request #6105 from dakota/fix-memcache
Fix issue with memcache and domains starting with letter "u"
2015-03-19 12:02:45 +01: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
José Lorenzo Rodríguez
e607548fce Merge pull request #6093 from cakephp/issue-6090
Fix notice errors in pagination link generation.
2015-03-18 09:33:39 +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
Mark Story
c3e1ba1dc9 Merge pull request #6089 from garas/2.6-i18n-ExtractTask-function-warnings
Do not warn about i18n functions definitions on extract task
2015-03-17 10:21:26 -04:00
Edgaras Janušauskas
b444fe7b81 Do not warn about i18n functions definitions on extract task 2015-03-16 23:16:50 +02:00
mark_story
02c40d5ca5 Update version number to 2.6.3 2015-03-15 22:06:30 -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