7212 commits

Author	SHA1	Message	Date
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
Chris Valliere	0dca5c8877	Using App::uses('CakeLog', 'Log') twice ... I think this was accidentally added twice?	2015-03-06 13:41:40 -05:00
ADmad	7173f21dc8	Type hint model param	2015-03-04 21:15:24 +05:30
ADmad	a1286e9e7d	Prefix fields with model alias	2015-03-04 21:11:18 +05:30
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
José Lorenzo Rodríguez	bc4bca9737	Merge pull request #5974 from cakephp/issue-5838 ... Make global paths for vendors and plugins based on ROOT.	2015-02-27 09:16:19 +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	aec0241a4c	Make global paths for vendors and plugins based on ROOT. ... Using CAKE means that composer installed CakePHP will generate incorrect 'global' paths. Refs #5838	2015-02-26 12:49:04 -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
AD7six	5342605d92	The parentheses were unbalanced	2015-02-23 15:21:39 +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
Michael Houghton	4f2ed15612	fix for confirm message on the bake templates	2015-02-21 10:21:37 +00: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
mark_story	3fee5b9eaa	Update version number to 2.6.2	2015-02-19 07:34:27 -05:00
Jan Dorsman	e3b5306521	Fixing issue #5764	2015-02-19 12:19:27 +05:30
Mark Story	c8ca7cbfd9	Merge pull request #5890 from cakephp/issue-5889 ... Fix doubly linking URLs starting with //	2015-02-16 20:09:25 -05:00
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
ADmad	18246daf17	Merge branch 'master' into 2.7	2015-02-15 21:15:02 +05:30
Mark Story	10b6ba7dc2	Merge pull request #5903 from cakephp/tree-optimization ... Reduced code nesting.	2015-02-15 10:35:43 -05:00
ADmad	bdc6a1f010	Fix CS error	2015-02-15 19:22:44 +05:30
ADmad	0750a63ed4	Make code DRYer.	2015-02-15 18:36:30 +05:30
Markus Fischer	546941a79b	i18n: Remove POT-Creation-Date ... Prevent app locale files getting marked as modified in VCS even if the actual content didn't change. Fixes #5887	2015-02-15 12:38:48 +01:00
ADmad	844b4beaa6	Reduced code nesting.	2015-02-15 16:30:43 +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
James Tancock	3cee029aa7	Removed usage of __() for InternalError	2015-02-12 15:09:18 +00: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
James Tancock	1cb670bdfa	Add deprecated doctag for current methods	2015-02-10 08:15:01 +00: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
David Yell	703be31c83	Update phpunit.php ... PHPUnit can no longer be installed using pear	2015-02-05 12:02:18 +00:00
Emil Møller	3f715c4262	Load ClassRegistry Once	2015-02-04 21:29:16 +01: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
James Tancock	2ff6bdccec	Back port of Flash component & helper	2015-02-04 12:18:31 +00:00
Rachman Chavik	acd32b71fe	Fix: "bake plugin" generates incorrect directory for View/Layouts	2015-02-04 15:47:01 +07:00
James Watts	970cb81d03	Typo typo	2015-02-02 02:07:13 +01: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
tgskiv	97c6850005	Let IDE work better with ClassRegistry::init() ... This small change will allow some IDEs like NetBeans to work with returned object like with a instance of $class parameter. I`m sure, this will help Cake users a lot!	2015-01-27 19:06:46 +02: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	4fa5dd62c5	Remove conditional status setting.	2015-01-26 23:47:20 +01:00
Mark Scherer	70276b7a7a	Doc block adjustment.	2015-01-26 10:35:02 +01:00
Mark Scherer	e753fbadca	Fix ControllerTestCase redirect	2015-01-26 10:31:04 +01: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	5e89e893f2	Ignore counter cache also	2015-01-23 08:30:34 +00:00
AD7six	c0ee49fe88	Remove callbacks to speed up saving	2015-01-23 08:30:26 +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	4e33ef0386	Merge branch 'issue-5712' into master.	2015-01-21 23:32:25 -05:00
mark_story	58334996a2	Fix PHPCS errors.	2015-01-21 23:32:08 -05:00
Mark Story	49a08dc259	Merge pull request #5709 from cakephp-fr/2.x-pot-files ... put message in cake.pot file instead of default.pot	2015-01-21 23:24:41 -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
Richan Fongdasen	fd47d26f6b	Keep the user agent list in alphabetical order	2015-01-21 22:50:46 +07:00
cake17	2c251b80af	put message in cake.pot file instead of default.pot	2015-01-21 16:41:34 +01:00
Richan Fongdasen	a7d604bca8	Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706	2015-01-21 13:47:03 +07:00
Mark Story	3cc3db8380	Merge pull request #5681 from robertpustulka/2.7-short-plugin-shell ... 2.7 - Short plugin alias in shells	2015-01-19 21:44:47 -05:00
mark_story	511ee1f776	Fix strict error with 2.6 code.	2015-01-19 21:43:14 -05: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	f4933b29a8	CS fix	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
David Steinsland	e5d1846d4b	Fixed PHP 5.2 compatibility	2015-01-16 16:02:44 +01:00
David Steinsland	e37db25ce0	Change configuration property to static class property	2015-01-16 14:47:44 +01:00
Mark Scherer	d37721ab0e	Fix notice in PaginatorHelper when model params are not available.	2015-01-16 14:11:32 +01:00
mark_story	09e5e43d09	Update version number to 2.6.1	2015-01-15 21:36:35 -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	8969565526	Merge pull request #5675 from cakephp/master-docs ... Correct CakeSocket docblocks.	2015-01-15 21:27:30 -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
Mark Scherer	2b1e487530	Correct CakeSocket docblocks.	2015-01-15 23:39:09 +01:00
David Steinsland	a5e1be7abf	Fixed tests	2015-01-15 23:11:36 +01:00
David Steinsland	e5134986e6	Reset Exception.bail just in case	2015-01-15 20:10:48 +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
David Steinsland	687d0b44f5	Backport of https://github.com/cakephp/cakephp/issues/5667	2015-01-15 11:00:27 +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 S.	77e8661cb7	Merge pull request #5651 from bcrowe/copyright ... Bump copyright year in license	2015-01-12 21:47:04 +01:00
Bryan Crowe	6a83e6b1de	Bump copyright year in license	2015-01-12 15:18:04 -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
José Lorenzo Rodríguez	0a4141c78c	Merge pull request #5614 from cakephp/issue-5595 ... Convert header_sent exception into a notice error.	2015-01-09 22:25:09 +01:00
Mark Story	1fee3c030e	Merge pull request #5616 from cakephp/issue-5603 ... Fix radio buttons not being added to security hash.	2015-01-09 15:32:44 -05:00
mark_story	03d8c40d99	Fix PHPCS error.	2015-01-09 15:32:33 -05:00
mark_story	18f02bf5b3	Don't emit errors or trigger exceptions when headers have been sent. ... After discussing it a bit, we've come to consensus that emitting errors or throwing exceptions are both pretty disruptive and annoying to deal with. Instead we'll revert to the previous 2.x behavior of doing nothing.	2015-01-09 15:16:14 -05:00
antograssiot	c2f298a8b7	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01: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	a7aaa93131	Convert header_sent exception into a notice error. ... Throwing an exception here, causes an infinite loop when handling fatal errors, as the shutdown function sends headers automatically. Refs #5595	2015-01-08 21:47:13 -05:00
dmromanov	eb414bdda1	Fix double encoding time strings (CakeTime) ... Fix time strings being double encoded when mb_string is not installed.	2015-01-09 00:03:49 +03:00
Bryan Crowe	66a0e6226d	Correct criterion inflection	2015-01-06 23:03:53 -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
José Lorenzo Rodríguez	f6975f5254	Merge pull request #5572 from cakephp/issue-5570 ... Improve error used when a cache configuation fails to start.	2015-01-05 10:15:35 +01:00
mark_story	d7bc73b1e3	Improve error used when a cache configuation fails to start. ... Refs #5570	2015-01-04 19:54:58 -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
euromark	722e54279c	Rename String to CakeText.	2015-01-05 00:53:32 +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
Gerd Katzenbeisser	bf3ff8e2ad	Avoid connection to default for mocked models ... Fixes #5565	2015-01-04 16:53:00 +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	9553c029c4	Merge branch 'autolink-brackets' into master ... Fixes #5544	2015-01-03 14:34:30 -05:00
mark_story	b6029d7ad1	Add some additional tests for autoLink. ... Refs #5544	2015-01-03 14:30:56 -05:00
Mark Story	0a4cffc603	Merge pull request #5501 from cakephp/2.6-hotfix-session-tmp-dir ... Also autocreate session folder in debug mode	2015-01-02 11:36:53 -05:00
Rob McVey	76b7c8c594	More complex test case for GET params	2015-01-02 15:31:27 +00:00
Rob McVey	54e172b129	Regex modified to to not capture brackets ... Modified the existing regex from th TLD onwards Credit to @gruber for the regex info https://gist.github.com/gruber/249502	2015-01-02 15:15:23 +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
euromark	5aff618109	Also autocreate session folder in debug mode	2014-12-27 20:34:47 +01: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	fe3d2b938c	Added conditional to do not show rerun link if is warning of no test present ... CS Fix Update CakeHtmlReporter.php Removed spaces in array return	2014-12-26 15:50:25 -03:00
Esteban	21f3a51ebc	Rerun only one test option adding ... Changed scope of function and fix CS problem	2014-12-26 15:50:23 -03: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
Esteban	b7510d4883	Avoids problem with code coverage switch when are to equaly named files in a test	2014-12-23 17:23:12 -03: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	02ca7f5fcb	Update version number to 2.6.0	2014-12-23 11:26:27 -05:00
mark_story	f4b682d384	Revert version number. ... I forgot to merge a few pull requests before releasing.	2014-12-23 11:25:54 -05:00
Mark Story	033d968766	Merge pull request #5468 from dereuromark/2.6-i18n ... Allow apps to overwrite translation domains from third party plugins.	2014-12-23 11:25:10 -05:00
Mark Story	96c458f300	Merge pull request #5467 from cakephp/2.6-mediaview ... Don't send response from view.	2014-12-23 11:24:47 -05:00
mark_story	8de2877573	Update version number to 2.6.0	2014-12-23 11:22:20 -05:00
mark_story	10717d9248	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-12-23 11:22:00 -05:00
mark_story	667e2be2d2	Update version number to 2.5.8	2014-12-23 11:21:16 -05:00
mark_story	5cf5fe53ee	Clarify question. ... Fixes #1870	2014-12-23 11:18:32 -05:00
euromark	22a4a2f5de	Correct argument. Should not have a default string.	2014-12-23 15:36:25 +01:00
euromark	d089341ee7	Wording.	2014-12-23 13:46:55 +01:00
euromark	53f1390b7d	Backport array support for testAction()	2014-12-23 13:42:21 +01:00
euromark	5c5fb59c8d	Allow apps to overwrite translation domains from third party plugins.	2014-12-23 13:09:53 +01:00
euromark	545ff20e1d	Add component and helper wrapper methods.	2014-12-23 03:50:35 +01:00
mark_story	6db96d5e41	Merge branch '2.6' into 2.7	2014-12-22 21:39:08 -05:00
euromark	813925abee	Backport Session consume()	2014-12-23 03:39:05 +01:00
mark_story	c540e2b798	Merge branch 'master' into 2.6	2014-12-22 21:38:58 -05:00
euromark	5af24bdb31	Correct array syntax.	2014-12-23 03:29:52 +01:00
euromark	515302528d	Backport Configure::consume() to 2.x	2014-12-23 03:26:03 +01:00
euromark	0a974dd59f	Adjust tests	2014-12-22 22:07:51 +01:00
euromark	14073dc742	Don't send response from view.	2014-12-22 21:02:52 +01:00
Mark Story	484b114e9b	Merge pull request #5384 from okinaka/fix-mysql-describe ... 2.5: Fixing Mysql::describe() for timestamp.	2014-12-21 21:27:27 -05:00
Rachman Chavik	45be270a7b	Enable use of Containable with TreeBehaviors ... This patch allows Containable use with: - TreeBehavior::getParentNode() - TreeBehavior::children() - TreeBehavior::getPath()	2014-12-20 16:32:20 +07:00
Marc Würth	e778b5dce2	Corrected/Improved DocBlock	2014-12-19 18:20:48 +01:00
Mark Story	1651e7742c	Merge pull request #5088 from sebastienbarre/ticket-5041 ... Ticket #5041: have Auth::login() send Auth.afterIdentify event	2014-12-18 00:12:22 -05:00
mark_story	839ef73d43	Merge branch '2.6' into 2.7	2014-12-17 21:46:54 -05:00
mark_story	4d6611b328	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-12-17 21:38:32 -05:00
mark_story	2637d35543	Don't quit bake when a table is missing. ... When a table is missing print a warning to stderr but don't exit. This allows people to use `bake fixture all` with non-conventional tables. Refs #5377	2014-12-15 21:28:55 -05:00
mark_story	ae8a540101	Remove trailing whitespace.	2014-12-14 18:05:20 -05:00
mark_story	f19916bccf	Add comments for possibly confusing code.	2014-12-13 22:25:52 -05:00
mark_story	c58e7da667	Handle exception when RequestHandler::startup() fails. ... In the case that there is a request data type parser raises an exception, or startup() otherwise fails the error page should be created correctly. While I'm not able to write a test case for this, manual testing confirmed the fix. Refs #5311	2014-12-13 15:04:11 -05:00
Walther Lalk	9be725613e	Backport helper method for view blocks from 3.0 ... Related PR is #5385	2014-12-11 16:44:11 +02:00
OKINAKA Kenshin	8c008ad97d	Update.	2014-12-11 13:55:41 +09:00
mark_story	cf108dbff3	Remove duplicate order key. ... This was a mistake made in 4b6dba0. Fixes #5376	2014-12-10 22:32:59 -05:00
mark_story	23c4b7b7d5	Fix whitespace.	2014-12-10 22:17:02 -05:00
Mark Story	2228afda0e	Merge pull request #5334 from tranfuga25s/master ... Change output to show the difference between fixture data and fields	2014-12-10 22:16:33 -05:00
OKINAKA Kenshin	5cff6aa746	Fixing Mysql::describe() for timestamp.	2014-12-11 10:31:19 +09:00
mark_story	ac6d5cc70f	Fix incorrect pluralization of Human. ... Human should become humans, unlike other words ending in man. Fixes #5370	2014-12-09 21:51:42 -05:00
Mark Story	1a1583a832	Merge pull request #5360 from ADmad/i18n-arabic ... Fix plural calculation for Arabic	2014-12-09 12:54:02 -05:00
tranfuga25s	360346acd0	Added PHPCS fixes	2014-12-09 09:35:12 -03:00
tranfuga25s	674af51d6b	Added PHPCS fixes	2014-12-09 09:16:34 -03:00
tranfuga25s	9ecdaf7965	Added PHPCS fixes and better array diff handling on fixture data count difference	2014-12-09 08:56:34 -03:00
Mark Story	0ce38029d0	Merge pull request #5362 from cakephp/master-sniff ... Consolidate with conditions sniff.	2014-12-08 22:23:25 -05:00
euromark	1e6876b627	Fix tests	2014-12-09 03:43:35 +01:00
euromark	f63d955f73	Add additional test.	2014-12-09 03:43:35 +01:00
euromark	dc70da9d14	Only merge the _defaults keys.	2014-12-09 03:43:35 +01:00
euromark	dc41a1ff56	Fix paginator options when disabled.	2014-12-09 03:43:34 +01:00
euromark	e1c128bb99	Consolidate with conditions sniff.	2014-12-09 03:17:35 +01:00
mark_story	ef28b42b2b	Update version number to 2.5.7	2014-12-08 20:50:35 -05:00
ADmad	31c7b01c3a	Add reference links to docblock	2014-12-09 00:03:24 +05:30
ADmad	850edf47a0	Fix plural calculation for Arabic. ... Refs #5348	2014-12-08 23:58:27 +05:30
euromark	2937ea9ba5	Make comparison stricter.	2014-12-08 11:39:15 +01:00
euromark	f302d8c4d3	Extract being less verbose until explicitly asked for.	2014-12-08 11:36:24 +01:00
mark_story	c32e165052	Merge branch '2.6' into 2.7	2014-12-06 21:29:13 -05:00
mark_story	ad2d6edda9	Merge branch 'master' into 2.6	2014-12-06 21:28:59 -05:00
euromark	11981f80fa	Correct doc block.	2014-12-06 04:54:22 +01:00
tranfuga25s	b0d0143b82	Fix PHPCS problems	2014-12-05 16:14:47 -03:00
tranfuga25s	ec2530ba58	Fix PHPCS problems and a better comparation of schema and data	2014-12-05 16:01:49 -03:00
tranfuga25s	fc756ac0b8	fix some small typo changing variables names	2014-12-05 15:34:53 -03:00
tranfuga25s	a2d04589a6	Change to output the difference between fixture data and fields	2014-12-05 15:23:48 -03:00
shin1x1	a5843dbe87	add binary protocol option in MemcachedEngine	2014-12-02 19:56:30 +09:00
mark_story	bbfe3170dc	Fix incorrect hardcoded database name.	2014-12-01 23:03:47 -05:00
Guy Warner	327fcb4846	Fix some missed doc block issues	2014-11-30 14:50:11 -07:00
Guy Warner	fb61d9393b	Add @trigger doc blocks of methods triggering CakeEvent	2014-11-30 14:45:40 -07:00
mark_story	1c913d29b6	Merge branch '2.6' into 2.7	2014-11-29 22:00:24 -05:00
mark_story	543f05e3d0	Merge branch 'master' into 2.6	2014-11-29 22:00:00 -05:00
Florian Krämer	e7f554cba7	Changing the direct access of super globals in Cake/Network/CakeRequest.php to use env() and fixed a typo.	2014-11-29 03:04:07 +01:00
Florian Krämer	43f7fcc735	Adding a few more ways to detect HTTP headers, extensions and the accept header.	2014-11-27 01:00:44 +01:00
euromark	d0f75a03af	Allow RLIKE in conditions.	2014-11-26 19:56:58 +01:00
Tsuyoshi Sadakata	1f4402cd4c	check ob_get_level() before ob_flush()	2014-11-26 17:25:10 +09:00
mark_story	1e6d22b8cb	Make the version option function as intended. ... The version option is documented but does not work. While this 'breaks' behavior, it also fixes what I think is a more important issue. Refs #5234	2014-11-24 22:38:00 -05:00
Lawrence Barsanti	9631b54244	remove space	2014-11-24 16:36:43 -05:00
Lawrence Barsanti	bb5088cda3	PHPUnit can be included as a phar file. ... No need to install phpunit in order to run unit tests. Simply place 'phpunit.phar' in the vendors folder.	2014-11-24 14:51:36 -05:00
Sebastien Barre	20e2882bf6	Remove duplicate class declaration	2014-11-23 21:49:29 -05:00
Sebastien Barre	5ac47487f9	Merge branch 'ticket-5041' of github.com:sebastienbarre/cakephp into ticket-5041 ... Conflicts: lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php	2014-11-22 13:38:11 -05:00
Sebastien Barre	a2e7896038	Fix uses, style	2014-11-22 13:31:39 -05:00
Sebastien Barre	7da48669c8	Have BaseAuthenticate implement CakeEventListener instead	2014-11-22 13:31:38 -05:00
Sebastien Barre	50e5b5e8fe	Move App::uses() again	2014-11-22 13:31:38 -05:00
Sebastien Barre	d7b353dcf9	Move App::uses(), rename helper class to avoid conflict	2014-11-22 13:31:38 -05:00
Sebastien Barre	43413f029e	Ticket 5041: have Auth::login() send Auth.afterIdentify event	2014-11-22 13:31:38 -05:00
mark_story	b6caddcf49	Fix file_map being regenerated on every request. ... A mistake a few months ago caused the file_map to always be regenerated as Configure::write() would cause both Configure and Hash to be loaded, invalidating the file map. By entering bootstrap mode earlier we can avoid that. Refs #5229	2014-11-22 12:21:28 -05:00
Florian Krämer	4ff07b745a	Adding a test for the new json and xml detectors that were added to the CakeRequest class.	2014-11-22 17:30:53 +01:00
Florian Krämer	83eb8ce7de	Changes to Cake/Network/CakeRequest.php as discussed on Github for the detector code changes. Fixed the description of a few doc blocks, removed the use of getallheaders(), removed the failsafe (based on extension) for the xml and json detectors.	2014-11-22 12:55:22 +01:00
Florian Krämer	17e5d41e55	Restructuring the CakeRequest::is() code and related code a little.	2014-11-21 18:49:36 +01:00
Stephen Cuppett	ffb7e86641	Enable sslmode for PostgreSQL connections ... By default, PHP 5.5 and PostgreSQL PDO will not allow SSL connections. This adds the default of "allow", but also the user may override the setting to "require" or any of the other potential values. See: http://php.net/manual/en/function.pg-connect.php	2014-11-20 22:37:39 -05:00
Florian Krämer	24c4cab4f3	phpcs fix in Cake/Test/Case/Network/CakeRequestTest.php	2014-11-20 22:50:12 +01:00
Florian Krämer	3f5f8cbc15	phpcs fixes in Cake/Network/CakeRequest.php	2014-11-20 22:16:36 +01:00
Florian Krämer	728764c543	Adding a test for the refactored CakeRequest code.	2014-11-20 21:14:17 +01:00
Florian Krämer	88bfa70cad	Refactoring the detector code for CakeRequest::is() and adding default detectors for JSON and XML.	2014-11-20 21:14:07 +01:00
Rachman Chavik	a37e007d9f	BC fix for css() and script() with identical resource names	2014-11-19 11:20:37 +07:00
Rachman Chavik	7bea96f534	Add test for css() and script() with the same resource identifier	2014-11-19 11:20:37 +07:00
mark_story	fe6d3e36d5	Bump version number to 2.7.0-dev ... Open a branch for any development on 2.7.x which will be a 2.x API compatible release.	2014-11-18 23:06:24 -05:00
mark_story	23c5805763	Fix mistake with previous commit. ... I forgot to put the correct variable into the query like a doofus. Refs #4168	2014-11-18 22:03:30 -05:00
Mark Story	5dab175aa9	Merge pull request #5196 from cakephp/issue-5140 ... Gracefully handle invalid chunks in HttpSocket	2014-11-18 21:58:41 -05:00
Mischa ter Smitten	f2c84602b9	Bugfix for: Memcached Engine segfaults with memcached client version < 2.0.0 ... Fixes #5028	2014-11-18 21:26:57 +01:00
ndm2	bae556e73f	Prevent zero only lines from being emptied	2014-11-18 17:26:31 +01:00
mark_story	ddc3eee84c	Use name() instead of hand quoting sequence names. ... By using name() we can easily accomodate postgres sequences that exist out side of sequences. Fixes #4168	2014-11-17 22:47:07 -05:00
mark_story	8cbf975943	Gracefully handle invalid chunks in HttpSocket ... When invalid chunks are detected we should assume the server is incorrect and handle the remaining content as a single large chunk. Refs #5140	2014-11-17 22:23:46 -05:00
mark_story	e00aa596b1	Merge branch '2.6' of github.com:cakephp/cakephp into 2.6	2014-11-14 21:25:24 -05:00
mark_story	decce4daf2	Merge branch 'master' into 2.6	2014-11-14 21:25:09 -05:00
Mark Story	f570f931ce	Merge pull request #5159 from cakephp/issue-5155 ... Add order=>false to all treebehavior queries. Refs #5155	2014-11-14 10:02:17 -05:00
mark_story	4b6dba0c0a	Add order=>false to all treebehavior queries. ... Models can define default order conditions that will cause issues with postgres. By setting order=>false on all the queries emitted by TreeBehavior, we can avoid this issue and not have issues with models that define a default ordering. Refs #5155	2014-11-13 21:21:47 -05:00
Bryan Crowe	e3e54d40fa	Fix CS, remove extra space	2014-11-13 16:47:10 -05:00
mark_story	6092c168a9	Fix issues with sqlite field parsing. ... The previous attempt would still fail on unions or derived table join queries. This new approach is a bit slower but more robust. Refs #3972	2014-11-12 20:49:19 -05:00
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
watermark	8712dc01df	Cleanup of isUnique ... isUnique takes the count of the args multiple times. Store the count in a variable to cut down on overhead.	2014-11-11 16:13:16 -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
mark_story	9ce3d89c81	Clean up formatting and make a failure exit non-zero. ... Console tools should exit non-zero when a comman fails. Refs #4993	2014-11-09 21:21:42 -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	cc1fd33d0b	Update version number to 2.6.0-RC1	2014-11-07 20:36:25 -05:00
mark_story	c151ea585d	Update version number to 2.5.6	2014-11-07 20:35:12 -05: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
mark_story	dac8b7b644	Update return type for Model::saveField(). ... Fixes #5086	2014-11-05 20:37:43 -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
euromark	345a18f15f	Merge branch 'master' into 2.6	2014-11-05 23:29:06 +01: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
euromark	0d5d6b19b5	Wording correction.	2014-11-05 13:14:45 +01:00
euromark	768f2c809c	Correct doc block return types.	2014-11-05 13:03:27 +01: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
Mark Story	96b82e4226	Merge pull request #5021 from dereuromark/master-mysql ... Fix IN replacement in virtual fields for MYSQL.	2014-11-04 08:24:03 -05:00
euromark	a6bd133413	Correct typos.	2014-11-02 22:41:17 +01:00
euromark	e7f76a983a	Add a method for generating pagination meta links.	2014-11-02 22:29:02 +01:00
euromark	00432fa427	Show stack trace for fatal errors if xdebug is loaded.	2014-11-02 20:44:17 +01:00
Sebastien Barre	2995d9319c	Prepend model alias for safety	2014-11-01 09:36:59 -04:00
Sebastien Barre	417c137d11	Fix DigestAuthenticate test	2014-10-31 21:42:18 -04: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
Mark Story	a8c5b70b22	Merge pull request #4489 from busgurlu/patch-1 ... to correctly return SET() type	2014-10-30 19:56:47 -04: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	1e8f12f9f5	Bump the depth of variables in stack traces to 4. ... Giving more context allows developer to look at request/response data more easily. Fixes #5005	2014-10-29 21:43:18 -04: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
José Lorenzo Rodríguez	431578d956	Merge pull request #4931 from jrbasso/2.6-router-optimization ... Simplified way to add new prefixes to the router	2014-10-26 22:09:17 +01: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	4b5783c5fe	Add deterministic ordering to translate associations. ... Having a deterministic ordering based on the primary key resolves tests potentially failing when postgres returns data in a non-sequential order.	2014-10-24 22:21:06 -04: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
ptica	abb0c7cb9d	Update FormHelper.php ... disabled multiple checkbox input should not generate an enabled hidden input, as it leads to saving empty data upon submission -> carrying the disabled attribute to the hidden input prevents this	2014-10-24 18:25:31 +02: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
Bryan Crowe	6f4c3b2765	Fix views overwrite warning text	2014-10-21 14:39:09 -04:00
Juan Basso	833ca68a55	Replaced for loops by foreach	2014-10-20 16:43:11 -04:00
Juan Basso	9b4379b17d	Simplified way to add new prefixes to the router	2014-10-19 21:55:33 -04:00
Juan Basso	ba0901d40e	Removed the code that was never being executed	2014-10-19 18:56:02 -04:00
dmromanov	959a22a8b2	Documentation correction	2014-10-19 00:05: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	2ad181b6e1	Now the tableParameters array gets escaped through values(), too	2014-10-16 19:10:52 +02:00
Marc Würth	b3770974f1	Added tests for MySQL table comment feature	2014-10-16 16:44:09 +02:00
Marc Würth	84b0fe1c88	Added comment to $tableParameters array	2014-10-16 16:06:33 +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	dcb605c700	Possible fix for isUnique backward compatibility	2014-10-13 19:46:10 +07: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
ADmad	ecf030796b	Fix docblock	2014-10-11 19:37:22 +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
Ceeram	1dfd3405a4	TranslateBehavior now uses original atomic option value, if set	2014-10-10 14:17:16 +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
Bryan Crowe	e16bef1868	Fix missing 'r' from your	2014-10-08 15:06:30 -04:00
suzuki86	e4c0dee6ee	Fix small typo	2014-10-08 23:37:38 +09:00
mark_story	7b44d5d7a3	Update version number to 2.6.0-beta	2014-10-04 23:01:03 -04:00
mark_story	ce98a1ff57	Update version number to 2.5.5	2014-10-04 22:59:03 -04:00
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
Mark Story	d99d9bc37f	Merge pull request #4780 from Schlaefer/timeAgoInWords-futureString ... adds option for future string to CakeTime::timeAgoInWords & code cleanup	2014-10-01 20:34:41 -04:00
mark_story	2ee0827161	Fix PHPCS errors.	2014-10-01 20:34:33 -04:00
Hunter Perrin	be8c591dd8	Fixed coding standard violations.	2014-10-01 12:40:22 -07:00
Hunter Perrin	050e368bd0	Improvements to Hash::expand and Hash::merge. ... Because of the recursion in these functions, processing very large arrays would take a very long time. I rewrote the functions to eliminate any unnecessary recursion and function calls. Large arrays are now processed much faster.	2014-10-01 12:08:43 -07: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
euromark	af7916b1a7	Fix bug in CakeEmail::reset()	2014-09-24 14:02: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
mstra001	244acc724d	Add strftime() support to CakeTime::timeAgoInWords() ... When an absolute date is generated CakeTime will automatically use strftime() if the format string contains %. This allows for simpler localization. Refs #4550	2014-09-22 20:49:20 -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
Joseph Sutton	faaba42aa7	Fixed type-casting for AuthComponent::login()	2014-09-14 11:15:08 -05:00
Joseph Sutton	87a58eeaea	AuthComponent::login() returning deprecated method ... Changed $this->loggedIn() to $this->user(), as per the PHPDOC for loggedIn() at line 817	2014-09-14 00:28:30 -05:00
mark_story	9e4446fe5f	Trim whitespace from columns before checking for operators. ... Fixes #4599	2014-09-13 21:50:35 -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	a6df3300b9	Wording.	2014-09-10 17:57:26 +02:00
euromark	eedefb9dec	Clarify octal input instead.	2014-09-10 17:56:02 +02:00
euromark	3e25282d4c	Fix PHP flaw around intval with custom base.	2014-09-10 17:40:01 +02:00
euromark	e3dc51bb68	Manually correct remaining casts.	2014-09-10 16:40:22 +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
ptica	1959b97ba3	hardcode a relative path to core installed via composer ... as book suggests	2014-09-08 11:57:01 +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
Angel S. Moreno	29570e1d99	Fixed overwriting of files when Folder::SKIP is set	2014-09-06 18:32:45 -04:00
Mark Story	2311c13f12	Merge pull request #4417 from jeremyharris/3331 ... Fix for #3331	2014-09-04 20:26:55 -04:00
Burak USGURLU	996ad04b95	to correctly return SET() type	2014-09-04 18:07:30 +03:00
Jeremy Harris	3a41433c94	Deprecated AuthComponent::mapActions	2014-09-04 08:35:40 -05:00
Mark Story	f82fd2d982	Merge pull request #4463 from ravage84/deprecated-annotaions ... Update all @deprecated annotations	2014-09-04 08:48:45 -04:00
Markus Fischer	0c55adebe0	console: don't use colored output if there's no TTY ... This prevents ANSI escape codes and style tags showing up in cron-jobs, pipes or redirects.	2014-09-03 10:47:05 +02: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
mark_story	638d2ea7b6	Add array cast for method_cache data. ... Fixes #4186	2014-09-02 22:39:28 -04:00
Marc Würth	67ba9cb406	Update all @deprecated annotations ... to adhere to the @deprecated <version> <description> format, where version and description are mandatory.	2014-09-02 17:03:22 +02:00
mark_story	9c2a25d4c0	Update version number to 2.5.4	2014-09-01 22:05:27 -04: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	cd7438d33d	Fix 0 index not being properly parsed for files.	2014-08-23 13:05:16 +02:00
Karma Dice	f03393a2a3	Preventing multiple iterations	2014-08-23 15:47:12 +05:30
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
Majna	380ac9e88e	Optimize FileEngine::gc() ... SplFileObject constructor throws an exception if the file does not exist or is a directory.	2014-08-20 23:56:26 +02:00
Mark Story	90499971e0	Merge pull request #4304 from mtak3/ignore_exception_cache_file_engine ... Ignore RuntimeException	2014-08-20 21:24:39 +02: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
mtak3	6b95764619	Ignore RuntimeException ... RuntimeException is thrown at race condition. However, since for the processing at Garbage Collection, other processes is determined that the expired. this process is acceptable to ignore the RuntimeException even if there is missing file.	2014-08-19 17:44:25 +09: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	5c69ac5578	All CakeSchema doc blocks conform to coding standards. ... As laid out here: http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html#typehinting	2014-08-12 12:55:55 -05:00
Brian Porter	4a0f42e179	Doc block capitalization corrections as requested.	2014-08-12 10:48:12 -05:00
Brian Porter	7d8d2f2f18	Code sniff fix.	2014-08-11 11:51:09 -05:00
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
Brian Porter	543e520ccb	Corrects logic to only apply default filename in **all** cases where none provided.	2014-08-11 10:34:30 -05:00
Brian Porter	6358208e32	Figures it'd be a missing paren.	2014-08-11 09:23:56 -05:00
Brian Porter	be9be48c46	More predictable default for CakeShema class naming. ... Instead of using the `APP_DIR` constant, which may change between developer installations of a project and cause issues loading Schemas generated elsewhere, use a fixed string, 'App'. This is related to CakeDC/migrations#184 and should fully resolve #4174.	2014-08-11 09:12:16 -05:00
Brian Porter	f93029b29f	SchemaShell always uses --file param when present. ... Addresses **part** of the problem described in #4174. Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.	2014-08-11 09:08:59 -05:00
Marc Würth	120bd37ffa	Be forward compatible to PHP 7's "Uniform Variable Syntax" ... https://wiki.php.net/rfc/uniform_variable_syntax	2014-08-11 01:33:25 +02: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	cb45821c43	Fix reversed arguments in error message.	2014-08-08 23:29:29 -04: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	92957913d9	Merge pull request #4023 from cvo-technologies/2.6-basics-context ... Add the other translation shortcuts for context support	2014-08-07 08:54:11 +02:00
Marc Würth	49bdde88d2	Added links to book	2014-08-07 01:56:53 +02:00
euromark	5f5218f3b2	Fix cookie reading.	2014-08-06 22:53:54 +02:00
Mark S.	2471c64aae	Merge pull request #4158 from dereuromark/master-cakesession-hotfix ... Fix notice in CakeSession.	2014-08-06 18:25:55 +02: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
Mathew Foscarini	4957418a4b	Added missing return statement. ... PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.	2014-08-05 08:39:19 -04:00
euromark	e714341ce3	Auto-detect composer installed CakePHP folder.	2014-08-05 03:53:40 +02:00
euromark	816e64bec8	Adjust wording.	2014-08-04 16:46:56 +02:00
euromark	bbcdf2404e	Deprecate ssn() validation in favor of plugin Localized.	2014-08-04 16:39:43 +02:00
euromark	9ef7b5713a	CS fixes.	2014-08-04 13:53:52 +02:00
euromark	864f5e06f6	Fix notice in CakeSession.	2014-08-04 13:32:20 +02:00
mark_story	4e168ca004	Fix incorrect docs.	2014-08-03 20:36:31 -04:00
chinpei215	cb376bf420	Add some more transaction tests ... And remove 2 else clauses.	2014-08-03 22:34:11 +09:00
ADmad	c193ce708a	Throw exception instead of logging in debug mode.	2014-08-03 03:16:39 +05:30
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
William Notowidagdo	23954e6ad3	Update HtmlHelper.php ... No need to add `null` to `$options` param as mentioned in the docs section: [Using blocks for script and CSS files](http://book.cakephp.org/2.0/en/views.html#using-blocks-for-script-and-css-files)	2014-08-01 11:22:29 +07:00
Mark Story	a6caf28ea6	Merge pull request #4122 from chinpei215/master-scaffold-error-fix ... Fix a fatal error occurs in combination with a scaffold error.	2014-07-31 10:44:33 -04:00
chinpei215	f3e1a18740	Fix a fatal error occurs in combination with a scaffold error.	2014-07-31 05:49:23 +09:00
Anthony GRASSIOT	aa42b80a4d	a / an typo fixes fot API	2014-07-30 22:11:03 +02: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
Steve Tauber	0af698c591	Updating RequestHandlerComponent to accept body of HTTP Delete requests	2014-07-29 16:08:33 +02:00
mark_story	0b85c35635	Fix up code formatting and structure for #3998 ... * Fix the various PHPCS errors. * Make the logic less complex.	2014-07-28 21:47:35 -04:00
Xinquan Zhu	e08b8148a5	throw CakeException instead, putting throws tag in the comment	2014-07-28 21:41:51 -04:00
Xinquan Zhu	809de69dcf	replace whitespaces with TABs and only throw exception when Cake is in Debug mode	2014-07-28 21:41:51 -04:00
Xinquan Zhu	792c251890	throw an Exception when header is already been sent	2014-07-28 21:41:51 -04:00
mark_story	3c1d3ee461	Deprecate CacheHelper. ... It has been removed from 3.0 as it was a bad idea, and better solutions have been created outside of PHP.	2014-07-27 22:20:47 -04: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
euromark	99d6932ecc	Fix project baking	2014-07-24 18:43:48 +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
mark_story	08de917b3c	Fix accidental typo in SQL file. ... Fixes #4061	2014-07-22 09:38:46 -04: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
David Steinsland	b61972871a	Fixed sending of headers when ajaxLogin is set	2014-07-22 13:21:42 +02:00
Denys Kyselov	1434e79330	Typo fix	2014-07-21 23:55:49 -04:00
Denys Kyselov	79dc624062	Add removeSubcommand in ConsoleOptionParser	2014-07-21 23:55:42 -04:00
mark_story	9b8e6403fd	Add indexes to db_acl.sql in skel directory. ... Copy changes in app/Config/Schema into the skel directory. Refs #4052	2014-07-21 21:31:05 -04:00
Marlin Cremers	fbeb8fe26b	Add the other translation shortcuts for context support	2014-07-21 15:47:04 +02:00
Ceeram	02b8bce641	Fix cs error introduced after resolving merge conflict with master to 2.6	2014-07-21 14:01:43 +02:00
mark_story	ac9af7e326	Update version number to 2.5.3	2014-07-20 22:20:47 -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	0aabc5d910	Merge branch 'master' into 2.6	2014-07-18 21:50:05 -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
David Yell	28ec1c40a5	When specifying Session as a component and using Session flash messages, you end up with 'Paginator, Session, Session' which doesn't make sense. Added an array_unique to remove any duplicated components.	2014-07-18 15:37:22 +01: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
Carl Sutton	8d58d93636	Make the error message better for fixture errors ... The stack trace has no details about which fixture is the actual problem.	2014-07-15 13:21:48 +01: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
ADmad	53259cb389	Deprecate $confirmMessage argument.	2014-07-10 23:31:51 +05:30
chinpei215	1a58b76e42	A micro optimization of h() ... In most cases, the first argument of h() will be a string.	2014-07-10 20:53:10 +09:00
David Yell	79be5e6805	Update Model.php ... Fixed the case on the link to the book, to match the anchor in the page.	2014-07-10 10:46:48 +01: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
mark_story	b3dfad614a	Correct pattern matching. ... Instead of 10 digits, it should limit at 10 groups. Refs 1988e89e73	2014-07-06 09:42:20 -04: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
Ceeram	a266a9493d	minor optimisation, refs comments on 81875cfeb1	2014-07-04 17:25:41 +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
mark_story	1988e89e73	Add an upper bound to the POST data SecurityComponent will consider. ... 'Kurita Takashi' has let us know that the previous patterns could be abused by an evil doer. One could potentially send a very large deeply nested POST data structure. Matching that structure could overflow the PCRE limits causing a segmentation fault. Adding an upper bound will solve the problem and I doubt anyone is doing POST data structures with more than 10 levels of nesting.	2014-07-03 22:02:00 -04:00
mark_story	765be87d88	Overwrite the schemaName property if it is not defined in the class. ... If a model class does not define a schemaName we should use the datasource's schemaName. We can assume that people using schemaName want to lock the model onto a specific schema given the changes in #3210 Fixes #3720	2014-07-03 21:53:54 -04:00
Costa Caruso	8bfebd64fb	Fix for failing test "Whitespace found at end of line"	2014-07-03 15:45:03 -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	33a5b6e451	Fix additional missing API doc tags.	2014-07-02 23:38:34 -04:00
Costa Caruso	1164c0bcad	Fix for CakeResponse::sharable() header to include private caches	2014-07-02 17:34:09 -04:00
Mark Story	2c53bc8a1b	Merge pull request #3838 from cakephp/revert-3646-no-truncate-fixture ... Revert "No truncate when drop table." Not truncating tables when they are created causes a number of issues in ControllerTestCases as indicated by the comments in #3646 post merge.	2014-07-01 22:02:57 -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	1686edf016	Revert "No truncate when drop table."	2014-06-30 14:14:20 +02: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
Derek Perkins	6bf0b22195	Add setInput function to CakeRequest ... Modify data originally from `php://input`. Useful for altering json/xml data in middleware or DispatcherFilters before it gets to RequestHandlerComponent or other controllers.	2014-06-29 22:55:29 -04:00
Mark Story	a966f089d2	Merge pull request #3832 from ADmad/2.5-inflector ... Add pluralization rule for "stadia" to uninflected list.	2014-06-29 09:34:09 -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
mark_story	91721244a4	Fix more doc block errors in lib/	2014-06-27 22:58:34 -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
euromark	73dcb2cb91	cs correction	2014-06-26 14:22:34 +02: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
Mark Story	e9da7b8f80	Merge pull request #3596 from zeroasterisk/2.6 ... MySQL DbdSource alter field support 'after'	2014-06-25 23:10:29 -04: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
Dan Voyce	239af0322e	Raise an exception when Hash::get() receives invalid parameters ... I'm not sure on whether this is a problem with my local app but I have seen it a couple of times in a couple of projects: Warning (2): Invalid argument supplied for foreach() [CORE/Cake/Utility/Hash.php, line 52] I think Hash::get should be able to handle this better rather than throwing an error in a core Util file. Refs #3754	2014-06-25 09:15:46 -04:00
euromark	b3507b199a	Update doc blocks regarding return $this	2014-06-25 00:06:51 +02:00
José Lorenzo Rodríguez	bf33e1cf57	Merge pull request #3761 from aka-toxa/master ... improving acl perfomance	2014-06-24 21:58:30 +02: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
José Lorenzo Rodríguez	e9e09bf19a	Merge pull request #3788 from dereuromark/master-composer ... Fix composer app issues with cake.php	2014-06-24 21:56:01 +02:00
euromark	05709908a7	Fix composer app issues with cake.php	2014-06-24 17:49:18 +02:00
suzuki86	8f9589f7c8	Fix typo	2014-06-25 00:20:54 +09: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
Anatoliy Petrovskiy	ad678e3988	improving acl perfomance	2014-06-23 13:51:52 +03:00
mark_story	6bacc5bb46	Merge branch 'master' into 2.6	2014-06-22 21:25:06 -04:00
mark_story	59c3b73f7a	Skip autoloaders for APCIterator ... We can skip autoloaders for this class as it is provided by a C extension and will never come from userland code.	2014-06-22 21:22:00 -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	ffe811935c	Remove else. ... By returning early we can avoid the else statement entirely.	2014-06-20 16:07:47 -04:00
mark_story	e683616329	Apply patch from 'biesbjerg' to ApcEngine ... This set of changes allows ApcEngine to work with APCu and newer versions of APC. Fixes #3749	2014-06-20 13:59:05 -04:00
Anatoliy Petrovskiy	bb15271622	improving acl perfomance by adding indexes on acl tables and reorganization joins in getting acl node function	2014-06-20 20:49:02 +03:00
euromark	d81d568cc0	make coredispatcher fully BC again	2014-06-20 14:05:18 +02:00
mark_story	497ecd3f80	Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt	2014-06-19 21:41:02 -04:00
José Lorenzo Rodríguez	5f81a745c4	Merge pull request #3744 from markstory/2.6-missing-views ... 2.6 Improve missing view error pages	2014-06-19 20:40:02 +02:00
mark_story	8f3ce9c9c4	Filter out core paths from missing view/layout errors. ... End developers shouldn't be dropping files in /lib/Cake so lets not tell them to.	2014-06-19 10:03:00 -04:00
euromark	9c035ff315	doc block corrections	2014-06-19 13:25:36 +02:00
euromark	53a544d9f0	Improve toList to allow localization	2014-06-18 17:56:35 +02:00
Mark Story	282a5d1cb5	Merge pull request #3731 from cakephp/issue-3656 ... Fix TextHelper::autoLinkEmail() near HTML Refs #3656	2014-06-18 09:53:30 -04:00
Mark Story	163cacbd1d	Merge pull request #3734 from voycey/patch-1 ... Add 'research' to the list of uninflected words.	2014-06-18 09:31:54 -04:00
mark_story	31956c2abb	Remove dead code. ... The list of paths is now output on the default error page, we don't need to make an educated guess here anymore.	2014-06-18 09:26:38 -04:00
Mark Story	c99c68684b	Merge pull request #3646 from nanapi/no-truncate-fixture ... Don't truncate test fixtures when the table has been freshly created.	2014-06-18 09:18:24 -04:00
Mark Story	562ed73562	Merge pull request #3726 from dereuromark/master-console-cake-unification ... DS console cake unification	2014-06-18 08:55:53 -04:00
mark_story	fecc687f81	Cleanup missing view/layout errors. ... Fix formatting issues and make path listings correct.	2014-06-17 23:20:49 -04:00
Dan Voyce	4915639efb	Update Inflector.php ... Added Research	2014-06-18 11:48:16 +10:00
mark_story	e548dfcaea	First pass at making MissingView/MissingLayout exceptions show all ... paths. Showing all the paths a template file could be located help expose developers to the view path cascade and helps ensure we don't tell people the wrong place to put a view file. Refs #3712	2014-06-17 16:30:50 -04:00
euromark	6161aae54e	also bring template one in sync.	2014-06-17 13:08:13 +02:00
euromark	a927f5d954	remove wrong App::uses() call	2014-06-17 05:10:19 +02:00
Bryan Crowe	1db10b4dd1	Basic grammar update to BasicAuthenticate docblock	2014-06-16 21:48:35 -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
euromark	a9de83daeb	console cake cleanup and unification ... remove duplicate define	2014-06-17 02:28:52 +02:00
mark_story	96df2c4b68	Update version number to 2.5.2	2014-06-14 21:36:39 -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	460cc29fff	Remove unneeded comment out line that I just saw in compare view on GH	2014-06-12 08:51:35 -05:00
Melvin Ross	361531509e	Fix coding standard violations	2014-06-12 08:47:40 -05:00
Mark Story	7ea6626a15	Merge pull request #3692 from MMS-Projects/i18n-refactor ... Refactor i18n basics	2014-06-12 08:10:46 -04:00
Marlin Cremers	4f91e14cab	Refactor translation functions arguments handeling	2014-06-12 08:48:28 +02:00