Commit graph

5651 commits

Author SHA1 Message Date
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
7c66d0db50 Fix autoLink() when URLs contain email addresses.
Add whitespace lookbehind to ensure the email address is preceded by
whitespace, this obviously means that emails starting with word/symbols
are not detected, however those symbols are generally valid in an email
address anyways, and will form the local part.

Fixes #2403
2013-11-29 22:24:03 -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
ADmad
155c7585e0 Fixed docblock 2013-11-29 00:14:43 +05:30
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
eb34e011e2 Update version number to 2.4.3 2013-11-24 21:25:25 -05:00
José Lorenzo Rodríguez
edc6fc6701 Merge pull request #2379 from rspenc29/2.5
Added support for passing additional flags to mysql connection
2013-11-24 01:07:58 -08:00
Rob Spencer
b8e32dd2b3 Adding flags override to additional pdo drivers 2013-11-24 01:04:17 -05:00
Rob Spencer
cda9320e96 Added support for passing additional flags to mysql connection 2013-11-24 00:47:06 -05:00
mark_story
eac6d7850f Remove pointless array cast. 2013-11-23 12:36: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
311189a662 Sort tables before returning them.
This fixes unsorted table lists in the various bake related tasks.

Fixes #2386
2013-11-23 12:34:16 -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
ber clausen
1b9bf7b0fd Always remove verify_host from SSL context.
It is only used to be able to set ```CN_match```.
2013-11-21 16:23:01 -02:00
José Lorenzo Rodríguez
df5fc2304a Merge pull request #2289 from bar/2.5-optimize-dbosource
First part of the DboSource cleanup.
2013-11-21 01:02:36 -08:00
Eric Büttner
8c319c7dbc fix the failing test case. 2013-11-20 12:26:03 +01:00
mark_story
1be40d5d64 Fix coding standards error.
Refs #2364
2013-11-19 18:36:52 -05: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
mark_story
99fd6e40fe Leave db->cacheSources unaltered.
When a model uses cacheSources = false, it should not have side effects
on the datasource.

