mark_story
99cbaed298
PHP 5.6 builds should now pass.
2014-05-12 14:29:40 -04:00
mark_story
92e6c138c5
Add missing static on Debugger::output()
...
This method should have been static the whole time, and the lack of
static was causing tests to fail on PHP 5.6
2014-05-12 14:29:10 -04:00
Mark Story
5e369a5a86
Merge pull request #3468 from h4cc/patch-1
...
Added PHP 5.6 to travis.
2014-05-12 09:00:14 -04:00
Julius Beckmann
c8a2921b12
Made PHP 5.6 a allowed failure on travis.
2014-05-12 08:42:17 +02:00
Mark Story
6f08b064a6
Merge pull request #3470 from cuppett/master
...
Fixes #3469 , explicit isset check for counterCache
2014-05-11 21:13:55 -04:00
Stephen Cuppett
ed83df5bed
Fixes #3469 , explicit isset check for counterCache
2014-05-11 19:17:18 -04:00
Julius Beckmann
28404ace96
Added PHP 5.6 to travis.
2014-05-11 22:15:35 +02:00
mark_story
cc49d28ef8
Fix double / in missing component error page.
...
Fixes #3466
2014-05-10 22:02:22 -04:00
mark_story
cd37810b02
Merge branch 'fix-formhelper'
...
Fix failing tests on PHP5.2.x
2014-05-09 17:17:23 -04:00
mark_story
51909ae738
Only parse URLs when they contain ://
...
Parsing incomplete URLs fails in PHP5.2.
2014-05-09 17:01:24 -04:00
José Lorenzo Rodríguez
751d2d8f2d
Merge pull request #3448 from dereuromark/master-controller
...
Controller::referer() and local URL
2014-05-07 22:42:28 +02:00
mark_story
5469840c80
Fix incorrectly generated URL path.
...
Refs #3442
2014-05-07 08:52:42 -04:00
mark_story
1103ca7816
Ensure that only the path and query are used to make the hash.
...
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.
Fixes #3442
2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7
Make test names match the rest of the tests.
2014-05-06 22:13:44 -04:00
ADmad
ead6c837c8
Add formatting rules for .yml files to editorconfig.
2014-05-04 18:37:41 +05:30
José Lorenzo Rodríguez
2f0a9be0e4
Merge pull request #3432 from dereuromark/master-hotfix
...
Hotfix - For TextHelper
2014-05-02 14:14:42 +02:00
euromark
57cb7ea260
Correct documentation.
2014-05-02 13:48:39 +02:00
euromark
fecf321cce
This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it.
2014-05-02 13:33:57 +02:00
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
mark_story
a0eb736151
Update version number to 2.4.8
2014-04-28 20:35:20 -04: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
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
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
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