7388 commits

Author	SHA1	Message	Date
Larry E. Masters	26ea74cbcf	Forcing bool	2015-12-13 20:06:05 -06:00
Larry E. Masters	fac95baee7	Forcing bool return	2015-12-13 20:05:54 -06:00
Larry E. Masters	130e854c30	Adding missing @return tag in function comment	2015-12-13 15:38:39 -06:00
Larry E. Masters	894d233fd6	add @throws anotation to fix travis PHP_CODESNIFFER warnings	2015-12-13 15:16:49 -06:00
Larry E. Masters	6a68032e0b	FIxing srand() expects parameter 1 to be integer, string given ... Type casting to integer	2015-12-13 14:18:59 -06:00
Larry E. Masters	48e018e707	Allowing tests to run on PHP 7	2015-12-13 14:12:31 -06:00
Richard van den Berg	077f157adf	Test case for proxy authentication when request is HTTPS	2015-12-12 11:13:41 +01:00
Richard van den Berg	ac50b609ac	Added space	2015-12-11 15:01:05 +01:00
Richard van den Berg	e315fb6688	Fix proxy authentication when SSL is used	2015-12-11 14:44:46 +01:00
Richard van den Berg	4a4728b44d	Fix SSL via proxy	2015-12-11 10:28:53 +01:00
Mark S	b76a235175	Remove default overwrites that are useless	2015-12-08 18:21:51 +01:00
Kars Frijters	2fdd3030e2	Removed last typehint Exception ... #7671 Removed last typehint Exception as it was still giving an uncaught typeError message in PHP7	2015-12-07 16:25:14 +01:00
Mark Scherer	f662b2f5aa	Skip error for now.	2015-12-06 12:50:09 +01:00
Qing Wu	48dd778bd0	Fixed issue #7579 on the 2.7 branch	2015-12-02 10:24:16 +11:00
Gareth Ellis	7ba19c717e	Update docblock for ConsoleOutput::overwrite() $size param	2015-12-01 17:09:42 +00:00
Gareth Ellis	031ae3d105	Use traditional array syntax	2015-12-01 15:37:06 +00:00
Gareth Ellis	d84b6a2c22	Use traditional array syntax	2015-12-01 15:32:54 +00:00
Gareth Ellis	56cfe8492a	Use traditional array syntax	2015-12-01 15:32:06 +00:00
Gareth Ellis	3f992695b2	Use traditional array syntax	2015-12-01 15:16:54 +00:00
Gareth Ellis	1bd22e5277	Add test for ConsoleOutputStub	2015-12-01 14:32:59 +00:00
Gareth Ellis	eafee25d13	PHPCS fixes	2015-12-01 14:26:22 +00:00
Gareth Ellis	6b6a90e5c1	Add table shell helper	2015-12-01 13:29:08 +00:00
Gareth Ellis	53b9dc83f6	Add helper method to shell class for loading/fetching helper instances	2015-12-01 13:07:56 +00:00
Gareth Ellis	2854940693	Renamed progress helper files to include Shell to avoid conflicts with existing view helpers	2015-12-01 13:07:32 +00:00
Gareth Ellis	788c57dd4b	Add progress helper	2015-12-01 12:03:09 +00:00
Gareth Ellis	e580ad813e	Add overwrite method to ConsoleOutput class	2015-12-01 12:01:39 +00:00
chinpei215	415661b18a	Fix data type and docblock	2015-11-30 00:02:00 +09:00
chinpei215	f2f8f3f1ea	Add test for #7224	2015-11-29 23:38:09 +09:00
Yasushi Ichikawa	bed76acea1	fixed coding standards error	2015-11-29 23:37:07 +09:00
Yasushi Ichikawa	5b098af240	remove extract function in the Validation::comparison	2015-11-29 22:42:55 +09:00
mark_story	7aa6908800	Update version number to 2.7.7	2015-11-22 21:29:57 -05:00
mark_story	7bbdcb207b	Merge branch 'memory-fix' into 2.8. ... This change automatically increases the memory limit when handling fatal errors. The intent is to bump the memory limit enough to allow logging of the fatal error source. Refs #7224	2015-11-19 21:41:07 -05:00
Mark Story	5ac7b875e9	Merge pull request #7680 from chinpei215/magic-find ... Magic call with custom finders	2015-11-15 21:02:18 -05:00
mark_story	48450e71fa	Merge branch '2.7' into 2.8	2015-11-11 22:53:45 -05:00
mark_story	079d15d54f	Handle enhanced config in a more graceful way. ... HttpSocket further munges the host into a nested array. This config value should be preferred over the top level host config. Refs #7675	2015-11-11 22:51:17 -05:00
chinpei215	726699ee7a	Magic call with custom finders ... Now we can use findListBy, etc - closes #7674	2015-11-11 22:43:19 +09:00
Richard van den Berg	f8e7634131	Use hostname of request instead of hostname of proxy for SNI	2015-11-10 10:54:36 +01:00
mark_story	89d5449270	In CLI mode default the error handlers to Console flavors. ... In the somewhat rare case where an error or exception occurs during application bootstrap, we should not emit HTML to the stdout. Refs #7661	2015-11-09 21:47:16 -05:00
Mark Scherer	8c5f78bc58	Remove another type hint	2015-11-10 00:32:48 +01:00
Mark Scherer	7982b6b078	Allow ParseError as exception and remove typehint.	2015-11-10 00:14:04 +01:00
mark_story	df3c786f57	Update version number to 2.7.6	2015-11-05 22:30:43 -05:00
mark_story	1a6f733286	Merge branch '27-pages-fix' into 2.7	2015-11-05 22:30:25 -05:00
Jose Lorenzo Rodriguez	18544c5aaa	Fix validation allowing arrays. ... Accepting arrays can cause a number of adverse effects. While this may be a breaking change the alternatives are worse.	2015-11-04 21:35:05 -05:00
Jorge González	5845cad93f	fix phpcs	2015-11-04 16:37:21 +00:00
Jorge González	cb6a17c34e	add Flash back to Controller, fix Scaffold to use Flash instead	2015-11-04 10:41:35 +00:00
mark_story	5e60cc5d18	Fix plugin view names being able to escape the plugin root directory. ... Remove the ability to specify completely arbitrary view files. This is possibly a breaking change. However, I feel the risks out weigh the benefits in this situation. Now absolute paths must be located *within* a configured view path.	2015-11-01 22:04:15 -05:00
Mark Story	aa66293310	Merge pull request #7624 from rchavik/2.8-redis-cache-fix ... Workaround for Cache::write() call from DboSource::__destruct()	2015-10-30 21:58:05 -04:00
ADmad	90c9ead8cd	Fix CS error	2015-10-30 09:28:03 +05:30
ADmad	b9dc89acff	Update docblock	2015-10-30 09:24:22 +05:30
Rachman Chavik	c1b6f89b23	Workaround for Cache::write() call from DboSource::__destruct() ... Closes #7559	2015-10-30 10:14:16 +07:00
Mark Story	9c804186af	Merge pull request #7614 from ravage84/2.7-timehelper-engine-type-hint ... Specify type hint	2015-10-27 20:56:27 -04:00
Mark Scherer	820fc2286f	Correct doc block.	2015-10-27 21:17:10 +01:00
Marc Würth	58316b3a58	Specify type hint ... Plus fix two typos.	2015-10-27 16:47:48 +01:00
mark_story	bc977544c5	Use a more stable timezone. ... Regina does not observe DST meaning this test won't fail twice a year.	2015-10-26 22:28:00 -04:00
Mark Scherer	8287981855	Make sure direction values are lowercased to be consistent.	2015-10-26 23:20:30 +01:00
mark_story	c26b7bbffe	Fix PHPCS errors and failing test. ... Refs #7577	2015-10-20 21:08:57 -04:00
vanquang9387	0cdfed0aee	Add more test on UploadedFileSize validation	2015-10-20 09:00:32 +07:00
vanquang9387	13132cd113	Fix using php 5.4 array [ ]	2015-10-19 15:52:10 +07:00
vanquang9387	8b3bba3341	Reformat Validation class	2015-10-19 15:47:33 +07:00
vanquang9387	af8c992655	2.x uploadedFile validation (backported from #4524)	2015-10-19 15:15:28 +07:00
mark_story	8c404ad6a7	Merge branch '2.7' into 2.8	2015-10-17 21:00:26 -04:00
mark_story	925647ae2b	Simplify code used to generate plugin flash messages.	2015-10-17 20:59:02 -04:00
gmponos	fd50d1976a	Flash Component was not handling plugin option	2015-10-17 20:55:52 -04:00
mark_story	dea32345c8	Add failing test for #7570 ... Documented behavior that exists in 3.x is not working in 2.x	2015-10-17 20:54:40 -04:00
José Lorenzo Rodríguez	d0e7a2fd38	Merge pull request #7552 from cakephp/issue-7546 ... Fix error when Memcached::getAllKeys() fails.	2015-10-17 15:46:33 +02:00
mark_story	e2a1094e69	Define variables before they are used. ... Refs #7563	2015-10-16 23:07:25 -04:00
mark_story	bfec911661	Merge branch '2.7' into 2.8	2015-10-16 22:09:21 -04:00
mark_story	fea6fd7d30	Fix incorrect doc tag.	2015-10-16 22:09:12 -04:00
mark_story	707915e693	Merge branch '2.7' into 2.8	2015-10-15 22:10:56 -04:00
Ashley Pinner	83b904bc7b	Remove censoring of schema and prefix from debug() ... As per discussion in #cakephp the other day, `debug()` will automatically censor out a list of keys, including `prefix` and `schema`. These are useful to see in output for debugging prefix routing, and should not automatically be considered sensitive information.	2015-10-15 12:55:32 +01:00
mark_story	e8a0726737	Fix error when Memcached::getAllKeys() fails. ... Refs #7546	2015-10-14 21:56:01 -04:00
mark_story	e0d2c45d9a	Fix PHPCS error.	2015-10-12 22:20:15 -04:00
mark_story	94aeee438b	Merge branch pull request #7496 into 2.7 ... Adds ssl_ context options to SmtpTransport via CakeSocket. Both CakeSocket and SmtpTransport can now use all the SSL context options with the same syntax as HttpSocket.	2015-10-12 22:07:40 -04:00
mark_story	3a4facbf8d	Remove allowSelfSigned() method. ... This method is no longer needed as the low level socket understands the `ssl_*` options now. Refs #7496	2015-10-12 21:58:55 -04:00
mark_story	cc3531d288	Move SSL context options into CakeSocket. ... Having all the options consolidated in one places enables all the SSL context options to be used in the SmtpTransport instead of just allowing self_signed as proposed in #7496	2015-10-12 21:56:20 -04:00
mark_story	29490eb84f	Add tests for #7516	2015-10-10 22:32:41 -04:00
mark_story	7bf6768066	Merge pull request #7516 into 2.7 ... PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes. It means PaginatorHelper::meta() does not generate same urls as PaginatorHelper::prev() & PaginatorHelper::next(). Refs #7516	2015-10-10 22:31:15 -04:00
Marc Würth	ed410dd12c	Do not mix void with other return types ... Inspired by #7527	2015-10-10 15:49:00 +02:00
Marc Würth	de8aed534f	Add false as return value of field() ... + improve DocBlocks	2015-10-08 16:31:01 +02:00
Mohsen	f57cdb7568	PaginatorHelper::meta() skips url parameters and disrespects defined routes ... PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes. It means PaginatorHelper::meta() does not generate same url as PaginatorHelper::prev() & PaginatorHelper::next().	2015-10-07 15:07:37 +03:30
Ian den Hartog	5dfb780970	Change names	2015-10-06 10:10:34 +02:00
Marc Würth	86da57d2be	Minor improvements to the front controller	2015-10-04 15:38:48 +02:00
Ian den Hartog	bb7e7850ae	Add test for Self-signed certificates	2015-10-02 16:17:26 +02:00
Ian den Hartog	5c722c6665	Fix peer verification	2015-10-02 10:18:07 +02:00
mark_story	506051f688	Correct input generation for postgres numeric types. ... Numeric types in postgres are treated like decimals, except they can have no length, precision or scale components defined. IE does not accept 1.00000 as a valid step attribute so we'll default to any when we encounter decimal types with no length. Refs #7497	2015-10-01 21:46:21 -04:00
mark_story	3fa5c4ff94	Update version number to 2.7.5	2015-10-01 21:03:56 -04:00
Ian den Hartog	e2c303b2b9	Add support for Self Signed certificates with smtp	2015-10-01 23:02:43 +02:00
mark_story	17c3358d77	Revert part of the changes in 1ede742d92 ... These variables are used by the HTML test reporter.	2015-09-29 21:41:33 -04:00
mark_story	a6a699b4b9	Merge branch '2.7' into 2.8	2015-09-28 21:17:45 -04:00
mark_story	0502e0731a	Update version number to 2.7.4	2015-09-28 21:13:09 -04:00
mark_story	13f147940f	Correct inflection of virus. ... Instead of viri, it should be viruses. Refs #7466	2015-09-28 21:04:23 -04:00
ADmad	c3e08fde30	Load config file before checking class existence. ... Closes #7465	2015-09-28 22:52:51 +05:30
Marc Würth	26a05a4e87	Update another link to DebugKit 2.2 branch	2015-09-28 12:51:30 +02:00
Marc Würth	2d82a120af	CS	2015-09-28 12:47:25 +02:00
Marc Würth	f1160b7401	Update link to DebugKit 2.2 branch ... Refs https://github.com/cakephp/debug_kit/issues/372	2015-09-28 12:47:14 +02:00
mark_story	ae83e197dc	Merge branch '2.8' of github.com:cakephp/cakephp into 2.8	2015-09-27 11:13:12 -04:00
mark_story	8a57d78dba	Merge branch '2.7' into 2.8	2015-09-27 11:12:55 -04:00
Mark Story	0da9c4976d	Merge pull request #7448 from ravage84/2.7-tests-improved ... Various improvements to the CakePHP test files	2015-09-25 18:00:14 -04:00
Marc Würth	a6d62cb6a8	Removed $stringClean ... Resfs: https://github.com/cakephp/cakephp/pull/7448#discussion_r40450663	2015-09-25 20:10:47 +02:00
Mark Story	3aec527fad	Merge pull request #7449 from ravage84/2.7-app-skel-sync ... App & skel folder sync + some improvements	2015-09-25 12:49:20 -04:00
Mark Story	12f5aee5a2	Merge pull request #7447 from ravage84/2.7-lib-improvements ... Various improvements to the CakePHP lib files	2015-09-25 12:14:00 -04:00
Marc Würth	41abccc062	Update param annotation ... Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444634	2015-09-25 18:12:20 +02:00
Marc Würth	1267586f23	Re-add closing tags to ctp files ... Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715	2015-09-25 18:10:18 +02:00
Marc Würth	f7c472ea1e	Add note to param ... Refs: https://github.com/cakephp/cakephp/pull/7447#discussion_r40444483	2015-09-25 18:03:36 +02:00
Marc Würth	bd461910e9	Correct return type ... Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444444	2015-09-25 18:02:44 +02:00
Marc Würth	5eedc0f2bb	Fix broken test	2015-09-25 17:55:01 +02:00
Marc Würth	dbfd2c44e9	App & skel folder sync + some improvements ... Mostly CS, doc blocks and some CSS	2015-09-25 17:25:35 +02:00
Marc Würth	1ede742d92	Various improvements to the CakePHP test files ... Mostly CS, doc blocks and unused variables.	2015-09-25 17:22:00 +02:00
Marc Würth	e690662f0e	Various improvments to the CakePH Plib files ... Mostly CS, doc blocks and explicit returning nulls.	2015-09-25 17:11:20 +02:00
Mark Story	b8b7282264	Merge pull request #7436 from cakephp/2.8-fix-order-merge ... Only array-wrap 'order' if it's not already an array.	2015-09-22 12:24:02 -04:00
Marc Würth	5b41a9b52d	Swallow the "--quiet" shell parameter before calling PHPUnit. ... PHPUnit does not provide a silent or quiet mode, so we cannot pass it along: https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions Resolves #7432	2015-09-22 14:25:53 +02:00
Mark Scherer	8909b2ed42	Fix remaining test.	2015-09-22 14:21:04 +02:00
Mark Scherer	81cbb52f74	Only array-wrap 'order' if it's not already an array.	2015-09-22 13:04:28 +02:00
mark_story	c14d1ffe93	Add tests for #7428	2015-09-21 21:39:51 -04:00
Mark Story	9208a0857e	Merge pull request #7428 from burriko/fix-dbo-connection-issues ... Fix use of $_connection in DboSource in 2.x	2015-09-21 21:38:20 -04:00
Graeme Tait	dc856b8508	Switch out is_null()	2015-09-21 17:00:20 +01:00
Graeme Tait	1b33efaad3	Check $_connection is not null before trying to use it ... Stops a fatal error if calling isConnected() after disconnect().	2015-09-21 14:08:07 +01:00
Graeme Tait	8fae10a971	Set DboSource::$_connection to null on disconnect	2015-09-21 14:05:56 +01:00
Mark Scherer	97b6f8674c	Fix CS	2015-09-21 13:45:18 +02:00
Mark S.	c87de2a069	Fix CS	2015-09-17 11:33:59 +02:00
mark	e7d6319d59	Skip test for versions of < MySQL5.6.	2015-09-17 10:43:43 +02:00
mark	d8a55ad065	Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+.	2015-09-16 14:16:58 +02:00
Mark Scherer	450a544eb4	Backport 3.x limit of fixture data generation.	2015-09-13 13:12:53 +02:00
Sander Visser	5a7507df4f	Fix issue "Debugger class not found" ... App::uses('Debugger') not needed because it's allready defined in top of file	2015-09-12 15:28:30 -04:00
adam1010	20c22444ba	Increase memory during shutdown for Fatal Error handling	2015-09-10 22:01:59 -05:00
mark_story	9eafde13d2	Set the key variable in the SessionHelper. ... This fixes cross template compatibility between the Flash and Session helpers. Refs #7365	2015-09-09 22:08:49 -04:00
thomasv	1dbb6dd0e4	Update DatabaseSession.php ... To prevent error: "Integrity constraint violation: 1052 Column 'id' in where clause is ambiguous" when using a custom Session object in relationship with another object (belongsTo <-| hasMany)	2015-09-10 00:25:39 +02:00
mark_story	e4cce7a441	Fix errors in PHP <5.4	2015-09-06 22:14:04 -04:00
mark_story	60d7bbaa10	Always update updated/modified columns when a fieldList is used. ... When a fieldList is used, and updated is not in the fieldList, the column should continue to be updated even if the column has a value from the user. Because the field is not in the fieldList, we must assume that the intent is for the field to update automatically, as it would have if the updated column was not present in the save data. Refs #7076	2015-09-05 22:01:33 -04:00
mark_story	77f2c8cb42	Use mb_strtolower in case-insensitive sorting. ... We should try to support unicode everywhere people might use it.	2015-08-25 21:49:10 -04:00
mark_story	9b910dff31	Merge branch '2.8-hash-sort-ignore-case' into 2.8 ... Refs #7217	2015-08-25 21:46:08 -04:00
mark_story	a9ef1f8aea	Simplify branching and add default options. ... Use fewer conditionals by merging defaults and avoid exceptions by setting defaults as well. Refs #7217	2015-08-25 21:39:02 -04:00
Mark Scherer	3cfc46db38	Fix merge to + operator.	2015-08-24 06:33:04 +02:00
mark_story	0dbabce792	Update version number to 2.7.3	2015-08-23 22:22:27 -04:00
mark_story	51d8f74c50	Merge branch '2.7' into 2.8	2015-08-23 16:29:07 -04:00
mark_story	143c34bdc1	Handle case where a visible input shares a name with an invisible one. ... If a visible input is created *after* a hidden input was created, the form would always blackhole unless the visible input had the same value as the hidden input. Refs #7274	2015-08-22 23:10:44 -04:00
Mark Scherer	f154a8f4d7	Fix MediaView extension handling as documented and expected.	2015-08-21 12:35:49 +02:00
Jose Lorenzo Rodriguez	3c7f022fa8	Merge branch '2.7-tz-abbr' of https://github.com/rchavik/cakephp into rchavik-2.7-tz-abbr	2015-08-21 10:56:48 +02:00
Jose Lorenzo Rodriguez	40d628530a	Merge branch '2.7' into 2.8	2015-08-21 10:54:30 +02:00
Rachman Chavik	e6acacac03	CakeTime::listTimezones(): Add option to Display timezone abbreviations ... Useful for countries that do not have many of its cities, even major ones, listed. For eg: Indonesia, only have 4 cities listed. For backward compatibility, abbreviations will not be shown. Note: You might need to update timezonedb for PHP 5.3 Closes #7271	2015-08-21 10:54:33 +07:00
mark_story	0df0f1a559	Don't use short tags. ... They are not broadly supported before PHP 5.4 and we should escape all the content the core templates output.	2015-08-20 22:36:09 -04:00
Mark Story	d05727b6df	Merge pull request #7265 from mattmemmesheimer/issue-7048 ... Issue 7048	2015-08-20 22:32:39 -04:00
mattmemmesheimer	70feb52f73	Changing the default layout to use FlashComponent::render instead of the deprecated SessionComponent::flash. Changing the flash elements to retain the id attribute that was previously present. Also fixing file permissions on the template files I added.	2015-08-20 20:19:22 -05:00
mattmemmesheimer	7d5e6e3a3e	Reverting accidental chmod.	2015-08-19 17:50:47 -05:00
ndm2	8fe953548c	Fix path traversal check for Windows based systems ... On Windows based systems, both, backward as well as forward slashes are supported as path separators, thus checking for `DS` only, would allow to slip in `../` fragments. refs #5905, cad57dcc28	2015-08-19 16:47:53 +02:00
mattmemmesheimer	d4467f9acf	Fixing unit tests.	2015-08-18 22:14:10 -05:00
James Tancock	5b92c900e6	Missing test fix ModelIntegration	2015-08-18 13:32:16 +01:00
James Tancock	fdb41e01bb	Alter Model::exists() to return false with no table	2015-08-18 13:07:30 +01:00
James Tancock	2f7cc052d2	Typo in tests docblock	2015-08-17 13:15:35 +01:00
James Tancock	fd198ce0fa	Edits to tests to cover the changes to Model::exists	2015-08-17 12:19:02 +01:00
mattmemmesheimer	d3cf879195	Updating deprecated SessionComponent::setFlash calls to FlashComponent magic calls.	2015-08-16 18:01:23 -05:00
mattmemmesheimer	604cb0e48b	Including the FlashComponent by default in the controller when baking.	2015-08-16 17:58:41 -05:00
mattmemmesheimer	0df7bcd26d	Adding Flash element template files.	2015-08-16 17:55:03 -05:00
James Tancock	90a77f6ce5	Alter model exists to consider useTable	2015-08-16 19:06:12 +01:00
Adrian Gunawan	12e5719aad	Remove whitespace at end of line	2015-08-14 17:05:59 +10:00
Adrian Gunawan	80f6a97d93	Check === 'natural' was inadvertently removed	2015-08-14 15:32:23 +10:00
Adrian Gunawan	2eafcc0f72	Use array() instead of the short notation []	2015-08-14 14:55:44 +10:00
Adrian Gunawan	bf6574c3b2	Use array() instead of the short notation []	2015-08-14 14:26:01 +10:00
Adrian Gunawan	b89d8d5efa	Use array() instead of the short notation []	2015-08-14 14:15:00 +10:00
Adrian Gunawan	f23e6589d0	Overload $type parameter instead of adding another parameter for case insensitive sort	2015-08-13 11:16:32 +10:00
Adrian Gunawan	a217556c13	Ability for Hash::sort to sort case-insensitively	2015-08-12 14:35:11 +10:00
Marc Würth	f3e590acfb	Annotate test coverage	2015-08-11 16:36:09 +02:00
Marc Würth	4330335940	Correct title of testAdd methods	2015-08-10 12:06:19 +02:00
mark_story	67585d6fe1	Data must be serialized before being written ... Data is unserialized by redis engine on read, so we have to serialized on write.	2015-08-09 16:00:44 -04:00
mark_story	d6251eff19	Fix parameter order.	2015-08-09 15:54:09 -04:00
mark_story	a5ff7ecaa3	Merge branch 'memcached-add-method' into 2.8 ... Refs #7165	2015-08-09 15:29:33 -04:00
mark_story	d79855a77a	Tweak doc blocks for Cache::add().	2015-08-09 15:21:56 -04:00
Nick Cinger	41d0e1df19	Cache add() method added for all Cache engines.	2015-08-09 15:32:02 +02:00
mark_story	ca19b63a32	Merge branch '2.7' into 2.8	2015-08-07 22:04:46 -04:00
paolo	a7b5f8c3af	DboSource now check the actual status of connection by executing a dumb query on DB ... This change makes it possible for developer to build reconnection logic on MySQL connections which frequently time out in long running CLI processes. Cherry picked onto 2.7 from #7190.	2015-08-07 21:59:28 -04:00
mark_story	f959b76013	Update version number to 2.7.2	2015-08-06 21:43:53 -04:00
mark_story	07c2047984	Merge branch '2.7' of github.com:cakephp/cakephp into 2.7	2015-08-06 21:43:40 -04:00
mark_story	b7c9ac913d	Backport fixes for comparison() and range() to 2.x ... These fixes were released as a security update for 3.x, they also belong in 2.x	2015-08-06 21:36:39 -04:00
mark_story	056f24a774	Forbid direct prefix access with mixed casing. ... Changing the casing up should not allow prefix method access.	2015-08-05 23:05:30 -04:00
mark_story	9f20330d17	Fix fatal error on null subject. ... Refs #7176	2015-08-05 22:20:39 -04:00
Mark Scherer	3f15c8a199	fix templates	2015-08-05 11:45:27 +02:00
Mark Story	58bede76d1	Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware ... Make fixture import from table aware of records found	2015-08-03 16:01:35 -04:00
José Lorenzo Rodríguez	b89ac18e55	Merge pull request #7147 from cakephp/issue-7118 ... Fix incorrectly parsed mo file context.	2015-08-02 11:30:46 +02:00
Marc Würth	27c88a872b	Use tabs and single spaces in all .htaccess files	2015-08-01 00:39:10 +02:00
mark_story	a73fc25657	Fix incorrectly parsed mo file context. ... The context from mo files should be parsed correctly. Refs #7118	2015-07-30 22:28:55 -04:00
mark_story	26ab829d5a	Bootstrap Configure after the mb_* shims have been defined. ... By bootstrapping after the shims have been defined allows the shims to be used by Inflector which is often involved with bootstrapping. Refs #7135	2015-07-29 22:01:27 -04:00
José Lorenzo Rodríguez	355eb1859c	Merge pull request #7106 from cakephp/issue-7098 ... Consistently remove plugin names in object collections.	2015-07-28 15:58:41 +02:00
mark_story	58ea40e32c	Don't stop reading when only a '0' has been read. ... Make tests simpler by using onConsecutiveCalls() instead of trying to maintain mock method indexes. Refs #7121	2015-07-27 22:40:27 -04:00
Mark Story	97be4f893a	Merge pull request #7117 from Tijme/2.7 ... Disable SNI in HttpSocket	2015-07-27 16:57:53 -04:00
t.gommers	b16d627b36	Disable SNI in HttpSocket	2015-07-27 13:03:21 +02:00
Mark Scherer	a239324a0d	use constant PHP_SAPI	2015-07-26 15:35:03 +02:00
mark_story	7f6ab82c9b	Merge branch '2.7' into 2.8	2015-07-25 21:49:03 -04:00
Mark Story	de4b44a37b	Merge pull request #7077 from dereuromark/2.7-static ... Replacing self with static due to PHP5.3+. Following #7040.	2015-07-23 22:27:37 -04:00
mark_story	b3a192add0	Add warning for irregular method. ... Refs #7096	2015-07-23 21:49:22 -04:00
mark_story	418dcfd7f8	Consistently remove plugin names in object collections. ... We were sometimes removing plugin prefixes (set, and some subclass methods). But many other methods were missing the pluginSplit() feature. This change makes all of the methods in ObjectCollection strip plugin prefixes, which increases consistency across the framework. Refs #7098	2015-07-23 21:46:21 -04:00
mark_story	45877df3eb	Update version number to 2.7.1	2015-07-23 21:08:54 -04:00
Marc Würth	b412b405f9	Make fixture import from table aware of records found	2015-07-23 18:03:42 +02:00
Marc Würth	71e4ed91af	Slightly improve the bake templates	2015-07-23 17:29:47 +02:00
antograssiot	94b2ea29a6	enable colors for windows ConEmu user ... backport of #7090	2015-07-23 05:49:15 +02:00
Mark Story	e19f621314	Merge pull request #7086 from cakephp/issue-7069 ... Fix issues saveMany & saveAssociated with boolean values.	2015-07-22 22:01:39 -04:00
Yoshiyuki Kinjo	00919c5f01	Fix FormHelper::input ignoring value option. ... Signed-off-by: mark_story <mark@mark-story.com> Backport fixes from #7082 to 2.7	2015-07-22 22:00:20 -04:00
Yoshiyuki Kinjo	e25be3a47e	Add failing test for FormHelper::input ... FormHelper::input does not respect 'value' option when form is of date/time type. Signed-off-by: mark_story <mark@mark-story.com> Backport fixes from #7082 to 2.7	2015-07-22 21:59:44 -04:00
mark_story	c6e5026767	Fix issues saveMany & saveAssociated with boolean values. ... For non-atomic, save operations that include models with boolean fields. The first false value would cause the save to abort. This regression was introduced in #6947. Instead of checking the data from save() we should be boolean casting save() to capture the success/failure. Refs #7069	2015-07-22 00:41:10 -04:00
mark_story	e4b2428735	Fix PHPCS errors.	2015-07-21 16:28:17 -04:00
Yoshiyuki Kinjo	5de9b022ea	Fix FormHelper::input ignoring value option.	2015-07-21 23:04:20 +09:00
Yoshiyuki Kinjo	0e0775559c	Add failing test for FormHelper::input ... FormHelper::input does not respect 'value' option when form is of date/time type.	2015-07-21 22:58:50 +09:00
Mark Scherer	52e79987a2	Replacing self with static due to PHP5.3+. Following #7040.	2015-07-21 10:22:53 +02:00
mark_story	bd23fdeebf	Simplify code and reduce test redundancy. ... We don't need the additional parameter, and some of the tests weren't covering unique scenarios. Refs #7040	2015-07-20 22:16:50 -04:00
Chris Valliere	64f0ca0028	Fix Hash::maxDimensions ... The current Hash::maxDimensions function calls Hash::dimensions to try to get the maximum depth of the passed in array. However, this ends up only getting the depth of the first element of each 1st dimension element in the array passed to maxDimensions. The function needs to be called recursively in order to get the depth of ALL of the elements in all of the dimensions of the passed in array. I made the maxDimensions function more closely resemble the deprecated Set::countDim function in order to restore the correct functionality.	2015-07-20 22:07:58 -04:00
Chris Valliere	7b2d7ad748	Test Case for Hash::maxDimensions ... Added test case for Hash::maxDimensions using the example array in pull request #7040.	2015-07-20 22:07:58 -04:00
David Yell	4af2e5489b	Update deprecated method in docblocks ... So that the docblock doesn't point you to another deprecated method which then points you to the actual method.	2015-07-17 16:14:06 +02:00
mark_story	9b313f86e4	Add tests for #7034 ... These tests ensure that redirect() is never called which ensures the Location header is never set. Ajax requests when no loginElement is defined should get an empty response with a 403 status code.	2015-07-16 23:00:20 -04:00
adam1010	1922a18d07	Ajax requests not properly returning 403 ... When an AJAX request is made to a page that's not authorized, an infinite redirect loop to /status:403/exit:1 is triggered. This bug has existed at least since CakePHP v2.3.0. The main use case is when a user's session has expired and they try to use an authenticated feature as a logged-out user.	2015-07-16 22:47:13 -04:00
David Yell	cfabc9a719	Update deprecated method in docblocks ... So that the docblock doesn't point you to another deprecated method which then points you to the actual method.	2015-07-16 11:37:41 +01:00
Mark Story	6fa3195de1	Merge pull request #7005 from wnasich/pot-without-references ... Generate .pot files without references	2015-07-15 21:34:38 -04:00
Walter Nasich	9d74bb289c	Fixing a coding standars issue	2015-07-14 00:04:04 -03:00
Walter Nasich	80896cef2a	Replacing param --locations by boolean flag --no-location	2015-07-13 19:47:26 -03:00
mark_story	4b974aeef2	Merge branch '2.7' into 2.8	2015-07-13 11:49:50 -04:00
Mark Scherer	d98e7d8d27	Fix tests.	2015-07-13 08:37:11 +02:00
Mark Scherer	2eea245491	Backport utf fix for CakeText::tokenize().	2015-07-13 08:23:05 +02:00
Walter Nasich	06b8cb0c30	Renaming option 'headers' to 'locations'	2015-07-13 00:54:11 -03:00
Walter Nasich	67d81e499e	Removing trivial asserts from UT	2015-07-12 23:30:14 -03:00
Walter Nasich	44756eaac5	Adding a new option to i18n shell to generate .pot files without sentence references	2015-07-12 23:08:50 -03:00
mark_story	47dd42ae84	Start 2.8 branch.	2015-07-11 21:54:32 -04:00
mark_story	e07b64f4e3	Update version number to 2.7.0	2015-07-11 21:34:20 -04:00
mark_story	47378427e3	Merge branch '2.6' into 2.7	2015-07-11 21:25:26 -04:00
mark_story	65c1745349	Add missing parameter to rawQuery() ... Previously bound parameters were put in the incorrect position. Refs #6992	2015-07-10 12:56:49 -04:00
Marc Würth	4a131bdcbf	Capitalize Windows, the OS	2015-07-09 15:54:03 +02:00
Anne	b4b10e75ac	Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like: ... - Method _toString is not implemented for translated	2015-07-08 09:35:06 -04:00
Anne	64951a3e7e	Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like: ... - Method _toString is not implemented for translated	2015-07-08 11:23:29 +02:00
Mark Story	97656d8edb	Merge pull request #6965 from dy-dx/backport-csv-mapping ... Don't map text/plain to csv. Backport from 3.0. Refs #1696	2015-07-07 22:07:02 -04:00
mark_story	7613e720e7	Fix PHPCS errors.	2015-07-07 22:06:47 -04:00
mark_story	59a18e7709	Merge branch '2.6' into 2.7	2015-07-07 22:05:56 -04:00
Chris Kim	94fbc6e5f2	Don't map text/plain to csv. Backport from 3.0. Refs #1696 ... Jquery sets accepts header similar to "text/plain, */*; q=0.01" by default for xhr requests. Due to this RequestHandler used to set extension to csv thereby causing View class to look for views under non-existent csv folders.	2015-07-07 15:19:45 -04:00
mark_story	4102961cb5	Add tests for #6879 ... I wasn't able to reproduce the issue the reporter had, but we have more robust tests now.	2015-07-06 22:43:52 -04:00
hiromi2424	deb62c8887	#6935 Fix deep saving for hasMany could not handle validation errors correctly	2015-07-04 06:10:58 +00:00
mark_story	c037e04ace	Update version number to 2.6.8	2015-06-29 22:35:55 -04:00
mark_story	cbd45f702d	Make FlashComponent/FlashHelper more backwards compatible. ... Merge branch 'issue-6874' into 2.7. Make AuthComponent use FlashComponent, and make FlashHelper more compatible with SessionHelper::setFlash().	2015-06-26 22:05:32 -04:00
mark_story	97c5463387	Fix failing tests. ... FlashHelper uses `Message` not flash now. This is more backwards compatible with 2.x Refs #6874	2015-06-26 22:04:00 -04:00
mark_story	e651d15df5	Add tests for less greedy field parsing in SQLite. ... Refs #6887	2015-06-25 22:21:38 -04:00
Lawrence Barsanti	0b28c2e839	Added negative lookahead ... It is possible to have multiple occurrences of 'as' in a field name. Use the last occurrence of 'as' when extracting field name. Tested with following examples: "WeldCheck"."weld_id" count(*) as WeldCheck__num_measurements count(case decision when 2 then 1 else null end) as WeldCheck__num_failures avg(cast (WeldMeasurement.surface_indentation as bigint)) as WeldCheck__avg_indentation avg(cast (WeldMeasurement.circle_diameter as bigint)) as WeldCheck__avg_diameter	2015-06-25 22:21:38 -04:00
mark_story	ae2ea1ea6c	Merge branch '2.6' into 2.7	2015-06-25 21:50:47 -04:00
Highstrike	a9d77d26f0	fix failing tests ... fixing...	2015-06-25 13:40:50 +03:00
mark_story	2f616a9e0c	Fix greedy regex operators in Postgres driver. ... `*` is greedy in regex, and needs to be escaped so that SQL operators don't cause invalid SQL conditions to be created. Refs #6877	2015-06-24 23:39:26 -04:00
Mark Scherer	1c56c723f5	Backport param() access.	2015-06-25 00:52:33 +02:00
Highstrike	8257100f54	How about this?	2015-06-24 15:46:48 +03:00
Highstrike	ef1fc7dfef	PHPCS	2015-06-24 15:18:57 +03:00
Highstrike	833c747b41	Test append PR to Issue ... This commit fixes #6874	2015-06-24 14:18:14 +03:00
Highstrike	7cdf19363d	Tab instead of space ... IDE preference	2015-06-24 14:09:32 +03:00
Highstrike	58983f717a	2.7.0-RC Auth doesn't use the new Flash component ... Changed 'Flash.' to 'Message.' and also provided backwards compatibility in FlashHelper->render	2015-06-24 14:06:35 +03:00
Mark Story	0841c04351	Merge pull request #6853 from cakephp/2.6-template ... Cleanup method calls.	2015-06-22 10:53:32 -04:00
Mark Scherer	fc57e43a5b	Adjust tests.	2015-06-21 12:13:09 +02:00
Humberto Pereira	77150eb6f6	fixed tests cases to print html	2015-06-20 22:19:08 -04:00
Humberto Pereira	26630991a6	CakeShells should not print html in case of a error	2015-06-20 22:19:07 -04:00
Mark Scherer	6e5381a4e3	Cleanup method calls.	2015-06-20 23:27:32 +02:00
mark_story	26b3713bd6	Merge branch '2.7' of github.com:cakephp/cakephp into 2.7	2015-06-20 10:03:24 -04:00
mark_story	664ba53c89	Merge branch '2.6' into 2.7	2015-06-20 10:03:14 -04:00
Mark Scherer	1d03d5bd59	Consolidate template whitespace	2015-06-20 05:10:35 +02:00
mark_story	705f44e30a	Fix regression where attributes were created with no whitespace.	2015-06-19 22:00:27 -04:00
Mark Scherer	4025f2fb22	add cast for clarification and to allow int 0.	2015-06-17 12:38:06 +02:00
Mark Scherer	1b81323462	Use strict check	2015-06-17 12:06:56 +02:00
Mark Scherer	7dedf7f86d	Refactor cleanly.	2015-06-17 11:38:42 +02:00
Mark Scherer	2d7487d33c	img tag needs manual space	2015-06-17 11:34:03 +02:00
Mark Scherer	51d75bc2be	Remove overhead whitespace in templates.	2015-06-17 11:04:04 +02:00
Mark Scherer	ccac3b3e06	Allow deep options for radio() just as for select().	2015-06-16 13:23:51 +02:00
Mark Story	65b64e0348	Merge pull request #6816 from cakephp/2.6-fix-validation-multiple ... Fix Validation::multiple() regarding 0 value.	2015-06-15 12:20:13 -04:00
mark_story	97be9b9696	Fix PHPCS errors.	2015-06-15 12:19:20 -04:00
Mark Scherer	86c358f3f9	Fix Validation::multiple() regarding 0 value.	2015-06-15 16:35:27 +02:00
Mark Story	32fe09835b	Merge pull request #6809 from ravage84/2.7-code-coverage ... Explicit definition of the code coverage	2015-06-15 10:13:12 -04:00
mark_story	c3080873b9	Update version number to 2.7.0-RC	2015-06-14 22:50:05 -04:00
mark_story	947262e754	Fix PHPCS errors.	2015-06-14 21:56:48 -04:00
mark_story	ebb01f0fac	Merge branch '2.6' into 2.7	2015-06-14 21:52:53 -04:00
Marc Würth	f3099fefdf	Define code coverage explicitly	2015-06-15 00:56:09 +02:00
mark_story	56143c663e	Update doc blocks for CakePlugin::load(). ... Refs #5665	2015-06-11 22:17:18 -04:00
mark_story	c47196fe08	Merge branch '2.6' into 2.7	2015-06-07 15:45:26 -04:00
mark_story	6d60e6a4db	Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x ... Backport fixes to base path generation that prevent issue when a URL contains // it can circumvent the base path generation, which results in unwanted user data in the base/webroot paths. This creates an opportunity for CSS manipulation in old versions of IE, and newer ones via iframe inheritance.	2015-06-07 15:45:16 -04:00
mark_story	0e6fcc02b8	Add/correct some tests for humanize. ... The arguments for assertEquals() were backwards. While there are many more flipped assertions I will change the others separately.	2015-06-05 10:31:29 -04:00
mark_story	239c83938f	Fix regression in camelize(). ... The input should not be lowercased before camelizing, as this can cause inputs that were previously camelized to create incorrect results. Refs #6735	2015-06-05 10:20:51 -04:00
mark_story	df0f2295c3	Fix issue with overlapping irregular inflections. ... When irregular inflections overlap we should choose the longest match, not the shortest. Refs #6659	2015-06-02 23:09:29 -04:00
Mark Scherer	0524eb95ae	Documentation update	2015-06-01 16:14:15 +02:00
Mark Scherer	4ad001b9ca	Use options array.	2015-06-01 16:12:45 +02:00
Mark Scherer	670d93b6f6	Extract formatTreeList() from generateTreeList().	2015-06-01 12:36:20 +02:00
Mark Scherer	2a5cbb8037	Add missing static keyword.	2015-05-31 13:40:22 +02:00
mark_story	d7d8b90986	Merge branch '2.6' into 2.7	2015-05-28 19:34:59 -04:00
mark_story	523597df43	Update version number to 2.6.7	2015-05-28 19:30:33 -04:00
mark_story	65691836be	Fix syntax errors in PHP <5.4	2015-05-28 17:39:52 -04:00
mark_story	b66c1ce53c	Update version number to 2.6.6	2015-05-28 09:50:27 -04:00
mark_story	995d8d22c6	Disable reading XML files and URLs when handling user data. ... Allowing users to load arbitrary files/URLs with Xml is not desirable when handing user input.	2015-05-27 09:45:53 -04:00
mark_story	dddc504f87	Merge branch 'issue-6635' into 2.6 ... Fixes FormHelper generating invalid ID attributes when multibyte values are used.	2015-05-26 22:51:13 -04:00
mark_story	733ddc7ff4	Use mb* functions in Inflector humanize/underscore. ... Use the mbstring shims we already provide to make Inflector more robust than it currently is. This solves the invalid ID attribute generation in a way that never varies between environments. Refs #6635	2015-05-26 22:51:00 -04:00
Igor Padovan da Silva	bf550d13ce	preventing error on trying to delete unexiting buffer	2015-05-26 17:46:08 -04:00
nojimage	c6e4208bda	refs #6635 Inflector::underscore, humanize support multibyte string inputs	2015-05-26 13:29:05 +09:00
nojimage	8ebc9cdd87	refs #6635 FormHelper::radio() return collect id attributes with multibyte	2015-05-25 22:10:50 +09:00
mark_story	15f88533e8	Update version number to 2.6.5	2015-05-24 21:01:09 -04:00
mark_story	9626f0e726	Exclude deprecated validators from bake. ... Don't include deprecated validators in bake. Refs #6581	2015-05-22 22:03:32 -04:00
mark_story	4a3b2e2a03	Fix failing test in SQLite. ... SQLite does not handle subqueries in virtual fields well. However, the original issue was that the generated query was invalid which find(first) will still catch.	2015-05-21 21:58:12 -04:00
mark_story	52a0d642ec	Fix incorrectly quoted table aliases in virtual fields. ... DboSource::_quoteFields() is already a bit of a mess, and while I'm not happy about having to add more regex replacement, it seems to be the only reasonable solution given that the code is already 'parsing' SQL to apply identifier quoting. Fixes #6602	2015-05-20 22:40:47 -04:00
Marc Würth	508b9d1443	Rename test methods after notBlank change ... Was a left-over from #6579	2015-05-19 15:13:28 +02:00
Mark Scherer	29747995dc	Add missing minimizable HTML attributes	2015-05-18 18:10:02 +02:00
Mark Scherer	f742fa51fe	Dont include deprecated options for bake	2015-05-17 23:24:23 +02:00
Mark Scherer	4f3602ad5f	Adjust bake, docblocks and tests for notBlank.	2015-05-17 22:27:16 +02:00
Mark Scherer	866242643f	Deprecate notEmpty in favor of notBlank.	2015-05-17 22:13:04 +02:00
mark_story	6ffc9670d2	Document missing option in loadAll().	2015-05-13 22:37:52 -04:00
ndm2	323e8d8d76	Add underscore support for multi word irregulars. ... Underscore separated words were not catched by the irregular regex, tests however didn't fail as the default rules matched the tested words too. The added test should ensure that this won't happen again. Fixes the gap left by the previous #6538 fix.	2015-05-12 14:33:15 +02:00
mark_story	d4740c9c09	Fix incorrect handling of irregular values. ... When inflecting irregular values, both plural and singular forms were generated incorrectly. Fixes #6538	2015-05-11 21:35:08 -04:00
ovidiupruteanu	a55685c278	Replace preg_replace with basename in SchemaShell	2015-05-11 14:52:31 +03:00
ovidiupruteanu	4b3386c16f	Replace rtrim with preg_replace in SchemaShell ... The second parameter of rtrim is a character mask, not a string to be replaced. It was breaking file names ending in one or more 'p' or 'h' characters.	2015-05-11 14:35:20 +03:00
mark_story	6cb21e6dc8	Change default value to allow code coverage on non-app files. ... Don't default to app, as it prevents generating code coverage for core and plugin files. Fixes #6533	2015-05-10 21:34:08 -04:00
Mark Scherer	4915e802c1	Fix tableCells()	2015-05-02 16:52:51 +02:00
Mark Scherer	f510dac32a	fix cs	2015-05-02 16:16:27 +02:00
Mark Scherer	8e618ed9e6	Fix documentation regarding attributes	2015-05-02 14:31:38 +02:00
Mark Scherer	cdbf5a0dec	Correct brackets.	2015-05-02 14:26:57 +02:00
Mark Scherer	ed21f84236	Backport _xmlOptions	2015-05-02 14:24:02 +02:00
mark_story	032c01d18c	Add other key types to {*} test.	2015-05-01 22:41:41 -04:00
mark_story	5e9d4893a8	Add the {*} matcher to Hash::extract() ... This matcher will match anything and is useful when you just want to traverse through data and you're not too picky. I've also refactored the conditions to use a case as it is slightly more readable and uses fewer lines of code. Refs #6447	2015-05-01 22:03:40 -04:00
Mark Story	bcb403078d	Merge pull request #6455 from cakephp/2.6-status-code-429 ... Backport #6431	2015-04-30 20:13:36 -04:00
Mark Scherer	adf2eb03f2	Backport jsonOptions	2015-04-30 15:51:13 +02:00
Mark Scherer	309aee9fe5	Backport #6431	2015-04-30 15:18:28 +02:00
mark_story	345d8d8390	Merge branch '2.6' into 2.7	2015-04-29 19:54:53 -04:00
Mark Scherer	c31fcd6f39	Correct default value to false.	2015-04-21 14:32:34 +02:00
Mark Scherer	8cdf222cc0	Also fix hour()	2015-04-20 22:04:33 +02:00
mark_story	096a2ebb72	Merge branch '2.6' into 2.7 ... Conflicts: lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php lib/Cake/VERSION.txt	2015-04-20 15:42:54 -04:00
Mark Scherer	3ba4308356	Use hour as field name.	2015-04-20 18:39:54 +02:00
Mark Scherer	c71a478876	Add test case.	2015-04-20 18:38:19 +02:00
Mark Scherer	a9ae7fd5bb	Fix year form field when magic input wrapper is used. ... s	2015-04-20 18:31:00 +02:00
mark_story	f925511a54	Update version number to 2.6.4	2015-04-19 21:10:15 -04:00
Marc Würth	b19b76b9f2	Fix parameter type annotation ... https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L265 https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L293	2015-04-13 18:20:16 +02:00
mark_story	5f2aa4c307	Fix errors when testing controllers that use file() ... Fix errors related to ob_end_clean() closing PHPUnit's output buffer when testing controller methods that use response->file().	2015-04-09 20:38:37 -04:00
mark_story	a6aefdd4d3	Fix null path in Hash::get() causing exceptions. ... This was a regression introduced in 2.6.x Refs #6297	2015-04-09 07:50:29 -04:00
Mark van Driel	4a7344ae80	Keep only test for null value as path	2015-04-09 07:49:35 -04:00
Mark van Driel	900fd3e7e5	Test to demonstrate issue with non-string paths in Hash::get	2015-04-09 07:47:25 -04:00
mark_story	f55111bdc1	Allow empty headers to be read. ... Allow headers with '' and '0' as their values to be read. Fixes #6299	2015-04-08 16:33:28 -04:00
mark_story	b2958dad79	Re-add call to parent destructor. ... In 762ebd4 a destructor was added to DboSource, this accidentally removed the rollback on destruct that Datasource provides. Restoring this via a parent call allows pending transactions to be rolled back at the end of a request. Fixes #6251	2015-04-01 20:37:06 -04:00
José Lorenzo Rodríguez	405e725767	Merge pull request #6238 from cakephp/issue-6224 ... Fix maxDimensions() for empty/1 dimensional arrays.	2015-04-01 09:26:50 +02:00
Justin Yost	f32d1c1362	Updates Inflector For Irregular Case Sieves ... Sieves incorrectly singualrized as sief. Adds sieve, sieves as an irregular case and test cases to match for the Inflector class. Closes Issue #6240 in CakePHP 2.6 Branch Signed-off-by: Justin Yost <justin.yost@yostivanich.com>	2015-03-31 22:21:05 -07:00
mark_story	69971505a2	Fix maxDimensions() for empty/1 dimensional arrays. ... maxDimensions() should not emit warnings or mis-calculate an array's dimensions. Fixes #6224	2015-03-31 22:21:15 -04:00
mark_story	446dd408bb	Renew the session even the session id is '0'. ... This fixes AuthComponent not being able to log a user in when they inadvertently change their session id to 0. Refs #6053	2015-03-29 21:42:43 -04:00
mark_story	3151c53255	Merge branch '2.6' into 2.7	2015-03-23 22:50:09 -04:00
mark_story	b80e02c114	Fix coding standards errors. ... * Line lengths * Whitespace. Refs #2057	2015-03-23 22:31:09 -04:00
Richard van den Berg	1d0d20e974	Account for SNI changes in HttpSocketTest	2015-03-23 22:31:08 -04:00
Richard van den Berg	1f7b787236	Use $host parameter	2015-03-23 22:31:08 -04:00
Richard van den Berg	9e6b1b6930	Support for SSL Server Name Indication	2015-03-23 22:31:08 -04:00
Richard van den Berg	23d4d1155a	Do not use full uri in request line for HTTPS requests via proxy	2015-03-23 22:31:08 -04:00
Richard van den Berg	15c80f7c3d	Move proxy code inside if (->connected)	2015-03-23 22:31:05 -04:00
Richard van den Berg	7704efdb28	Use feof() in while loop	2015-03-23 22:31:05 -04:00
Richard van den Berg	3995c70046	Strict === and space	2015-03-23 22:31:04 -04:00
Richard van den Berg	bb8e0ae835	Use enableCrypto()	2015-03-23 22:31:01 -04:00
Richard van den Berg	54a3f8724b	Addapted quick hack from issue #2057 for 2.6.3	2015-03-23 22:31:01 -04:00
mark_story	5a6a74e2f8	Fix failing tests. ... The test was taking the wrong index when creating mock path choices. Refs #6125	2015-03-20 20:35:43 -04:00
Dave Hensley	0003296f42	Add CAKE directory fallthrough for plugins/vendors ... Fixes issue #6124.	2015-03-20 17:35:19 -04:00
mark_story	744952e344	Fix FormHelper::create() dropping 0 value parameter. ... When 0 is the first passed parameter we shouldn't drop it. Fixes #6107	2015-03-19 21:15:20 -04:00
Walther Lalk	359c0ab816	Fix issue with memcache and domains starting with letter "u"	2015-03-19 11:42:14 +02:00
José Lorenzo Rodríguez	277f641108	Merge pull request #6064 from robmcvey/jsonView ... 2.6 jsonView should throw exception if json_encode fails	2015-03-18 10:01:40 +01:00
mark_story	6df7bf9c21	Fix notice errors in pagination link generation. ... No errors should be emitted when creating links for models that were not paginated. Refs #6090	2015-03-17 22:19:17 -04:00
Edgaras Janušauskas	b444fe7b81	Do not warn about i18n functions definitions on extract task	2015-03-16 23:16:50 +02:00
mark_story	02c40d5ca5	Update version number to 2.6.3	2015-03-15 22:06:30 -04:00
Rob McVey	4741abcd63	Remove whitespace	2015-03-15 11:14:49 +00:00
Rob McVey	d94e05cf76	Assert exception msg contains UTF-8 ... The different versions of PHP throw several various messages for UTF-8 sequences, so this just performs a basic regex check	2015-03-15 11:01:51 +00:00
Rob McVey	a59a057133	assert correct exception msg thrown	2015-03-15 10:36:06 +00:00
mark_story	827465fa30	Merge branch 'postgres_altercolum_error' into master ... Merge changes from #5512 into master. This fixes changing columns in postgres to integer from string types.	2015-03-14 22:23:43 -04:00
mark_story	c32e5559bb	Add test to ensure column was converted to integer. ... Refs #5512	2015-03-14 22:23:17 -04:00
mark_story	8cadb553d7	Merge branch 'master' into 2.7	2015-03-14 22:08:53 -04:00
Rob McVey	fe0ddf2171	Assert exception is thrown, reset error handler in tearDown	2015-03-14 13:27:34 +00:00
Rob McVey	56c6f02efc	Remove tabs	2015-03-14 13:16:05 +00:00
Rob McVey	d3c24be84b	add a custom error handler for tests of json_encode	2015-03-14 13:12:09 +00:00
Rob McVey	5002bd4dbe	Use fall back json_last_error_msg	2015-03-14 09:21:15 +00:00
Rob McVey	10cfb878be	fallback implementation of json_last_error_msg	2015-03-14 09:13:31 +00:00
Rob McVey	bcb6549565	add throws tag to function comment	2015-03-14 08:45:18 +00:00
Rob McVey	842cdf58f8	Don't translate errors	2015-03-14 08:34:06 +00:00
Jonas	5f40161e24	2.6.2: cake bake / ModelTask should respect decimal ... PR for https://github.com/cakephp/cakephp/issues/6066	2015-03-13 21:35:12 +01:00
Rob McVey	3b01c5f842	suppress warnings so test runner doesn't fart	2015-03-13 16:58:29 +00:00
Rob McVey	b880714231	coding standards elseif	2015-03-13 16:27:24 +00:00
Rob McVey	2ba9f3b8fb	Encoding false is OK - should return string null	2015-03-13 16:21:54 +00:00
Rob McVey	ddfcb06d02	Coding standards	2015-03-13 16:13:29 +00:00
Rob McVey	08620704be	Handle json_encode failure	2015-03-13 16:12:21 +00:00
Rob McVey	05aba7afb6	Assert CakeException throw when json_encode fails	2015-03-13 15:52:22 +00:00
mark_story	8e735c2db0	Fix class name in scaffold error. ... Fixes #6061	2015-03-12 22:00:03 -04:00
David Yell	24edae5792	Update App.php ... Add a missing apostrophe	2015-03-12 15:26:59 +00:00
Marc Würth	4f9d764fc2	Fixed link to cookbook	2015-03-11 11:27:30 +01:00
mark_story	0b916cedbb	Merge branch 'master' into 2.7	2015-03-09 21:55:20 -04:00
mark_story	cad57dcc28	Use DS instead of checking both slash styles. ... Refs #5905	2015-03-09 21:55:07 -04:00
Mark Story	43f16f38f0	Merge pull request #5905 from davidsteinsland/fix_file_response_dots ... Fix file response dots	2015-03-09 21:54:02 -04:00
mark_story	a9519d39f7	Fix whitelist being empty during afterSave. ... whitelist should only be reset after afterSave event. Refs #6028	2015-03-08 13:51:46 -04:00
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