Fixes #2364
2013-11-19 15:06:55 -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
881f81d01a Fixed undefined constant 2013-11-19 11:50:28 +01:00
davidsteinsland
7056ccd38a Added msgpack support for Memcached 2013-11-19 11:35:05 +01:00
imsamurai
f817beb8b6 change method public unsigned to protected _unsigned 2013-11-19 10:55:44 +02:00
imsamurai
1313b81913 fix since phpdoc tag for fixture 2013-11-19 10:48:51 +02:00
mark_story
3b8208be2e Merge branch 'master' into 2.5 2013-11-18 21:49:13 -05:00
Matheus Pedroso
4677ddf490 Fix duplicated webroot path on HtmlHelper::meta('icon'). 2013-11-18 23:38:01 -02:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Eric Büttner
1e3865acc7 formatting app::uses blocks (refs #2265) 2013-11-18 11:56:00 +01:00
imsamurai
20dc92291e fix broken test 2013-11-17 23:34:22 +02:00
imsamurai
0286e4120d fix code style 2013-11-17 23:12:51 +02:00
imsamurai
8bcfe452da not add unsigned to not numeric fields, fix broken test, add new test 2013-11-17 23:10:53 +02:00
imsamurai
2f6122cb01 add unsigned property in Model::describe 2013-11-17 22:37:01 +02:00
imsamurai
00fb663f90 remove numeric from unsigned config 2013-11-17 21:23:13 +02:00
imsamurai
1d9ecc6c94 Merge upstream/2.5 into 2.5 2013-11-17 21:13:25 +02:00
Marc Würth
229bd69903 Added link to three hash methods 2013-11-17 03:40:39 +01: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
b6b8d83980 Remove non-portable data type from MySQL.
'numeric' is a non-portable type that is not supported by any other
database driver. Removing it now will prevent future problems.
2013-11-14 10:28:09 -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
7bc8dac453 fix phpcs errors 2013-11-14 02:19:41 +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
Andy Dawson
d94c187adc Merge pull request #2305 from kimegede/docblock-construct-destruct-return-void
Docblock construct destruct remove @return
2013-11-13 01:44:35 -08:00
Ber Clausen
ed142d8c89 Add missing type hints. 2013-11-13 00:09:45 -03:00
Ber Clausen
0e74a0757a Keep insertQueryData() DRY, issue less lookups. Remove unused $assocData
and $LinkModel from the signature.
Model objects should be CamelCase.
2013-11-13 00:09:39 -03:00
Ber Clausen
52d425737a Call getDataSource() instead of the directly calling
ConnectionManager::getDataSource().
2013-11-12 03:38:47 -03:00
Ber Clausen
c1f3d9c274 Model objects should be in CamelCase. 2013-11-12 01:37:38 -03:00
Ber Clausen
014d2dd2d9 Remove 'self' key from getConstraint() calculations because it is not necessary anymore. 2013-11-12 01:30:57 -03:00
Ber Clausen
e658e071d1 Remove unused variable from the signature. 2013-11-12 01:17:11 -03:00
Ber Clausen
67a65663a7 Assign before actually using it. 2013-11-12 01:13:55 -03:00
Ber Clausen
026565033b Model objects variables should be CamelCase. 2013-11-12 00:49:06 -03:00
Ber Clausen
6b8a79be6d Remove reference from the signature. 2013-11-12 00:29:36 -03:00
Ber Clausen
cb42b056ac Remove the 'Line indented incorrectly' PHPCS error. 2013-11-12 00:08:39 -03:00
Ber Clausen
7f570f33e4 Unindent, and remove unnecessary getDataSource() call.
Also, objects should be CamelCase.
2013-11-12 00:01:18 -03: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
f0fcaa1305 Improve generateAssociationQuery():
* bail early when $linkModel is Null (BC for now).
* move SQL fields warmup and SQL statement building to its own functions
 (it will payoff later improving self documentation and readability).
* make assignments and function calls only when needed (depending on the
 association type).
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
dcadfcbcab Remove inline assignment. 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
Ber Clausen
5da05d9216 Remove unneeded test inside conditional. 2013-11-11 23:27:50 -03:00
Ber Clausen
f16695db5f Move variables to logical blocks.
Unindent to ease readability, and avoid assigning variables when
unneeded.
Free a little memory before entering to recursive intensive loops.
2013-11-11 23:27:50 -03:00
Ber Clausen
fdb4b11d0b Remove unnecessary call to getDataSource(). 2013-11-11 23:27:50 -03:00
Ber Clausen
c9e0131d6a Only generate query data for hasOne and belongsTo associations.
Avoid calling generateAssociationQuery():

* when the return value will never be usefull (True in this case)
* to avoid polluting $queryData with uneeded fields

Later, the SQL statement for the primary, and 'hasOne' plus 'belongsTo'
relationships, is built.
2013-11-11 23:27:50 -03:00
Ber Clausen
2532228844 Improve readability and optimize minimizing variable lookups. 2013-11-11 23:27:49 -03:00
mark_story
1f5d1eee98 Remove duplicated reference for behaviors in ClassRegistry
The 2nd key in the registry was to support persistModel which has long
since been removed. With this registry key not being used it can be
removed with reasonable safety.

Fixes #2306
2013-11-11 12:30:00 -05:00
Kim Egede Jakobsen
18e0dc95dd Remove @return from docblock (for __construct && __destruct methods) 2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad Try to make same comments for constructors.
Conflicts:
	lib/Cake/I18n/L10n.php
2013-11-11 11:03:57 +01: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
Andy Hobbs
e8984a9033 Profiles and optimised EventManager::listeners() function, reducing execution time by 14.5%
Refs #2105
2013-11-10 22:34:05 -05:00
mark_story
3561929be7 Merge branch 'master' into 2.5 2013-11-10 21:53:09 -05:00
José Moreira
b1e366c500 Model.php PHPDoc Description: Chang afterFilter with afterFind 2013-11-10 16:59:28 +00: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
407c420176 Remove CRLF from To headers in MailTransport.
Like other header fields To should not contain CRLF.

Refs #2209
2013-11-08 13:25:51 -05:00
mark_story
2e7d687b98 Merge branch 'master' into 2.5 2013-11-07 23:01:25 -05:00
Bryan Crowe
9ee5efaa2d Add missing return type 2013-11-07 22:14:11 -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
mark_story
d8acf531cb Merge branch 'postgres-sequence'
Merge changes for pull request #2248
2013-10-31 19:53:51 -04:00
mark_story
9e4ac31dc3 Correctly identifier quote column names before adding them to queries.
Closes #2248
2013-10-31 19:53:42 -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
Bryan Crowe
94d7ac1dd6 Correct spelling of retrieve 2013-10-30 23:13:07 -04:00
Luis Ramos
e33653a8d7 Add test case 2013-10-30 16:06:27 -06:00
Luis Ramos
db63ba2d8f Parse cookie values "{}" & "[]" as array 2013-10-30 15:26:50 -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
Zach Gambino
927a4933d1 Fix for #2247 | Use correct column when calculating next sequence value
See #2247 for more details.
2013-10-30 11:25:06 -07:00
euromark
fecbef5949 Pass depth through for Debugger::dump(). 2013-10-30 18:31:48 +01:00
Mark Story
9d87f6fcb5 Merge pull request #2239 from bcrowe/hotfix-strictTimeCompare
Update date comparisons to be strict in CakeTime
2013-10-29 20:14:19 -07:00
Bryan Crowe
507bb44301 Update date comparisons to be strict in CakeTime 2013-10-29 23:02:14 -04:00
mark_story
16be5722ba Fix COUNT(DISTINCT x) queries from getting corrupted in Sqlserver.
Add into the tower of hacks that is the SQL generation and stop breaking
COUNT(DISTINCT foo) style queries. Previously these would be converted
into DISTINCT COUNT(foo) which will give the non-distinct results.
2013-10-29 23:01:55 -04:00
mark_story
0f8dae55c9 Add missing trim() around Sqlserver queries.
This solves issues with queries failing.

Fixes #2222
2013-10-29 23:01:49 -04:00
Bryan Crowe
00c5e88570 Make use of timezone parameter in CakeTime::dayAsSql() 2013-10-29 20:29:01 -04: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
mark_story
a098ff28b8 Update doc block and remove inline assignment. 2013-10-29 12:32:20 -04:00
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
a753718387 Update docs for CookieComponent::delete().
Refs #2182
2013-10-28 23:13:51 -04: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
Bryan Crowe
8eb6652fd7 Change Cake to CakePHP 2013-10-28 22:14:50 -04:00
Saleh Souzanchi
8844e54647 Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection 2013-10-28 03:35:44 +03:30
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
Saleh Souzanchi
ab96ed56f3 fix multi connection/part downloading file 2013-10-28 01:06:33 +03:30
Saleh Souzanchi
459de09144 optimise download file 2013-10-28 01:03:06 +03:30
Saleh Souzanchi
bfde2d136f fix spell of contentType 2013-10-28 00:49:40 +03:30
Saleh Souzanchi
1f13f86367 add mkv mime file type 2013-10-28 00:14:38 +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
mark_story
411f510406 Fix file always being set to 'schema.php'
When the name parameter is set and no custom file value is provided,
the name should be used to generate the file name. empty() cannot be
used because the file parameter has a default value of 'schema.php'.

Fixes #2202
2013-10-25 23:36:25 -04: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
mark_story
7624884240 Use + instead of array_merge.
If you have numeric columns in your database, array_merge() will re-key
the array dropping the original values.

Fixes #2198
2013-10-25 10:23:50 -04: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
Robert Sworder
940a51b5fa Update definition of an empty model. 2013-10-25 15:12:03 +01:00
euromark
8a90cbd4fe coding standards 2013-10-24 23:14:09 +02:00
Mark Story
ea0c66e713 Merge pull request #2187 from bar/model-optimizations
Optimize conditionals and reduce lookups.
2013-10-24 14:09:47 -07:00
Mark Story
d7f37efc34 Merge pull request #2196 from ravage84/orphaned-home
Emptied home.ctp in test_app as much as possible
2013-10-24 09:21:00 -07: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
José Lorenzo Rodríguez
a6eb348e2f Merge pull request #2194 from ravage84/gh-link-home.ctp
Improved wording of link to GH repo in home.ctp
2013-10-24 07:33:19 -07:00
ADmad
df523ded7c Fixed docblock. Closes #2193 2013-10-24 19:27:56 +05:30
Marc Würth
0e348dfbbd Improved wording of link to GH repo in home.ctp 2013-10-24 15:51:59 +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
Ber Clausen
1fbe9c0021 Optimize conditionals and reduce lookups.
Also, make the code easier to read removing unneded indentations.
2013-10-24 10:16:55 -03:00
José Lorenzo Rodríguez
230b9dac66 Merge pull request #2191 from jameswatts/feature/skel-links
Updated links to CakePHP resources
2013-10-24 05:42:37 -07: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
James Watts
12f0cc0559 Updated links to CakePHP resources 2013-10-24 14:39:32 +02:00
Marc Würth
7c07d37fb3 Some DocBlock improvements for Model.php 2013-10-24 13:05:32 +02:00
Ber Clausen
6dcfd28600 Optimize _clearCache().
It is cheaper to make an assignment or call strtolower() than to pluralize.
2013-10-23 22:29:42 -03:00
Mark Story
43fccc1cbf Merge pull request #2184 from ravage84/sortby
Renamed $sortby to $sortBy in sortByKey
2013-10-23 09:42:28 -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
Marc Würth
c44135a50b Renamed $sortby to $sortBy in sortByKey 2013-10-23 17:28:48 +02:00
Mark Story
b4a0182bf0 Merge pull request #2181 from bcrowe/hotfix-classname
Add space between classname(s)
2013-10-23 04:37:23 -07:00
Mark Story
bd4aff13ee Merge pull request #2180 from bcrowe/hotfix-strict
Strict null check on group parameter
2013-10-22 20:13:37 -07:00
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
mark_story
328fcdc376 Sync skel and app directories.
Closes #1698
2013-10-22 22:18:59 -04:00
Bryan Crowe
79846d25f8 Strict null check on group parameter 2013-10-22 22:11:02 -04:00
mark_story
75624c0279 Update version number to 2.4.2 2013-10-22 21:49:25 -04:00
Frank de Graaf
ab89f6ec97 Makes DboSource less string dependent. 2013-10-22 16:43:32 +02:00
Bryan Crowe
d39ced8381 Correct 'an URL' to 'a URL' in docblocks 2013-10-22 00:09:34 -04:00
mark_story
e27e887707 Deprecate features being removed in 3.0 2013-10-21 16:55:21 -04:00
euromark
fca8a01c15 Correct casing of class names. 2013-10-21 22:34:29 +02:00
mark_story
bcafde6212 Add numeric validator for float fields by default.
Make bake add numeric validator to float fields.

Fixes #2163
2013-10-20 22:54:30 -04:00
euromark
c08df2a7f9 Correct wording of Hash::expand() 2013-10-19 17:54:43 +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
Cameri
bb33d52cc6 Added 'xhr' as callback in JqueryEngineHelper::request() so it formats as Javascript. 2013-10-17 18:26:39 -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
Bryan Crowe
1f2a4113bf Readability update for Dispatcher::_invoke() 2013-10-17 00:48:17 -04:00
Bryan Crowe
bc2fcf421f Remove extra space around the brace in CakeSchema::_arrayDiffAssoc() 2013-10-16 09:52:29 -04:00
Mark Story
ff0b963941 Merge pull request #2142 from bcrowe/hotfix-strictNull
Change is_null() calls to strict checks
2013-10-15 20:00:12 -07:00
Bryan Crowe
5addb2cc9f Change is_null() calls to strict checks in CakeSchema::_arrayDiffAssoc() 2013-10-15 22:53:04 -04:00
Bryan Crowe
39b7023e75 Change is_null() calls to strict checks 2013-10-15 22:32:46 -04:00
Marc Würth
fcb7f86b76 include calls without parentheses
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
2013-10-16 01:40:45 +02: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
Bryan Crowe
f9435aff27 Add missing return tags 2013-10-14 22:43:17 -04:00
Mark Story
d4ecb7d185 Merge pull request #2134 from dereuromark/master-test-case
Make tests pass on win.
2013-10-14 17:47:34 -07:00
euromark
69d0253109 coding standards 2013-10-15 02:07:36 +02: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
Bryan Crowe
bb821a426d Remove duplication of throws 2013-10-13 21:40:35 -04:00
euromark
ed2054f4f2 Allow international domains to pass validation. Fixes #1763 2013-10-13 23:43:29 +02:00
euromark
ee0ed3a43a coding standards 2013-10-13 18:18:24 +02:00