3541 commits

Author	SHA1	Message	Date
mark_story	75dd2ff1fb	Merge branch 'master' into 2.5	2014-01-16 15:20:40 -05:00
mark_story	f25e84f4fb	Don't select year 0 when there are all 0's. ... Year 0 is almost never a 'good' selection value and causes odd behavior when paired with MySQL. Fixes #2658	2014-01-15 10:23:45 -05:00
Matthew Ouyang	84eb46dbdc	allow additional status codes through constructor ... through $options['statusCodes']	2014-01-14 11:18:57 -05:00
euromark	690f54ad9d	more corrections in order	2014-01-10 00:33:27 +01:00
euromark	3ff23c732f	unify and correct assert order	2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez	606362d519	Merge pull request #2636 from dereuromark/2.5-title-for-layout ... Follow the deprecation note in the doc block of View class	2014-01-09 15:13:07 -08:00
euromark	97e43e5806	unify to expected	2014-01-09 16:52:21 +01:00
euromark	738b34c2d0	Correct assert param order	2014-01-09 16:50:27 +01:00
euromark	29e15386b2	Follow the deprecation note of 2.1 migration guide and switch to fetch(title) ... correct assert order for test	2014-01-09 16:45:49 +01:00
mark_story	b20ca3f4e0	Fix errors with postgres tests.	2014-01-08 09:42:13 -05:00
mark_story	312b2c3cd1	Merge branch 'translate-patch'	2014-01-06 21:21:25 -05:00
mark_story	3763350667	Add test for issue #2595 ... Fold conditions that did the same thing and add a test case. Closes #2595	2014-01-06 21:21:13 -05:00
euromark	ecfd64c082	adding test	2014-01-06 21:07:00 +01:00
mark_story	3cee3b0e99	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-12-30 21:28:22 -05:00
Rachman Chavik	c48afae2dc	Add test to prove issue when saving invalid tree data	2013-12-27 12:35:28 +07:00
mark_story	1daa27c0d7	Add tests for uncovered case of :0 replacements. ... There were previously no tests for the :0, :1 style replacement markers in DboSource. In fact I didn't even know it was a 'feature'.	2013-12-24 13:13:05 -05:00
Mark Story	1cb7e4f0ff	Merge pull request #1635 from dereuromark/master-dom-ids ... Fix duplicate ID generation of for multiple checkboxes.	2013-12-24 07:02:38 -08:00
euromark	b392254c92	fix cs	2013-12-24 15:20:32 +01:00
mark_story	99e4dbd827	Merge branch 'master' into 2.5	2013-12-23 11:58:07 -05:00
mark_story	70530135d6	Don't use FORWARDED_HOST when getting referer values. ... HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the original HTTP_HOST value. It has nothing to do with referer values. Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header in proxied setups, add a trustProxy parameter to host() and default it to false. This maintains existing behavior and allows people to access the proxied value. Fixes #2537	2013-12-23 11:32:14 -05:00
mark_story	62e89734ab	Throw exceptions from Hash::combine() ... When the key + value counts do not match Hash should throw an exception. Silently doing the wrong thing is generally not a good idea. While this change could break existing applications, those applications were probably behaving incorrectly anyways. Fixes #2470	2013-12-21 17:46:05 -05:00
José Lorenzo Rodríguez	60d2ece035	Merge pull request #2506 from dereuromark/2.5-string ... Correct tokenize for empty strings.	2013-12-21 10:31:52 -08:00
mark_story	7e5c0f7185	Merge branch 'master' into 2.5	2013-12-20 14:15:35 -05:00
mark_story	5bddc477a3	Fix incorrectly handled time values around 12:00:00 ... When using 12 hour formats & intervals, values around 12:00 were incorrecly converted to midnight. Fixes #2507	2013-12-19 17:36:27 -05:00
euromark	3ecce19732	Correct tokenize for empty strings.	2013-12-19 15:58:08 +01:00
Saleh Souzanchi	bbbf3076ab	undo remove end line break	2013-12-19 00:36:20 +03:30
OKINAKA Kenshin	3433e10fbd	Fix Postgres for bigint primary key.	2013-12-18 14:58:18 +09:00
Saleh Souzanchi	4639d3597c	add DispatcherFilter Settings	2013-12-18 06:54:27 +03:30
ADmad	49a9d24ca7	By default use filter_var() to valid email addresses in CakeEmail. ... Refs #2477	2013-12-18 01:07:40 +05:30
mark_story	30e139412d	Fix input type inference when type=>checkbox ... FormHelper should not infer types when the explicit type is checkbox. Instead the provided type should be used. Fixes #2491	2013-12-16 23:26:20 -05:00
ADmad	27979286b2	Revert change done in 11f543f1f2. ... The change is unneeded now as Security::encrypt() no longer throws exception for falsey values.	2013-12-15 20:29:41 +05:30
ADmad	8a666fb37e	Don't throw exception when trying to encrypt falsey value.	2013-12-15 19:28:56 +05:30
mark_story	e15d1652ed	Relax the 'my' and 'ym' date validation formats. ... All other formats that include 'y' allow 2006 or 06. These formats are now conformant with the other formats available. Closes #2436	2013-12-14 23:02:12 -05:00
Mark Story	bf96ea36d9	Merge pull request #2482 from zoghal/2.5-cookie-fix2 ... fix CookieComponent - when write null or empty string	2013-12-14 16:21:58 -08:00
mark_story	c2b8778ce8	Merge branch 'master' into 2.5	2013-12-14 17:45:49 -05:00
Saleh Souzanchi	11f543f1f2	fix CookieComponent - when write null or empty string	2013-12-15 02:15:36 +03:30
Mark Story	384c3a815d	Merge pull request #2350 from tuffz/formatting_app_uses_blocks ... formatting app::uses blocks	2013-12-14 12:37:02 -08:00
mark_story	79701af501	Make Hash::numeric() accept more numeric things. ... Negative numbers and other stringy forms of numbers should be accepted. The name Hash::numeric implies is_numeric which it now uses. Fixes #2478	2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez	fc6edf4d9c	Fixed small coding standard error	2013-12-12 09:07:00 +01:00
mark_story	3b867a048e	Add test for saveMany + validate=false. ... Closes #2468	2013-12-11 12:43:18 -05:00
Mark Story	a2f043d2a3	Merge pull request #2445 from young-steveo/2.5 ... CakeFixtureManager::load now calls CakeTestFixture::truncate	2013-12-09 09:23:02 -08:00
mark_story	2a58e529b7	Merge branch 'glorand-master' ... Fix Hash::extract() operating on non-array data. Closes #2433	2013-12-09 12:17:36 -05:00
mark_story	edcfe2d3a8	Add tests for #2433	2013-12-09 12:17:25 -05:00
José Lorenzo Rodríguez	6358741944	Merge pull request #2449 from cakephp/fix-session-cyclic-error ... Fixed error in CakeSession that would call start() in an infinite loop	2013-12-09 02:18:21 -08:00
mark_story	48d2618c62	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Routing/Router.php	2013-12-08 21:25:59 -05:00
mark_story	abf4af14a8	Change quotes to keep postgres happy.	2013-12-08 11:58:26 -05:00
mark_story	530c95725f	Attempt to fix errors with postgres tests.	2013-12-08 11:46:17 -05:00
Jose Lorenzo Rodriguez	3a2c497206	Fixed failing test	2013-12-08 14:08:57 +01:00
Rachman Chavik	98e645a1ea	Add test to prove issues with deleteAll with $order set	2013-12-08 16:39:56 +07:00
Jose Lorenzo Rodriguez	848a0ce217	Fiexed error in CakeSession that would call start() in an infinite loop ... when the session is marked as invalid	2013-12-07 22:25:33 +01:00
Stephen Young	8645e05ab1	Removed leading underscores from ReflectionProperty variables in test case	2013-12-07 12:10:03 -05:00
Stephen Young	f0036b3ebc	CakeFixtureManager::load now calls CakeTestFixture::truncate	2013-12-07 09:47:06 -05:00
ADmad	738d0e2277	Fixed edge case which allowed login with empty password. ... Ensure skipping call to FormAuthenticate::_checkFields() does not allow logging in with empty password. Closes #2441.	2013-12-07 18:40:08 +05:30
Brian Porter	bfdc41e8bb	Baked test methods are marked incomplete. ... Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing. It is much easier when _running_ tests to locate incomplete test methods. Fixes 2437.	2013-12-05 22:54:26 -06:00
mark_story	85a9132c9b	Append / to the start/end of the mapResources prefix. ... This makes the method easier to use and less error prone. Fixes #2431	2013-12-04 21:46:59 -05:00
euromark	8ebf004450	Also make DOM ids for radio element values unique.	2013-12-04 02:14:08 +01:00
euromark	587a04ab84	prevent possible XSS attack via form helper selects and unescaped output.	2013-12-04 01:51:39 +01:00
euromark	aae0f762dd	Collision free approach to resolve the DOM ID issue in a clean way. Fix to generation of ids for multiple checkboxes. Resolves ticket 4064.	2013-12-04 01:30:57 +01:00
ADmad	f3900e89fd	Fixed bug where deleteAll tried to delete same id multiple times. ... Ensure find done in deleteAll only returns distinct ids. A wacky combination of association and conditions can sometimes generate multiple rows per id.	2013-12-03 22:18:17 +05:30
mark_story	8578708e76	Merge branch 'master' into 2.5	2013-12-01 21:37:37 -05:00
ADmad	c72def4840	Moved exception throwing to after paging info it set for request. ... This fixes the regression caused in 2096d3f632. When catching exception thrown by PaginatorComponent::paginate() in controller, developer again has access to paging info in request object. Closes #2402	2013-11-30 19:00:08 +05:30
mark_story	a9ca1bdc58	Add tests and fix other cases where autoLinkEmail would fail. ... Refs #2403	2013-11-29 22:57:43 -05:00
mark_story	bbe4c659aa	Add tests for TextHelper::autoLink() ... Add tests for email addresses embedded in urls. Refs #2403	2013-11-29 21:57:08 -05:00
mark_story	97ab2c0e9b	Merge branch 'imsamurai-2.5' into 2.5 ... Add unsigned integer support to MySQL. Unsigned integers have not been added to other databases as they either do not support them (postgres, sqlserver) or they are 'faked' and don't do anything (sqlite). Fixes #2321	2013-11-27 20:12:28 -05:00
mark_story	430ef88118	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-11-25 23:15:15 -05:00
mark_story	5e77183afe	Fix failing tests when Console group was run in isolation.	2013-11-23 12:36:02 -05:00
mark_story	d97cf79545	Add coverage for comma in email alias. ... Closes #2381	2013-11-22 13:14:21 -05:00
mark_story	37e387fed2	Replace non-breaking spaces with Inflector::slug(). ... Fixes #2363	2013-11-22 10:13:10 -05:00
imsamurai	62a53d26bb	fix typo	2013-11-22 16:17:25 +02:00
mark_story	a4460ff228	Fix tests even better than before. ... The current tests work on travis, but fail on jenkins. Fix that up.	2013-11-21 22:57:50 -05:00
mark_story	71312932e8	Merge branch 'master' into 2.5	2013-11-21 21:46:21 -05:00
mark_story	0e7b0ad111	Fix failing test.	2013-11-21 21:46:03 -05:00
José Lorenzo Rodríguez	df5fc2304a	Merge pull request #2289 from bar/2.5-optimize-dbosource ... First part of the DboSource cleanup.	2013-11-21 01:02:36 -08:00
mark_story	ec38ee1c48	Only enable cacheSources if both the datasource + model agree on it. ... This prevents models from flipping cacheSources on when the datasource has it disabled already. Refs #2364	2013-11-19 17:36:20 -05:00
davidsteinsland	c29d2abf69	Fixed test	2013-11-19 12:10:01 +01:00
davidsteinsland	22d9cd8a00	Fixed test case	2013-11-19 11:58:52 +01:00
davidsteinsland	7056ccd38a	Added msgpack support for Memcached	2013-11-19 11:35:05 +01:00
mark_story	3b8208be2e	Merge branch 'master' into 2.5	2013-11-18 21:49:13 -05:00
Matheus Pedroso	4677ddf490	Fix duplicated webroot path on HtmlHelper::meta('icon').	2013-11-18 23:38:01 -02:00
ADmad	dda6080579	Merge branch 'master' into 2.5	2013-11-19 00:27:12 +05:30
Eric Büttner	1e3865acc7	formatting app::uses blocks (refs #2265)	2013-11-18 11:56:00 +01:00
imsamurai	20dc92291e	fix broken test	2013-11-17 23:34:22 +02:00
imsamurai	0286e4120d	fix code style	2013-11-17 23:12:51 +02:00
imsamurai	8bcfe452da	not add unsigned to not numeric fields, fix broken test, add new test	2013-11-17 23:10:53 +02:00
imsamurai	2f6122cb01	add unsigned property in Model::describe	2013-11-17 22:37:01 +02:00
imsamurai	00fb663f90	remove numeric from unsigned config	2013-11-17 21:23:13 +02:00
mark_story	016c3aed44	Add test for saveAssociated and expression objects. ... Add a test for #1514. This issue was fixed during recent refactorings. Closes #1514	2013-11-16 10:51:14 -05:00
mark_story	cee2801700	Add 'metadata' to the uninflected list. ... Fixes #2332	2013-11-15 21:49:05 -05:00
Mark Story	17ae40f0ce	Merge pull request #2319 from ravage84/php-5-removal ... Removed "PHP 5" from file header DocBlocks	2013-11-14 06:41:31 -08:00
imsamurai	f1a2c1a75c	add decimal type for unsigned	2013-11-14 10:56:51 +02:00
imsamurai	15805e668e	fix phpcs errors	2013-11-14 02:39:16 +02:00
imsamurai	87fef89737	fix phpcs errors	2013-11-14 02:19:31 +02:00
imsamurai	fd64d952b5	change position from afterDefault to beforeDefault during to wrong order, add test	2013-11-14 01:36:27 +02:00
imsamurai	e35823e72a	fix tests, add numeric type for unsigned	2013-11-14 01:33:11 +02:00
imsamurai	5a40944a6f	fix test name testBuildColumn3 to testBuildColumnUnsigned	2013-11-14 01:20:21 +02:00
imsamurai	2fcb4c3c6c	- change check to strict for options of $fieldParameters ... - add `types` parameter and strict check if it present in `$fieldParameters` (if it present and not contain column type field parameter will be skipped) - add `noVal` parameter to `$fieldParameters` if it present and not empty value of this parameter from column will be ignored - add `unsigned` column type for integer, float and biginteger. If it set to `true` an 'UNSIGNED' will be add in sql column part, if not set or set not to `true` this parameter will be skipped	2013-11-14 01:11:30 +02:00
Marc Würth	7018997979	Fixed some copyright and license statements in the file header DocBlocks	2013-11-14 00:07:03 +01:00
Marc Würth	7cfa0116f4	Removed "PHP 5" from file header DocBlocks ... This statement does not serve a purpose anymore. In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to. http://pear.php.net/manual/en/standards.sample.php But since PHP 5.1 and later this is only marginally true. Thus I propose to remove it from CakePHP.	2013-11-13 22:58:39 +01:00
Marc Würth	ce47890e98	Replaced all remaining license references to the Open Group Test Suite License with the MIT License	2013-11-13 18:52:06 +01:00
Marc Würth	19b972cfeb	Implemented skipping of fields for the data validation rules when baking a model	2013-11-13 13:36:19 +01:00
mark_story	a07608cbb9	Fix incorrect CSRF token fields when using postLink() ... Creating a postLink after creating a GET form would result in the incorrect fields being generated. Fixes #2308	2013-11-11 21:56:55 -05:00
Ber Clausen	b35c9671ad	Explicitly build SQL statements, calling buildAssociationQuery().	2013-11-11 23:27:50 -03:00
Ber Clausen	64f34b75a2	Fix a couple of failing tests.	2013-11-11 23:27:50 -03:00
Ber Clausen	53c6df554c	Remove unused $resultSet argument from generateAssociationQuery().	2013-11-11 23:27:50 -03:00
mark_story	63d867c98b	Restore global event managers that were causing cascading failures. ... Refs #2105	2013-11-10 22:35:00 -05:00
Andy Hobbs	3e373771d7	Corrected coding standards violations in CaKeEventManagerTest.php ... - Changed combining of arrays in CakeEventManager::listeners() to be more efficient Refs #2105	2013-11-10 22:34:50 -05:00
Andy Hobbs	7656ffd12e	Corrected coding standards violations in CateEventMAnagerTest.pnp ... Refs #2105	2013-11-10 22:34:43 -05:00
Andy Hobbs	11db7c1631	Removed EventManager test that tested using a closure as it breaks compatability with php < 5.3.0 ... Refs #2105	2013-11-10 22:34:35 -05:00
Andy Hobbs	615f700d22	Added EventManager::prioritisedListeners() function to alow the global event manager to return unprocessed listeners array ... Refs #2105	2013-11-10 22:34:27 -05:00
mark_story	3561929be7	Merge branch 'master' into 2.5	2013-11-10 21:53:09 -05:00
mark_story	8d38861a2e	Fix missing HTML encoding on URL's generated by Html->meta(). ... The input URL was not correctly handled as an asset URL and thus was not correctly HTML or URL escaped. This created invalid HTML when favicon URLs included query string arguments. Refs #2233	2013-11-09 14:31:09 -05:00
mark_story	bf2f2e772e	Split existing tests up, and add tests for Router based image URL's ... Refs #2233	2013-11-09 12:00:56 -05:00
mark_story	3c1f775ab2	Merge branch 'master' into 2.5	2013-11-09 09:37:27 -05:00
mark_story	ada0ec4c77	Fix formatting of decimal values when there is no fractionSymbol. ... When a currency format does not include a fractionSymbol it should be able to format fractional values. Fixes #2253	2013-11-09 09:36:38 -05:00
mark_story	2e7d687b98	Merge branch 'master' into 2.5	2013-11-07 23:01:25 -05:00
mark_story	145dbacb78	Fix incorrectly encoded headers in MailTransport. ... When encoded values are present in header fields, they need to have newlines removed as leaving the newlines in place and interfere with delivery on Qmail based SMTP servers. Fixes #2209	2013-11-04 22:17:21 -05:00
ADmad	d647fe8a91	Added buffering of form tags generated by FormHelper::postLink()	2013-11-03 23:11:11 +05:30
mark_story	afd182898f	Merge branch 'master' into 2.5	2013-11-01 16:54:57 -04:00
davidsteinsland	94998763a5	Fixing whitespace	2013-10-31 23:58:52 +01:00
davidsteinsland	e68a61c375	Added configurable default value to Hash::get()	2013-10-31 23:31:48 +01:00
Rachman Chavik	fb436644c3	RedisEngine: Support for selecting database number ... Closes GH-2254	2013-10-31 20:45:39 +07:00
Luis Ramos	e33653a8d7	Add test case	2013-10-30 16:06:27 -06:00
mark_story	aaac360833	Merge branch 'master' into 2.5	2013-10-30 14:58:20 -04:00
Mark Story	d6f5f2f0bb	Merge pull request #2244 from dereuromark/2.5-debugger ... Pass depth through for Debugger::dump().	2013-10-30 11:26:28 -07:00
euromark	fecbef5949	Pass depth through for Debugger::dump().	2013-10-30 18:31:48 +01:00
mark_story	525efcb808	Remove use of deprecated constants. ... Fixes #2232	2013-10-29 17:49:16 -04:00
ADmad	d9ca148499	Merge branch 'master' into 2.5 ... Conflicts: CONTRIBUTING.md lib/Cake/Model/Model.php lib/Cake/VERSION.txt	2013-10-30 02:34:09 +05:30
José Lorenzo Rodríguez	bd8f6e3d06	Merge pull request #2219 from zoghal/2.x-fix-download-multi-connection ... 2.x fix download multi connection/optimise serve file	2013-10-29 05:02:09 -07:00
mark_story	07f4779efe	Fix cookie component being inconsistent about writes. ... Instead of treating multi-key and single key writes differently, they should be treated consistently to allow simpler and more consistent interactions with the stored data. This also results in fewer cookies being sent across the wire which is an added benefit. Fixes #2182	2013-10-28 23:13:51 -04:00
Saleh Souzanchi	cc0c65d7ea	update tests	2013-10-28 02:24:58 +03:30
Saleh Souzanchi	7c4a698bde	update tests	2013-10-28 02:11:49 +03:30
José Lorenzo Rodríguez	81e6a56543	Merge pull request #2201 from ravage84/start-viewblock-twice ... Throw an exception when starting a view block twice	2013-10-27 03:22:35 -07:00
Phally	9260a78ea3	Fixes last items for #1665. ... - Changes double quotes to single quotes. - Documents and tests array-based string replace. - Rewrites test case. Rewrites the test case because the tests didn't work as well as they should be. The test file copied itself to the tmp directory, did some string replace stuff on it and then loaded the data to test its contents. However in those contents were also the expectations, so assertContains() would always see the string in the file... even if the replacing didn't work. Closes #1665.	2013-10-26 14:50:42 +02:00
rooseveltrp	98e11cea5d	Adds File::replaceText(). ... Added File::replace() Searches for a given text and replaces the text if found Renamed File::replace() to File::replaceText() Updated the replaceText() method to utilize File Locking Updated File::replaceText() 1. Method now checks if the lock is not identical to null 2. Since the method uses File::read() to get the contents of the file, there is no need for a temporary file. Removed the temporary file creation File::replaceText() update Opening file with r+ mode	2013-10-26 14:05:12 +02:00
Marc Würth	39cd7565ef	Throw an exception when starting a view block twice	2013-10-26 03:35:12 +02:00
Mark Story	3dc60af166	Merge pull request #2204 from thatcode/master ... Models fetched by Containable find depend on number of fields in intermediate Model	2013-10-25 17:33:32 -07:00
euromark	4048c686b7	coding standards	2013-10-25 19:29:33 +02:00
Robert Sworder	456645d7ad	Update tests for incorrect containable behaviour if a model only finds 1 field.	2013-10-25 15:15:52 +01:00
Marc Würth	86bc9d73cf	Emptied home.ctp in test_app as much as possible ... This file is never seen by anyone but gets analyzed by ``ExtractTaskTest::testExecute()``	2013-10-24 16:57:58 +02:00
Marc Würth	3773311cc0	Normalized associated models in unbindModel. ... Resolves #1764 Had to cast $models to an array since ``Hash::normalize()`` doesn't support strings which ``Set::normalize()`` does (but which is deprecated). Reused existing tests.	2013-10-24 15:28:31 +02:00
José Lorenzo Rodríguez	45bd01fdc0	Merge pull request #2132 from dereuromark/2.5-paginator-sort ... Ability to use PaginatorHelper::sort() with only one direction.	2013-10-24 05:40:42 -07:00
mark_story	23b23d8050	Fix delivery issues with long subject lines and MailTransport. ... A few people have reported issues sending wrapped messages via MailTransport. Removing the new lines has been suggested as a fix. Refs #2176	2013-10-23 12:41:57 -04:00
Bryan Crowe	a943ea5c34	Add space between classname(s)	2013-10-22 22:59:50 -04:00
Frank de Graaf	ab89f6ec97	Makes DboSource less string dependent.	2013-10-22 16:43:32 +02:00
euromark	fca8a01c15	Correct casing of class names.	2013-10-21 22:34:29 +02:00
euromark	def015108d	Ability to use PaginatorHelper::sort() with only one direction.	2013-10-19 12:44:50 +02:00
Cameri	2b234236d6	Removed /mpm from 'url' option for last test in JqueryEngineHelper::testRequest().	2013-10-18 11:41:38 -04:00
Cameri	069b309249	Added test case for JqueryEngineHelper::request() to validate 'xhr' callback.	2013-10-18 11:00:15 -04:00
mark_story	1ae470a284	Fix inflection rules for curves. ... Remove curve from the uninflected list and update rules so it, wolves, and lives are still properly handled. Fixes #2148	2013-10-17 12:15:56 -04:00
mark_story	935a51c892	Add tests for curve<->curves ... Closes #2148	2013-10-17 12:10:49 -04:00
mark_story	5c8eb5c5a7	Add test cases for pluralization/singularlization of quota. ... Closes #2077	2013-10-15 17:48:26 -04:00
Marc Würth	bf8a13a77c	Added binary type to field type map, defaulting to file input field ... Refs https://github.com/cakephp/cakephp/issues/2071	2013-10-15 22:25:51 +02:00
mark_story	5a394c379a	Merge branch 'master' into 2.5	2013-10-14 22:57:50 -04:00
euromark	afb6471128	Make tests pass on win.	2013-10-14 23:59:14 +02:00
Mark Story	ce74153389	Merge pull request #1691 from uzyn/2.5-decimal ... Add support for decimal type in Schema. Fixes #3171	2013-10-14 08:36:15 -07:00
euromark	ed2054f4f2	Allow international domains to pass validation. Fixes #1763	2013-10-13 23:43:29 +02:00
euromark	1cb24ae537	CS fixes using phpcs-fixer auto-correction.	2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez	df549898ad	Merge remote-tracking branch 'origin/2.5' into k-halaburda-master	2013-10-12 01:05:02 +02:00
Jose Lorenzo Rodriguez	9673048c30	Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master	2013-10-12 01:03:20 +02:00
Jose Lorenzo Rodriguez	63b65e2f69	Fixing CS	2013-10-12 00:58:14 +02:00
José Lorenzo Rodríguez	8cdbafd312	Merge pull request #1631 from ovidiupruteanu/patch-2 ... flushMethodCache not working if called before cacheMethod	2013-10-11 15:56:19 -07:00
Mark Story	3c6d0af01d	Merge pull request #1644 from WyriHaximus/2.5 ... Add CompletionShell to allow easier development of shell scripts to provide autocompletion in environments like bash.	2013-10-11 13:17:05 -07:00
mark_story	4265dbcc33	Use App.base when there are no requests to generate URL's ... Setting App.fullBaseUrl to a non-host value causes issues generating URL's in a web context. However, not including the base path generates incorrect URL's in a CLI context. This change allows the use of App.base to populate the base path which is used as a fallback when there are no requests, or when the base path is empty. Refs #2931	2013-10-10 23:07:03 -04:00
mark_story	5aa8a458b1	Update UUID pattern to accept the 'nil' UUID. ... Fixes #4133	2013-10-10 21:11:55 -04:00
Rick Guyer	a091c630d7	Prevent name param from overwriting file if both are passed	2013-10-09 23:20:25 -05:00
euromark	ce1939c4d6	Correct argument order.	2013-10-09 20:43:54 +02:00
Bryan Crowe	81c2e9db84	Capitalize UUID acronym	2013-10-08 21:46:30 -04:00
euromark	b5bd087bc5	Replace deprecated methods.	2013-10-08 20:23:57 +02:00
mark_story	f82b00c25e	Fix content view variable being stomped by send() parameter. ... The content of send() should only be used if it is a non-empty value. Fixes #4129	2013-10-08 12:28:45 -04:00
ADmad	105f032e81	Merge pull request #1705 from Schlaefer/FileLog-RotateOlderLogs ... fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate'	2013-10-07 20:58:07 -07:00
Bryan Crowe	c1dd0e4393	Changed url to URL where appropriate	2013-10-07 23:17:58 -04:00
euromark	381a8c1216	Simplify test.	2013-10-08 00:47:47 +02:00
euromark	35ca40635e	Add doc block	2013-10-08 00:32:11 +02:00
euromark	c621985f69	Fix whitelist to be modifiable from behaviors to work with validate.	2013-10-07 23:45:27 +02:00
euromark	7b57df5554	Correct method names and missing parent calls.	2013-10-07 20:24:28 +02:00
mark_story	60b0893c79	Merge branch 'master' into 2.5	2013-10-06 23:49:32 -03:00
José Lorenzo Rodríguez	9472b3149b	Merge pull request #1704 from cakephp/2.5-cache ... 2.5 - Add Cache::remember()	2013-10-06 07:02:54 -07:00
Schlaefer	8060f1b4be	fixes FileLog doesn't delete on rotation if rotate = 0	2013-10-06 15:04:57 +02:00
Schlaefer	83d340a3af	fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate'	2013-10-06 13:59:52 +02:00
euromark	cd3defcc0b	Correct spelling mistake in class name.	2013-10-06 02:12:57 +02:00
Mark Story	0608ea2e7b	Merge pull request #1654 from kamisama/improvement/2.5-memcached-cache-engine-fix ... Add option to select a serializer engine in Memcached Cache engine	2013-10-05 11:44:26 -07:00
mark_story	1ce89545bd	Fix 5.4 only syntax.	2013-10-05 14:40:23 -03:00
mark_story	f146d4334a	Add Cache::remember() ... This method provides a really simple approach to read-through caching. A callable or Closure can be used to provide results when the cache is empty.	2013-10-05 10:47:07 -03:00
ADmad	aa60b8791a	Fixed setting "required" attribute for file input. Closes #4124 ... In general fixed the issue where enabling SECURE_SKIP for a field skipped "required" attribute check altogether. Instead now "required" is set to false for hidden fields by default.	2013-10-04 20:35:38 +05:30
Mark Story	7df9925618	Merge pull request #1699 from dereuromark/2.5-page-title ... 2.5 page title	2013-10-04 05:18:22 -07:00
euromark	eb98770304	Remove leftover of pageTitle.	2013-10-04 00:35:56 +02:00
Renan Gonçalves	4f3b3737a5	Fixing CS errors.	2013-10-03 14:09:24 +02:00
Bryan Crowe	b9003e5f7c	Allow Folder::addPathElement() to accept arrays, also corrected docblock	2013-10-02 22:45:22 -04:00
wyrihaximus	ac9b7f3882	Refactored the shell reflection portion into a seperate task.	2013-10-02 22:30:12 +02:00
Cees-Jan	79202ad8a0	Updated doc blocks	2013-10-02 22:02:40 +02:00
mark_story	530731ec5d	More gracefully handle invalid data in Accept headers. ... Some browsers have invalid accept headers, we should ignore the invalid extension data as assuming it will be a qualifier can result in incorrect results. Fixes #4105	2013-10-02 11:29:04 -04:00
Mark Story	942bb77046	Merge pull request #1695 from renan/2.4-wordwrap ... Make String::wrap() unicode aware. Fixes #3981.	2013-10-02 05:04:02 -07:00
Renan Gonçalves	a73e926467	Make String::wrap() unicode aware. Solves #3981.	2013-10-01 22:35:11 +02:00
mark_story	314ae1c8b4	Merge branch 'master' of github.com:cakephp/cakephp	2013-10-01 15:12:34 -04:00
Simon Males	c998888fe7	Do not assume CONTENT_TYPE is available. ... In some server environments notably the CLI server, _SERVER['CONTENT_TYPE'] is not available. In these cases, fall back to the HTTP_CONTENT_TYPE header. Refs #GH-1661	2013-10-01 15:10:33 -04:00
ovidiupruteanu	dd3b1e41bc	Test case for DboSource::flushMethodCache	2013-10-01 21:34:40 +03:00
U-Zyn Chua	4806d09d7e	Setting of step for decimal field based on precision.	2013-09-29 22:44:50 +08:00
U-Zyn Chua	091658a752	Decimal support for FormHelper.	2013-09-29 22:40:35 +08:00
U-Zyn Chua	e527506c39	MySQL: Numeric data type now supported under decimal column. #3171	2013-09-28 23:05:53 +08:00
U-Zyn Chua	c74c8d49a1	Decimal support for SQLite. #3171	2013-09-28 14:36:55 +08:00
U-Zyn Chua	e0eb8f8e18	Added decimal CakeSchema test case and DatatypeFixture. #3171	2013-09-28 14:29:39 +08:00
U-Zyn Chua	a1a3e70039	Decimal support for PostgreSQL. #3171	2013-09-28 14:07:00 +08:00
mark_story	5e9b22271a	Merge branch 'master' into 2.5	2013-09-27 22:26:33 -04:00
mark_story	e96fe515a1	Rename config class used in test cases. ... Having a separate classname for testing allows the testsuite to not provide a classname that the application would. This allows composer to generate the correct classmap when CakePHP is installed with composer. Fixes #4112	2013-09-27 22:22:23 -04:00
U-Zyn Chua	7fb51ab50f	Decimal support for MySQL. #3171	2013-09-28 09:23:46 +08:00
Frank de Graaf	3e8af8b180	Merge pull request #1689 from dereuromark/master-cakephp-name ... Cake to CakePHP name	2013-09-27 12:16:25 -07:00
Frank de Graaf	ceb78fee9c	Merge pull request #1671 from ADmad/bugfix/auth-infinite-redirect ... Fixed infinite redirects when authenticated user tried to access login p...	2013-09-27 12:13:36 -07:00
euromark	9a86f7e883	correct spelling mistake	2013-09-27 20:28:03 +02:00
ADmad	4dbf9107a8	Fixed infinite redirects for authenticated users accessing login page.	2013-09-27 22:33:07 +05:30
Mark Story	355e2efbc6	Merge pull request #1685 from dereuromark/master-autolink ... Test to prove that autoLink has issues with umlauts.	2013-09-27 06:53:38 -07:00
Mark Story	066e0b6677	Merge pull request #1684 from dereuromark/master-shell ... Bugfix: Assert own tasks are loaded before trying to access taskNames.	2013-09-27 06:52:12 -07:00
euromark	bd87ef45f2	complete autoLinkEmail()	2013-09-27 15:01:46 +02:00
euromark	205f7a504b	also fix autoLinkEmail()	2013-09-27 14:56:53 +02:00
Frank de Graaf	41a7739b69	Merge pull request #1686 from andydhobbs/ticket-4108 ... Fixes bad merge of #1683. Refs #4108.	2013-09-27 05:53:10 -07:00
euromark	2a954b6095	Make TextHelper::autoLink() work properly with umlauts.	2013-09-27 14:48:57 +02:00
Andy Hobbs	56f1c9b8b5	Ticket 4108 ... - updated DboSourceTest::testFieldsCacheKeyWithSchemanameChange() to skip for Postgres and Sqlserver	2013-09-27 13:03:32 +01:00
Renan Gonçalves	bd1c0b18ff	Merge pull request #1679 from dereuromark/master-cleanup-tests ... Don't use comp. wrappers anymore.	2013-09-27 04:10:39 -07:00
euromark	c23531e806	Assert own tasks are loaded before trying to access taskNames.	2013-09-27 12:53:18 +02:00
mark_story	cc5795c67d	Merge branch 'master' into 2.5	2013-09-26 10:07:10 -04:00
Andy Hobbs	0f7d6a90a1	Ticket 4108 ... - Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name	2013-09-26 11:56:14 +01:00
Bryan Crowe	ab4bc16463	Updated Controller:: doc block and ControllerMergeVarsTest::	2013-09-25 22:53:23 -04:00
Bryan Crowe	915b51b239	Updated JavaScript casing and JsHelper references in doc blocks	2013-09-25 22:46:38 -04:00
euromark	0b45a2eca8	correct order of params	2013-09-25 22:07:52 +02:00
euromark	9844da8e99	Don't use comp. wrappers anymore.	2013-09-25 20:58:29 +02:00
Mark Story	ce9f547175	Merge pull request #1655 from dereuromark/2.5-inlist-clean ... 2.5 inList(), multiple() and case sensitivity	2013-09-25 11:45:29 -07:00
euromark	2455af09c5	Resolves ticket #4100	2013-09-25 14:01:35 +02:00
Bryan Crowe	3e05ab897c	Missed a couple instanceOf asserations	2013-09-24 22:12:51 -04:00
Bryan Crowe	9a1170cd2b	Replaced true asserations with instanceOf asserations in test cases	2013-09-24 22:10:36 -04:00
Bryan Crowe	7d7954ce18	Replaced all is_a() calls with instanceof operator	2013-09-24 21:08:06 -04:00
euromark	f7e507145c	Case insensitive validation inList option. Resolves ticket 3521. Added two tests to proof the faulty behavior of $strict here. Also address the faulty behavior in multiple() and replace it with case sensitivity.	2013-09-24 02:01:50 +02:00
mark_story	d2577fac60	Merge branch 'master' into 2.5	2013-09-21 20:01:50 -04:00
mark_story	a30f861f2c	Use array_key_exists instead of isset() ... This allows contains() to work with null values. Fixes #4083	2013-09-19 21:44:09 -04:00
Kamisama	7c83f7140f	Rename serializer to serialize	2013-09-19 18:40:41 -04:00
Kamisama	0a704cc288	Fix test	2013-09-19 18:38:02 -04:00
euromark	f62f46562c	add missing create() for creating a new record.	2013-09-19 00:23:56 +02:00
euromark	17bd465cae	simplify tests	2013-09-19 00:17:21 +02:00
ADmad	1d89ee1c6d	Fixed TreeBehavior::recover() when using scope. Fixes #4062.	2013-09-19 00:39:19 +05:30
euromark	58f38f1667	Fix casing of validation rules in bake	2013-09-18 18:31:55 +02:00
Kamisama	5d509e23c2	Throw exception when selected serializer is not installed	2013-09-18 00:46:21 -04:00
Kamisama	bd3f005ab6	Add serializer option to Memcached Cache engine ... Add option to select a serializer engine among php, json or igbinary	2013-09-18 00:29:48 -04:00
mark_story	a7a6fcae8a	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-09-17 10:11:24 -04:00
euromark	e3a3946e89	address casting cs	2013-09-17 15:15:25 +02:00
euromark	382f75dbfc	cs corrections, bool to boolean and int to integer.	2013-09-17 14:44:34 +02:00
mark_story	5ec9b145bf	Fix label element for attributes not matching their inputs. ... Radio elements would contain ModelModelFieldValue instead of ModelFieldValue like they should. This was caused by the fix for #3936 and lack of tests for create() + radio(). Fixes #4071	2013-09-16 22:38:28 -04:00
spiliot	37c9832dc1	removed duplicate test case ... Was exact duplicate of case starting line 692	2013-09-17 00:48:09 +03:00
euromark	c8b18164c5	fix test	2013-09-16 00:49:01 +02:00
mark_story	7379d32b59	Simplify & fix phone number validation. ... The changes made in fa3d4a0bb5 tightened the area code validation too much and excluded at least one valid area code. This change replaces that with a more generic solution that does not attempt to exclude non-allocated but potentially valid area codes. Fixes #4066	2013-09-13 23:05:40 -04:00
José Lorenzo Rodríguez	d40f9f7f67	Merge pull request #1574 from dereuromark/2.5-logging ... 2.5 logging - deprecate/disallow magic logging	2013-09-13 00:29:22 -07:00
euromark	61b05c40c6	remove autologging	2013-09-13 02:28:25 +02:00
mark_story	ba4afcc074	Fix incorrectly encoded address fields. ... Address fields cannot contain : or " it causes a number of mail servers/clients to be confused. Fixes #4058	2013-09-12 20:14:11 -04:00
mark_story	a2bd91638e	Merge branch 'master' into 2.5	2013-09-12 19:47:13 -04:00
euromark	a796b26f13	fix renderLayout and update deprecated and outdated code	2013-09-13 00:09:31 +02:00
Simon Males	50ad043092	View::get() default param test	2013-09-11 22:22:50 +08:00
Mark Story	fd50c5277e	Merge pull request #1624 from ADmad/fix-paginator-order ... Fix setting of order in Paginator options when using model's order. Refs #3902	2013-09-10 13:41:51 -07:00
euromark	beff12d8a5	add missing params for parent call	2013-09-10 21:19:30 +02:00
ADmad	1d0c785725	Fixed setting of order in Paginator options when using model's order. Refs f680c76, #3902	2013-09-10 22:47:31 +05:30
Ber Clausen	0a52061d86	Update afterFind() callback signature to be PHP5.4+ compliant.	2013-09-10 14:15:01 -03:00
Mark	994a5b00b6	Merge pull request #1622 from bar/php54-afterSave ... Update Model/Behavior afterSave() callback signature to be PHP5.4+ compliant.	2013-09-10 04:04:04 -07:00
mark_story	fc2e1fac4e	Fix clearing groups with FileCache and no prefix. ... If you used FileCache + groups + an empty prefix cached files would not be cleared as strpos() would fail.	2013-09-09 22:24:18 -04:00
Ber Clausen	867d4b312d	Update afterSave() callback signature to be PHP5.4+ compliant.	2013-09-09 21:34:11 -03:00
Ber Clausen	98a32c334a	Fix CS.	2013-09-09 21:25:22 -03:00
mark_story	5210f831c8	Add test for insertMulti with id in the last spot. ... Both tests work, so there are no changes to the implementation. Closes #4048	2013-09-09 19:43:15 -04:00
mark_story	2fc3222322	Fix whitespace.	2013-09-09 12:20:54 -04:00
ovidiupruteanu	7019c79b81	Quoting test for null value and string column	2013-09-09 17:14:09 +03:00
ADmad	c27aa99af9	Merge branch 'master' into 2.5	2013-09-08 20:36:40 +05:30
Ber Clausen	c3ee9a2058	JsonView should return null if no data is set, regardless of the type of '_serialize'. ... It should also honor true/false/0/'' values.	2013-09-07 02:38:52 -03:00
euromark	959988cfa1	Remove last yoda conditions as per coding standards guidelines.	2013-09-06 18:36:57 +02:00
Mark Story	66394f2201	Merge pull request #1610 from bar/php54-callback-signatures ... Update Model/Behaviors callback signature to be PHP5.4+ compliant. This may require updates to userland behaviours.	2013-09-05 11:11:15 -07:00
mark_story	6a6371b2d4	Fix CROSS JOINs ... While seldomly used, CROSS joins should not generate invalid SQL. Fixes #4050	2013-09-05 12:45:48 -04:00
mark_story	e3e4efba0a	Add test for issue #3936 ... radio() method should accept an array for the label element. Refs #3936	2013-09-05 11:04:47 -04:00
mark_story	f22c4cf90b	Merge branch 'master' into 2.5	2013-09-05 10:21:41 -04:00
Ber Clausen	c524645738	Update Model/Behaviors callback signature to be PHP5.4+ compliant.	2013-09-05 11:17:02 -03:00
Rob McVey	7f44cc01b5	Plural of breif is breifs not breives	2013-09-04 09:20:32 +01:00
mark_story	4c92cdcada	Reorder inflection rules. ... Place rules for words like 'archives' and 'relatives' before words like 'knives'. Fixes #4040	2013-09-03 12:50:02 -04:00
mark_story	59bb05b433	Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-09-02 11:35:09 -04:00
Renan Gonçalves	6750a65e1b	Merge pull request #1568 from markstory/2.5-encrypt ... 2.5 - Add Security::encrypt() and Security::decrypt()	2013-09-02 01:19:47 -07:00
mark_story	229c824da6	Remove a default helper from View. ... This goes back to the days of yore and combined with b8320fdbb7 it causes issues. The specific issue at hand was testing a helper that uses other aliased helpers (HtmlHelper specifically). The core helper would always be loaded instead of the aliased one.	2013-09-01 21:39:59 -04:00
euromark	eb71eeeac5	add scope for generateTreeList - resolves ticket 4028	2013-09-01 01:02:26 -07:00
Ceeram	84c980f1f4	avoid notices when loading locale file ... Conflicts: lib/Cake/Test/Case/I18n/I18nTest.php	2013-09-01 06:05:40 +02:00
mark_story	9b0e26cc21	Deprecate MemcacheEngine and update defaults for Memcached ... People should switch to Memcached instead. The underlying extension is better maintained and provides improved features and performance. Collapse the persistent and persistentId settings, while also making non-persistent connections the default. Persistent connections should be an opt-in feature as having them enabled by default could go very wrong on shared hosting environments.	2013-08-31 13:29:54 -04:00
mark_story	9e8c4ad285	Rename persistent_id to persistentId. ... The new name is more consistent with other settings in CakePHP.	2013-08-31 13:15:53 -04:00
Mark Story	0f9560c5cf	Merge pull request #1562 from kamisama/feature/2.5-memcached-cache-engine ... 2.5: Add Memcached storage engine for cache Fixes #3511	2013-08-31 10:12:16 -07:00
Phally	28dbc5b89b	PHPCS fixes.	2013-08-31 13:30:05 +02:00
ADmad	75e8facd2f	Remove JS constant use from tests.	2013-08-31 11:45:59 +05:30
mark_story	4f237e6a93	Merge branch '2.4' making 2.4 into the master branch. ... Conflicts: lib/Cake/VERSION.txt	2013-08-30 16:02:42 -04:00
mark_story	7bd2174c5b	Refactor tests to use a data provider.	2013-08-30 15:36:18 -04:00
mark_story	94b602b684	Merge pull request #1456 'fix-for-3515' into 2.4 ... Conflicts: lib/Cake/Test/Case/View/ViewTest.php Fixes #3515	2013-08-30 15:27:49 -04:00
Mark Story	824a6f700b	Merge pull request #1563 from mvdriel/fix-i18n-extract ... Extract category strings to separate .po files	2013-08-30 12:19:17 -07:00
mark_story	95ad5f5c78	Add hmac to encrypted data. ... Using an HMAC ensures that the ciphertext has not been modified.	2013-08-29 14:40:01 -04:00
Gilles Wittenberg	a54e8f238e	Add y/yes option to schema create and update subcommands	2013-08-29 09:13:54 +02:00
Mark Story	a902529702	Merge pull request #1570 from cakephp/issue-4030 ... 2.4 - Load helpers at View construction.	2013-08-28 14:28:00 -07:00
mark_story	c03edd9d1a	Don't load Helpers in dataviews when _serialize is set. ... Loading helpers when they aren't going to be used is wasteful.	2013-08-28 15:47:44 -04:00
mark_story	130ccf4714	Merge branch '2.4' into 2.5	2013-08-28 12:35:17 -04:00
mark_story	f18d354f55	Merge branch 'master' into 2.4	2013-08-28 12:35:07 -04:00
mark_story	b8320fdbb7	Load helpers at View construction. ... Loading helpers earlier in View's lifecycle allows for the removal of many duplicated code segments and a now useless property. It slightly modifies how View behaves in a test case, but that issue is easily remedied by calling loadHelpers() a second time. This primarily fixes issues where helpers may not be loaded in View subclasses if they override any of View's methods. This is particularly problematic when aliased helpers are involved. Refs #4030	2013-08-28 12:27:07 -04:00
mark_story	c5092851d1	Fix compatibility with PHP 5.2	2013-08-27 23:03:08 -04:00
mark_story	215d43eb06	Add encrypt() and decrypt() methods. ... These methods use AES-256 and provide a simple to use API with easy to remember names.	2013-08-27 21:20:22 -04:00
mark_story	c1ae41da51	Correctly generate bigint primary keys in sqlite. ... generate bigint primary keys correctly. Autoincrement cannot be set as it only works with INTEGER columns[1]. I decided to use some string manipulations as the entire SQL generation bits are a bit janky and I've already re-written them for 3.0. [1] https://www.sqlite.org/autoinc.html Closes #GH-1552	2013-08-27 18:11:04 -04:00
Kamisama	244df0764f	Coding standard and readability	2013-08-27 14:22:45 -04:00
Kamisama	bdd00c2307	Throw an exception if attempting to use authentication without SASL support installed	2013-08-27 13:57:57 -04:00
Calin	075bf37030	Added test case for param with options detector. ... Fix coding standards errors.	2013-08-27 09:38:46 -04:00
Kamisama	2b20ddc81c	Drop backup/restore Configure values	2013-08-26 20:55:38 -04:00
Kamisama	e315f563be	Add MemcachedEngine	2013-08-26 18:26:33 -04:00
Mark van Driel	88d7fbeb53	Extract category strings to separate .po files	2013-08-25 23:04:05 +02:00
mark_story	499212a86e	Merge branch '2.4' into 2.5	2013-08-24 21:51:51 -04:00
mark_story	42feb8dff6	Fix failing test. ... Quote encoding in confirm handlers has changed in 2.4. Update the relevant test.	2013-08-24 21:51:42 -04:00
mark_story	ceb35ac39a	Merge branch 'master' into 2.4	2013-08-24 21:50:02 -04:00
Saleh Souzanchi	e157d8a7e6	convert forbidden character in filename(Windows) with underline	2013-08-25 02:09:13 +04:30
Chen Cohen	a0014e7a30	Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()	2013-08-24 02:02:01 +03:00
mark_story	6d45953525	Merge branch '2.4' into 2.5 ... Conflicts: lib/Cake/VERSION.txt	2013-08-23 12:57:08 -04:00
mark_story	53d265cfba	Merge branch 'master' into 2.4	2013-08-23 12:56:43 -04:00
Renan Gonçalves	703d9881e9	Adding files to be compared against bake generated files, fixing bake templates in the meantime. ... Writing assertContains() or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult. Things like: ``` } else { } ``` Are very easy to happen (which was the case) and was not being covered by the test.	2013-08-21 23:44:07 +02:00
mark_story	24123e2374	Add test for postLink with escape false + confirm option. ... Closes #4008	2013-08-21 13:09:47 -04:00
euromark	036954b52d	remove duplicate newlines according to CS	2013-08-20 20:27:06 +02:00
AD7six	09cf69c452	Pass Controller:$components config to mocked components ... Otherwise there can be significant differences in behavior between using an unmodifiedcomponent in testAction and using a mock as the config will not be propogated from the controller	2013-08-19 10:33:16 +00:00
k-halaburda	9ad75e078a	Successfully :)	2013-08-19 08:29:39 +02:00
k-halaburda	9536b3cacd	Successfully	2013-08-19 08:11:45 +02:00
mark_story	0f2d59d987	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Network/CakeResponse.php lib/Cake/TestSuite/CakeTestCase.php	2013-08-18 23:10:08 -04:00
mark_story	675f828e16	Remove insertQuery and deleteQuery. ... These properties were never implemented and are misleading when people try to use them. Closes #3997	2013-08-18 21:37:37 -04:00
k-halaburda	2166b397bc	Successfully	2013-08-18 17:43:26 +02:00
k-halaburda	39f9d40be4	Fixed formaiing and Successfully	2013-08-18 17:41:43 +02:00
k-halaburda	2a27b37a43	New line on end	2013-08-18 17:37:34 +02:00
Phally	524aaf3449	Makes PHPCS pass again.	2013-08-18 16:12:23 +02:00
mark_story	a140b30435	Add a test for Hash::sort() ... Closes #3956	2013-08-17 17:16:33 -04:00
Mark Story	005699eb49	Merge pull request #1533 from dereuromark/master-null-checks ... unify null checks - avoid method call in favor of strict check	2013-08-17 12:05:52 -07:00
joostdekeijzer	7fe2395be3	RedirectRoute class does not honor persist as array with custom route elements. ... Custom route elements like '/:lang/etc' should be persisted by redirect routes as they are in standard routes. Refs #GH-1531	2013-08-17 14:51:12 -04:00
Rachman Chavik	8e5a9cd7da	Accept 'connectOptions' in Router::mapResources()	2013-08-17 19:28:18 +07:00
euromark	6a14f37b74	a few more orders in test case corrected	2013-08-16 20:55:17 +02:00
euromark	47e8e0c57a	simplyfy test and correct some test param orders	2013-08-16 20:51:11 +02:00
mark_story	3244b9e3d7	Merge branch 'master' into 2.4	2013-08-16 14:47:01 -04:00
euromark	6cf147e8c8	unify null checks - avoid method call in favor of strict check	2013-08-16 20:12:49 +02:00
k-halaburda	391d997c27	Fixed some formatting	2013-08-16 10:02:50 +02:00
k-halaburda	180ecb7929	Fixed some formatting	2013-08-16 10:02:11 +02:00
k-halaburda	f5daf1c8aa	Fixed some formatting	2013-08-16 09:51:01 +02:00
k-halaburda	d7dab3282f	Remove added fixtures and use existing. Updated one old test to add data from afterFind callback	2013-08-16 09:28:32 +02:00
ADmad	8428928fd6	Merge pull request #1528 from mvdriel/caketime-fix ... Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...	2013-08-15 10:55:03 -07:00
Mark Story	7c29aa5155	Merge pull request #1508 from fuga/feature/email-config ... making the config method of email-transport-classes mergable	2013-08-15 08:26:11 -07:00
Mark van Driel	1595287290	Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system	2013-08-15 08:58:05 +02:00
Mark Story	c040bb0cdc	Merge pull request #1523 from tersmitten/improved-tests-that-use-setlocale ... Makes the locale test not always pass, be verbose when it is skipped.	2013-08-14 16:54:50 -07:00
Frank de Graaf	33f7de0072	Merge pull request #1520 from mvdriel/cakenumber-fix ... Cakenumber fix	2013-08-14 13:41:53 -07:00
Mischa ter Smitten	0e49a23065	Makes the locale test not always pass, be verbose when it is skipped.	2013-08-14 22:32:04 +02:00
Mark van Driel	559fb5805b	Fix formatting with locales using , as decimal separator ... No double number formatting for readable size Fixed testPrecisionLocalized for travis (when locale is missing?) Switched locale to nl_NL and fixed test Skip test when locale is not available	2013-08-14 22:19:38 +02:00
Phally	6f74e1958b	Makes the locale test not always pass, be verbose when it is skipped.	2013-08-14 21:00:31 +02:00
mark_story	cb6ea82fea	Allow CakeEmail::template() to disable layout rendering. ... Fix the code to act as documented. Sending template('view', null) should disable layout rendering. Fixes #3983	2013-08-13 14:01:33 -04:00
k-halaburda	1d9bce34d4	Formatting issues	2013-08-13 13:01:38 +02:00
k-halaburda	2235a0e677	Formatting issues	2013-08-13 13:00:12 +02:00
k-halaburda	50cf070727	Formatting issues	2013-08-13 12:59:30 +02:00
k-halaburda	a6efcae625	Deleted rows in ModelReadTest	2013-08-13 12:32:36 +02:00
fuga	245611424f	Apply ADmad's patch and update testConfig method according to a new specification.	2013-08-13 17:42:52 +09:00
Alexander Hofbauer	80e589f19d	Correctly encode confirm handlers ... With encode set to false the onclick handler will be sent through h() regardless, making links and postLinks work again.	2013-08-13 10:11:22 +02:00
k-halaburda	39b202a4a9	Added some tests to related models afterFind callback	2013-08-13 10:04:17 +02:00
k-halaburda	8e40a3a3d3	Added some tests for related models afterFind callback	2013-08-13 09:29:14 +02:00
mark_story	26769edd04	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Utility/CakeTime.php lib/Cake/VERSION.txt	2013-08-12 14:39:02 -04:00
ankr	1cb41294b8	Making CakeTime display 'about X ago' when time passed is lower than accuracy ... Removing unnecessary else Also support 'about' times for future times Make 'about' times translateable in all languages	2013-08-12 10:01:38 -04:00
José Lorenzo Rodríguez	789400ac44	Merge pull request #1409 from cdburgess/phone-validation-update ... Phone validation update	2013-08-11 14:37:05 -07:00
Jose Lorenzo Rodriguez	9d07fc4330	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/ShellDispatcher.php lib/Cake/Utility/CakeNumber.php lib/Cake/View/Elements/sql_dump.ctp	2013-08-11 23:31:10 +02:00
José Lorenzo Rodríguez	890d4a9e2c	Merge pull request #1478 from aleho/2.4 ... Use a protected method to generate confirm() links	2013-08-11 13:51:29 -07:00
José Lorenzo Rodríguez	42bb766d92	Merge pull request #1503 from tigrang/cake-response-multi-header ... Cake response multi header. Fixes #3960	2013-08-11 12:19:26 -07:00
Mark Story	de479cfe8d	Merge pull request #1493 from dereuromark/2.4-cleanup ... remove undocumented code and unnecessary in_array() checks + cleanup	2013-08-11 08:06:00 -07:00
James Watts	19afed0003	Updated unit test for HTTP status codes	2013-08-10 13:32:49 +02:00
Marc Würth	2a540ff8a8	Fix for #3515, functional extension & tests ... https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3515 I used (string) because it is faster than strval() and there are no real benefits in this case. Also enabled assign(), append() and prepend() to take any values convertible to string. Removed try/catch as discussed with ADmad. Changed the three exception expecting tests to check for PHPUnit_Framework_Error now.	2013-08-09 01:34:08 +02:00
euromark	fc2d28974b	remove undocumented code and uncessary in_array() checks + cleanup	2013-08-08 03:56:58 +02:00
euromark	e7e5f46916	prevent rtrim to remove whitespace from test	2013-08-08 01:14:31 +02:00
euromark	1339a9dfe1	coding standards according to new sniffer rules	2013-08-08 01:03:21 +02:00
ADmad	faa4262969	Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url ... Fixed full urls on asset methods	2013-08-07 10:29:11 -07:00
Mark	6c30851783	Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding ... provide ability for rounding - closes #1986	2013-08-07 10:15:35 -07:00
Mark Story	054668f149	Merge pull request #1194 from dereuromark/2.4-file-improvements ... Allow creating of missing tmp directories in debug (development) mode	2013-08-07 09:52:07 -07:00
euromark	f5859ca719	allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files	2013-08-07 13:24:45 +02:00
ADmad	339cd00fec	Merge pull request #1482 from ADmad/2.4-l10n ... L10n cleanup	2013-08-07 00:42:09 -07:00
Mark Story	dc15c78710	Merge pull request #1483 from tigrang/debugger-fix ... Added case for `unknown` type. Fixes #3966	2013-08-06 19:39:13 -07:00
mark_story	9efad54e31	Fix missing expiry times on cookies. ... When writing multiple cookies in a single request with the default expiry time, cookies after the first should continue to have the default expiry time used. Fixes #3965	2013-08-06 22:01:13 -04:00
Juan Basso	330f8d168d	Merge pull request #1228 from jrbasso/2.4-router-parse ... Supoprt query parameters on Router::parse.	2013-08-06 18:57:37 -07:00
Tigran Gabrielyan	2150e8dce5	Added case for unknown type. Fixes #3966	2013-08-06 18:30:00 -07:00
Mark Story	33af7e2e52	Merge pull request #1426 from dereuromark/2.4-currency-fraction ... Fix currency output for fraction values. Fixes #1329	2013-08-06 18:19:01 -07:00
euromark	ad6fcd43d7	Fix currency output for fraction values using fractionExponent option.	2013-08-07 00:36:37 +02:00
ADmad	18cd3729e4	Deprecated DEFAULT_LANGUAGE constant and config value 'Config.language' is not used for default. ... Cleaned up L10n::_setLanguage(). Removed unused L10n::$found	2013-08-07 03:37:26 +05:30
Tigran Gabrielyan	34d848d0ca	Fixed order of assert params	2013-08-06 12:59:36 -07:00
U-Zyn Chua	3559aa35af	Removed a stray tab.	2013-08-06 17:13:53 +08:00
Tigran Gabrielyan	a6e3bb37a6	Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself ... Added ability to send multiple values with the same type of header in CakeResponse	2013-08-06 01:35:45 -07:00
Alexander Hofbauer	8601e0078a	Implement a Helper method to generate confirm() links ... This allows for overriding the default behavior of showing confirm()-dialogs in Html and Form helpers.	2013-08-06 10:04:44 +02:00
José Lorenzo Rodríguez	a54c92fc0f	Merge pull request #1475 from cakephp/feature/2.4-mock-app-model ... Make mocking random models easier	2013-08-05 00:22:53 -07:00
ADmad	04fb1eb614	Added more tests to db related tests group	2013-08-04 23:38:30 +05:30
ADmad	f68701d647	Created new test group for all db related tests	2013-08-04 21:23:45 +05:30
ADmad	38b050a711	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/Command/ConsoleShell.php	2013-08-04 19:26:55 +05:30
AD7six	ff856b7ebb	bark if the model doesn't exist ... Getting the following warning: ReflectionException: Class Mock_Foo_e187b1d1 does not have a constructor, so you cannot pass any constructor arguments Is a much less obvious way of saying "the class you're trying to mock doesn't exist". Be more explicit	2013-08-03 16:00:34 +00:00
AD7six	35b4ac0286	make it possible to run this test on its own ... Without setting up paths to the test_app - two of the tests will fail Verify/demonstrate how to mock a model without a model existing	2013-08-03 16:00:04 +00:00
Juan Basso	cda1a1e6c9	Added test for relative path using app asset configuration	2013-08-03 11:04:52 -04:00
Juan Basso	db6d0a748b	Fix for relative protocol on assets	2013-08-03 10:36:19 -04:00
Juan Basso	316c6582ea	Fixed pathPrefix for css and script methods	2013-08-03 10:36:19 -04:00
Christian Winther	cd44c2afae	Merge pull request #1472 from ADmad/bugfix/3948 ... Fixed bug when using multi model fieldList and whitelists for all models...	2013-08-03 05:56:22 -07:00
Andy Dawson	f34388c53a	Merge pull request #1471 from cakephp/feature/2.4-pretty-print ... pretty print json and xml responses in debug mode	2013-08-03 01:35:56 -07:00
euromark	a5531f7419	fix casing	2013-08-03 04:32:39 +02:00
euromark	6c1e60953b	fix cs	2013-08-03 03:02:52 +02:00
mark_story	b3860b3992	Fix clearing files in multiple groups. ... When using multiple groups on a cache config, clearing was not working properly. Clearing un-used cache configs also failed when the directories did not exist. Fixes #3930	2013-08-02 17:56:27 -04:00
ADmad	473e4f991f	Fixed bug when using multi model fieldList and whitelists for all models are not provided. ... Fixes #3948	2013-08-03 02:49:41 +05:30
mark_story	8209a298f7	Make CakeRoute::persistParams() more tolerant ... Subclasses and instances may not always define persist options. CakeRoute should be accepting of these differences. Fixes #3957	2013-08-02 13:28:58 -04:00
AD7six	1643e10c74	pretty print json and xml responses in debug mode	2013-08-02 15:17:24 +00:00
U-Zyn Chua	585ac157c0	CS fix.	2013-08-02 18:19:13 +08:00
Christian Winther	227f9aaa88	Merge pull request #1440 from Phally/master-postgres-fails ... Adds order to the test models to make the results more predictable.	2013-08-01 02:38:33 -07:00
ADmad	61bf8df454	Renaming base url config keys and methods for better uniformity.	2013-08-01 00:44:36 +05:30
ADmad	b22b39f158	Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.	2013-07-31 18:31:26 +05:30
ADmad	b7cee8ff57	Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key. ... Fixes #3874	2013-07-31 17:24:36 +05:30
Mark Story	4c7bc11a08	Merge pull request #1461 from thegallagher/master ... Required fields not recognised by FormHelper when only using ModelValidator::add()	2013-07-29 18:33:28 -07:00
David Gallagher	37ab0611ae	Fix whitespace	2013-07-30 11:26:49 +10:00
David Gallagher	35cc737261	Add for required fields when using only ModelValidator::add()	2013-07-30 11:11:49 +10:00
Mark Story	7269568ae6	Merge pull request #1460 from ravage84/cakeschematest-setup+teardown ... Removed unused setup & teardown methods	2013-07-28 17:54:33 -07:00
Marc Würth	3a4f7815e8	Removed unused setup & teardown methods from MyAppSchema in CakeSchemaTest	2013-07-29 01:55:32 +02:00
Marc Würth	1cac1846a3	Added missing calls to setUp & tearDown in tests	2013-07-29 01:52:39 +02:00
mark_story	8a81903e37	Fix FileEngine not clearing keys when groups are used. ... Fixes #3930	2013-07-27 22:20:40 -04:00
mark_story	17b25388b3	Throw exceptions when '' is used as translation domain. ... '' is never a good translation domain and often indicates developer error. Treat it as a mistake and throw an exception. Fixes #3939	2013-07-27 21:41:22 -04:00
mark_story	76aab0a635	Add failing test for #3930	2013-07-27 17:15:15 -04:00
Phally	933013f808	Test case to prove base urls are stripped. ... Refs #3938, #3916.	2013-07-26 19:57:12 +02:00
Phally	6b41eaa950	Merge branch 'master' into 2.4	2013-07-26 19:44:11 +02:00
Phally	f7eab23a5c	Strips the base off the generated URL from the AuthComponent. ... Fixes #3922.	2013-07-26 15:18:28 +02:00
euromark	24fa926ff9	remove private in favor of protected visibility	2013-07-22 21:08:05 +02:00
Phally	5953171c7b	Fixes cake bake all. Refs #1443.	2013-07-20 20:21:35 +02:00
Phally	6d6be87f8f	Replaces deprecated paginate() calls in controller bake templates. ... Fixes #3895.	2013-07-20 16:59:39 +02:00
Mark Story	1402796047	Merge pull request #1441 from ravage84/ViewTestsCleanup ... Added missing test + minor cleanup of ViewTests.php	2013-07-19 19:40:09 -07:00
Marc Würth	da8e50a48a	Added missing test + minor cleanup of ViewTests.php ... Added missing block reset test through assign(). Also made some minor cleanup in ViewTests.php. Mostly docblocks (params, returns) but also some unused variables.	2013-07-20 01:43:07 +02:00
Phally	db1876d837	Adds order to the test models to make the results more predictable. ... Even though there was some code in place to prevent results in random order from PostgreSQL we were still experiencing this with Jenkins and Travis. This commit removes the old code that handled this. From now on this will be handled differently. Every test model will order by its primary key. You can disable this by changing the order property of the model to `null`: `$testModel->order = null`.	2013-07-19 22:31:09 +02:00
Phally	36cac116d0	Fixes errors in tests with APC installed but not enabled in CLI.	2013-07-19 17:04:54 +02:00
Phally	32b818d2d8	Fixes bug in the first link of PaginatorHelper::numbers(). ... The link was the current URL instead of a link to the first page. This only happened with named parameters. This commit also includes a test for querystring parameters. Refs #1432.	2013-07-18 19:32:41 +02:00
mark_story	f725779a17	Better support various ranges as described in RFC2616 ... Refs #3914	2013-07-18 11:26:55 -04:00
mark_story	3f9e8e8113	Add missing calls to parent.	2013-07-18 11:04:09 -04:00
mark_story	e03d3df0fe	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Test/Case/View/HelperTest.php lib/Cake/VERSION.txt	2013-07-17 22:40:09 -04:00
Mark Story	204fb4b864	Merge pull request #1428 from markstory/2.4-location ... 2.4 location	2013-07-17 18:19:13 -07:00
Christian Winther	4416f2e796	Merge pull request #1427 from dereuromark/2.4-paginator-page1 ... fixes #700	2013-07-17 09:26:08 -07:00
mark_story	7b5122adb1	Fix pluralization of Objective. ... Fixes #3921	2013-07-17 10:04:29 -04:00
mark_story	6c18f6a231	Add failure messages to test assertions.	2013-07-17 09:47:10 -04:00
euromark	22d6625872	fix test	2013-07-17 12:18:06 +02:00
mark_story	2df873412c	Add CakeResponse::location() ... This method provides an easy to use interface to get/set the location header in a response object. This is primarily to facilitate future development in 3.x	2013-07-16 23:38:57 -04:00
euromark	05415dd83f	do not display page:1 or ?page=1 to avoid duplicate content in paginator helper output	2013-07-17 00:45:27 +02:00
mark_story	d4db64ff26	Ignore asset requests containing %2e in them. ... urldecode URI's early to avoid issues with encoded `.` characters.	2013-07-16 13:14:27 -04:00
mark_story	b873186468	Fix being unable to sort on custom synthetic columns. ... If a sort field whitelist is used we should trust its data and also trust that the developer wanted what they asked for. This solves issues where it was impossible to sort on synthetic columns added in custom find types. Fixes #3919	2013-07-16 10:19:18 -04:00
euromark	b412e2cbb1	provide ability for rounding - closes #1986	2013-07-16 15:42:08 +02:00
euromark	13ee5b7338	ability to provide custom strings for timeAgoInWords()	2013-07-16 15:16:30 +02:00
mark_story	4d6258adeb	Correct off by one error. ... Refs #3914	2013-07-15 21:48:03 -04:00
Christian Winther	532b2099e5	Merge pull request #1410 from Phally/2.x-3814 ... LH#3814 CakeNumber::toPercentage() should return percentage	2013-07-15 10:44:41 -07:00
Adam Taylor	5a6f1259e3	Fix the "testAssetUrlNoRewrite" test ... When running the test in the browser from somewhere other than http://localhost (e.g. http://foo.dev), the test was failing.	2013-07-13 23:38:55 -06:00
ADmad	d161b21ae1	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Controller/Component/AuthComponent.php	2013-07-14 10:58:55 +05:30
Majna	1ce9fc537f	Pages controller should render 404 on missing view file	2013-07-13 17:41:16 +02:00
mark_story	e016f1156f	Revert previous changes. ... Adding this parameter was a mistake. Remove it.	2013-07-12 21:37:22 -04:00
mark_story	52be365598	Introduce the strip argument to Router. ... This allows callers to request that the basepath *not* be stripped off when normalizing string URL's. This is important in AuthComponent when handling redirect URL's as the redirect location could point to a controller that shares a name with the base path. Refs #3897 Refs #3916	2013-07-12 21:16:18 -04:00
Mark	f9fdc1e6e0	Merge pull request #1408 from dereuromark/master-cleanup ... remove @access and unnecessary $name	2013-07-12 07:10:23 -07:00
mark_story	494fd05de6	Fix downloading Ranges in files. ... Correctly handle ranges that don't terminate at the end of the file. Also reject invalid ranges as described in RFC-2616. Thanks to Kim Biesbjerg for the initial patch. Fixes #3914	2013-07-11 23:20:12 -04:00
Mark Story	d992d3a626	Merge pull request #1385 from LeaseWeb/2.4 ... Add option to send email attachment from string (not only from file).	2013-07-10 10:12:07 -07:00
Mark Story	1ecc921e13	Merge pull request #1412 from wernerhp/master ... Inflector pluralize and singularize update	2013-07-10 08:59:03 -07:00
Werner Pieterson	3d83c628eb	Added more words to InflectorTest	2013-07-10 17:49:18 +02:00
Werner Pieterson	a27499d88a	Updated Inflector's 'pluralize and singularize to correctly handle addisional words. ... Updated InflectorTest to test new words.	2013-07-10 17:46:01 +02:00
Phally	e35bd80dfb	Adds option to multiply decimal percentages. Fixes #3814	2013-07-10 14:37:57 +02:00
Charles Burgess	fa3d4a0bb5	Updating the phone validation routine. ... According to NANPA, there are area codes and exchanges that are invalid or reserved and not available for assignment. This would make those phone numbers invalid. For example: - area-codes: 555, N11, N9X, 37X, 96X - exchanges: N11 - numbers: 555-0100 thru 555-0199 You could also say 555-1212 is invalid as it is assigned as information for the US. I changed the tests where 555 as an area code was being used as the assertion will give it a false on the area code and not the exchange as intended.	2013-07-09 09:54:18 -06:00
euromark	a643295e4c	remove @access and unnecessary $name	2013-07-08 15:50:50 +02:00
ADmad	4ded269549	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php lib/Cake/VERSION.txt	2013-07-07 12:22:12 +05:30
Rachman Chavik	4bb0a1228a	Fix I18n to extract plugin model validation messages	2013-07-07 11:20:14 +07:00
Christian Winther	cbb4f7db90	allow serialize in json and xml alias	2013-07-06 16:57:46 +00:00
euromark	af455b4121	correct return types in doc blocks	2013-07-05 17:19:22 +02:00
euromark	ba02678693	doc block corrections	2013-07-05 16:17:23 +02:00
euromark	e7f380d2b7	doublespace to single space	2013-07-05 14:36:40 +02:00
mark_story	22a198a8ba	Merge branch 'master' into 2.4	2013-07-04 21:40:51 -04:00
euromark	a620fbbbb8	fix cs	2013-07-04 13:30:08 +02:00
euromark	f680c763b2	ticket-3902 - paginator and display of order via model default order	2013-07-04 13:07:14 +02:00
mark_story	c597855fe4	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Test/Case/Network/CakeRequestTest.php	2013-07-03 14:21:09 -04:00
euromark	a90cb29c0f	simplify else cases	2013-07-03 01:14:41 +02:00
euromark	7cb19b97db	coding standards and simplification of else cases as well as some minor fixes	2013-07-03 00:52:48 +02:00
mark_story	521c293eb1	Fix coding standards.	2013-07-01 22:56:00 -04:00
Mark Story	9a08aeafcf	Merge pull request #1377 from ravage84/fix-for-3318 ... Trim off webroot/index.php when determining base and url. Trimming off index.php from url and webroot/index.php from base url allows the correct values to be created when a path contains index.php in it. Fixes #3318	2013-07-01 19:51:34 -07:00
Mark Story	2219991d3b	Merge pull request #1386 from nojimage/cakeemail-custom-email-validation ... CakeEmail class be able to setting custom email validation rule.	2013-07-01 07:36:34 -07:00
Mark Story	da033cbed7	Merge pull request #1375 from dereuromark/master-cake-email ... Move boundary calculation inside _render()	2013-07-01 06:12:24 -07:00
Mark Story	94db8fbed6	Merge pull request #1380 from ceeram/2.4-ext ... Set extension with multiple accept based on order in parseExtensions.	2013-06-30 19:42:50 -07:00
nojimage	f6a011215c	change emailRegex to emailPattern	2013-07-01 00:03:18 +09:00
Marc Würth	f930a50805	Fix for #3318 ... Fixes https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3318 It seems fixing this in the htaccess file(s) isn't going to work even though a url rewriting based solution was more clean. On the plus side this works for any web server. If a url is called with "index.php" in it then the CakeRequest swallows this part and fixes the path. Any linked url from the requested page will have a clean url. Thus after following one of these urls this problem is gone anyway. Some code docblock improvements to CakeRequestTest.php Added test case for fix Also now you can call just index.php even if you have url rewriting enabled	2013-06-30 05:38:58 +02:00
mark_story	f09693f6e8	Merge branch 'master' into 2.4	2013-06-29 23:26:26 -04:00
mark_story	1d18a4f702	Fix issue where redirectURLs were not generated correctly. ... When the first path segment matches the base path an incorrect URL was generated. Trimming slashes off makes Router normalize the URL correctly as the leading / implies that the base is already prepended. Fixes #3897	2013-06-29 23:26:13 -04:00
mark_story	0d76bfe325	Add an additional test for CakeRequest::referer(). ... Trying to track down the issue for #3897. This test coverage was missing, so fix that.	2013-06-29 23:26:13 -04:00
ADmad	75e7797a26	Allow escaping only attributes of a link and not it's title	2013-06-29 20:51:52 +05:30
euromark	b346c4af8e	Test to proof that render itself should handle the boundary.	2013-06-29 15:16:58 +02:00
nojimage	175280ad79	CakeEmail be able to setting custom email validation rule	2013-06-29 02:55:16 +09:00
nojimage	202b753c63	Add emailRegex property to CakeEmail	2013-06-29 02:44:55 +09:00
Maurits van der Schee	cd71a8439c	Add option to send email attachment from string (not only from file). ... I would be very pleased if this option would be available in some future version. Thank you.	2013-06-28 02:12:28 +02:00
Marc Würth	9591f55394	Annotated testReconnect	2013-06-27 17:15:56 +02:00
Mark Story	6fdbdf508f	Merge pull request #1368 from planardothum/url-conformance ... Url conformance	2013-06-27 06:31:42 -07:00
Ceeram	6a0185d7e6	Set extension with multiple accept based on order in parseExtensions, currently with multiple accepted types, no extension is set at all	2013-06-27 14:34:00 +02:00
Marc Würth	2609016dfe	Changed http links to lighthouse, groups.google and github to https ... Because they get redirected anyway and we should follow good practices. Also in many cases similar URLs were already using https	2013-06-25 22:58:30 +02:00
euromark	ee5e8c95dd	fix issue with FormHelper and undefined variable and extract	2013-06-25 12:11:10 +02:00
euromark	290c343a74	tests to disprove that input date and partial dateFormat does not work	2013-06-25 11:54:29 +02:00
Juan Basso	19c94d0211	Fixed default datestyle for postgres tests	2013-06-25 00:15:03 -04:00
Juan Basso	accc98f55d	Resetting the datestyle to not affect other tests	2013-06-24 23:36:40 -04:00
euromark	d6c25bd0e3	add convenience method param() for PaginatorHelper	2013-06-24 00:03:08 +02:00
José Lorenzo Rodríguez	fb111d6fd6	Merge pull request #1366 from dereuromark/2.4-unify-engine ... unify engine to not require the suffix	2013-06-23 14:42:13 -07:00
mark_story	dcf7df39d2	Merge branch 'master' into 2.4	2013-06-21 17:47:37 -04:00
mark_story	94815a74f1	Add ordering to prevent occasional pgsql failures.	2013-06-21 17:47:08 -04:00
Harold Putman	7acf162268	HTTP_HOST is not available in CLI ... use FULL_BASE_URL instead.	2013-06-21 16:37:39 -04:00
Harold Putman	2fd36bdedc	Router::url should passthru //example.com/file.ext ... The function allows ://example.com/file.ext but was treating //example.com as cake-relative URL. The updated regex matches URI schemes as defined in RFC2396. Will passthru any of these formats: * Starts with a valid URI scheme (javascript:, https:, itunes:, ftp:) * Starts with a '#' * [NEW] Starts with a '?' which may be meaningless, but is as valid as starting with '#' (RFC1808) * starts with //, or :// (:// is not technically valid, but included for compatibilty)	2013-06-21 15:10:11 -04:00
Harold Putman	cfdac5e32d	Allow plus signs in URL's to pass unscathed in Helper functions. ... According to RFC 1738 the plus sign does not have special meaning outisde of the query part of a URL.	2013-06-21 14:24:39 -04:00
euromark	8141dd2d5d	unify other log types as well	2013-06-21 16:43:01 +02:00
euromark	24506dcc2c	update test for FileLog config	2013-06-21 16:39:51 +02:00
euromark	cb24dbb084	unify engine to not require the suffix (as Cache and other places do).	2013-06-21 15:04:27 +02:00
mark_story	68db74d32d	Cleanup from previous commit. ... Refs #GH-1352	2013-06-19 15:06:51 -04:00
Lucas Machado	dc3f9113b0	Fix to the date input year field ... Create the field if no value is informed only to the maxYear and not to the current date.	2013-06-19 15:05:15 -04:00
Rachman Chavik	0d486bdab4	AuthComponent: Allow suppressing authError message ... When unauthenticated users accesses protected areas, they are greeted with the default 'You are not allowed to access that location' which is not desired in some cases. This patch allows applications to suppress this message by setting AuthComponent::authError to false bypassing the call to SessionComponent::setFlash() altogether. Refs: https://github.com/croogo/croogo/pull/175#discussion_r4714240	2013-06-17 09:33:59 +07:00
ADmad	12da3b1f27	Merge branch 'master' into 2.4	2013-06-16 13:07:44 +05:30
mark_story	111bfa43d4	Fix incorrect autolinking when urls end at HTML tags. ... Fixes #3879	2013-06-15 22:01:29 -04:00
mark_story	1c358c0f53	Add tests for Model::clear()	2013-06-14 09:21:20 -04:00
José Lorenzo Rodríguez	2f93d781ad	Merge pull request #1349 from renansaddam/smtpTransportReturnPath ... Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport	2013-06-13 05:05:36 -07:00
Renan Gonçalves	796e4b45dd	Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport. ... The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery. Quote RFC2821: > When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.	2013-06-12 11:31:49 +02:00
Rik van der Heijden	e7d2892e81	Fixed unit-test locales	2013-06-11 20:18:40 +02:00
mark_story	cd3c54bb9d	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt	2013-06-10 22:12:10 -04:00
euromark	6ed85f2d5d	doc block	2013-06-10 15:10:32 +02:00
euromark	42777b7809	incorrect tab to space - whitespace coding standards	2013-06-09 21:01:01 +02:00
euromark	4518624187	more whitespace coding standard corrections	2013-06-09 17:39:48 +02:00
euromark	a6f065e7a2	coding standards whitespace and single quote	2013-06-09 17:20:08 +02:00
ADmad	405c5b0280	Fix test	2013-06-09 18:57:09 +05:30
ADmad	636cc8c103	Merge branch 'master' into 2.4	2013-06-09 18:08:32 +05:30
mark_story	e5b1182a0d	Only delete files that have a matching group + prefix. ... Fixes #3873	2013-06-08 22:42:41 -04:00
Aymeric Derbois	0cfdb87cdf	Fix a problem of tag values which is not taken into account ... (when equal to zero) when passing an array to XML object.	2013-06-09 00:52:06 +02:00
mark_story	e527eab5aa	Add missing call to parent::setUp()	2013-06-08 09:47:46 -04:00
Mark Story	5cdd11cb38	Merge pull request #1336 from djbobke/caketimetest-locale ... Fix locale for CakeTimeTest when configured different locale in app	2013-06-08 06:45:20 -07:00
Rik van der Heijden	0946a7799a	Fix locale for CakeTimeTest when configured different locale in app	2013-06-08 10:25:28 +02:00
euromark	394bf1054d	remove name attribute where not necessary, clean up doc blocks	2013-06-08 04:29:08 +02:00
Jose Lorenzo Rodriguez	f14c55916f	Repeating previous change for SQLite, so it passes on PHP 5.5	2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez	04a6bfbda6	Fixing postgres test for PHP 5.5	2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez	51af8800f2	Rewriting assertion to account for the actual case and not breaking in ... PHP 5.5	2013-06-06 17:45:52 +02:00
José Lorenzo Rodríguez	3b4a4fde31	Merge pull request #1317 from lorenzo/feature/full-base-url ... Adding App.fullbaseURL as a recognized Configure value	2013-06-05 15:12:27 -07:00
Jose Lorenzo Rodriguez	7b746ccb57	Overwriting App.fullBaseURL if changed using Router::baseURL()	2013-06-05 23:57:16 +02:00
Kim Egede Jakobsen	6c3a63ea9b	Correct small typos.	2013-06-05 09:57:18 +02:00
Mark Story	59646aa30a	Merge pull request #1326 from fahad19/http-patch ... convenience wrapper for HTTP PATCH in HttpSocket class.	2013-06-04 20:54:45 -07:00
Fahad Ibnay Heylaal	679177b8f3	convenience wrapper for HTTP PATCH in HttpSocket class.	2013-06-04 22:46:15 +02:00
mark_story	3aa189eb3a	Fix cookie expiry time calculation on 32bit systems. ... strtotime() misbehaves on 32bit systems when the resulting timestamp would overflow an integer. Use a DateTime to workaround this issue. Fixes #3868	2013-06-03 20:16:18 -04:00
mark_story	027cfe9496	Fix typo.	2013-06-02 18:12:51 -04:00
mark_story	cbf3228c34	Fix inconsistent name/alias usage. ... TranslateBehavior should always use name instead of alias when creating/updating/saving new translate records. It already uses name when finding translations and the mismatch was causing translations to not be found when saved from an aliased model. Thanks to Joost de Keijzer for providing the initial patch. Fixes #3865	2013-06-02 13:50:23 -04:00
ADmad	3303a2cda1	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php lib/Cake/Console/Templates/skel/Config/Schema/i18n.php lib/Cake/Console/Templates/skel/Config/Schema/sessions.php lib/Cake/Console/Templates/skel/Config/acl.ini.php lib/Cake/Console/Templates/skel/Config/acl.php lib/Cake/Console/Templates/skel/Config/bootstrap.php lib/Cake/Console/Templates/skel/Config/core.php lib/Cake/Console/Templates/skel/Config/database.php.default lib/Cake/Console/Templates/skel/Config/email.php.default lib/Cake/Console/Templates/skel/Config/routes.php lib/Cake/Console/Templates/skel/Console/Command/AppShell.php lib/Cake/Console/Templates/skel/Console/cake.bat lib/Cake/Console/Templates/skel/Console/cake.php lib/Cake/Console/Templates/skel/Controller/AppController.php lib/Cake/Console/Templates/skel/Controller/PagesController.php lib/Cake/Console/Templates/skel/Model/AppModel.php lib/Cake/Console/Templates/skel/View/Errors/error400.ctp lib/Cake/Console/Templates/skel/View/Errors/error500.ctp lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp lib/Cake/Console/Templates/skel/View/Layouts/default.ctp lib/Cake/Console/Templates/skel/View/Layouts/error.ctp lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp lib/Cake/Console/Templates/skel/View/Pages/home.ctp lib/Cake/Console/Templates/skel/index.php lib/Cake/Console/Templates/skel/webroot/index.php lib/Cake/Console/Templates/skel/webroot/test.php	2013-06-02 18:03:59 +05:30
Saleh Souzanchi	ca44413689	fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options	2013-06-01 14:16:23 +04:30
mark_story	be2a252345	Fix coding standards.	2013-05-31 10:37:20 -04:00
Mark Story	4b7c128f04	Merge pull request #1320 from ravage84/docblock-improvements ... Improved the DocBlocks and other code cleanup	2013-05-31 07:36:04 -07:00
Mark	525bf3b362	Merge pull request #1297 from dereuromark/master-email-wrapping ... enforce a better email wrapping to send valid emails	2013-05-31 07:30:32 -07:00
Marc Würth	4c9f0414cb	Improved the DocBlocks and other code cleanup ... Fixed @license tag, url comes first Whitespace and other minor code cleanup Added some docblocks	2013-05-31 00:11:19 +02:00
Jose Lorenzo Rodriguez	4bc92b822e	Adding App.fullbaseURL as a recognized Configure value	2013-05-30 16:07:26 +02:00
Sebastián Marcos Arce	bf6c3854e5	Update HttpSocketTest.php ... Update tests.	2013-05-30 10:13:31 -03:00
Marc Würth	2bbd391972	Synced PHP version annotations ... CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5" http://pear.php.net/manual/en/standards.header.php	2013-05-29 20:19:14 +02:00
Mark Story	bed60b5d82	Merge pull request #1312 from ravage84/package-fixes ... Fixed or removed some package/subpackage definitions to reflect director...	2013-05-29 10:14:00 -07:00
Marc Würth	e7eb09bc23	Renamed ...Controller package to ...View ... Probably a leftover from splitting in 09e7f1d491	2013-05-29 17:20:41 +03:00
Marc Würth	29cc6b3652	Fixed or removed some package/subpackage definitions to reflect directory structure ... Lowercase cake instead of Cake Tests instead of Test Fixtures instead of Fixture	2013-05-29 15:00:18 +02:00
mark_story	cce9e84907	Merge branch 'master' into 2.4	2013-05-28 22:40:32 -04:00
mark_story	06cf62aefe	Fix failing tests. ... Refs GH-1307	2013-05-28 22:38:01 -04:00
Mark Story	b111750494	Merge pull request #1308 from Jippi/hotfix/sql-bug-with-not-in-with-one-key ... Hotfix/sql bug with NOT in with one key	2013-05-28 10:21:21 -07:00
Christian Winther	ef8603e1a7	Add unit test	2013-05-28 12:02:58 +00:00
euromark	bebb8ec416	do not translate error message in test case	2013-05-28 03:25:52 +02:00
mark_story	7334643b55	Fix issues with getting Xml as SimpleXmlElement and invalid Xml. ... Fixes #3855	2013-05-27 13:22:14 -04:00
ADmad	dd2892ad8d	Added password hasher	2013-05-26 11:29:06 +05:30
ADmad	36c592e72e	Merge branch 'master' into 2.4	2013-05-26 11:23:53 +05:30
mark_story	9ee610757e	Throw exceptions when invalid permission keys are used. ... Silently 'failing' to save permissions is bad, throw exceptions instead. Fixes #3851	2013-05-24 21:47:22 -04:00
Rachman Chavik	a63b54c34b	Fix: Incorrect model being used as Controller::$modelClass ... We cannot be sure that Controller::$uses have not been iterated, so reset the array to use the first value.	2013-05-24 17:50:43 +07:00
euromark	75b5a323e4	enforce a better email wrapping to send valid emails	2013-05-23 18:34:39 +02:00
mark_story	ca1f9e800e	Make CakeEmail::config() merge configuration. ... This allows you to incremementally overwrite configuration and better matches other config methods in CakePHP. Fixes #3848	2013-05-23 09:47:24 -04:00
ADmad	eccdf3bf60	Ensure passing empty array to SmtpTransport::config() does not reset existing config. ... Synced args and return value with AbstractTransport::config(). Fixes #3840	2013-05-22 11:36:31 +05:30
Gilles Wittenberg	6d996d52ce	Allow setting different type on scriptStart + scriptEnd	2013-05-21 20:14:44 +02:00
Gilles Wittenberg	f19615a3be	Allow setting different type on scriptBlock	2013-05-21 20:14:44 +02:00
Mark Story	28a3b73bdc	Merge pull request #1292 from openam/HtmlHelper ... make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false	2013-05-21 08:44:08 -07:00
TAKAHASHI Kunihiko	05473fe7d0	Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST	2013-05-21 10:50:46 +09:00
Michael Tuttle	0d082b599a	changed HtmlHelper::tag() just return $text when empty($name)	2013-05-20 17:36:51 -06:00
Michael Tuttle	12462b2e51	make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false	2013-05-19 22:00:27 -06:00
ADmad	fb86859585	Merge branch 'master' into 2.4	2013-05-19 14:37:41 +05:30
mark_story	f8c6138ad7	Fix incorrect exception type when double slash paths are used. ... Fixes #3838	2013-05-18 12:20:06 -04:00
mark_story	e23c4ffad9	Fix empty response bodies when redirect URL's are empty. ... When redirecting XHR requests to an empty URL the response body should not be overwritten. Fixes #3835	2013-05-17 16:33:08 -04:00
Mark Story	9147f545fe	Merge pull request #1286 from kunit/master ... CakeEmail::_wrap does not operate correctly by the character string of specific Japanese.	2013-05-17 13:17:13 -07:00
TAKAHASHI Kunihiko	f541260350	Add TestCase for Network/Email/CakeEmail.php	2013-05-17 18:56:52 +09:00
TAKAHASHI Kunihiko	a562d9c04e	The assembly of the message was not correctly completed in specific Japanese.	2013-05-17 18:36:53 +09:00
euromark	97c2cb367d	CS fixes	2013-05-17 10:36:17 +02:00
mark_story	72b75660e5	Merge branch 'master' into 2.4	2013-05-16 21:31:27 -04:00
José Lorenzo Rodríguez	e466af05b9	Removing copy pasted extra line	2013-05-16 17:25:39 +02:00
Jose Lorenzo Rodriguez	018e5d0659	Adding Sylog as a logging engine	2013-05-14 23:21:38 +02:00
euromark	9fd2af96a8	add test case	2013-05-14 10:38:10 +02:00
mark_story	f7d106a386	Fix FormHelper::tagIsInvalid with saveMany forms. ... When saving multiple records validation errors were not correctly shown. Fudge the entity path so it matches the validation errors set in the models. Fixes #3828	2013-05-13 21:09:31 -04:00
mark_story	bd3428e456	Remove Asset.x Configure values. ... Having Asset.timestamp on can fail tests accidentally.	2013-05-13 21:09:31 -04:00
mark_story	c1b2ca581c	Use terser assertions.	2013-05-13 21:09:31 -04:00
ADmad	4d434ec9f3	Fix CS errors	2013-05-13 23:51:32 +05:30
mark_story	df872dde28	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt	2013-05-10 21:58:48 -04:00
mark_story	6017db9dc8	Add missing urlencoding to base/webroot. ... This fixes URL generation when PHP_SELF or the request path contains special characters.	2013-05-10 11:04:46 -04:00
mark_story	cdede82b7e	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Core/Object.php	2013-05-07 22:22:48 -04:00
Mark Story	94ff1b20e2	Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem ... Fix bug in Xml::_toArray Method	2013-05-07 19:03:18 -07:00
Mark Story	293ba4cdb9	Merge pull request #1261 from dereuromark/2.4-bake-fixtures ... add schema param and skip interactive prompts if unnecessary	2013-05-07 18:59:42 -07:00
Derbois Aymeric	ca6612bc8b	Fix a problem of tag values which is not taken into account ... (when equal to zero) when passing an XML object to an array.	2013-05-08 00:56:17 +02:00
ADmad	91319bbe7b	Fix disabled attribute check. ... Fixes #3818	2013-05-08 01:43:27 +05:30
ADmad	372089797f	Fix test	2013-05-07 23:23:07 +05:30
ADmad	36a51bdad5	Avoid fail due to postgres ordering	2013-05-06 22:03:45 +05:30
ADmad	a10275fb8b	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php	2013-05-05 14:36:46 +05:30
Rik van der Heijden	dddf8aafb9	Fixed curly brackets at a few class definitions	2013-05-04 13:23:58 +02:00
ADmad	db26e24cb7	Remove error setting when reading/deleting non-existent key. ... Fixes #3813	2013-05-04 03:16:33 +05:30
Angel S. Moreno	2c4e9dc8f6	Added Aliasing of Tasks in the TaskCollection() class and added tests	2013-05-03 01:53:37 -04:00
mark_story	d4036310e4	Update limit() for Postgres ... It should work like the parent class.	2013-05-02 23:27:26 -04:00
mark_story	00569ea405	Update limit() for Sqlite. ... It should behave as the parent class does.	2013-05-02 23:25:13 -04:00
mark_story	2096d3f632	Clamp limit values to be unsigned integers. ... This solves large page numbers potentially turning into scientific notation when being formatted into queries. It also further safeguards against SQL manipulation. Refs #GH-1263	2013-05-02 22:36:50 -04:00
Rob McVey	bd3be2877d	Test case for loooong page numbers in paginated results seems to cause SQL error	2013-05-02 09:57:04 +01:00
euromark	0959c7008f	add schema param and skip interactive prompts if unnecessary	2013-05-02 00:19:46 +02:00
Rachman Chavik	5682907a88	Add Cache::groupConfigs() to get group->config map	2013-05-01 12:03:15 +07:00
mark_story	41d124d4de	Fix autoLinkUrls() not autolinking URL's without a /. ... Refs #GH-1259	2013-04-30 17:02:07 -04:00
mark_story	37ce6dfc81	Only allow sort fields that match the current object alias. ... Instead of modifying aliases that do not match, only allow aliases that do match. Refs #3803	2013-04-30 12:41:42 -04:00
euromark	fab5a6f4d9	spelling corrections	2013-04-30 14:11:50 +02:00
Mark	faa6292f15	Merge pull request #1255 from dereuromark/master-copyright-noise-removed ... Remove copyright noise from test files	2013-04-30 02:24:25 -07:00
mark_story	2b0e10eebb	Exclude domain names starting with - ... Related to 479aefc438 Refs #3414	2013-04-29 21:31:30 -04:00
Mark Story	ac94d11e65	Merge pull request #1254 from dereuromark/master-spelling-corrections ... spelling corrections (a url to an URL, unify URL)	2013-04-29 09:27:48 -07:00
euromark	5b298c1306	remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway	2013-04-29 17:16:53 +02:00
Mark	eb9b80e63a	Merge pull request #1192 from dereuromark/master-templated-emails ... fix line length for templated emails	2013-04-29 07:34:06 -07:00
euromark	ff0aa70b59	fix line length for templated emails	2013-04-29 16:18:00 +02:00
euromark	09d9efe235	spelling corrections (a url to an URL, unify URL)	2013-04-29 11:05:17 +02:00
Mark Story	619f66178b	Merge pull request #1233 from spiliot/patch-1 ... Money validation should accept one decimal place.	2013-04-28 18:06:49 -07:00
spiliot	dbe90cae71	removed duplicate test case ... ```$this->assertFalse(Validation::money('text'));``` is now tested only once	2013-04-29 00:20:35 +03:00
mark_story	62186ac8da	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt	2013-04-28 17:00:30 -04:00
mark_story	65b1a94e63	Simplify how fullBase is calculated. ... Using FULL_BASE_URL fixes URL generation when URL rewriting is disabled. Fixes #3777	2013-04-27 23:03:25 -04:00
mark_story	c327bdc4bd	Enforce model aliases when generating order by clauses. ... Invalid SQL could be created by sorting on an invalid alias, with a field that exists on the model. Fixes #3797	2013-04-27 13:29:29 -04:00
ADmad	e11d0f829a	Added html5 required attribute for select tags too	2013-04-27 18:39:53 +05:30
ADmad	8135d405a3	Merge branch 'master' into 2.4	2013-04-27 18:39:30 +05:30
Mark	372cd6f952	Merge pull request #1250 from dereuromark/master-form-input-require ... dont add required class on wrapper div	2013-04-26 07:07:17 -07:00
Mark Story	cfda4e5c43	Merge pull request #1248 from zoghal/fix-router1 ... fix currentRoute() when $_currentRoute is empty, return false	2013-04-26 07:00:33 -07:00
euromark	67cc7f66da	dont add required class on wrapper div	2013-04-26 15:41:35 +02:00
Saleh Souzanchi	4aabf72e1f	fix currentRoute() when $_currentRoute is empty, return false	2013-04-26 13:36:35 +04:30
Rachman Chavik	03e5207aa1	Fix: write() after clearGroup() does not actually write to file ... Although clearGroup() does not use $this->_File, it needs to be null-ed so that subsequent write() call do not see stale object.	2013-04-26 14:43:36 +07:00
ADmad	3c036e9ebf	Merge pull request #1249 from DiegoMax/master ... Fixed CakeResponse Tests	2013-04-26 00:37:18 -07:00
Diego Massanti	03b6c3fa61	Fixed test case for CakeResponse	2013-04-26 04:32:44 -03:00
ADmad	19f8274a95	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt	2013-04-25 03:06:04 +05:30
Jose Lorenzo Rodriguez	db6dd18f86	Fixing case where it was possible to pass array data to FormAuthenticate ... fields	2013-04-24 22:33:24 +02:00
ADmad	3db632732c	Avoid unnecessary overhead if user record already available from session.	2013-04-23 01:35:04 +05:30
euromark	48fa358260	Remove leftover param that is now wrongly triggering "strict"	2013-04-22 11:36:17 +02:00
spiliot	2d7f6fc707	Added tests	2013-04-22 03:42:19 +03:00
mark_story	c2c096428c	Uncomment test. ... I missed this earlier, because I'm a doofus.	2013-04-21 11:29:25 -04:00
ADmad	06a5c509c0	Merge branch 'master' into 2.4	2013-04-21 19:15:55 +05:30
mark_story	f6c3015705	Add additional tests and fix incorrect meridian selection ... When dates around midnight were used with interval + 12hr formats, the incorrect meridian was selected. Refs #GH-1237	2013-04-20 14:39:47 -04:00
Majna	78ea4da681	Add test for time input with interval on first hour of the day	2013-04-20 17:51:50 +02:00
Ceeram	842b1802d9	add assert that habtm save does not return false	2013-04-19 19:37:23 +02:00
mark_story	efd86a498a	Do type checks when looking for models in Controller::$uses. ... This solves issues with models not being added when $uses = true. Fixes #3774	2013-04-19 12:20:46 -04:00
mark_story	0f3d28c6ea	Fix condition parsing in mysql specific cases. ... When using collation + array values the incorrect operator would be used. IN should be used over =. Fixes #3772	2013-04-18 21:52:22 -04:00
mark_story	4d8dd12449	Add support for key => value cookies. ... This makes using simple arrays easier, and I feel it is a long standing omission from HttpSocket. Fixes #3771	2013-04-18 21:22:50 -04:00
ADmad	79ad8ab95a	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Utility/File.php	2013-04-14 00:05:18 +05:30
ADmad	ba56fb7064	Fixed issue where incorrect cached filesize was reported when appending to file.	2013-04-13 19:45:20 +05:30
Juan Basso	ce5563ff83	Supoprt query parameters on Router::parse. It will increase the symmetry of parse and reverse methods	2013-04-12 23:28:23 +00:00
mark_story	ed435870ae	Fix secure field lists when select elements have custom name attributes. ... When a select element had a custom name attribute the secured field name was incorrect. Fixes #3753	2013-04-12 12:30:05 -04:00
mark_story	8bd1980dd4	DateTime::getTimestamp() is PHP5.3+	2013-04-11 13:39:05 -04:00
ADmad	548cccbbe2	"maxlength" is not a valid attribute for input element of type "number" in html5.	2013-04-11 21:06:52 +05:30
mark_story	5c83bc177d	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Model/Model.php lib/Cake/VERSION.txt	2013-04-09 22:09:56 -04:00
mark_story	0e646a2a4d	Fix incorrect timestamp values when using fromString() ... When using fromString() on DateTime objects that were in the global timezone, an incorrect value would be returned. Fixes #3743	2013-04-09 21:30:20 -04:00
ADmad	e55877d171	Merge branch 'master' into 2.4	2013-04-06 00:57:46 +05:30
ADmad	431ab2aebd	Fix CS errors	2013-04-04 17:37:51 +05:30
mark_story	d8d8e9644d	Fix array('disabled') and array('disabled' => true) working differently. ... The shortform should work the same as the longer form with regards to disabling field locking with SecurityComponent. Fixes #3734	2013-04-03 12:46:39 -04:00
Rémi Dewitte	c70a3868a9	schema update CREATEs non-existing tables instead of ALTER	2013-04-03 17:37:09 +02:00
Mark Story	bb776cfa72	Merge pull request #1213 from markstory/improve-request-is ... Improve CakeRequest::is() Fixes #3714	2013-04-02 10:20:13 -07:00
José Lorenzo Rodríguez	0b73c8b6ac	Merge pull request #1171 from remidewitte/feature/filelog-mask2 ... Add mask setting to FileLog	2013-04-01 23:44:02 -07:00
mark_story	2d6ee3cdb1	Remove pointless code. ... Add a missing call to parent::setUp() and remove code that it takes care of.	2013-04-01 22:30:27 -04:00
mark_story	ce04d6afa1	Add CakeRequest::isAll(). ... Provides a way to test multiple request types at the same time. And assert that all pass. This replaces longer conditionals with a terser syntax. Refs #3714	2013-04-01 21:52:22 -04:00
mark_story	d4a3594e4f	Add support for is() with multiple types. ... Add ability to check if a request is one of a set number of types by providing an array. If any type matches, then the method returns true. Refs #3714	2013-04-01 21:52:15 -04:00
ADmad	d809b1480e	Fix CS errors	2013-04-01 02:16:52 +05:30
mark_story	d28c2f8e72	Fix code & tests for isPast() and isFuture() ... The methods and tests now follow coding standards and work.	2013-03-30 22:24:14 -04:00
Roberto Frega	632c4feb5d	Adds two new time testing methods: 'isFuture' and 'isPast' ... TestCases included	2013-03-30 22:24:08 -04:00
mark_story	3fc627c5f8	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Controller/Component/AuthComponent.php lib/Cake/Error/ErrorHandler.php lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php lib/Cake/View/Helper/HtmlHelper.php	2013-03-30 22:12:27 -04:00
ADmad	7b90542230	Fix CS error	2013-03-31 00:23:03 +05:30
mark_story	ceb46b5d2c	Try to fix random test failures on postgres. ... Sorting in postgres is undefined and no based on the primary key when sorting is not supplied.	2013-03-30 13:38:47 -04:00
Mark Story	84c0de7e2d	Merge pull request #1203 from cincodenada/patch_httpsocket ... Add a bit of backwards compatibility for specifying auth in the config. Restore compatibility with older versions when providing auth data in the request data.	2013-03-29 18:19:46 -07:00
Joel Bradshaw	ece6ac3663	Backwards compat for auth in the config array of HttpSocket::request() ... Brings functionality back in line with docs as well	2013-03-29 15:46:42 -07:00
Renan Gonçalves	96c9174ee2	Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true. ... Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.	2013-03-29 15:24:08 +01:00
Mark	42ea6895b2	Merge pull request #1107 from TeckniX/patch-1 ... Added autoParagraph functionality to 2.4 Branch	2013-03-28 03:30:15 -07:00
ADmad	342bf65811	Ensure referrer is saved in session even when AuthComponent::$loginRedirect is set. ... Clarified redirectUrl() docblock.	2013-03-27 15:11:02 +05:30
mark_story	041c2d289f	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/Shell.php	2013-03-26 20:31:54 -04:00
José Lorenzo Rodríguez	8c9a16ab9f	Merge pull request #1186 from ceeram/2.4-blacklist ... 2.4 blacklist	2013-03-26 07:35:43 -07:00
Ceeram	6bf9363217	Add option to skip exception types for logging. ... add blacklisting for logging exceptions add test for skipping exception logging, and fix typo and cs add example to docblock in core.php for skipLog remove app_error.php skips, those are no longer used in 2.x use assertContains instead of assertRegExp check for instanceof, instead of matching names	2013-03-26 15:11:39 +01:00
Loki	d260f4a5b3	Added autoParagraph to TextHelper with proper test cases and made it non-static	2013-03-25 11:00:37 -04:00
euromark	3a1ff36d5e	correct coding standards	2013-03-25 13:06:38 +01:00
mark_story	a7708c914f	Remove test case that is no longer useful. ... It is impossible for the current test to ever fail in the test suite, as PHPUnit will always be loaded.	2013-03-22 21:36:11 -04:00
José Lorenzo Rodríguez	c3222f746f	Merge pull request #1185 from ceeram/2.4-unauthenticated ... stop execution when unauthenticated, to prevent the page to show when ca...	2013-03-22 05:09:47 -07:00
mark_story	5d6a6fa203	Fix error when generating Xml. ... Fix warnings/un-escaped entities with deeply nested elements. Fixes #3718	2013-03-21 21:12:21 -04:00
Mark	a13f7e1f8a	Merge pull request #1178 from dereuromark/2.4-bake-behaviors ... Allow behaviors to be added for baked models	2013-03-21 06:16:19 -07:00
mark_story	729ef8fe58	Fix default null not being reflected by SqlServer ... Apply patch from 'Josh Rehm' to fix null default values from being stomped on when reflecting table schema. Fixes #3615	2013-03-19 21:02:27 -04:00
mark_story	b821505014	Merge branch 'phantom-master' ... Refs GH-1182	2013-03-18 21:40:14 -04:00
mark_story	37532389d6	Add test cases for GH-1182 ... Add tests for afternoon times with an interval and 12 hour time format.	2013-03-18 21:37:38 -04:00
Ceeram	89ecd95e55	fix failing tests	2013-03-18 18:47:05 +01:00
Ceeram	99fba8c601	more coding standards fixes, minor rectaoring of testcase	2013-03-18 11:38:50 +01:00
Ceeram	89100f9476	fix coding standards	2013-03-18 11:12:28 +01:00
mark_story	83de70efcf	Tighten Canadian postal code validation. ... D, F, I, O, Q, U should not be valid anywhere in a canadian postal code. Fixes #3708	2013-03-17 18:14:56 -04:00
ADmad	7becd58237	Add test for Auth.redirect session var clearing.	2013-03-15 17:50:05 +05:30
euromark	dab0c5e753	Allow behaviors to be added to bake templates and improve doc blocks	2013-03-15 12:14:06 +01:00
mark_story	e97b3acebb	Merge branch 'master' into 2.4	2013-03-14 20:54:42 -04:00
Mark Story	6d301394f4	Merge pull request #1183 from cincodenada/patch-1 ... Fix bug where differing key-ordering in fixtures causes errors. When a fixtures first and last records differed data should be inserted correctly.	2013-03-14 17:52:06 -07:00
Joel Bradshaw	9d7148e16f	Restructuring Strings test so that it is compatible with this change	2013-03-14 14:51:54 -07:00
Mark Story	76ea0803d5	Merge pull request #1174 from psparrow/master ... Fixed issue with including including PHPUnit's Autoload script.	2013-03-14 14:36:16 -07:00
mark_story	246c09ae40	Allow character classes in attribute patterns. ... Fixes #3706	2013-03-14 12:55:03 -04:00
Mark Story	60f9131940	Merge pull request #1177 from yuya-takeyama/fix-alphaNumeric-validation ... Fix alphaNumeric validation	2013-03-14 07:23:51 -07:00
Ceeram	18095ed42d	fix failing test with webrunner	2013-03-14 12:44:11 +01:00
Yuya Takeyama	14c81fe052	Fix alphaNumeric validation	2013-03-14 20:10:17 +09:00
ADmad	8e299fc404	Move 'Auth.redirect' session value clearing from AuthComponent::shutdown() to prevent unnecessary session start. ... Closes #3702	2013-03-14 12:42:21 +05:30
mark_story	0900c32c03	Merge branch 'master' into 2.4	2013-03-13 21:01:03 -04:00
mark_story	f1d192f282	Fix issue with midnight hour & 12hr formats. ... No hour would be selected in the case of 12hr formats and a time like 00:xx:yy	2013-03-13 20:56:04 -04:00
mark_story	81dc4c1e85	Merge branch 'master' into 2.4	2013-03-13 20:30:25 -04:00
mark_story	274a146b24	Move tests around. ... Try to fix timing issues in formhelper tests.	2013-03-13 20:29:45 -04:00
Ceeram	8374eb92cc	fix failing tests. test and mocked sources would cause exceptions	2013-03-13 22:31:23 +01:00
José Lorenzo Rodríguez	abe6511d78	Merge pull request #1169 from ADmad/2.4-auth-take-2 ... Implemented stateless login for Auth	2013-03-13 14:22:18 -07:00
pjskeptic	9b9cf3d165	Fixed code formatting.	2013-03-13 12:18:32 -04:00
Ceeram	f6477d58df	change formatOutput option name to pretty	2013-03-13 15:44:59 +01:00
pjskeptic	294dff7a26	Added test for CakeTestSuiteDispatcher::loadTestFramework.	2013-03-13 10:13:48 -04:00
Ceeram	fc34d9fe7f	Add formatoutput option to Xml::fromArray	2013-03-13 13:07:36 +01:00
pjskeptic	b17d8c9124	Added test for CakeTestSuiteDispatcher::loadTestFramework.	2013-03-12 23:34:30 -04:00
euromark	f633241775	fix spacing error	2013-03-10 18:26:58 +01:00
euromark	a9bbaed3d6	fix coding standards	2013-03-10 18:11:50 +01:00
ADmad	b7834a2b16	Implemented stateless login for Auth	2013-03-10 00:11:35 +05:30
mark_story	8209097bc3	Merge branch 'master' into 2.4	2013-03-09 12:40:59 -05:00
Rémi Dewitte	5b5180f661	code style in FileLog and FileLogTest	2013-03-08 09:32:46 +01:00
Rémi Dewitte	ab510d1700	Add settings array to connection parameters that executes SET statements once connected	2013-03-07 23:45:42 +01:00
Rémi Dewitte	278700677a	Add mask setting to FileLog	2013-03-07 21:40:06 +01:00
Mark	b105318bcc	Merge pull request #1148 from dereuromark/2.4-currency ... Top 6 world currencies - UTF-8	2013-03-06 15:29:59 -08:00
euromark	eb874f87a3	Top 6 world currencies and make them utf8 per default	2013-03-06 23:35:18 +01:00
Mark Story	69f416da1e	Merge pull request #1165 from cakephp/master-year-range ... Fix FormHelper year range for ranges outside of 1901-2038	2013-03-05 17:36:47 -08:00
euromark	a07c9f0c3c	Fix FormHelper year range for ranges outside of 1901-2038	2013-03-05 22:11:23 +01:00
Adam Taylor	433dd09ec4	Fix typos	2013-03-05 00:05:14 -07:00
mark_story	cfc10a7c68	Fix failing test and unskip tests in SchemaShell::create() ... The tests were accidentally skipped when tests for --exclude were added & fixed. Restore the gist of the previous tests.	2013-03-04 22:37:48 -05:00
mark_story	4a0df83783	Fix failing tests. ... When the app did not have the correct models, tests would fail.	2013-03-04 22:13:45 -05:00
mark_story	4b13e0a5f2	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt	2013-03-04 21:55:29 -05:00
Alexander Hofbauer	c920209f58	SchemaShell: Implement "exclude" parameter ... Allows for passing a list of tables to ignore when generating schemas. Closes #3652.	2013-03-04 22:37:44 +01:00
Jad Bitar	f1b815a9bb	Add scope to email logging.	2013-03-01 22:24:02 -05:00
Renan Gonçalves	fd72f894ad	Expanding year range based on the provided value. ... This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.	2013-03-01 13:45:55 +01:00
Kyle Robinson Young	85862bbb9f	Lazy load models in shells.	2013-02-28 20:30:06 -08:00
mark_story	1d529c1dd2	Add type hints in SchemaShell. ... I'm trying to figure out what's going on in the failing travis builds.	2013-02-28 22:54:31 -05:00
mark_story	00edc594bf	Fix failing test.	2013-02-28 21:31:09 -05:00
mark_story	92d215df4d	Merge branch 'pr-cli' into 2.4 ... From pull request 1142	2013-02-28 21:23:03 -05:00
mark_story	15d01bf901	Fix tests for cli runner.	2013-02-28 21:22:01 -05:00
mark_story	33bd7a571a	Restore whitelist when save fails. ... Fixes whitelist not being restored when save fails due to no data. Fixes #3646	2013-02-25 20:57:56 -05:00
mark_story	3d0920a405	Fix failing tests. ... Two buffers are needed now that handleFatalError() is blowing one up. Related to pull request #1158	2013-02-25 14:19:13 -05:00
mark_story	d1c88ebf8a	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Log/Engine/FileLog.php lib/Cake/Utility/Validation.php lib/Cake/View/Helper/HtmlHelper.php	2013-02-24 20:24:26 -05:00
ADmad	b32e855a3d	Fixing behavior prioritizing	2013-02-24 22:52:31 +05:30
Mark Story	51d2cb60fa	Merge pull request #1139 from ADmad/2.3-dispatcher ... Prevent response object being set as response body	2013-02-24 09:07:15 -08:00
Mark Story	b870d5d004	Merge pull request #1138 from ravage84/date-validation ... Added 'ym'- & 'y'-date validation.	2013-02-21 19:21:47 -08:00
nojimage	84725993e5	Postgres datasource support regular expression operators.	2013-02-22 10:14:06 +09:00
mark_story	9f25da49ef	Attempt to get more tests passing on travis ci.	2013-02-19 22:17:47 -05:00
mark_story	27dc666c8d	Fix incorrect method names.	2013-02-19 22:04:44 -05:00
mark_story	3e34a09e8b	Make skips more permissive. ... Hopefully this fixes issues on travisci.	2013-02-19 21:05:05 -05:00
mark_story	341c0d17f0	Attempt to fix failures in travisci. ... Network tests have recently started failing, make those skip conditions instead. Convert SocketExceptions in Xml::build() into XmlExceptions. This is the documented behavior so we should try to honour that.	2013-02-19 20:53:28 -05:00
ADmad	4ab27ca840	Implemented log file rotation.	2013-02-19 00:36:18 +05:30
ADmad	484801ecf4	Prevent response object being set as response body	2013-02-16 02:07:02 +05:30
Marc Würth	33fbace4c7	Added 'ym'- & 'y'-date validation ... Added regex in validation Added tests analog to 'my'-date validation tests, extended the new tests even further	2013-02-15 14:35:20 +01:00
Mark	3b02013f7d	Merge pull request #1127 from dereuromark/master-strict-comparison ... Strict comparison for strings where applicable	2013-02-14 01:10:48 -08:00
mark_story	f104bd3504	Use simpler asserts. ... Refs #3622	2013-02-13 22:43:18 -05:00
nojimage	fbb1a812dd	Create rename field statements in postgres ... Refs #3622	2013-02-13 22:24:21 -05:00
ADmad	f6215129f6	Fix type casting of string scopes to array in log engines	2013-02-13 00:10:32 +05:30
mark_story	0d9ef854ff	Fix FULLTEXT column generation ... Fixes #3618	2013-02-12 09:00:57 -05:00
euromark	111366d5c8	== to === and != to !== where applicable	2013-02-12 03:38:08 +01:00
Marc Würth	019c3aa721	Fixed small typo	2013-02-11 22:21:50 +01:00
euromark	23ef13f9c7	adding Kazakh and correcting some locales	2013-02-10 20:07:09 +01:00
mark_story	974ac44fb4	Use random iv values in rijndael. ... Using fixed iv values has a number of known problems like dictionary attacks against the cipher key. Use a random iv value for all future encrpyted values. Provide backwards compatibility for values encrypted with fixed iv's, and silently upgrade values for enhanced security.	2013-02-09 20:48:27 -05:00
ADmad	74b9cdb36f	Fix failing tests caused by previous commit	2013-02-09 18:24:27 +05:30
ADmad	13029cc2bc	Merge branch 'master' into 2.4	2013-02-09 02:20:16 +05:30
ADmad	431e610317	Fix broken tests	2013-02-08 19:04:41 +05:30
Graham Weldon	26a08c6780	Updated copyright	2013-02-08 21:28:17 +09:00
Graham Weldon	66d856d883	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
Graham Weldon	7b860debe4	This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years. ... I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.	2013-02-08 20:59:49 +09:00
euromark	d522f412db	Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105	2013-02-07 15:36:00 +01:00
mark_story	1ceb17589a	Merge branch 'master' into 2.4	2013-02-06 21:05:03 -05:00
ADmad	0b46b042b9	Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script(). ... Closes #3593	2013-02-05 23:22:24 +05:30
ADmad	afb62959ef	Added JSONP support for JsonView	2013-02-04 23:20:49 +05:30
mark_story	103bbbc375	Add CakeRequest::param() ... This method gives a read accessor to the data in $request->params. It removes the need to use isset() and empty().	2013-02-03 22:09:52 -05:00
Mark Story	e0ce0ac8e3	Merge pull request #1103 from perrywky/master ... fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery Fixes #3579	2013-02-01 06:36:06 -08:00
Ceeram	fa1d22dc5e	added test to disprove #3588	2013-01-31 16:21:01 +01:00
ADmad	fb7fbcf01b	Added option to disable counter caches updating. ... Closes #3109	2013-01-31 18:14:39 +05:30
ADmad	8ff59586f6	Merge branch 'master' into 2.4	2013-01-31 18:12:01 +05:30
Perry	5ac5e784de	fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery	2013-01-31 17:01:59 +08:00
euromark	ee08fe5c1f	BC fixes for disabled checkboxes ... see: d504642 see: #3545 Signed-off-by: Rachman Chavik <rchavik@xintesa.com>	2013-01-31 09:44:35 +07:00
Rachman Chavik	1cb24384cd	Merge branch '2.2'	2013-01-31 09:42:55 +07:00
euromark	d504642c9b	BC fixes for habtm. Closes #3545. ... Signed-off-by: Rachman Chavik <rchavik@xintesa.com>	2013-01-30 21:11:41 +07:00
mark_story	78b23d8e31	Fix issue with inputs() and plugin models. ... inputs() should not trigger errors when generating inputs for plugin models. Previously the internal state of FormHelper was incorrect as model() returned the plugin name instead of the modelname. Fixes #3571	2013-01-29 22:02:21 -05:00
Rik van der Heijden	e331ae64ee	Fix CrudAuthorizeTest, added Router::reload() in setUp	2013-01-29 21:35:29 +01:00
ADmad	bb767408d3	Fix cs errors	2013-01-27 23:03:06 +05:30
ADmad	04ec9dd614	Renamed AuthComponent::redirect() to AuthComponent::redirectUrl(). ... Closes #3268	2013-01-27 21:22:11 +05:30
ADmad	422ceaff85	Added "tel" and "email" input type guessing. ... Closes #3557	2013-01-27 08:59:54 +05:30
mark_story	4af6039107	Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Console/Command/Task/ModelTask.php lib/Cake/Model/Model.php	2013-01-26 21:16:26 -05:00
Mark Story	1fc9641af3	Merge pull request #1089 from majna/2.3-sort-natural ... Fix Hash::sort() 'natural' type fallback on PHP < 5.4	2013-01-25 18:49:16 -08:00
mark_story	ce7f85abe8	Fix Token fields being added to GET forms. ... They are not used so there is not much point in appending them. Fixes #3565	2013-01-25 15:21:16 -05:00
Mark Story	bc4db91b51	Merge pull request #864 from dereuromark/2.3-radio-multiple-between ... allow between to be an array of strings Fixes #2859	2013-01-25 12:06:55 -08:00
Majna	5250c92635	Fix Hash::sort() 'natural' type fallback on PHP < 5.4	2013-01-25 01:07:45 +01:00
mark_story	e4f241dd23	Merge branch 'pr-1075' ... Merge changes in pull request 1075.	2013-01-23 21:19:53 -05:00
mark_story	0b659d513e	Add tests for #3545 ... Fix included in GH-1075 Closes #3545	2013-01-23 21:19:37 -05:00
Mark Story	6ade91e83b	Merge pull request #1083 from ceeram/2.3-pmdvars ... Remove unused local vars.	2013-01-23 14:51:11 -08:00
Ceeram	16be9d4990	remove unused local vars	2013-01-23 17:22:06 +01:00
ADmad	82f34c4cb3	Don't set "required" attribute for checkboxes (unless explicitly specified). ... Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field. Closes #3560	2013-01-23 20:38:24 +05:30
mark_story	0cdef75060	Fix failing tests. ... I have no idea why the updated session test was expected to fail as the data was written to the session. Refs #3551	2013-01-21 21:13:35 -05:00
mark_story	75495705a6	Fix Hash::get($data, '0') ... Fixes #3555	2013-01-21 20:50:46 -05:00
mark_story	7790bcacff	Allow afterFind() to fully remove an associated record. ... By returnning array() or unsetting the 0'th result an afterFind callback should be able to fully remove data from the results. Fixes #3541	2013-01-17 20:35:37 -05:00
mark_story	773666ddad	Fix coding standards and save a function call.	2013-01-17 20:34:25 -05:00
Mark Story	acc6a2645f	Merge pull request #1039 from bfanger/master ... Fixes an issue with urls as GET parameters	2013-01-17 17:31:59 -08:00
Renan Gonçalves	23d4807933	Fixing expected value from find when it results in failure. ... When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().	2013-01-17 13:00:56 +01:00
Mark Story	70171f5403	Merge pull request #1073 from cakephp/issue-3533 ... Partially revert default niceShortFormat The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format. Fixes #3533	2013-01-16 18:08:44 -08:00
mark_story	95ed471c41	Reduce duplication in code. ... This will result in all tests being skipped when any of the required models pre-exists.	2013-01-16 12:59:13 -05:00
mark_story	5a6a45d0d1	Add support for --admin to bake controller all. ... I missed this when originally implementing bake controller all. Fixes #3536	2013-01-16 12:57:18 -05:00
mark_story	ad0d6644c4	Partially revert default niceShortFormat ... In 9fa531d6e3 the default niceShortFormat was changed, which has been interpreted as a regression in #3533. This change partially reverts the previous change and tries to strike a balance between the old behavior and new. Refs #3533	2013-01-14 21:12:11 -05:00
mark_story	9c29fab4a4	Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Network/Http/HttpResponse.php	2013-01-14 20:24:56 -05:00
U-Zyn Chua	bcdbdc8108	Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531	2013-01-15 09:17:24 +08:00
ADmad	d8551c49e5	Improve messages logged for exceptions	2013-01-12 11:30:25 +05:30
ADmad	676872d623	Allow AuthComponent::$unauthorizedRedirect to be an url. ... Closes #3494	2013-01-12 11:25:13 +05:30
Mark Story	e7330fa585	Merge pull request #1067 from ceeram/paginatecount ... Avoid calling paginateCount when there are no results.	2013-01-11 18:09:32 -08:00
José Lorenzo Rodríguez	d571b056f4	Merge pull request #1063 from ADmad/2.3-cakeplugin ... Added feature to ignore include errors for CakePlugin	2013-01-11 15:13:54 -08:00
dogmatic69	bcb3eb89dc	Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string ... version while doing calculations will normally end up as floats. This causes output differences on pages like order totals or invoices where there is a mix of calculated values and database values. Number::currency(0.00, 'GBP') -> &#163;0.00 Number::currency('0.00', 'GBP') -> 0p Both versions will return `&#163;0.00` (or whatever 0 is configured to return).	2013-01-11 17:00:06 +00:00
euromark	11a88042bd	fix doc block endings	2013-01-11 15:06:54 +01:00
Ceeram	92d9b11aee	fix double semicolon	2013-01-11 11:15:15 +01:00
Ceeram	d3f9cc10b5	fix failing test	2013-01-10 18:10:24 +01:00
mark_story	7008b812be	Fix string '0' not being exported correctly. ... Fixes #3518	2013-01-09 23:04:58 -05:00
mark_story	735517ade1	Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/VERSION.txt	2013-01-08 22:27:17 -05:00