Commit graph

17411 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
6c6a6507d5 Merge pull request #3431 from ADmad/2.4-travis
Fix travis builds.
2014-05-01 16:33:18 +02:00
ADmad
0c0448fe0b Fix travis builds.
Travis updated to phpunit 4 for PHP 5.3 and CakePHP needs phpunit 3.7.
2014-05-01 19:38:59 +05:30
Mark Story
279a86f313 Merge pull request #3427 from thinkingmedia/patch-2
remove constructor return value.
2014-04-30 16:43:48 -04:00
Mathew Foscarini
2244e02017 remove constructor return value.
Not sure why this was here, but constructors shouldn't return a value. Nothing in the docs says that a controller's implementation of appError should return a value either. So I figure this was a mistake.
2014-04-30 16:25:01 -04:00
ADmad
6f9efbf386 Merge pull request #3426 from thinkingmedia/patch-1
Grammar fixes
2014-05-01 01:50:17 +05:30
Mathew Foscarini
f7453500b9 fixed case. 2014-04-30 16:19:15 -04:00
Mathew Foscarini
bb726d58ba Grammar fixes
@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.
2014-04-30 16:09:53 -04:00
ADmad
c930bbb0b3 Merge pull request #3421 from thinkingmedia/patch-1
Removed incorrect usage of @deprecated phpDoc
2014-04-30 19:27:15 +05:30
Mathew Foscarini
ceab9f185f Removed incorrect usage of @deprecated phpDoc
@deprecated is flagging the function element as deprecated in all IDE's that support phpDOC tags. There is no phpDoc tag to deprecate a function parameter.
2014-04-30 09:55:27 -04:00
mark_story
4b5e3c176e Update version number to 2.4.9 2014-04-29 21:52:10 -04:00
mark_story
e1057e3e6b Fix FormHelper::postLink() not working when SecurityComponent is enabled.
The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.

Fixes #3418
2014-04-29 11:23:52 -04:00
Mark Story
1a39917e76 Merge pull request #3416 from dereuromark/master-strict
More coding standard corrections.
2014-04-29 09:37:48 -04:00
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
Mark Story
79ca18492a Merge pull request #3415 from dereuromark/master-strict
Stricter string comparisons.
2014-04-29 07:21:25 -04:00
euromark
bd074e7dc7 Stricter string comparisons. 2014-04-29 12:05:47 +02:00
mark_story
1d1a2f859c Fix coding standards error. 2014-04-28 20:56:06 -04:00
euromark
06aa747b21 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite 2014-04-29 02:35:20 +02:00
mark_story
a0eb736151 Update version number to 2.4.8 2014-04-28 20:35:20 -04:00
mark_story
5432f834ff Merge branch '2.5' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-04-28 20:34:29 -04:00
euromark
5e5a776de8 Backporting overwrite() from 3.0 to 2.6. 2014-04-29 02:18:27 +02:00
euromark
8679c5cd18 Fix test 2014-04-28 17:33:56 +02:00
euromark
43d359b1d7 Make referer() behave as expected. 2014-04-28 17:23:26 +02:00
mark_story
99a7ddf195 Update version number to 2.5.0-RC2 2014-04-26 22:04:40 -04:00
mark_story
cf96e9f54f Merge branch 'master' into 2.5 2014-04-26 22:04:19 -04:00
mark_story
a28158d614 Add additional test for f23d811ff5
I neglected to put a negative test to ensure validatePost fails when the
URL differs.
2014-04-26 10:23:27 -04:00
Mark Story
5b46eb71ec Merge pull request #3397 from steinkel/fix-formhelper-with-model-mock
fixed FormHelper to allow create() on Mock Models without errors
2014-04-26 08:53:43 -04:00
ADmad
68572d8046 Cannot use php 5.4+ array syntax for 2.x. 2014-04-26 17:30:31 +05:30
Jorge González
5cf2ce723c fixed FormHelper to allow create() on Mock Models without errors 2014-04-26 10:33:58 +01:00
mark_story
460204913a Merge branch '2.5' into 2.6 2014-04-25 22:10:14 -04:00
mark_story
de0062de77 Merge branch 'master' into 2.5 2014-04-25 22:10:02 -04:00
mark_story
f23d811ff5 Use the form action URL in generated form hashes.
By including the URL in generated hash for secured forms we prevent
a class of abuse where a user uses one secured form to post into a
controller action the form was not originally intended for. These cross
action requests could potentially violate developer's mental model of
how SecurityComponent works and produce unexpected/undesirable outcomes.

