3780 commits

Author	SHA1	Message	Date
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
Juan Basso	6171ef69c3	Update test cases for CakeRoute::__set_state ... It removes the eval and test the __set_state more explicitly.	2014-10-27 23:45:46 -04:00
mark_story	d228d83b1e	Relative paths should be created relative to pwd. ... If create() is called with a relative directory and the path does not exist, it should be created inside of the folder->pwd() and not inside the process' cwd. Refs #4990	2014-10-27 21:32:28 -04:00
mark_story	ebc1bcb624	Add additional useful tests for autoLink() ... These new tests cover an important case that could easily be missed in the future. Links with URL's should not be re-linked. Refs #4998	2014-10-27 21:03:03 -04:00
mark_story	177b797aab	Merge branch 'master' into 2.6	2014-10-26 21:25:05 -04:00
Marek Władysz	65cb186652	Use assertNotSame() instead of assertTrue($result !== false)	2014-10-26 14:19:19 +01:00
Jan Ptacek	797635d26b	fixing testcases + do not disable the hidden input on partial disables	2014-10-25 21:05:37 +02:00
Marek Władysz	090e85a5a4	Make CakeResponse::file() accept ranges even when download option is false.	2014-10-25 19:49:56 +02:00
mark_story	b5050db643	Merge branch '2.6' of github.com:cakephp/cakephp into 2.6	2014-10-24 22:06:03 -04:00
mark_story	b98d2a3365	Merge branch 'master' into 2.6	2014-10-24 22:05:46 -04:00
Juan Basso	f7320cd8cd	Fixed PHPCS issues	2014-10-21 23:47:17 -04:00
Juan Basso	b2a92f9cd8	Implementing __set_state for CakeRoute ... It helps the applications to cache the routes using var_export when possible.	2014-10-21 23:04:08 -04:00
mark_story	cdc67116c5	Handle query string arguments in digest auth data. ... Handle &, ? in digest auth data uri. Refs #4908	2014-10-17 23:12:41 -04:00
Marc Würth	b3770974f1	Added tests for MySQL table comment feature	2014-10-16 16:44:09 +02:00
mark_story	4c93f103c7	Merge branch 'master' into 2.6	2014-10-15 23:28:27 -04:00
mark_story	afcd0312bf	Fix Memcached test failures. ... The Memcached extension does not provide enough information to PHP's Reflection API to allow mock objects to be generated correctly. We'll skip the affected tests until php-memcached-dev/php-memcached#126 has been resolved.	2014-10-15 11:11:50 -04:00
mark_story	b86aae4d8b	Add default prefix to RedisEngine ... This makes redis work like the other cache engines. Also by having a default prefix the clear() method will not wipe all the data in the current redis database. Refs #4876	2014-10-14 22:47:34 -04:00
José Lorenzo Rodríguez	e686a43524	Merge pull request #4867 from cakephp/issue-4694 ... Fix getMockForModel() using the incorrect datasource.	2014-10-14 14:13:01 +02:00
mark_story	1c440e2cb2	Merge branch '2.6' of github.com:cakephp/cakephp into 2.6	2014-10-13 21:11:52 -04:00
mark_story	87fcc9f0b9	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-10-13 21:11:38 -04:00
mark_story	b55a88508f	Fix PHPCS and PHP5.3 error.	2014-10-13 21:07:08 -04:00
mark_story	50b3893e65	Make rule sniff less complicated and tidy up doc block. ... Refs #4871	2014-10-13 17:59:31 -04:00
Rachman Chavik	dc7b8cbb89	Add BC test for #4851	2014-10-13 19:40:30 +07:00
mark_story	9b9e886df6	Fix getMockForModel() using the incorrect datasource. ... Because getMockForModel() does not go through the test datasource injection in ClassRegistry::init() we need to duplicate the basics of that logic here. Thankfully, we already have a mock so we can do that datasource switching without reflection. Of course this means there will be limitations to how/when this will work, but I feel those scenarios can probably be solved by not using mocks, or by mocking out the problematic methods. This set of changes makes getMockForModel() work with secondary datasources, as one would expect it to do, but I'm not sure it ever did. Refs #4694	2014-10-12 22:30:22 -04:00
ADmad	6dc98afa1e	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-10-12 20:20:14 +05:30
Mark Story	63ffb2215b	Merge pull request #4853 from ceeram/2.6-atomic-translate ... TranslateBehavior now uses original atomic option value, if set	2014-10-10 17:48:31 -04:00
Ceeram	43e998422e	Fix PHPCS errors	2014-10-10 16:52:01 +02:00
Ceeram	12ebf8b427	add test for atmoic save of TranslateBehavior	2014-10-10 16:44:01 +02:00
mark_story	39011cd9d8	Fix Model::isUnique() not working as a validator. ... While it *did* work for single fields, isUnique could not be used to validate the uniqueness across multiple fields as documented. Because validation methods pass arguments in an order the validator did not expect the validation method would not work correctly. Fixes #4571	2014-10-09 22:49:17 -04:00
mark_story	0ff9545e5a	Add test for find() and array conditions. ... Add a test for conditions using an array with only one element. Closes #4848	2014-10-09 19:58:18 -04:00
ADmad	94e718372a	Make CakeSession::read() return null for all failure cases.	2014-10-09 19:27:27 +05:30
Ceeram	fcffe3961f	Revert "add test to prove requesthandler works correct with Angular wonky accept headers" ... This reverts commit 8507ef83f1. Incorrect header was used for this test, Cake cannot safely determine correct header. To get CakePHP to respond with json, you can modify the angular common headers.	2014-10-02 22:12:35 +02:00
Ceeram	8507ef83f1	add test to prove requesthandler works correct with Angular wonky accept headers	2014-10-02 16:07:10 +02:00
Schlaefer	fd2dd58360	code formatting, fixes PHPCS errors	2014-10-01 11:25:24 +02:00
Schlaefer	388e412a82	fixes failing test cases from last CakeTime::timeAgoInWords changes ... at b96eb1fb46	2014-10-01 11:09:00 +02:00
Schlaefer	b96eb1fb46	cleans up CakeTime::timeAgoInWords and adds option for custom futures string	2014-10-01 10:35:41 +02:00
mark_story	af43bc1706	Merge branch 'master' into 2.6	2014-09-25 22:39:51 -04:00
euromark	9c8ab826bf	Correct a few more misleading assert orders.	2014-09-24 14:34:24 +02:00
euromark	fce16189d5	Fix tests	2014-09-24 14:25:18 +02:00
mark_story	1877cab341	Fix UUID primary key columns not being reflected properly. ... When UUID columns are converted into varchar(36) they should also be default = null, null = false. Fixes #4695	2014-09-23 22:16:18 -04:00
Yves	b70cb132fd	Fix Hash::remove() removing data even if the path is not matched	2014-09-23 22:00:49 +02:00
mark_story	249dc5650b	Merge branch 'relative-sprintf' into 2.6 ... Refs #4550	2014-09-22 20:56:33 -04:00
mstra001	d6abfcaf90	Update tests for strfime() in timeAgoInWords() ... Add test asserts for testTimeAgoInWordsWithFormat with strftime format	2014-09-22 20:50:37 -04:00
mark_story	cf45d3fab8	Merge branch 'master' into 2.6	2014-09-22 20:46:28 -04:00
Mischa ter Smitten	a69e9bc63b	Cs fixes	2014-09-18 10:50:35 +02:00
euromark	4d1a65ede2	Add intl email test.	2014-09-16 10:14:00 +02:00
wisoot	eb14a64d0b	Check whether the filter key is a valid class name before assuming that value is class settings	2014-09-15 15:29:30 +10:00
mark_story	0d11cf7a33	Merge branch 'master' into 2.6	2014-09-14 23:26:33 -04:00
euromark	c65cb6f62b	wording	2014-09-13 13:39:11 +02:00
antograssiot	0215ada9dd	fix failling test on Jenkins after ee1e270 ... This test is failling build on 2.5, 2.6 and 3.0 since #4477	2014-09-13 08:19:40 +02:00
euromark	03d92494f1	Fix maxlength for manual type set and add textarea maxlength support.	2014-09-13 04:03:33 +02:00
ADmad	3fb252ad2f	Merge branch 'master' into 2.6	2014-09-13 00:37:16 +05:30
Yves	90ad813b40	Fix Hash not returning correct value with special paths ... When doing a Hash::insert() with a part of the path starting with a '0', Hash::get() returned null even if the same path was used.	2014-09-10 22:47:25 +02:00
euromark	04ef39217f	Take care of more int casts.	2014-09-10 16:29:23 +02:00
euromark	e77f96d8b7	Use (int) cast instead of intval() function for performance reasons and to unify it.	2014-09-10 15:52:57 +02:00
mark_story	58bf005c09	Merge branch 'folder_overwrite_fix' ... Merge pull request #4521 into master.	2014-09-09 21:33:29 -04:00
mark_story	86bc7f1861	Add tests for #4521 and reformat code. ... Add a regression test for #4521 as the original author didn't have one. Reformat a long line since I was nearby already. Closes #4521	2014-09-09 21:33:17 -04:00
Marc Würth	6cac5d0af3	Removed use of @lastmodified annotation	2014-09-09 23:04:29 +02:00
Marc Würth	9812147779	Removed use of @modifiedby annotation	2014-09-09 23:03:43 +02:00
Marc Würth	80788c3c00	Removed use of @version annotation	2014-09-09 23:03:11 +02:00
mark_story	734bb9223b	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Core/App.php lib/Cake/VERSION.txt	2014-09-06 23:04:20 -04:00
Mark Story	2311c13f12	Merge pull request #4417 from jeremyharris/3331 ... Fix for #3331	2014-09-04 20:26:55 -04:00
José Lorenzo Rodríguez	b5bfbfcf15	Merge pull request #4223 from chinpei215/2.6-issue2529-fix ... Fix different format of $results in afterFind	2014-09-03 10:39:37 +02:00
ADmad	d60cd3ab2f	Revert "Merge pull request #4405 from php-engineer/master-session-bugfix" ... This reverts commit 5863adda42, reversing changes made to 4c37cf6d4b. There was no real issue. The lack of session cookie in CLI makes writing tests a bit tricky which caused the confusion. Refs #4405, #4451.	2014-09-01 00:17:53 +05:30
mark_story	7c316bbc56	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/basics.php	2014-08-30 21:28:11 -04:00
mark_story	c26b381469	Make words ending in data uninflected. ... Since both metadata and word ending in metadata have caused issues in the past, uninflecting them seems like the best option. This will also cover cases like ProfileData not being inflected to ProfileDatum which seems like an improvement to me. Fixes #4419	2014-08-30 20:27:37 -04:00
Jeremy Harris	66b2173566	Made AuthComponent::mapActions() act as a getter refs #3331	2014-08-29 08:23:41 -05:00
Jeremy Harris	2dac6d29c2	Clearing HABTM (unique) when HABTM array is empty, refs #2461	2014-08-28 17:52:13 -05:00
chinpei215	010bbc6764	Resolve ambiguous column names for Sqlite	2014-08-27 16:06:28 +09:00
chinpei215	c06b7162ef	Resolve ambiguous column names	2014-08-27 15:32:57 +09:00
chinpei215	31204832c2	Ensure that afterFind is called when using 'joins' with 'recursive' = -1	2014-08-27 15:16:13 +09:00
chinpei215	b74774bb0c	hasOne/belongsTo associations should contain associated records in afterFind ... Before 1fe943d6f1, afterFind() is called twice with belongsTo/hasOne associations. Although $results also doesn't contain associated records on first time, it contains them on second time. After 1fe943d6f1, it doesn't work if associated records are used in afterFind. This commit fixes it.	2014-08-27 09:32:00 +09:00
Mark Story	5863adda42	Merge pull request #4405 from php-engineer/master-session-bugfix ... CakeSession::delete() bugfix	2014-08-26 12:43:02 -04:00
Stefan Dickmann	66ccfaf5e2	session bugfix	2014-08-26 17:47:45 +02:00
David Yell	04a8053af6	Update TagFixture.php ... Updated the tag fixture so that it doesn't break `CakeSchema::_arrayDiffAssoc()`	2014-08-26 14:53:31 +01:00
ADmad	ff3273d8eb	Merge pull request #4386 from cakephp/issue-4184 ... Fix CURRENT_TIMESTAMP being stored as a default value.	2014-08-25 21:06:41 +05:30
euromark	cc0acd1556	Fix CS.	2014-08-25 16:54:12 +02:00
mark_story	7936b5e764	Fix CURRENT_TIMESTAMP being stored as a default value. ... When reflecting timestamp columns in MySQL current_timestamp comes back as the default value. This causes insertion errors later on as 'current_timestamp' is an invalid value for timestamp columns. Refs #4184	2014-08-25 11:17:11 +02:00
Mark Story	7a8cb4315e	Merge pull request #4366 from hmic/ticket#2707 ... Fixed i18n __*() bug	2014-08-24 17:25:30 +02:00
Hans-Joachim Michl	b4620b4c6c	Fixes #2707 ... When the first variable argument = null, but there are more arguments given. Added testcases to show the change (to fail before the fix)	2014-08-24 14:27:49 +00:00
mathieu strauch	85cd11384a	fix failing testLogError	2014-08-24 15:46:44 +02:00
mark_story	f0f1531fac	Add test for #4309 ... The Router internals don't handle // which is good.	2014-08-24 12:13:05 +02:00
mark_story	4a805af5c6	Merge branch 'master' into 2.6	2014-08-23 09:20:19 +02:00
Jeremy Harris	8f420d74fa	HttpSocket: not overwriting auth header if it is set in request configuration	2014-08-21 11:24:10 -05:00
mark_story	0400a63004	Forward port fixes for #4294 from 1.3 to 2.x ... CakeTime was broken in the same way as TimeHelper was in 1.x. Getting 1969 on invalid input can be very confusing and un-helpful. Refs #4294	2014-08-20 00:25:01 +02:00
euromark	07937d5a5f	Correct typo.	2014-08-19 13:49:34 +02:00
Marc Würth	edc6490f11	Removed Vendor folder from plugin baking task, updated test	2014-08-18 18:55:17 +02:00
Marc Würth	6e1b8f3ce8	Added missing folders to plugin baking task, updated test	2014-08-18 18:54:48 +02:00
ADmad	9d53a1e9ce	Merge branch 'master' into 2.6	2014-08-15 12:37:13 +05:30
Brian Porter	9b9600fe18	CakeSchema naming fallback. ... Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility. Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.	2014-08-11 10:40:57 -05:00
chinpei215	c246695518	Fix different format of $results in afterFind ... Refs #2529 As of this commit, we can get consistent format of $resutls in afterFind. And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.	2014-08-11 01:19:40 +09:00
chinpei215	c227c14bf2	Fix afterFind() called twice with hasMany relationship ... It occurs when a model and the children models are related to a same model. For example, such as the following: * User hasMany Comment * User hasMany Article * Article hasMany Comment	2014-08-11 00:12:03 +09:00
mark_story	9c3089796f	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Model/Model.php	2014-08-08 23:28:06 -04:00
mark_story	d114fa1431	Update join building to not error out on empty conditions. ... When conditions are empty we can assume one of two things: * The person made a mistake. * The person is doing the join conditions in the where clause. In both cases we should attempt to generate proper SQL. Fixes #4189	2014-08-08 10:02:09 -04:00
José Lorenzo Rodríguez	64e74cbaac	Merge pull request #4175 from chinpei215/master-issue2268-fix ... Fix afterFind() called twice with belongsTo and hasOne relationships	2014-08-06 10:48:45 +02:00
Mark Story	221fc862aa	Merge pull request #4140 from chinpei215/master-issue2849-fix ... Fix transactions do not get rollbacked in saveAssociated/saveMany. Fixes #2849	2014-08-05 20:05:15 -04:00
chinpei215	1fe943d6f1	Fix afterFind() called twice with belongsTo and hasOne relationships ... Refs #2268	2014-08-06 07:27:04 +09:00
euromark	9ef7b5713a	CS fixes.	2014-08-04 13:53:52 +02:00
chinpei215	cb376bf420	Add some more transaction tests ... And remove 2 else clauses.	2014-08-03 22:34:11 +09:00
ADmad	713f430fc4	Merge branch 'master' into 2.6	2014-08-03 01:05:36 +05:30
chinpei215	799500ce6d	Fix transactions do not get rollbacked in saveAssociated/saveMany ... Refs #2849	2014-08-02 10:12:33 +09:00
chinpei215	3d77ce5d34	Fix serveral tests pass regardless of whether data is valid or not	2014-08-02 09:55:29 +09:00
chinpei215	f3e1a18740	Fix a fatal error occurs in combination with a scaffold error.	2014-07-31 05:49:23 +09:00
mark_story	f9785042bc	Fix indentation. ... Refs #4108	2014-07-29 21:53:55 -04:00
Steve Tauber	e6f6ded334	Adding unit test for HTTP DELETE and RequestHandlerComponent::requestedWith	2014-07-29 16:34:11 +02:00
ADmad	4e52941f59	Fix CS errors.	2014-07-27 12:54:15 +05:30
ADmad	9e21d048ce	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-07-27 12:29:39 +05:30
euromark	b188d670b7	Make year range validation less strict by default.	2014-07-26 04:06:26 +02:00
Mark Story	adf739b893	Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix ... Make SMTP auth reply code checks work properly.	2014-07-24 08:42:22 -04:00
Rachman Chavik	aad89444d1	Fix: Blackholed request when POSTing to a URL with space ... Eg: Actual Posted URL: /admin/settings/settings/prefix/Access%20Control $_GET value: /admin/settings/settings/prefix/Access_Control Since $unsetUrl differs, the $_GET value will get copied in to CakeRequest::$query, causing CakeRequest::here() to return: /admin/settings/settings/prefix/Access%20Control?%2Fadmin%2Fsettings%2Fsettings%2Fprefix%2FAccess_Control= This confuses SecurityComponent in the following line: f23d811ff5/lib/Cake/Controller/Component/SecurityComponent.php (L514)	2014-07-24 16:25:03 +07:00
David Steinsland	6e777a54a3	Mocking _sendHeader instead of send()	2014-07-22 15:05:06 +02:00
David Steinsland	d98abc58d1	Added test case for CakeResponse::send() and ajaxLogin	2014-07-22 14:45:18 +02:00
Denys Kyselov	79dc624062	Add removeSubcommand in ConsoleOptionParser	2014-07-21 23:55:42 -04:00
mark_story	0d14bf7cc8	Update doc blocks. ... There were a few trailing comments in #3706 that have now been addressed.	2014-07-20 22:00:07 -04:00
Mark Story	7ef7ce2dbb	Merge pull request #3706 from MelvinRoss/httpsocketheader ... Add support for specifying protocol in Cakesocket/HttpSocket. Add HEAD function to HttpSocket	2014-07-20 21:58:37 -04:00
mark_story	0dfce1abf3	Add . to the list of allowed characters. ... This was missed when the email validation rules were relaxed in dc34d80f6f. Fixes #4027	2014-07-19 19:57:33 -04:00
Mark Story	dbe7329e54	Merge pull request #3703 from MMS-Projects/i18n-context-2.6 ... Basic support for I18n contexts as requested by #2063	2014-07-18 21:48:19 -04:00
ndm2	f03bf8067c	Add some more exception message checks	2014-07-18 14:56:10 +02:00
ndm2	bf7d01ac66	Make SMTP auth reply code checks work properly.	2014-07-18 14:53:22 +02:00
Mark Story	d62d6061b2	Merge pull request #3906 from ravage84/hash-nest-exception ... Hash::nest() should throw an exception instead of returning an empty arr...	2014-07-17 09:27:38 -04:00
Marlin Cremers	b47f91c47c	Add context support to the I18n class which resolves cakephp/cakephp#2063 ... This change adds Gettext context support to the I18n class. This allows custom translations for verbs and nouns and more.	2014-07-17 11:01:11 +02:00
mark_story	051d78c1a5	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Model/Model.php	2014-07-16 23:11:58 -04:00
Melvin Ross	09a7020119	Fix spacing to conform to coding standards	2014-07-14 14:54:26 -05:00
Melvin Ross	0eaf650d9f	Test for new HEAD function inside HttpSocket	2014-07-14 14:34:27 -05:00
chinpei215	ca93bbcd15	Fix CS	2014-07-14 01:21:09 +09:00
chinpei215	ace30fdd8a	Fix a race condition problem ... Prevents Model::save() from generating a query with WHERE 1 = 1 on race condition. Refs #3857	2014-07-12 23:27:39 +09:00
mark_story	03c2a8b722	Unify datetime column default values between MySQL and Postgres. ... Datetime columns should have 'default' => null, in both Postgres and MySQL. Fixes #3837	2014-07-11 23:10:16 -04:00
mark_story	9fd1a51a52	Merge branch 'master' into 2.6	2014-07-10 14:39:32 -04:00
mark_story	a098d96c94	Remove flaky test that was of questionable value.	2014-07-10 14:39:20 -04:00
euromark	ac0053d660	Added a shorthand stackTrace() method	2014-07-10 01:49:28 +02:00
mark_story	3a70d9c033	Merge branch 'master' into 2.6	2014-07-09 10:17:05 -04:00
chinpei215	0c1fc36b14	Fix an infinite recursion caused by missing plugin ... When a MissingPluginException has caught when rendering an exception, we should disable the plugin as needed to prevent an infinite recursion.	2014-07-09 15:55:41 +09:00
Marc Würth	c321a8fa93	Hash::nest() should throw an exception instead of returning an empty array ... Refs: https://github.com/cakephp/cakephp/pull/3498#issuecomment-48316204	2014-07-08 13:01:02 +02:00
Schlaefer	1e961a8aac	increases time window in CSRF token expiry tests to 2 seconds ... travis-cs failed with 1 second margin	2014-07-06 13:54:24 +02:00
Schlaefer	9fa7afa354	fixes #3887 CSRF reusable token expires	2014-07-06 10:39:00 +02:00
José Lorenzo Rodríguez	396725dc8c	Merge pull request #3880 from markstory/incorrect-validation ... Fix issues with Validation::inList() and SecurityComponent	2014-07-05 14:41:15 +02:00
ADmad	1eccec02e4	Merge pull request #3872 from CostaC/response-sharable-fix ... Fix for CakeResponse::sharable() header to include private caches	2014-07-04 10:32:51 +05:30
mark_story	3936cce4b8	Disallow hexadecimal input with inList. ... Instead of turning on/off strict mode based on the user supplied input, cast everything to strings and always use a strict check. This avoids the potential issue of a bad user using hexadecimal when they should not be allowed to do so. Thanks to 'Kurita Takashi' for pointing this out.	2014-07-03 22:10:49 -04:00
Costa Caruso	4f559f5cc9	Fixed failing test for CakeResponse::sharable + spacing	2014-07-03 15:03:48 -04:00
ADmad	e410501791	Fix CS errors.	2014-07-03 23:13:55 +05:30
mark_story	2bcd817367	Merge branch 'master' into 2.6	2014-07-03 11:13:06 -04:00
euromark	974ca851c2	Correct doc blocks according to cs guidelines. ... Remove superfluous empty lines.	2014-07-03 15:36:42 +02:00
mark_story	b1610c145e	Merge branch 'master' into 2.6	2014-07-02 23:39:16 -04:00
mark_story	adcf9ab723	Fix failing test. ... CakeEmail now has a default validation pattern. Refs #3742	2014-06-30 13:29:39 -04:00
mark_story	dc34d80f6f	Relax email validation rules even more. ... While filter_var() allows a number of email addresses that Validation::email() does not, it misses out of email address that contain IDN host names, and unicode mailboxes. Both of these are generally deliverable, and should be permitted. filter_var() also fails on local mailboxes like `root@localhost` which is useful in the context of cron jobs. Fixes #3742	2014-06-30 10:42:37 -04:00
mark_story	30952f2b64	Merge branch '2.6' of github.com:cakephp/cakephp into 2.6	2014-06-29 22:57:59 -04:00
Derek Perkins	b1a3ab9e64	Added unit test for CakeRequest::setInput ... Don't use mocks as the tests weren't really testing anything when mocks were involved. Refs #3764	2014-06-29 22:55:38 -04:00
ADmad	607200fa7b	Add pluralization rule for "stadia". ... Refs #3830	2014-06-29 14:51:23 +05:30
Mark Story	187272c06a	Merge pull request #3824 from NickBeeuwsaert/element_events ... Added view type getter and ensured element render events would get the proper type	2014-06-28 06:21:46 -04:00
Nick Beeuwsaert	733a610bf7	More coding standard fixes	2014-06-27 18:03:29 +00:00
Nick Beeuwsaert	6623a8a7f4	Adhering to CakePHP coding standards	2014-06-27 17:28:43 +00:00
Nick Beeuwsaert	f9aa954562	Changed Event names back, added view type getter ... Changed `Element.beforeRender` and `Element.afterRender` back to `View.beforeRender` and `View.afterRender` Also added a getter for `View::_currentType`. Added more tests to make sure that things were getting reset right And also that View::render and View::element events were working As expected Changed Event names back, added view type getter Changed `Element.beforeRender` and `Element.afterRender` back to `View.beforeRender` and `View.afterRender` Also added a getter and setter for `View::_currentType`. Added more tests to make sure that things were getting reset right And also that View::render and View::element events were working As expected	2014-06-27 15:40:12 +00:00
Bryan Crowe	a1ae31e554	Fix identifier typos	2014-06-26 23:06:08 -04:00
Renan Gonçalves	1a89a3cb9d	Exiting with 1 when Exception::getCode() returns non-integer values. ... From php.net/exception.getcode > Returns the exception code as integer in Exception but possibly as other type in Exception descendants (for example as string in PDOException).	2014-06-26 13:26:20 +02:00
Nick Beeuwsaert	7cef19fe96	Changed View::element() to have an appropriately named event ... And also made it so when the event fires the subjects type is `View::TYPE_ELEMENT`. Wrote some tests which I hope are done right I don't really know the bes way to write a test for a event listener	2014-06-25 22:08:59 -05:00
mark_story	a2673d8bf0	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Core/App.php	2014-06-25 09:22:10 -04:00
mark_story	a40fa5cae9	Add test for #3754	2014-06-25 09:19:24 -04:00
José Lorenzo Rodríguez	3df972faa2	Merge pull request #3782 from cakephp/issue-3779 ... Whitelist more URL-y characters in digest parsing.	2014-06-24 21:56:40 +02:00
euromark	26fe1265ab	Mark App::pluginPath as deprecated and don't use it anymore.	2014-06-24 11:52:29 +02:00
mark_story	b4bcd74e60	Whitelist more URL-y characters in digest parsing. ... Android clients include a full URL instead of just the URI. Also handle situations where URLencoded bytes and document fragments are used. Refs #3779	2014-06-23 14:39:35 -04:00
ADmad	9a1a965b1c	Update isAbsolute() to recognize stream wrapper paths. ... This has the benefit that the realpath() method is not applied to a registered stream wrapper in the constructor of the Folder class. Using the realpath() method will break the stream. Thank "davalb" for the original patch.	2014-06-22 13:43:14 +05:30
mark_story	497ecd3f80	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-06-19 21:41:02 -04:00
mark_story	9136f63874	Fix autoLinkEmail() not working when emails are adjacent to HTML. ... When an email address is adjacent to HTML it should be autolinked correctly. Refs #3656	2014-06-16 21:48:30 -04:00
mark_story	74d8e9ea40	Convert test to use a dataprovider instead of multiple calls. ... Dataproviders are generally a bit easier to work with in the future.	2014-06-16 21:46:34 -04:00
mark_story	fa19c34580	Fix Hash::extract() not matching 1/0 to true/false. ... Historically [prop=1] has matched prop=true as well. This restores that and also fixes [prop=0] not finding falsey values. This makes the typing less strict in Hash::extract() but I don't think it is unreasonable given PHP's type juggling. Refs #3288	2014-06-12 11:30:48 -04:00
Melvin Ross	ad4dbdcee5	Fix HttpSocket test to actually reset protocols for correct test. Modify HttpSocket so that Https with non-passed in protocol doesn't set it to tcp and fail test.	2014-06-12 09:37:03 -05:00
Melvin Ross	86923e3593	Modify CakeSocket and HttpSocket so that the "protocol" parameter can be used to specify which protocol to use for creating sockets. These are protcols in the php "[a-z]://" wrapper sense. I also modified the test for these two files respectively to accomodate these new changes. ... Unrelated to this bug, I added a "head" function inside of HttpSocket to go along with the GET/POST/PUT/DELETE/PATCH combination that's already present. Came in handy for me for deciding if I wanted to hit a resource with HttpSocket or not.	2014-06-11 19:04:58 -05:00
José Lorenzo Rodríguez	91224b0ec1	Merge pull request #3653 from markstory/2.6-html-css ... Add once option to css().	2014-06-06 09:55:06 +02:00
José Lorenzo Rodríguez	932bf47481	Merge pull request #3604 from Haititi/2.6-save-atomic ... 2.6 add 'atomic' option to "save()" API - delivery	2014-06-05 13:55:52 +02:00
mark_story	758599e6f4	Add once option to css(). ... The default value is false for backwards compatibility. In 3.0, the default will be made consistent with script(). Refs #1973 Refs #3628	2014-06-04 22:15:56 -04:00
Haithem BEN GHORBAL	31615ce415	add 'atomic' option to "save()" API ... This commit adds a transaction context to 'save()' API in order to rollback possible modifications done in some 'Model.beforeSave' listener callback. This will allow cakephp 2.x to behave like 3.0 . It uses try/catch to better handle transaction. Previous save() API is renamed to protected _doSave() method. A new save() method is created for transaction handling. 'atomic' option is disabled for internal 'save()' call.	2014-06-03 09:37:17 +02:00
mark_story	92eeef8ae0	Merge branch 'master' into 2.6	2014-06-02 22:57:25 -04:00
mark_story	55672b6df3	Merge branch 'router-stars' from Hikkijp ... Refs #3582, #3581	2014-06-02 22:38:27 -04:00
mark_story	4362f7bf8b	Add tests for CakeRoute::match() and trailing * routes. ... Add tests for /pages/** routes, and fix coding standards errors. Refs #3581	2014-06-02 22:37:37 -04:00
mark_story	975e4c3af0	Allow username of 0 in basic authentication. ... Refs #3624	2014-06-02 22:02:28 -04:00
mark_story	d1e4dfac47	Add tests for #3624 ... The username of '0' should be accepted by FormAuthenticate. Refs #3624	2014-06-02 21:58:50 -04:00
Stefan Dickmann	91907b5c6c	correct docblock ... invalid certificate domain	2014-06-01 13:23:47 +02:00
mark_story	15f63e9c81	Removing peer verification failure test. ... Since we are not running a domain with an invalid certificate relying on someone else to do that is quite unreliable.	2014-05-31 21:51:03 -04:00
ADmad	543066f34a	Set default sort direction to 'asc'.	2014-05-30 19:43:09 +05:30
Mark Story	136f026f77	Merge pull request #3548 from dogmatic69/patch-3 ... Allow getting params the same way data() works	2014-05-29 21:49:09 -04:00
dogmatic69	59fe581912	adding doc block for tests related to CakeRequest::param()	2014-05-28 22:28:44 +01:00
Haithem BEN GHORBAL	a8e410ee20	fix save with habtm returning false	2014-05-28 18:17:16 +02:00
mark_story	2546b79c62	Merge branch '2.6' of github.com:cakephp/cakephp into 2.6	2014-05-27 20:55:16 -04:00
mark_story	0c8406c034	Merge branch 'master' into 2.6	2014-05-27 20:55:06 -04:00
José Lorenzo Rodríguez	05d92ddc0a	Merge pull request #3560 from cakephp/2.6-memcached-options ... 2.6 memcached options	2014-05-26 21:47:45 +02:00
dogmatic69	bcdc530391	adding support to write values to param like can be done with data(), method returns $this as does ->data() when writing	2014-05-25 00:52:30 +01:00
dogmatic69	9dca564519	make the default return false so it matches previous use, improve tests for new method	2014-05-25 00:46:40 +01:00
Mark Story	9c9d45596f	Merge pull request #3478 from Schlaefer/#3303-lengthBetween ... closes #3303 RFC: Rename Validator::between() into Validator::length()	2014-05-24 16:48:05 -04:00
mark_story	86c7d1ff5e	Add addtional options array for memcached. ... Memcached supports a number of options that we should afford in our memcached adapter. Fixes #3477	2014-05-23 22:29:03 -04:00
mark_story	db86b0c050	Don't disable the entire select when disabled is array(1) ... When the disabled attribute is just array(1), then the attribute should be filtered out of select element attributes. This is kind of a hacky workaround but changing the underlying attribute handling is going to be pretty tricky and far more dangerous. Fixes #3546	2014-05-23 13:26:11 -04:00
mark_story	587f2da09e	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-05-22 14:29:43 -04:00
mark_story	cd68002246	Add additional test case for named parameters. ... Refs #3525	2014-05-22 14:14:35 -04:00
akiyan	781430c4af	Removed unnecessary conditional branch, fixed test and comment.	2014-05-22 14:08:18 -04:00
akiyan	67f256297d	Fixed secure form hash for special url. ... No htmlspecialchars encode and without fragment identifer.	2014-05-22 14:08:11 -04:00
mark_story	270e8774e4	Fix incorrect status line parsing in HttpSocketResponse. ... Allow for multi-word status reasons. Closes #3545	2014-05-21 21:53:18 -04:00
mark_story	2e4d6eb009	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-05-16 21:26:30 -04:00
euromark	143e8e4c56	Make sure invalid arrays return empty array instead of throwing notices.	2014-05-14 23:53:58 +02:00
mark_story	20ef10aca2	Fix inline attachments being broken when only sending an HTML text body. ... The rel boundary was closed too early causing inline images to be incorrectly included in the email message. Refs #3474	2014-05-14 09:42:25 -04:00
Schlaefer	6b80ae35b1	fixes model task test-cases for 'between' validation rule alias	2014-05-14 10:55:24 +02:00
Schlaefer	bf0edd1112	fixes failing test cases in ModelTaskTest if not run in test-suite ... Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture table 'core.number_tree' into account.	2014-05-14 10:34:09 +02:00
mark_story	66e733f8b1	Fix test I forgot to fix in b8fa7ce134	2014-05-13 22:12:39 -04:00
mark_story	b8fa7ce134	Fix issues where emails would have multipart/mixed when they should not. ... When sending multi-part emails with no attachments we shouldn't include the outer multipart/mixed header as it confuses Outlook and causes it to show the email as having attachments even though there are none. A bunch of tests need to be adjusted as the empty multipart/mixed container has been removed. Fixes #3474	2014-05-13 22:03:06 -04:00
mark_story	e9ecfe0936	Remove x bit on files. ... PHP files should not have executable permission set.	2014-05-13 12:30:14 -04:00
Schlaefer	3ac731273e	adds backwards compatible 'between' alias for 'lengthBetween' validation rule	2014-05-13 17:36:23 +02:00
Schlaefer	e10e8fcb15	fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X ... thousand separator isn't set in de_DE but in da_DK	2014-05-13 13:25:53 +02:00
Schlaefer	021d765620	fixes falling test case for 'lengthBetween' validator	2014-05-13 10:46:50 +02:00
Schlaefer	815838f150	replaces validator 'between' with 'lengthBetween'	2014-05-13 10:46:25 +02:00
Schlaefer	4848b63189	closes #3303 RFC: Rename Validator::between() into Validator::length()	2014-05-13 09:31:03 +02:00
mark_story	a34d5f733d	Fix PaginatorComponent tests. ... Because count() queries don't happen in many cases now, the lastQueries index needs to shift up by one because a query isn't happening anymore. Refs #3333	2014-05-12 22:10:27 -04:00
mark_story	89cd114e6f	Merge branch 'master' into 2.5	2014-05-12 14:30:02 -04:00
mark_story	d0b995ad79	Merge branch '2.5' into 2.6	2014-05-11 21:47:42 -04:00
José Lorenzo Rodríguez	751d2d8f2d	Merge pull request #3448 from dereuromark/master-controller ... Controller::referer() and local URL	2014-05-07 22:42:28 +02:00
mark_story	5469840c80	Fix incorrectly generated URL path. ... Refs #3442	2014-05-07 08:52:42 -04:00
mark_story	1103ca7816	Ensure that only the path and query are used to make the hash. ... While including the entire protocol, host, port, path and query would be even better in theory, it gets complicated when proxies and load balancers are involved. Fixes #3442	2014-05-06 23:00:11 -04:00
mark_story	559d9d39e7	Make test names match the rest of the tests.	2014-05-06 22:13:44 -04:00
Renan Gonçalves	87683b10f1	Allowing same Authenticate object to be setup with different settings.	2014-05-06 22:10:41 +02:00
ADmad	aa7f18840c	Merge branch '2.5' into 2.6	2014-05-04 14:40:39 +05:30
ADmad	d466e00644	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Model/Datasource/DboSource.php lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php lib/Cake/Utility/Folder.php lib/Cake/VERSION.txt	2014-05-04 14:35:36 +05:30
euromark	fecf321cce	This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it.	2014-05-02 13:33:57 +02:00
mark_story	e1057e3e6b	Fix FormHelper::postLink() not working when SecurityComponent is enabled. ... The action attribute value was not being included in the generated hash, so postLink() forms never worked properly. Fixes #3418	2014-04-29 11:23:52 -04:00
euromark	7a287a6942	More coding standard corrections.	2014-04-29 14:19:33 +02:00
mark_story	1d1a2f859c	Fix coding standards error.	2014-04-28 20:56:06 -04:00
euromark	06aa747b21	Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite	2014-04-29 02:35:20 +02:00
euromark	5e5a776de8	Backporting overwrite() from 3.0 to 2.6.	2014-04-29 02:18:27 +02:00
euromark	8679c5cd18	Fix test	2014-04-28 17:33:56 +02:00
mark_story	cf96e9f54f	Merge branch 'master' into 2.5	2014-04-26 22:04:19 -04:00
mark_story	a28158d614	Add additional test for f23d811ff5 ... I neglected to put a negative test to ensure validatePost fails when the URL differs.	2014-04-26 10:23:27 -04:00
Mark Story	5b46eb71ec	Merge pull request #3397 from steinkel/fix-formhelper-with-model-mock ... fixed FormHelper to allow create() on Mock Models without errors	2014-04-26 08:53:43 -04:00
ADmad	68572d8046	Cannot use php 5.4+ array syntax for 2.x.	2014-04-26 17:30:31 +05:30
Jorge González	5cf2ce723c	fixed FormHelper to allow create() on Mock Models without errors	2014-04-26 10:33:58 +01:00
mark_story	de0062de77	Merge branch 'master' into 2.5	2014-04-25 22:10:02 -04:00
mark_story	f23d811ff5	Use the form action URL in generated form hashes. ... By including the URL in generated hash for secured forms we prevent a class of abuse where a user uses one secured form to post into a controller action the form was not originally intended for. These cross action requests could potentially violate developer's mental model of how SecurityComponent works and produce unexpected/undesirable outcomes. Thanks to Kurita Takashi for pointing this issue out, and suggesting a fix.	2014-04-25 22:05:58 -04:00
ADmad	27699d1f12	Fix auto linking urls with subdomain with underscore. ... Closes #3392	2014-04-25 22:28:34 +05:30
Stefan Dickmann	f90f718e11	change parameter order	2014-04-24 12:54:45 +02:00
ADmad	971a845eb1	Merge pull request #3379 from dereuromark/2.5-inflector ... 2.5 inflector	2014-04-24 13:13:59 +05:30
mark_story	04edb547f3	Merge branch 'master' into 2.5	2014-04-23 22:21:57 -04:00
mark_story	6f68049bf5	Reject file paths containing ... ... Paths containing `..` are generally up to no good. Throw an exception, as developers can use realpath() if they really need to get relative paths. Fixes #3370	2014-04-23 22:20:14 -04:00
euromark	0c036f6370	Remove unncessary language support.	2014-04-23 18:07:08 +02:00
euromark	7e6bc48ef2	Complete Inflector transliterations.	2014-04-23 16:43:44 +02:00
ADmad	ead494eec1	Allow setting only default layout without specifying template in email config. ... Closes #3336	2014-04-22 20:02:36 +05:30
ADmad	6bdfdfd436	Optimize view paths caching for plugins. ... Closes #2047	2014-04-20 02:02:07 +05:30
mark_story	d54fbe6f60	Merge branch 'master' into 2.5	2014-04-18 22:13:56 -04:00
mark_story	f1b57d14ab	Revert changed added in #2750. ... While the had the potential to make 404s going through AssetDispatcher much faster, they broke plugins + extension routing. While explicit extensions could be fixed, routing all extensions could not. Because we are trying to keep 2.x as API compatible as possible it makes sense to revert the previous changes.	2014-04-13 20:00:34 -04:00
mark_story	749f2b99d9	Don't 404 extensions that could be handled by routing. ... Fixes an error in #2750 where routed extensions would always return 404's for plugin requests. When a file extenion could be handled by router, AssetDispatcher cannot 404 the request. Refs #3305	2014-04-13 06:48:51 -04:00
Stephen Young	b55fa98a2d	Updated documentation ... * Removed references to nonexistent `AclBase` class * Added references to `AclInterface` requirements	2014-04-11 15:10:56 -04:00
mark_story	bf9c3029cb	Merge branch 'master' into 2.5	2014-04-10 20:51:49 -04:00
mark_story	c6173a0054	Add tests for #3288 and remove nested ternaries. ... Nested ternaries are complicated to maintain and hard to read. Break down the nested ternary into two conditionals.	2014-04-10 20:37:08 -04:00
euromark	8e0f15b3d6	Revert the removal of a BC relevant part.	2014-04-10 20:11:58 +02:00
euromark	9058f0f6f1	Make CakePlugin::loadAll behave correctly regarding merging of settings.	2014-04-08 12:18:17 +02:00
Mark Story	caf0217fe0	Merge pull request #3259 from dereuromark/2.5-array-merge ... microptimize options and default merge and other string key array merges	2014-04-07 21:44:38 -04:00
mark_story	b05ab740d6	Merge branch '2.5-AssetDispatcher-404' into 2.5 ... Return a 404 much earlier when handling missing theme/plugin assets. Fixes #2750	2014-04-07 21:43:37 -04:00
mark_story	7eb569c439	Add test case for #2750	2014-04-07 21:26:11 -04:00
euromark	0ece694a75	microptimize options and default merge and other string key array merges	2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez	343d3279b9	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Test/Case/Utility/FileTest.php lib/Cake/VERSION.txt	2014-04-06 21:50:41 +02:00
mark_story	7fb920c256	Add file missed in last commit.	2014-04-04 22:22:38 -04:00
mark_story	4ec81542db	Fix email rendering when using 2 different plugins. ... When an email template and layout are in different plugins the incorrect plugin would be used for the layout. Fixes #3062	2014-04-04 21:45:04 -04:00
euromark	b150e33472	correct missed cs errors	2014-04-02 03:16:03 +02:00
euromark	e544340d67	fix indentation	2014-04-02 03:12:22 +02:00
euromark	bbe3b6a439	more cs	2014-04-02 03:09:42 +02:00
euromark	0d09a54033	more missing doc block tags added	2014-04-02 03:02:37 +02:00
euromark	44952b06a4	cs	2014-04-02 02:23:43 +02:00
Bryan Crowe	b93f373f16	Fix yoda condition in File test	2014-03-31 17:40:35 -04:00
ADmad	10f294d6bb	Remove $reponse param of Dispatcher::_invoke(). ... Use controller's $response property by default.	2014-03-30 19:29:07 +05:30
mark_story	ff73229ab8	Fix failing tests. ... Not everyone uses the same database names as me.	2014-03-24 10:04:19 -04:00
mark_story	2fe8c4050b	Insert manual joins *after* generated joins. ... Re-order query joins to make manually added joins be performed after generated joins. This removes the need to workaround the current join order, or redefine all association joins when you want to add an additional join on a leaf table. Refs #2179 Refs #2346	2014-03-23 21:09:08 -04:00
func0der	06f47ee01f	Introduced I18n category constants (#1894) ... Replaced all hard coded category values	2014-03-23 17:00:17 +01:00
Mark Story	dea6709d89	Merge pull request #3014 from ndm2/smtp-extensibility-response-access ... SMTP transport - Extensibility and response access	2014-03-23 09:24:21 -04:00
mark_story	8acb75425d	Merge branch 'master' into 2.5 ... Conflicts: CONTRIBUTING.md lib/Cake/Model/Datasource/DboSource.php	2014-03-21 22:55:28 -04:00
mark_story	f12b272758	Fix a few flaky/bad attribute matchers.	2014-03-21 22:52:52 -04:00
mark_story	af68f61e7a	Make assertTags() run much faster. ... Generating the various permutations a priori is incredibly expensive with sets of attributes. Using nested loops that look for matches is more efficient. Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers so they do not greedily eat all content. This also requires that preg:/ based attribute matchers *must* be quoted. Fixes #3072	2014-03-21 22:52:52 -04:00
mark_story	c1b2b560bb	Fix typo.	2014-03-21 22:52:52 -04:00
wbkostan	fea60bfe51	Update InflectorTest.php ... Added test cases for changes to inflector which affected words ending -aves. Author acknowledges the homonym conflict with 'leaves' and 'leaves', but preferences the word whose singular avoids an exception to the inflection rule.	2014-03-19 19:17:52 -04:00
mark_story	afc8587949	Merge branch 'master' into 2.5	2014-03-18 22:12:14 -04:00
mark_story	ee895a8bb1	Add form attribute to hidden inputs when present. ... If inputs are placed outside of the form elements the form attribute needs to be set on the hidden inputs. Without this attribute the empty state does not submit correctly. Fixes #3053	2014-03-18 22:11:57 -04:00
Hadrien	d55a167830	Themed CakeEmail should load view helpers with the theme set	2014-03-18 14:22:24 +01:00
mark_story	9888209e9a	Add tests and fix issues with multiple trailing whitespaces. ... Closes #3016	2014-03-17 13:08:46 -04:00
ADmad	abacf0d14b	Remove setting of Controller::$ext by RequestHandler. ... Closes #3022	2014-03-16 20:09:08 +05:30
ndm2	0ae225615c	Match SP as per rfc2821	2014-03-15 11:47:13 +01:00
ndm2	c1824071c9	Expose last SMTP response.	2014-03-13 16:28:54 +01:00
mark_story	c5b6dda82f	Merge branch 'master' into 2.5	2014-03-11 21:02:27 -04:00
mark_story	c0ac61117e	Only sort the keys once per request instead of on each match. ... Sorting the keys property by value sorts keys with the same prefix for free. This does change the order of the keys, but I don't think that is actually a large issue as it is just a list. Refs #2991	2014-03-10 21:42:26 -04:00
Mike Gibson	1202658396	Added a test case	2014-03-10 12:03:04 +00:00
Rachman Chavik	aa0f1c1862	Fix: Stray [] syntax in php 5.3 codebase	2014-03-07 09:23:06 +07:00
Rachman Chavik	e71d650ade	Fix: Regression with format specifiers in i18n methods ... Refs: #2589	2014-03-07 09:22:56 +07:00
mark_story	6c3bc48ce0	Merge branch 'master' into 2.5	2014-03-06 17:45:00 -05:00
Mark	3ca338fe26	Merge pull request #2781 from davidsteinsland/2.5 ... Fixed HTTP Status code when ajaxLogin is set	2014-03-06 12:37:51 +01:00
mark_story	5544fcc4c2	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2014-03-03 21:20:58 -05:00
ndm2	1015b38a27	Use convenience methods to create a (case-insensitive) negation matcher	2014-03-02 17:56:35 +01:00
ndm2	70a1b87db6	Fix wrong test model association class name	2014-03-01 23:01:33 +01:00
ndm2	01e1b5ca61	Fix failing tests caused by already existing classes	2014-03-01 20:24:32 +01:00
ndm2	008ad3237c	Fix verification of expected invocations #2919	2014-03-01 19:06:17 +01:00
ADmad	a707709e1d	Added test for FormHelper::radio(). ... Tests generating radio input for field with model other than one used in create(). Refs #2911.	2014-02-28 02:34:16 +05:30
mark_story	25f94f9b71	Add test to prove the fix made in pull/2899 ... Ensure that event listeners are not lost when merging the global and local listeners. Fixes #2897 Fixes #2899	2014-02-26 21:06:32 -05:00
mark_story	0f584c0e8b	Merge branch 'master' into 2.5	2014-02-24 21:19:17 -05:00
mark_story	0776b87214	Fix postLink() & postButton() with nested data. ... Flatten deeply nested array data before generating hidden inputs. This solves 'Array to string conversion' errors. Closes #2894	2014-02-24 21:17:31 -05:00
jalbertocr	35f152b333	Make sure a datetime instance is valid to avoid fatal errors.	2014-02-19 20:50:30 -03:00
AD7six	4e0627232c	account for localized floats more robustly. ... Normalize floats, strings too, so that they are validated as dddddddddd.dd ref #2853	2014-02-19 15:04:25 +00:00
mark_story	b8c94fa5d4	Merge branch 'master' into 2.5	2014-02-18 22:19:12 -05:00
mark_story	0a51458ffd	Fix Validation::decimal() not working with localized floats. ... Use similar workarounds as DboSource::value() for accepting localized floats. Fixes #2853	2014-02-18 22:18:56 -05:00
mark_story	3433f4a1f0	Clean up changes code standards and tests. ... Refs #2582	2014-02-17 11:03:49 -05:00
Jonas	b32deed4aa	changed FormHelper::secure() and FormHelper::end() to support attributes in the hidden CSRF-protection tags that are being generated for SecurityComponent to allow specification of additional html attributes like HTML5s "form" attribute. This allows separation of Form instantiation/controls and form data - for instance within html tables ... improved tests for testing against additional attributes for Form::secure() improved tests for testing against additional attributes for Form::end() removed array cast, fixed test fixed docblock format format Fixed a bug, this won't work as some forms are just empty	2014-02-17 10:54:02 -05:00
Mark Story	c325a93998	Merge pull request #2741 from ADmad/2.5-mimetype ... Added regex support to Validation::mimeType().	2014-02-17 10:10:48 -05:00
ADmad	9ae7f11a2a	Made mimetype check case insensitive.	2014-02-17 11:48:00 +05:30
mark_story	cde93ca7b9	2.x needs to be compatible with PHP<5.4	2014-02-16 21:37:28 -05:00
mark_story	3919f93149	Use simpler assertions.	2014-02-16 14:37:29 -05:00
mark_story	7a4cabe5d3	Add depth to log(). ... Much like dump() it is handy to be able to control the depth variables are dumped out when logged. Refs #2834	2014-02-16 14:35:32 -05:00
mark_story	2c5d96e916	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Model/Datasource/DboSource.php	2014-02-16 14:24:19 -05:00
AD7six	5334fe04c3	handle loose % signs in __() function ... While it's passed to sprintf and translation markers may contain variable placeholders (%s, %d) that doesn't mean translators need to be aware of all relevant rules. A % sign in a translation message shouldn't cause a warning (and no return) it should be handled as a literal percent sign.	2014-02-13 15:30:16 +00:00
euromark	1725386c16	Fix uploadError validation rule to work with OS Win. Here the error is string, not integer.	2014-02-12 21:52:18 +01:00
mark_story	827dc77a11	Fix incorrect assertion.	2014-02-11 22:00:24 -05:00
mark_story	96a37d5917	Fix temporary associations that replace fields not being restored. ... When binding temporary associations, fields should be restored in the afterFind as the association will have become unbound. Fixes #2816	2014-02-11 21:56:05 -05:00
mark_story	a5d50da040	Remove dead and unused code.	2014-02-11 16:38:24 -05:00
ADmad	9de3418079	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Model/Permission.php	2014-02-11 18:17:59 +05:30
ADmad	1da79080ac	Updated bake templates to use CakeRequest::allowMethod()	2014-02-10 17:56:57 +05:30
ADmad	bea30e62cb	Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod(). ... Existing name is unintuitive and it's not easily apparent what the method does. Closes #2803	2014-02-10 17:38:55 +05:30
mark_story	91349c306e	Remove trailing whitespace. ... Refs #2799	2014-02-09 16:03:37 -05:00
Sam	f3cd0fc808	Test added for previous fix in CakeRoute.php. Refs #2797.	2014-02-10 02:20:00 +11:00
ADmad	d9489257d3	Don't return true from view classes' render() method. ... It cause's Controller:render() to set the response body as `true`. Refs #2780	2014-02-06 03:06:00 +05:30
David Steinsland	f2b9aa5ca4	Fixed HTTP Status code when ajaxLogin is set	2014-02-05 16:05:02 +01:00
mark_story	be8ebfc005	Merge branch 'master' into 2.5	2014-02-05 09:22:46 -05:00
AD7six	adc0bf3ded	BC fix for checkbox ids ... Revert to previous behavior for id generation of checkboxes, This commit can be reverted for 2.5+ is desired Fixes #2733	2014-02-03 17:57:26 +00:00
José Lorenzo Rodríguez	e36c954da7	Merge pull request #2693 from ADmad/2.5-session-start ... Don't start a session if it's known to be empty.	2014-02-01 04:08:48 -08:00
Mark Story	a6459a6c2f	Merge pull request #2740 from rchavik/2.5-event-manager-regression ... RFC Fix: CakeEventManager regression	2014-01-31 07:10:46 -08:00
Mark Story	405f3a1cb9	Merge pull request #2752 from rchavik/2.4-postgres-alterschema ... Fix: Changing boolean to integer for Postgres	2014-01-31 06:46:52 -08:00
Rachman Chavik	35c22a291e	Add test to prove Event Manager regression	2014-01-31 16:52:26 +07:00
Rachman Chavik	59549b7ebe	Fix: Changing boolean to integer for Postgres ... Closes #2751, CakeDC/migrations#149	2014-01-31 15:14:20 +07:00
mark_story	4d57d3ce5b	Fix plugin path filtering when directories do not exist. ... When paths do not exist we should correctly remove them from the output paths. Fixes #2748	2014-01-30 21:40:08 -05:00
mark_story	605351d0c9	Allow empty values in checkboxes. ... Allow the checkbox value attribute to be empty. This is required to make checkboxes with a value of 0. Fixes #2717	2014-01-30 21:12:06 -05:00
Walter Nasich	43604f64d5	Rendering a proper value for html5 attribute 'step'	2014-01-30 17:17:50 -03:00
ADmad	2d10707d18	Added regex support to Validation::mimeType().	2014-01-30 21:05:04 +05:30
mark_story	c1ab6fa9d1	Merge branch 'master' into 2.5	2014-01-30 10:13:37 -05:00
Mark Story	6eb5a38f22	Merge pull request #2692 from jrbasso/2.5-cors ... Added support to cross origin requests	2014-01-29 06:45:11 -08:00
Mark Story	8db034cbf1	Merge pull request #2731 from joostdekeijzer/console-extract-not-handling-validation-quotes ... Console Extract task doesn't handle validation messages with qoutes correctly	2014-01-29 06:43:23 -08:00
Mark Story	5629dfdcc3	Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebehavior ... Fix Model::field() and TranslateBehavior::beforeFind() not working together. Fixes #2721	2014-01-29 06:40:27 -08:00
joostdekeijzer	42daa25340	Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly	2014-01-29 14:53:52 +01:00
joostdekeijzer	987187ef8c	Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname')	2014-01-29 13:37:47 +01:00
joostdekeijzer	827c815cf1	correct property comment	2014-01-29 12:25:09 +01:00
Rachman Chavik	b83b59a9d7	Log errors instead of calling trigger_error()	2014-01-29 17:51:07 +07:00
ADmad	c093804b35	Merge branch 'master' into 2.5	2014-01-26 17:39:50 +05:30
José Lorenzo Rodríguez	ddf046a246	Merge pull request #2694 from bar/patch-3 ... Correctly remove routing url from query string.	2014-01-22 05:15:03 -08:00
mark_story	61dd1c3f9d	Fix trailing whitespace.	2014-01-21 20:23:12 -05:00
Juan Basso	dae756c84a	Added option to allowed headers	2014-01-21 15:31:05 -05:00
Ber Clausen	5b4121f643	Update tests.	2014-01-21 16:56:37 -03:00
ADmad	84932fcc4a	Don't start a session if it's known to be empty. ... If an app only reads/checks the session there's no need to start a session to know that the read/checked session value is empty. Fixes #1981	2014-01-22 01:17:16 +05:30
Juan Basso	5af3da7fe6	Changed tests to support PHP 5.2 :(	2014-01-21 10:44:00 -05:00
Juan Basso	ec7196013c	Added support to cross origin requests	2014-01-21 09:44:49 -05:00
mark_story	55e1619c59	Fix issue with find(count) and TranslateBehavior. ... Fixes #2667	2014-01-18 21:54:09 -05:00
Rob McVey	7a27650297	Test case that demonstrates issue with count and Translate	2014-01-18 21:49:07 -05:00
mark_story	75dd2ff1fb	Merge branch 'master' into 2.5	2014-01-16 15:20:40 -05:00
mark_story	f25e84f4fb	Don't select year 0 when there are all 0's. ... Year 0 is almost never a 'good' selection value and causes odd behavior when paired with MySQL. Fixes #2658	2014-01-15 10:23:45 -05:00
Matthew Ouyang	84eb46dbdc	allow additional status codes through constructor ... through $options['statusCodes']	2014-01-14 11:18:57 -05:00
euromark	690f54ad9d	more corrections in order	2014-01-10 00:33:27 +01:00
euromark	3ff23c732f	unify and correct assert order	2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez	606362d519	Merge pull request #2636 from dereuromark/2.5-title-for-layout ... Follow the deprecation note in the doc block of View class	2014-01-09 15:13:07 -08:00
euromark	97e43e5806	unify to expected	2014-01-09 16:52:21 +01:00
euromark	738b34c2d0	Correct assert param order	2014-01-09 16:50:27 +01:00
euromark	29e15386b2	Follow the deprecation note of 2.1 migration guide and switch to fetch(title) ... correct assert order for test	2014-01-09 16:45:49 +01:00
mark_story	b20ca3f4e0	Fix errors with postgres tests.	2014-01-08 09:42:13 -05:00
mark_story	312b2c3cd1	Merge branch 'translate-patch'	2014-01-06 21:21:25 -05:00
mark_story	3763350667	Add test for issue #2595 ... Fold conditions that did the same thing and add a test case. Closes #2595	2014-01-06 21:21:13 -05:00
euromark	ecfd64c082	adding test	2014-01-06 21:07:00 +01:00
euromark	a02ab67521	unify exception and error handling.	2014-01-03 12:42:52 +01:00
mark_story	3cee3b0e99	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-12-30 21:28:22 -05:00
Rachman Chavik	c48afae2dc	Add test to prove issue when saving invalid tree data	2013-12-27 12:35:28 +07:00
mark_story	1daa27c0d7	Add tests for uncovered case of :0 replacements. ... There were previously no tests for the :0, :1 style replacement markers in DboSource. In fact I didn't even know it was a 'feature'.	2013-12-24 13:13:05 -05:00
Mark Story	1cb7e4f0ff	Merge pull request #1635 from dereuromark/master-dom-ids ... Fix duplicate ID generation of for multiple checkboxes.	2013-12-24 07:02:38 -08:00
euromark	b392254c92	fix cs	2013-12-24 15:20:32 +01:00
mark_story	99e4dbd827	Merge branch 'master' into 2.5	2013-12-23 11:58:07 -05:00
mark_story	70530135d6	Don't use FORWARDED_HOST when getting referer values. ... HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the original HTTP_HOST value. It has nothing to do with referer values. Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header in proxied setups, add a trustProxy parameter to host() and default it to false. This maintains existing behavior and allows people to access the proxied value. Fixes #2537	2013-12-23 11:32:14 -05:00
mark_story	62e89734ab	Throw exceptions from Hash::combine() ... When the key + value counts do not match Hash should throw an exception. Silently doing the wrong thing is generally not a good idea. While this change could break existing applications, those applications were probably behaving incorrectly anyways. Fixes #2470	2013-12-21 17:46:05 -05:00
José Lorenzo Rodríguez	60d2ece035	Merge pull request #2506 from dereuromark/2.5-string ... Correct tokenize for empty strings.	2013-12-21 10:31:52 -08:00
mark_story	7e5c0f7185	Merge branch 'master' into 2.5	2013-12-20 14:15:35 -05:00
mark_story	5bddc477a3	Fix incorrectly handled time values around 12:00:00 ... When using 12 hour formats & intervals, values around 12:00 were incorrecly converted to midnight. Fixes #2507	2013-12-19 17:36:27 -05:00
euromark	3ecce19732	Correct tokenize for empty strings.	2013-12-19 15:58:08 +01:00
Saleh Souzanchi	bbbf3076ab	undo remove end line break	2013-12-19 00:36:20 +03:30
OKINAKA Kenshin	3433e10fbd	Fix Postgres for bigint primary key.	2013-12-18 14:58:18 +09:00
Saleh Souzanchi	4639d3597c	add DispatcherFilter Settings	2013-12-18 06:54:27 +03:30
ADmad	49a9d24ca7	By default use filter_var() to valid email addresses in CakeEmail. ... Refs #2477	2013-12-18 01:07:40 +05:30
mark_story	30e139412d	Fix input type inference when type=>checkbox ... FormHelper should not infer types when the explicit type is checkbox. Instead the provided type should be used. Fixes #2491	2013-12-16 23:26:20 -05:00
ADmad	27979286b2	Revert change done in 11f543f1f2. ... The change is unneeded now as Security::encrypt() no longer throws exception for falsey values.	2013-12-15 20:29:41 +05:30
ADmad	8a666fb37e	Don't throw exception when trying to encrypt falsey value.	2013-12-15 19:28:56 +05:30
mark_story	e15d1652ed	Relax the 'my' and 'ym' date validation formats. ... All other formats that include 'y' allow 2006 or 06. These formats are now conformant with the other formats available. Closes #2436	2013-12-14 23:02:12 -05:00
Mark Story	bf96ea36d9	Merge pull request #2482 from zoghal/2.5-cookie-fix2 ... fix CookieComponent - when write null or empty string	2013-12-14 16:21:58 -08:00
mark_story	c2b8778ce8	Merge branch 'master' into 2.5	2013-12-14 17:45:49 -05:00
Saleh Souzanchi	11f543f1f2	fix CookieComponent - when write null or empty string	2013-12-15 02:15:36 +03:30
Mark Story	384c3a815d	Merge pull request #2350 from tuffz/formatting_app_uses_blocks ... formatting app::uses blocks	2013-12-14 12:37:02 -08:00
mark_story	79701af501	Make Hash::numeric() accept more numeric things. ... Negative numbers and other stringy forms of numbers should be accepted. The name Hash::numeric implies is_numeric which it now uses. Fixes #2478	2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez	fc6edf4d9c	Fixed small coding standard error	2013-12-12 09:07:00 +01:00
mark_story	3b867a048e	Add test for saveMany + validate=false. ... Closes #2468	2013-12-11 12:43:18 -05:00
Mark Story	a2f043d2a3	Merge pull request #2445 from young-steveo/2.5 ... CakeFixtureManager::load now calls CakeTestFixture::truncate	2013-12-09 09:23:02 -08:00
mark_story	2a58e529b7	Merge branch 'glorand-master' ... Fix Hash::extract() operating on non-array data. Closes #2433	2013-12-09 12:17:36 -05:00
mark_story	edcfe2d3a8	Add tests for #2433	2013-12-09 12:17:25 -05:00
José Lorenzo Rodríguez	6358741944	Merge pull request #2449 from cakephp/fix-session-cyclic-error ... Fixed error in CakeSession that would call start() in an infinite loop	2013-12-09 02:18:21 -08:00
mark_story	48d2618c62	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Routing/Router.php	2013-12-08 21:25:59 -05:00
mark_story	abf4af14a8	Change quotes to keep postgres happy.	2013-12-08 11:58:26 -05:00
mark_story	530c95725f	Attempt to fix errors with postgres tests.	2013-12-08 11:46:17 -05:00
Jose Lorenzo Rodriguez	3a2c497206	Fixed failing test	2013-12-08 14:08:57 +01:00
Rachman Chavik	98e645a1ea	Add test to prove issues with deleteAll with $order set	2013-12-08 16:39:56 +07:00
Jose Lorenzo Rodriguez	848a0ce217	Fiexed error in CakeSession that would call start() in an infinite loop ... when the session is marked as invalid	2013-12-07 22:25:33 +01:00
Stephen Young	8645e05ab1	Removed leading underscores from ReflectionProperty variables in test case	2013-12-07 12:10:03 -05:00
Stephen Young	f0036b3ebc	CakeFixtureManager::load now calls CakeTestFixture::truncate	2013-12-07 09:47:06 -05:00
ADmad	738d0e2277	Fixed edge case which allowed login with empty password. ... Ensure skipping call to FormAuthenticate::_checkFields() does not allow logging in with empty password. Closes #2441.	2013-12-07 18:40:08 +05:30
Brian Porter	bfdc41e8bb	Baked test methods are marked incomplete. ... Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing. It is much easier when _running_ tests to locate incomplete test methods. Fixes 2437.	2013-12-05 22:54:26 -06:00
mark_story	85a9132c9b	Append / to the start/end of the mapResources prefix. ... This makes the method easier to use and less error prone. Fixes #2431	2013-12-04 21:46:59 -05:00
euromark	8ebf004450	Also make DOM ids for radio element values unique.	2013-12-04 02:14:08 +01:00
euromark	587a04ab84	prevent possible XSS attack via form helper selects and unescaped output.	2013-12-04 01:51:39 +01:00
euromark	aae0f762dd	Collision free approach to resolve the DOM ID issue in a clean way. Fix to generation of ids for multiple checkboxes. Resolves ticket 4064.	2013-12-04 01:30:57 +01:00
ADmad	f3900e89fd	Fixed bug where deleteAll tried to delete same id multiple times. ... Ensure find done in deleteAll only returns distinct ids. A wacky combination of association and conditions can sometimes generate multiple rows per id.	2013-12-03 22:18:17 +05:30
mark_story	8578708e76	Merge branch 'master' into 2.5	2013-12-01 21:37:37 -05:00
ADmad	c72def4840	Moved exception throwing to after paging info it set for request. ... This fixes the regression caused in 2096d3f632. When catching exception thrown by PaginatorComponent::paginate() in controller, developer again has access to paging info in request object. Closes #2402	2013-11-30 19:00:08 +05:30
mark_story	a9ca1bdc58	Add tests and fix other cases where autoLinkEmail would fail. ... Refs #2403	2013-11-29 22:57:43 -05:00
mark_story	bbe4c659aa	Add tests for TextHelper::autoLink() ... Add tests for email addresses embedded in urls. Refs #2403	2013-11-29 21:57:08 -05:00
mark_story	97ab2c0e9b	Merge branch 'imsamurai-2.5' into 2.5 ... Add unsigned integer support to MySQL. Unsigned integers have not been added to other databases as they either do not support them (postgres, sqlserver) or they are 'faked' and don't do anything (sqlite). Fixes #2321	2013-11-27 20:12:28 -05:00
mark_story	430ef88118	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-11-25 23:15:15 -05:00
mark_story	5e77183afe	Fix failing tests when Console group was run in isolation.	2013-11-23 12:36:02 -05:00
mark_story	d97cf79545	Add coverage for comma in email alias. ... Closes #2381	2013-11-22 13:14:21 -05:00
mark_story	37e387fed2	Replace non-breaking spaces with Inflector::slug(). ... Fixes #2363	2013-11-22 10:13:10 -05:00
imsamurai	62a53d26bb	fix typo	2013-11-22 16:17:25 +02:00
mark_story	a4460ff228	Fix tests even better than before. ... The current tests work on travis, but fail on jenkins. Fix that up.	2013-11-21 22:57:50 -05:00
mark_story	71312932e8	Merge branch 'master' into 2.5	2013-11-21 21:46:21 -05:00
mark_story	0e7b0ad111	Fix failing test.	2013-11-21 21:46:03 -05:00
José Lorenzo Rodríguez	df5fc2304a	Merge pull request #2289 from bar/2.5-optimize-dbosource ... First part of the DboSource cleanup.	2013-11-21 01:02:36 -08:00
Eric Büttner	8c319c7dbc	fix the failing test case.	2013-11-20 12:26:03 +01:00
mark_story	ec38ee1c48	Only enable cacheSources if both the datasource + model agree on it. ... This prevents models from flipping cacheSources on when the datasource has it disabled already. Refs #2364	2013-11-19 17:36:20 -05:00
davidsteinsland	c29d2abf69	Fixed test	2013-11-19 12:10:01 +01:00
davidsteinsland	22d9cd8a00	Fixed test case	2013-11-19 11:58:52 +01:00
davidsteinsland	7056ccd38a	Added msgpack support for Memcached	2013-11-19 11:35:05 +01:00
imsamurai	1313b81913	fix since phpdoc tag for fixture	2013-11-19 10:48:51 +02:00
mark_story	3b8208be2e	Merge branch 'master' into 2.5	2013-11-18 21:49:13 -05:00
Matheus Pedroso	4677ddf490	Fix duplicated webroot path on HtmlHelper::meta('icon').	2013-11-18 23:38:01 -02:00
ADmad	dda6080579	Merge branch 'master' into 2.5	2013-11-19 00:27:12 +05:30
Eric Büttner	1e3865acc7	formatting app::uses blocks (refs #2265)	2013-11-18 11:56:00 +01:00
imsamurai	20dc92291e	fix broken test	2013-11-17 23:34:22 +02:00
imsamurai	0286e4120d	fix code style	2013-11-17 23:12:51 +02:00
imsamurai	8bcfe452da	not add unsigned to not numeric fields, fix broken test, add new test	2013-11-17 23:10:53 +02:00
imsamurai	2f6122cb01	add unsigned property in Model::describe	2013-11-17 22:37:01 +02:00
imsamurai	00fb663f90	remove numeric from unsigned config	2013-11-17 21:23:13 +02:00
mark_story	016c3aed44	Add test for saveAssociated and expression objects. ... Add a test for #1514. This issue was fixed during recent refactorings. Closes #1514	2013-11-16 10:51:14 -05:00
mark_story	cee2801700	Add 'metadata' to the uninflected list. ... Fixes #2332	2013-11-15 21:49:05 -05:00
Mark Story	17ae40f0ce	Merge pull request #2319 from ravage84/php-5-removal ... Removed "PHP 5" from file header DocBlocks	2013-11-14 06:41:31 -08:00
imsamurai	f1a2c1a75c	add decimal type for unsigned	2013-11-14 10:56:51 +02:00
imsamurai	15805e668e	fix phpcs errors	2013-11-14 02:39:16 +02:00
imsamurai	87fef89737	fix phpcs errors	2013-11-14 02:19:31 +02:00
imsamurai	fd64d952b5	change position from afterDefault to beforeDefault during to wrong order, add test	2013-11-14 01:36:27 +02:00
imsamurai	e35823e72a	fix tests, add numeric type for unsigned	2013-11-14 01:33:11 +02:00
imsamurai	5a40944a6f	fix test name testBuildColumn3 to testBuildColumnUnsigned	2013-11-14 01:20:21 +02:00
imsamurai	2fcb4c3c6c	- change check to strict for options of $fieldParameters ... - add `types` parameter and strict check if it present in `$fieldParameters` (if it present and not contain column type field parameter will be skipped) - add `noVal` parameter to `$fieldParameters` if it present and not empty value of this parameter from column will be ignored - add `unsigned` column type for integer, float and biginteger. If it set to `true` an 'UNSIGNED' will be add in sql column part, if not set or set not to `true` this parameter will be skipped	2013-11-14 01:11:30 +02:00
Marc Würth	7018997979	Fixed some copyright and license statements in the file header DocBlocks	2013-11-14 00:07:03 +01:00
Marc Würth	7cfa0116f4	Removed "PHP 5" from file header DocBlocks ... This statement does not serve a purpose anymore. In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to. http://pear.php.net/manual/en/standards.sample.php But since PHP 5.1 and later this is only marginally true. Thus I propose to remove it from CakePHP.	2013-11-13 22:58:39 +01:00
Marc Würth	ce47890e98	Replaced all remaining license references to the Open Group Test Suite License with the MIT License	2013-11-13 18:52:06 +01:00
Marc Würth	19b972cfeb	Implemented skipping of fields for the data validation rules when baking a model	2013-11-13 13:36:19 +01:00
mark_story	a07608cbb9	Fix incorrect CSRF token fields when using postLink() ... Creating a postLink after creating a GET form would result in the incorrect fields being generated. Fixes #2308	2013-11-11 21:56:55 -05:00
Ber Clausen	b35c9671ad	Explicitly build SQL statements, calling buildAssociationQuery().	2013-11-11 23:27:50 -03:00
Ber Clausen	64f34b75a2	Fix a couple of failing tests.	2013-11-11 23:27:50 -03:00
Ber Clausen	53c6df554c	Remove unused $resultSet argument from generateAssociationQuery().	2013-11-11 23:27:50 -03:00
mark_story	63d867c98b	Restore global event managers that were causing cascading failures. ... Refs #2105	2013-11-10 22:35:00 -05:00
Andy Hobbs	3e373771d7	Corrected coding standards violations in CaKeEventManagerTest.php ... - Changed combining of arrays in CakeEventManager::listeners() to be more efficient Refs #2105	2013-11-10 22:34:50 -05:00
Andy Hobbs	7656ffd12e	Corrected coding standards violations in CateEventMAnagerTest.pnp ... Refs #2105	2013-11-10 22:34:43 -05:00
Andy Hobbs	11db7c1631	Removed EventManager test that tested using a closure as it breaks compatability with php < 5.3.0 ... Refs #2105	2013-11-10 22:34:35 -05:00
Andy Hobbs	615f700d22	Added EventManager::prioritisedListeners() function to alow the global event manager to return unprocessed listeners array ... Refs #2105	2013-11-10 22:34:27 -05:00
mark_story	3561929be7	Merge branch 'master' into 2.5	2013-11-10 21:53:09 -05:00
mark_story	8d38861a2e	Fix missing HTML encoding on URL's generated by Html->meta(). ... The input URL was not correctly handled as an asset URL and thus was not correctly HTML or URL escaped. This created invalid HTML when favicon URLs included query string arguments. Refs #2233	2013-11-09 14:31:09 -05:00
mark_story	bf2f2e772e	Split existing tests up, and add tests for Router based image URL's ... Refs #2233	2013-11-09 12:00:56 -05:00
mark_story	3c1f775ab2	Merge branch 'master' into 2.5	2013-11-09 09:37:27 -05:00