Commit graph

18926 commits

Author SHA1 Message Date
mattmemmesheimer
d4467f9acf Fixing unit tests. 2015-08-18 22:14:10 -05:00
Mark Story
daa795dfd3 Merge pull request #7242 from tanuck/2.7-no-table-validation-fail
2.7 fix PDO exception from Model::exists when useTable is false - #7229
2015-08-18 22:30:15 -04:00
James Tancock
5b92c900e6 Missing test fix ModelIntegration 2015-08-18 13:32:16 +01:00
James Tancock
fdb41e01bb Alter Model::exists() to return false with no table 2015-08-18 13:07:30 +01:00
James Tancock
2f7cc052d2 Typo in tests docblock 2015-08-17 13:15:35 +01:00
James Tancock
fd198ce0fa Edits to tests to cover the changes to Model::exists 2015-08-17 12:19:02 +01:00
mattmemmesheimer
d3cf879195 Updating deprecated SessionComponent::setFlash calls to FlashComponent magic calls. 2015-08-16 18:01:23 -05:00
mattmemmesheimer
604cb0e48b Including the FlashComponent by default in the controller when baking. 2015-08-16 17:58:41 -05:00
mattmemmesheimer
0df7bcd26d Adding Flash element template files. 2015-08-16 17:55:03 -05:00
James Tancock
90a77f6ce5 Alter model exists to consider useTable 2015-08-16 19:06:12 +01:00
Adrian Gunawan
12e5719aad Remove whitespace at end of line 2015-08-14 17:05:59 +10:00
Adrian Gunawan
80f6a97d93 Check === 'natural' was inadvertently removed 2015-08-14 15:32:23 +10:00
Adrian Gunawan
2eafcc0f72 Use array() instead of the short notation [] 2015-08-14 14:55:44 +10:00
Adrian Gunawan
bf6574c3b2 Use array() instead of the short notation [] 2015-08-14 14:26:01 +10:00
Adrian Gunawan
b89d8d5efa Use array() instead of the short notation [] 2015-08-14 14:15:00 +10:00
Adrian Gunawan
f23e6589d0 Overload $type parameter instead of adding another parameter for case insensitive sort 2015-08-13 11:16:32 +10:00
Adrian Gunawan
a217556c13 Ability for Hash::sort to sort case-insensitively 2015-08-12 14:35:11 +10:00
Mark Story
979820b884 Merge pull request #7214 from ravage84/2.7-caktetext-coverage
CakeTextTest Annotate test coverage
2015-08-11 12:12:09 -04:00
Marc Würth
f3e590acfb Annotate test coverage 2015-08-11 16:36:09 +02:00
Mark Story
6fae3f6bd0 Merge pull request #7207 from ravage84/2.8-testadd
Correct title of testAdd methods
2015-08-10 14:08:38 -04:00
Marc Würth
4330335940 Correct title of testAdd methods 2015-08-10 12:06:19 +02:00
mark_story
67585d6fe1 Data must be serialized before being written
Data is unserialized by redis engine on read, so we have to serialized
on write.
2015-08-09 16:00:44 -04:00
mark_story
d6251eff19 Fix parameter order. 2015-08-09 15:54:09 -04:00
mark_story
a5ff7ecaa3 Merge branch 'memcached-add-method' into 2.8
Refs #7165
2015-08-09 15:29:33 -04:00
mark_story
d79855a77a Tweak doc blocks for Cache::add(). 2015-08-09 15:21:56 -04:00
Nick Cinger
41d0e1df19 Cache add() method added for all Cache engines. 2015-08-09 15:32:02 +02:00
mark_story
ca19b63a32 Merge branch '2.7' into 2.8 2015-08-07 22:04:46 -04:00
paolo
a7b5f8c3af DboSource now check the actual status of connection by executing a dumb query on DB
This change makes it possible for developer to build reconnection logic
on MySQL connections which frequently time out in long running CLI
processes.

Cherry picked onto 2.7 from #7190.
2015-08-07 21:59:28 -04:00
mark_story
f959b76013 Update version number to 2.7.2 2015-08-06 21:43:53 -04:00
mark_story
07c2047984 Merge branch '2.7' of github.com:cakephp/cakephp into 2.7 2015-08-06 21:43:40 -04:00
mark_story
b7c9ac913d Backport fixes for comparison() and range() to 2.x
These fixes were released as a security update for 3.x, they also belong
in 2.x
2015-08-06 21:36:39 -04:00
José Lorenzo Rodríguez
2fe2f6eb5a Merge pull request #7179 from cakephp/issue-7176
Fix fatal error on null subject.
2015-08-06 09:35:58 +02:00
mark_story
056f24a774 Forbid direct prefix access with mixed casing.
Changing the casing up should not allow prefix method access.
2015-08-05 23:05:30 -04:00
mark_story
9f20330d17 Fix fatal error on null subject.
Refs #7176
2015-08-05 22:20:39 -04:00
Mark Story
01b6374a9d Merge pull request #7175 from cakephp/2.7-hotfix
fix templates
2015-08-05 08:22:05 -04:00
Mark Scherer
3f15c8a199 fix templates 2015-08-05 11:45:27 +02:00
Mark Story
58bede76d1 Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
José Lorenzo Rodríguez
b89ac18e55 Merge pull request #7147 from cakephp/issue-7118
Fix incorrectly parsed mo file context.
2015-08-02 11:30:46 +02:00
Mark Story
b6cd2009e5 Merge pull request #7156 from ravage84/2.7-htaccess
Use tabs and single spaces in all .htaccess files
2015-07-31 20:37:26 -04:00
Marc Würth
27c88a872b Use tabs and single spaces in all .htaccess files 2015-08-01 00:39:10 +02:00
mark_story
a73fc25657 Fix incorrectly parsed mo file context.
The context from mo files should be parsed correctly.

Refs #7118
2015-07-30 22:28:55 -04:00
José Lorenzo Rodríguez
eddb2beb46 Merge pull request #7141 from cakephp/issue-7135
Bootstrap Configure after the mb_* shims have been defined.
2015-07-30 10:20:24 +02:00
mark_story
26ab829d5a Bootstrap Configure after the mb_* shims have been defined.
By bootstrapping after the shims have been defined allows the shims to
be used by Inflector which is often involved with bootstrapping.

Refs #7135
2015-07-29 22:01:27 -04:00
Mark Story
4d452812c0 Merge pull request #7131 from luissquall/fix-htaccess-indentation
Set .htaccess indentation to 4 spaces
2015-07-28 19:40:36 -04:00
Luis Ramos
a3bb420a7b Set .htaccess indentation to 4 spaces 2015-07-28 17:58:38 -05:00
ADmad
003a0dde74 Merge pull request #7129 from ravage84/patch-3
Add "Reporting a Security Issue"
2015-07-28 23:35:47 +05:30
Marc Würth
00d0a50dc2 Add "Reporting a Security Issue"
Backport of #7104
2015-07-28 20:02:06 +02:00
José Lorenzo Rodríguez
355eb1859c Merge pull request #7106 from cakephp/issue-7098
Consistently remove plugin names in object collections.
2015-07-28 15:58:41 +02:00
José Lorenzo Rodríguez
d5cc45c0cb Merge pull request #7124 from cakephp/issue-7121
Don't stop reading when only a '0' has been read.
2015-07-28 14:52:05 +02:00
mark_story
58ea40e32c Don't stop reading when only a '0' has been read.
Make tests simpler by using onConsecutiveCalls() instead of trying to
maintain mock method indexes.

Refs #7121
2015-07-27 22:40:27 -04:00