Thanks to Kurita Takashi for pointing this issue out, and suggesting
a fix.
2014-04-25 22:05:58 -04:00
Mark Story
4a24d6ea31 Merge pull request #3395 from ADmad/2.4-autolinkurl
Fix auto linking urls with subdomain with underscore.

Fixes #3392
2014-04-25 15:33:24 -04:00
ADmad
27699d1f12 Fix auto linking urls with subdomain with underscore.
Closes #3392
2014-04-25 22:28:34 +05:30
Mark Story
00be120e7a Merge pull request #3381 from planardothum/shell-requires-cli
Add check to abort if $argv is undefined.
2014-04-24 12:32:54 -04:00
Harold Putman
d62e5e1b00 Prevent infinite loop caused when argv not set.
If shell is invoked with the wrong PHP executable (not CLI) and argv is not an array,  array_search on null causes infinite number of error messages.
2014-04-24 11:48:19 -04:00
mark_story
9d19801cfa Clear data and validationErrors *after* calling clearCache().
Having both properties cleaned after clearCache() means that you can use
the model data in specialized clearCache() implementations.

Fixes #3386
2014-04-24 09:19:00 -04:00
Mark Story
5eff011711 Merge pull request #3387 from php-engineer/master-security-test
Correct parameter order
2014-04-24 07:06:12 -04:00
Stefan Dickmann
f90f718e11 change parameter order 2014-04-24 12:54:45 +02:00
ADmad
971a845eb1 Merge pull request #3379 from dereuromark/2.5-inflector
2.5 inflector
2014-04-24 13:13:59 +05:30
mark_story
eeb4e635a4 Merge branch '2.5' into 2.6 2014-04-23 22:22:11 -04:00
mark_story
04edb547f3 Merge branch 'master' into 2.5 2014-04-23 22:21:57 -04:00
mark_story
6f68049bf5 Reject file paths containing ...
Paths containing `..` are generally up to no good. Throw an exception,
as developers can use realpath() if they really need to get relative
paths.

Fixes #3370
2014-04-23 22:20:14 -04:00
mark_story
2333c3d535 Update docs for file().
Mention that relative paths will be prepended with APP.

Refs #3370
2014-04-23 22:15:10 -04:00
euromark
0c036f6370 Remove unncessary language support. 2014-04-23 18:07:08 +02:00
euromark
7e6bc48ef2 Complete Inflector transliterations. 2014-04-23 16:43:44 +02:00
Mark Story
a3ad1c859f Merge pull request #3376 from php-engineer/master-update-composer
update composer.json
2014-04-22 20:53:15 -04:00
Stefan Dickmann
01e95945ce update composer.json 2014-04-22 21:48:22 +02:00
ADmad
466714da62 Merge pull request #3373 from ADmad/2.5-cakeemail
Allow setting only default layout without specifying template in email c...
2014-04-22 23:58:57 +05:30
ADmad
ead494eec1 Allow setting only default layout without specifying template in email config.
Closes #3336
2014-04-22 20:02:36 +05:30
José Lorenzo Rodríguez
bd5ce96388 Merge pull request #3356 from ADmad/2.5-view-paths
Optimize view paths caching for plugins.
2014-04-20 09:20:58 +02:00