mark_story
9ce3d89c81
Clean up formatting and make a failure exit non-zero.
...
Console tools should exit non-zero when a comman fails.
Refs #4993
2014-11-09 21:21:42 -05:00
Mark Story
c1063dcd81
Merge pull request #5119 from ndm2/fix-unset-email-pattern
...
Make unsetting the email pattern work as expected.
2014-11-09 13:25:45 -05:00
ndm2
f0b6657113
Make unsetting the email pattern work as expected.
...
When set to `null`, only `filter_var()` should be used. This is a
partial backport of #5111
2014-11-09 16:33:57 +01:00
mark_story
c151ea585d
Update version number to 2.5.6
2014-11-07 20:35:12 -05:00
José Lorenzo Rodríguez
176473b549
Merge pull request #5096 from cakephp/issue-5076
...
Fix HttpSocket mishandling encoded URIs
2014-11-06 10:30:01 +01:00
mark_story
6aaac6b7e2
Fix HttpSocket mishandling encoded URIs
...
The HTTP specs seem to indicate that the Location header should contain
an 'absoluteURI' which includes encoded data. In order to avoid
a regression with the issue fixed in b9ee4fc9f1Fixes #5076
2014-11-05 22:18:48 -05:00
mark_story
dac8b7b644
Update return type for Model::saveField().
...
Fixes #5086
2014-11-05 20:37:43 -05:00
Mark Story
d5d8b32bd7
Merge pull request #5084 from cakephp/master-docblock-return
...
Correct doc block return types.
2014-11-05 08:00:39 -05:00
euromark
0d5d6b19b5
Wording correction.
2014-11-05 13:14:45 +01:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
Mark Story
96b82e4226
Merge pull request #5021 from dereuromark/master-mysql
...
Fix IN replacement in virtual fields for MYSQL.
2014-11-04 08:24:03 -05:00
Mark Story
279d15aaa5
Merge pull request #5053 from dereuromark/master-xdebug
...
Show stack trace for fatal errors if xdebug is loaded.
2014-11-02 15:03:39 -05:00
euromark
00432fa427
Show stack trace for fatal errors if xdebug is loaded.
2014-11-02 20:44:17 +01:00
euromark
0f9890720e
Correct test
2014-10-31 01:45:41 +01:00
euromark
bb67df4305
Simplify test
2014-10-31 01:18:08 +01:00
Mark Story
a8c5b70b22
Merge pull request #4489 from busgurlu/patch-1
...
to correctly return SET() type
2014-10-30 19:56:47 -04:00
euromark
70acd2fe3f
doc block update.
2014-10-30 19:15:23 +01:00
euromark
e5b45bcdea
Fix IN replacement in virtual fields for MYSQL.
2014-10-30 19:14:04 +01:00
mark_story
1e8f12f9f5
Bump the depth of variables in stack traces to 4.
...
Giving more context allows developer to look at request/response data
more easily.
Fixes #5005
2014-10-29 21:43:18 -04:00
José Lorenzo Rodríguez
a0aac5cfa9
Merge pull request #5001 from cakephp/issue-4990
...
Relative paths should be created relative to pwd.
2014-10-28 14:20:30 +01:00
mark_story
d228d83b1e
Relative paths should be created relative to pwd.
...
If create() is called with a relative directory and the path does not
exist, it should be created inside of the folder->pwd() and not inside
the process' cwd.
Refs #4990
2014-10-27 21:32:28 -04:00
mark_story
ebc1bcb624
Add additional useful tests for autoLink()
...
These new tests cover an important case that could easily be missed in
the future. Links with URL's should not be re-linked.
Refs #4998
2014-10-27 21:03:03 -04:00
Mark Story
5b32fd7e25
Merge pull request #4975 from ptica/disabled-hidden-input
...
Disable the hidden input for multi checkbox inputs when inputs are disabled.
2014-10-25 20:12:35 -04:00
Jan Ptacek
797635d26b
fixing testcases + do not disable the hidden input on partial disables
2014-10-25 21:05:37 +02:00
ptica
abb0c7cb9d
Update FormHelper.php
...
disabled multiple checkbox input should not generate an enabled hidden input,
as it leads to saving empty data upon submission -> carrying the disabled attribute to the hidden input prevents this
2014-10-24 18:25:31 +02:00
Mark Story
1a799b07b3
Merge pull request #4944 from agarzon/patch-1
...
Update .gitattributes
2014-10-21 20:05:26 -04:00
José Lorenzo Rodríguez
47bff090b8
Merge pull request #4950 from bcrowe/fix-viewtask
...
Fix views overwrite warning text
2014-10-21 21:12:27 +02:00
Bryan Crowe
6f4c3b2765
Fix views overwrite warning text
2014-10-21 14:39:09 -04:00
José Lorenzo Rodríguez
82ee5b0d1c
Merge pull request #4947 from agarzon/patch-2
...
Removing unrelated parameter in comment
2014-10-21 20:24:57 +02:00
Alexander Garzon
09ebb8bace
Removing unrelated parameter in comment
...
That parameter doesn't exists in display() function (in fact is not a parameter) and is breaking the [CakePHP code standards]:https://github.com/cakephp/cakephp-codesniffer
2014-10-21 14:11:51 -04:00
Alexander Garzon
3a3ddf414c
Update .gitattributes
...
PDF is a common file that should not be modified.
2014-10-21 10:33:46 -04:00
ADmad
62f392a011
Merge pull request #4921 from dmromanov/patch-1
...
Documentation correction
2014-10-19 01:37:18 +05:30
dmromanov
959a22a8b2
Documentation correction
2014-10-19 00:05:08 +04:00
mark_story
cdc67116c5
Handle query string arguments in digest auth data.
...
Handle &, ? in digest auth data uri.
Refs #4908
2014-10-17 23:12:41 -04:00
José Lorenzo Rodríguez
f616667a6f
Merge pull request #4891 from cakephp/fix-memcached-failures
...
Fix Memcached test failures.
2014-10-15 21:42:33 +02:00
mark_story
afcd0312bf
Fix Memcached test failures.
...
The Memcached extension does not provide enough information to PHP's
Reflection API to allow mock objects to be generated correctly. We'll
skip the affected tests until php-memcached-dev/php-memcached#126 has
been resolved.
2014-10-15 11:11:50 -04:00
José Lorenzo Rodríguez
e686a43524
Merge pull request #4867 from cakephp/issue-4694
...
Fix getMockForModel() using the incorrect datasource.
2014-10-14 14:13:01 +02:00
mark_story
b55a88508f
Fix PHPCS and PHP5.3 error.
2014-10-13 21:07:08 -04:00
mark_story
50b3893e65
Make rule sniff less complicated and tidy up doc block.
...
Refs #4871
2014-10-13 17:59:31 -04:00
Mark Story
1ded0c21dd
Merge pull request #4871 from rchavik/2.5-is-unique-test
...
2.5 Add isUnique test + possible fix
2014-10-13 17:55:15 -04:00
Rachman Chavik
dcb605c700
Possible fix for isUnique backward compatibility
2014-10-13 19:46:10 +07:00
Rachman Chavik
dc7b8cbb89
Add BC test for #4851
2014-10-13 19:40:30 +07:00
mark_story
9b9e886df6
Fix getMockForModel() using the incorrect datasource.
...
Because getMockForModel() does not go through the test datasource
injection in ClassRegistry::init() we need to duplicate the basics of
that logic here. Thankfully, we already have a mock so we can do that
datasource switching without reflection. Of course this means there will
be limitations to how/when this will work, but I feel those scenarios
can probably be solved by not using mocks, or by mocking out the
problematic methods. This set of changes makes getMockForModel() work
with secondary datasources, as one would expect it to do, but I'm not
sure it ever did.
Refs #4694
2014-10-12 22:30:22 -04:00
ADmad
ecf030796b
Fix docblock
2014-10-11 19:37:22 +05:30
Mark Story
6ee203541f
Merge pull request #4851 from cakephp/issue-4571
...
Fix Model::isUnique() not working as a validator.
2014-10-10 12:18:09 -04:00
mark_story
39011cd9d8
Fix Model::isUnique() not working as a validator.
...
While it *did* work for single fields, isUnique could not be used to
validate the uniqueness across multiple fields as documented. Because
validation methods pass arguments in an order the validator did not
expect the validation method would not work correctly.
Fixes #4571
2014-10-09 22:49:17 -04:00
mark_story
0ff9545e5a
Add test for find() and array conditions.
...
Add a test for conditions using an array with only one element.
Closes #4848
2014-10-09 19:58:18 -04:00
Mark Story
51fb003992
Merge pull request #4847 from ravage84/patch-1
...
Added code consistency badge from phpcs
2014-10-09 13:51:27 -04:00
Mark Story
84eb151dd1
Merge pull request #4850 from ADmad/issue-4849
...
Make CakeSession::read() return null for all failure cases.
2014-10-09 13:08:25 -04:00
ADmad
94e718372a
Make CakeSession::read() return null for all failure cases.
2014-10-09 19:27:27 +05:30
