Juan Basso
6171ef69c3
Update test cases for CakeRoute::__set_state
...
It removes the eval and test the __set_state more explicitly.
2014-10-27 23:45:46 -04:00
Juan Basso
f7320cd8cd
Fixed PHPCS issues
2014-10-21 23:47:17 -04:00
Juan Basso
b2a92f9cd8
Implementing __set_state for CakeRoute
...
It helps the applications to cache the routes using var_export when possible.
2014-10-21 23:04:08 -04:00
Mark Story
7930e680cb
Merge pull request #4940 from jrbasso/2.6-router-optimization-2
...
Replaced for loops by foreach
2014-10-20 17:27:55 -04:00
Juan Basso
833ca68a55
Replaced for loops by foreach
2014-10-20 16:43:11 -04:00
Mark Story
6b723b9327
Merge pull request #4930 from jrbasso/2.6-not-executed
...
Removed the code that was never being executed
2014-10-19 20:40:58 -04:00
Juan Basso
ba0901d40e
Removed the code that was never being executed
2014-10-19 18:56:02 -04:00
Mark Story
5263edde8b
Merge pull request #4897 from ravage84/2.6-mysql-table-comments
...
2.6 Add Support for MySQL Table Comments
2014-10-16 18:42:07 -04:00
Marc Würth
2ad181b6e1
Now the tableParameters array gets escaped through values(), too
2014-10-16 19:10:52 +02:00
Marc Würth
b3770974f1
Added tests for MySQL table comment feature
2014-10-16 16:44:09 +02:00
Marc Würth
84b0fe1c88
Added comment to $tableParameters array
2014-10-16 16:06:33 +02:00
mark_story
4c93f103c7
Merge branch 'master' into 2.6
2014-10-15 23:28:27 -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
923e1c5300
Merge pull request #4884 from cakephp/issue-4876
...
Add default prefix to RedisEngine
2014-10-15 15:26:01 +02:00
mark_story
b86aae4d8b
Add default prefix to RedisEngine
...
This makes redis work like the other cache engines. Also by having
a default prefix the clear() method will not wipe all the data in the
current redis database.
Refs #4876
2014-10-14 22:47:34 -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
1c440e2cb2
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-10-13 21:11:52 -04:00
mark_story
87fcc9f0b9
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-13 21:11:38 -04: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
6dc98afa1e
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-12 20:20:14 +05:30
ADmad
ecf030796b
Fix docblock
2014-10-11 19:37:22 +05:30
Mark Story
63ffb2215b
Merge pull request #4853 from ceeram/2.6-atomic-translate
...
TranslateBehavior now uses original atomic option value, if set
2014-10-10 17:48:31 -04:00
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
Bryan Crowe
e48831a4a7
Merge pull request #4855 from ceeram/2.6-phpcs
...
Fix PHPCS errors
2014-10-10 11:25:03 -04:00
Ceeram
43e998422e
Fix PHPCS errors
2014-10-10 16:52:01 +02:00
Ceeram
12ebf8b427
add test for atmoic save of TranslateBehavior
2014-10-10 16:44:01 +02:00
Ceeram
1dfd3405a4
TranslateBehavior now uses original atomic option value, if set
2014-10-10 14:17:16 +02: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
7b44d5d7a3
Update version number to 2.6.0-beta
2014-10-04 23:01:03 -04: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