Commit graph

17255 commits

Author SHA1 Message Date
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
Marc Würth
051c005b43 Added HTTP to URL 2014-10-09 14:25:40 +02:00
Marc Würth
e515a02e16 Added code consistency badge from phpcs 2014-10-09 14:13:34 +02:00
Bryan Crowe
d16a63894e Merge pull request #4843 from bcrowe/fix-typos
Fix missing 'r' from your
2014-10-08 15:20:57 -04:00
Bryan Crowe
e16bef1868 Fix missing 'r' from your 2014-10-08 15:06:30 -04:00
Bryan Crowe
2fc2109742 Merge pull request #4842 from suzuki86/fix-typo
Fix small typo
2014-10-08 11:06:33 -04:00
suzuki86
e4c0dee6ee Fix small typo 2014-10-08 23:37:38 +09:00
mark_story
ce98a1ff57 Update version number to 2.5.5 2014-10-04 22:59:03 -04:00
Mark Story
0a961dd70d Merge pull request #4801 from ceeram/2-accept-revert
Revert "add test to prove requesthandler works correct with Angular wonk...
2014-10-02 19:28:58 -04:00
Ceeram
fcffe3961f Revert "add test to prove requesthandler works correct with Angular wonky accept headers"
This reverts commit 8507ef83f1.

Incorrect header was used for this test, Cake cannot safely determine correct header.
To get CakePHP to respond with json, you can modify the angular common headers.
2014-10-02 22:12:35 +02:00
José Lorenzo Rodríguez
e2177361b5 Merge pull request #4798 from ceeram/2-angular
add test to prove requesthandler works correct with Angular wonky accept...
2014-10-02 16:26:19 +02:00
Ceeram
8507ef83f1 add test to prove requesthandler works correct with Angular wonky accept headers 2014-10-02 16:07:10 +02:00
Mark Story
5582edf6e7 Merge pull request #4787 from hperrin/master_hash_improvements
Improvements to Hash::expand and Hash::merge. (master)
2014-10-01 16:20:01 -04:00
Hunter Perrin
be8c591dd8 Fixed coding standard violations. 2014-10-01 12:40:22 -07:00
Hunter Perrin
050e368bd0 Improvements to Hash::expand and Hash::merge.
Because of the recursion in these functions, processing very large
arrays would take a very long time. I rewrote the functions to
eliminate any unnecessary recursion and function calls. Large arrays
are now processed much faster.
2014-10-01 12:08:43 -07:00
José Lorenzo Rodríguez
eac4e3d6ee Merge pull request #4711 from cakephp/master-email
Fix bug in CakeEmail::reset()
2014-09-24 16:29:09 +02:00
euromark
9c8ab826bf Correct a few more misleading assert orders. 2014-09-24 14:34:24 +02:00
euromark
fce16189d5 Fix tests 2014-09-24 14:25:18 +02:00
euromark
af7916b1a7 Fix bug in CakeEmail::reset() 2014-09-24 14:02:18 +02:00
mark_story
1877cab341 Fix UUID primary key columns not being reflected properly.
When UUID columns are converted into varchar(36) they should also be
default = null, null = false.

Fixes #4695
2014-09-23 22:16:18 -04:00
Mark Story
d7c4d3b521 Merge pull request #4704 from HavokInspiration/hash-remove-fix
Fix Hash::remove() removing data even if the path is not matched
2014-09-23 17:21:54 -04:00
Yves
b70cb132fd Fix Hash::remove() removing data even if the path is not matched 2014-09-23 22:00:49 +02:00
antograssiot
d715c6f2de force LF EOL in working directory 2014-09-22 15:42:06 +02:00
Mark Story
12cf82ba19 Merge pull request #4645 from tersmitten/cs-fixes
Cs fixes
2014-09-18 11:05:11 -04:00
Mischa ter Smitten
5838c85f96 Re(added) closing tag 2014-09-18 13:43:50 +02:00
Mischa ter Smitten
a441a71f77 Improved doc block 2014-09-18 11:55:31 +02:00