Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Add CakeTestCase::getMockForModel convenience method #953

Closed
wants to merge 355 commits into from
@rhelms

This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.

Associated with http://cakephp.lighthouseapp.com/projects/42648/tickets/3364-feature-request-convenience-method-for-getting-model-mocks#ticket-3364-1

markstory and others added some commits
@markstory markstory Merge branch 'master' into 2.3 c83e941
@markstory markstory Merge pull request #752 from dereuromark/2.3-truncate-tail
String::tail()
9e96c47
@dereuromark dereuromark use html ellipsis if possible (only a single char and therefore does …
…not line break or mess up the strlen count for length)
f201684
@dereuromark dereuromark coding standards 4039842
@dereuromark dereuromark legacy support with test cases 7969062
@dereuromark dereuromark correcting test 07d92ef
@markstory markstory Merge branch 'master' into 2.3 d5333a2
@markstory markstory Fix lint errors + comment content. 62dd391
@ceeram ceeram Ensure callbacks are triggered when using Xml/Json view with view tem…
…plates.

PaginatorHelper for instance needs this to correctly set options
e7dc23b
@ceeram ceeram Add onlyAllow() to CakeRequest, to check if the request method matche…
…s the allowed ones.

Throws exception if not matched, using the required Allow response header.
d730acb
@ceeram ceeram Merge pull request #749 from ceeram/2.3-allow
Add allowed() to CakeRequest, to check if the request method matches the...
973670c
@sitedyno sitedyno Add BlowfishAuthenticate adapter. d24bbcb
@markstory markstory Merge pull request #775 from sitedyno/BlowfishAuthenticate
Add BlowfishAuthenticate adapter.
fe3d99c
@markstory markstory Merge pull request #779 from dereuromark/2.3-ellipsis-html
use html ellipsis if possible
064fef1
@markstory markstory Ensure = is removed from generated salt values. 24b68ec
@thomseddon thomseddon Remove legacy test for all actions allowed (*) in startup and tidy code f3ba2bd
@markstory markstory Merge pull request #790 from thomseddon/2.3-authcomponent
Remove legacy test for all actions allowed (*) in startup and tidy code
e822191
@markstory markstory Merge branch 'master' into 2.3 d66d37c
@tigrang tigrang Added `$prefix` generation in `core.php` for `cake bake` shell 8e818c8
@tigrang tigrang Added tests for bake shell cache prefix generation 0441c9f
@markstory markstory Simplify code. 17ba713
@ceeram ceeram use new onlyAllow() method in baked code, to ensure 405 responses hav…
…e required Allow header included
27d83ee
@lorenzo
Owner

I'm not sure this is a good change. data can be empty but still be a POST request

Owner

Moreover, those methods also accept GET so it would be inaccurate to respond to browser that method only accepts POST

Collaborator

yeah, the delete method makes sense, but the rest is debatable.

Collaborator

propose to partial remove and keep in delete: cc92717

Collaborator

@ceeram: i guess you could first check on valid post/delete before actually checking for exists() in the db on delete. so the initial order was good for me.

Collaborator

I dont agree, if you get methodnotallowed then change method to same uri suddenly you could get 404
if the resource does not exist, your should always get 404, and only get 405 when it exists but wrong method

@ceeram I think the change in cc92717 is a good compromise that better communicates how delete() methods should be used, and doesn't tell half truths for add() and edit().

Collaborator

cherry-picked the commit to 2.3: abe74ad

ceeram and others added some commits
@ceeram ceeram partial remove onlyAllow from baked code, only keep in delete to be r…
…fc compliant
abe74ad
@markstory markstory Clarify docs. 028795e
@markstory markstory Fix whitespace. 934838f
@ceeram ceeram remove settings parameter from initialize as this is not being passed…
…. only the constructor gets settings passed
f1ce3f9
@markstory markstory Merge pull request #798 from ceeram/2.3-initialize
remove settings parameter from initialize as this is not being passed. o...
d18173d
@jrbasso jrbasso Changed to accept language do not return the qualifiers and order the…
… values by the qualifier. Also, making the test case insensitive
fd2f3ae
@markstory markstory Fix strict errors. 19c2a58
@markstory markstory Remove un-necessary parameter. 6a95b57
@tmacwill tmacwill added schema support for mysql bigints 15555a7
@tmacwill tmacwill BIGINTs can also be primary keys 68116f7
@tmacwill tmacwill added tests for bigints ec35e31
@markstory markstory Add bigint support for postgres 7bad865
@markstory markstory Add bigint support for Sqlite.
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
8d8f4b5
@markstory markstory Add support for biginteger on SQLserver. d4ee62b
@markstory markstory Fix big int lengths on SQLserver
SQLserver big ints aren't as big as other database servers.
e64f5f1
@markstory markstory Merge branch '2.3' of github.com:cakephp/cakephp into 2.3 d92ff9c
@markstory markstory Merge branch 'master' into 2.3 7283007
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
571c8bc
@markstory markstory Make test a bit more solid. 072991d
@markstory markstory Revert "Make test a bit more solid."
This reverts commit 072991d0da9430d0e9632330618c56cae1f0b988.
21a51a3
@brq brq Allow postLink() to support other HTTP methods; it defaults to POST fca98e3
@markstory markstory Merge pull request #811 from brq/2.3
Allow postLink() to support other HTTP methods; it defaults to POST
a1edede
@dereuromark dereuromark avoid path being made absolute twice 387a974
@ADmad ADmad Merge pull request #812 from dereuromark/2.3-mediaview
Remove redundant prefixing of APP to path. It's already done in CakeResponse::file()
a392892
@markstory markstory Merge pull request #731 from dereuromark/2.3-fix-rss-test
2.3 fix rss test
eb33929
@dereuromark dereuromark check() for CookieComponent and Configure (similar to `CakeSession::c…
…heck()`)
2170d87
@markstory markstory Fix coding standards. 771cfde
@ADmad ADmad Hidden divs created by FormHelper can now be customized. 2895186
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
6664acb
@AD7six AD7six make it possible to override all of basics.php 99b798f
@dereuromark dereuromark allow Folder to merge recursivly and add scheme option 3706853
@dereuromark dereuromark doc block update f7acab7
@dereuromark dereuromark correct spelling 2d9d400
@rchavik rchavik enable PluginDot for routeClass parameter 0cae19a
@lorenzo lorenzo Merge pull request #822 from rchavik/2.3
enable PluginDot for routeClass parameter
b227ff4
@dogmatic69 dogmatic69 simplify the code in the string class
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
f886d87
@markstory markstory Merge pull request #824 from dogmatic69/string-simplify-code
simplify the code in the string class
0d7db89
@dogmatic69 dogmatic69 Simplify the code for sanitize class
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
44f8f84
@dogmatic69 dogmatic69 simplify the code for object collection
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
91c09d8
@dogmatic69 dogmatic69 that change did make wonky uuids b842248
@markstory markstory Merge pull request #829 from dogmatic69/string-simplify-code
this change did make wonky uuids
5ddb61b
@markstory markstory Merge pull request #825 from dogmatic69/sanitize-simplify-code
Simplify the code for sanitize class
5d8ca79
@markstory markstory Merge pull request #827 from dogmatic69/simplify-object-collection
simplify the code for object collection
25b4471
@dogmatic69 dogmatic69 fixing the missing space on the if b1db2ae
@dogmatic69 dogmatic69 adding the timezone as it was not being used cf36104
@ADmad ADmad Merge pull request #830 from dogmatic69/string-code-format
fixing the missing space on the if
c4458a9
@lorenzo lorenzo Merge pull request #832 from dogmatic69/cake-time-unused-var
adding the timezone as it was not being used
395e5ba
@dogmatic69 dogmatic69 Simplify the ClassRegistry by removing else, early returns dc3995f
@dereuromark dereuromark added missing App::uses('Hash', 'Utility'); 288fb12
@dogmatic69 dogmatic69 adjusting the way the regex is done so its easier to read 50333a2
@dogmatic69 dogmatic69 PHP 5.4 strict error fix 173524a
@dogmatic69 dogmatic69 Cleaning up the paginator component by removing extra else statements…
… and shifting code around.
eb98fed
@dogmatic69 dogmatic69 cleaning up the code, removing extra variables set and un-needed else bf18fc4
@dogmatic69 dogmatic69 Simplify the cake time class
Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.

Also removed setting variables that are returned on the next line.
95b895b
@markstory markstory Merge pull request #834 from dereuromark/2.3-missing-appuses
added missing App::uses('Hash', 'Utility');
c7da60d
@markstory markstory Merge pull request #836 from dogmatic69/simplify-object-collection
PHP 5.4 strict error fix
051362a
@markstory markstory Merge pull request #833 from dogmatic69/simplify-class-registry
Simplify the ClassRegistry by removing else, and adding early returns
0f8262e
@markstory markstory Merge pull request #831 from dogmatic69/sanitize-regex-cleanup
adjusting the way the regex is done so its easier to read
31ca237
@markstory markstory Merge pull request #837 from dogmatic69/paginator-component-cleanup
Cleaning up the paginator component by removing extra else statements and shifting code around.
f22d4c0
@markstory markstory Merge pull request #838 from dogmatic69/security-component-cleanup
cleaning up the code, removing extra variables set and un-needed else
51e0715
@markstory markstory Merge branch 'simplify-cake-time' into 2.3
Conflicts:
	lib/Cake/Utility/CakeTime.php
ec54fa5
@dogmatic69 dogmatic69 Cleaning up the AuthComponent
Simplify if statements, return early and less variable use
2c70319
@markstory markstory Fix strict error in 5.4 921c2c6
@markstory markstory Merge pull request #821 from dereuromark/2.3-folder-merge
allow Folder to merge recursivly and add scheme option
5081be1
@markstory markstory Fix whitespace errors. c13ed33
@markstory markstory Merge pull request #840 from dogmatic69/cleanup-auth-component
Cleaning up the AuthComponent
1fe7913
@dogmatic69 dogmatic69 Adding a check to the object before use
For some reason that I have not been able to figure out yet the object is
returned as null.  This is causing some exceptions when trying to access
properties that dont exist.

FatalErrorException: "Call to a member function getAssociated() on a non-object"

Test still pass with the added check.
6f3e6c1
@dogmatic69 dogmatic69 You cant pass func_get_args() in PHP < 5.3 c7faad9
@markstory markstory Merge pull request #844 from dogmatic69/form-bug
Adding a check to the object before use
98992e0
@markstory markstory Merge pull request #845 from dogmatic69/security-component-cleanup
You cant pass func_get_args() in PHP < 5.3
ec4333d
@dogmatic69 dogmatic69 Cleaning up the RequestHandlerCompoent
removing redundant code and shifting a few things around so there
are less nested ifs and making things easier to follow.

Removing some variable setting, returning function calls instead.
e09bf02
@dogmatic69 dogmatic69 converting $foo == null / $foo == false to !$foo cf8fcca
@dogmatic69 dogmatic69 converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 22a2e1b
@dogmatic69 dogmatic69 converting if($foo == true) to if($foo) 5cc03ca
@dogmatic69 dogmatic69 strict type checks and removing some duplicate count() calls by setti…
…ng a variable
cfadc4d
@dogmatic69 dogmatic69 ADmads comments f5a8eb6
@markstory markstory Merge pull request #839 from dogmatic69/cleanup-request-handler
Cleaning up the RequestHandlerCompoent
a5481f1
@dereuromark dereuromark save some memory usage (PHP < 5.4) in case of huge content and cut of…
…f the isset call
6d3e0a2
@markstory markstory Merge pull request #843 from dereuromark/2.3-ticket-3172
check() for CookieComponent and Configure
89c9823
@markstory markstory Fix whitespace errors. ccd3378
@dogmatic69 dogmatic69 changing join() to implode() for consistency a38a616
@dogmatic69 dogmatic69 replacing is_integer() with is_int() aa87791
@dogmatic69 dogmatic69 changing is_writeable() to is_writable() 4899b5b
@dogmatic69 dogmatic69 die() to exit() d0bb8a9
@dogmatic69 dogmatic69 skipping the rijndael test if mcrypt_encrypt() is not available 2693423
@markstory markstory Merge pull request #848 from dogmatic69/removing-alias-function-calls
Removing alias function calls
7f76f70
@markstory markstory Merge pull request #849 from dogmatic69/rijndael-fatal-error
skipping the rijndael test if mcrypt_encrypt() is not available
cdfead0
@ceeram ceeram add default return value as parameter to use when size can not be det…
…ermined
9530e68
@markstory markstory Implement resetSequence()
This is an optional method in DboSource that allows datasources to
resetSequence values in tables.  This is useful for datasources like
Postgres, and makes using fixtures much easier.

Fixes #3026
55dcb9c
@markstory markstory Merge pull request #850 from ceeram/2.2-filesize
Add CakeNumber::fromReadableSize() and Validation::filesize()
07c5102
@ceeram ceeram opmitisation of fromReadableSize 90c32ad
@tigrang tigrang Added ability to set default view block content 6d98069
@tigrang tigrang Added test case for view block default value f1a344e
@tigrang tigrang Fixed test case d30e092
@lorenzo lorenzo Merge pull request #835 from tigrang/default-block-value
Added ability to set default view block content
d999a83
@markstory markstory Merge pull request #852 from cakephp/2.3-reset-sequence
Implement resetSequence()

Fixes #3206
144761c
@ceeram ceeram allow for lowercase as well, also strip the unit part off before pow() ff676b5
@dereuromark dereuromark adding query() for CakeRequest e8cfac0
@markstory markstory Merge pull request #856 from ceeram/2.3-cakenumber
Simplify and improve fromReadableSize().
5d4a6fd
@markstory markstory Implement missing bits for automatic sequence resetting.
Refs #3206
a1838a0
@markstory markstory Fix coding standards. 99cbd22
@dereuromark dereuromark test the query() method with arrays passed via $_GET 60385d1
@dereuromark dereuromark adding CakeNumber::formatDelta() and fixing issue with near-zero valu…
…es and format()
3fa6b96
@dereuromark dereuromark doc block 8a070ca
@dereuromark dereuromark coding standards 213d4ca
@dereuromark dereuromark adding basic test 0be1943
@markstory markstory Merge pull request #858 from dereuromark/2.3-request
adding query() for CakeRequest
e931211
@bar bar Add MySQL FULLTEXT support.
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext

Fixes #262
aaefbf1
@markstory markstory Attempt to make tests pass when OpenSSL is not enabled. 268e589
@dogmatic69 dogmatic69 adding a plugin propery to models wwith tests for ticket #85
Merge pull request #696
6d4f4b5
@lorenzo lorenzo Merge pull request #859 from dereuromark/2.3-format-delta
adding CakeNumber::formatDelta() and fixing issue with format()
2818ec6
@dogmatic69 dogmatic69 converting if ($foo != null) to if ($foo) b1f26b5
@dogmatic69 dogmatic69 converting if ($foo != false) to if ($foo) 8dc4de5
@dogmatic69 dogmatic69 converting if ($foo != "") to if ($foo) 36314e6
@dogmatic69 dogmatic69 fixing error pointed out by dereuromark with recursive cakephp/cakeph… cd99b7d
@dogmatic69 dogmatic69 undo the change to avoid change in behavior 1b36853
@ceeram ceeram refactoring asset dispatcher filter 3665a95
@lorenzo lorenzo Merge pull request #867 from ceeram/2.3-assetfilter
refactoring asset dispatcher filter
a355a84
@ceeram ceeram avoid pass by reference error on 5.4 e454282
@lorenzo lorenzo Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
d5c9d97
@lorenzo lorenzo Removing variable from dump test as it does not exist anymore 047ffd1
@lorenzo lorenzo Fixed typo c870044
@markstory markstory Attempting to get passing builds on travisci
Currently the 5.2 builds fail due to the length checks on blowfish
hashes.  Try a shorter wall to see if those builds will pass.
61d6f71
@markstory markstory Revert "Attempting to get passing builds on travisci"
This reverts commit 61d6f716bc718c0cefb6b0ef7cfdf8c18a37bac6.
8bbb1f1
@markstory markstory Try skipping blowfish tests if hashes are wrong.
Another attempt at fixing failing tests on travisci.
ea784f6
@markstory markstory Try to fix another test failure caused by blowfish.
travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
76d21c6
@dereuromark dereuromark correcting iso standard for nld (dutch) - making dut the alias c87b53a
@dereuromark dereuromark move charset/App.encoding into CakeResponse b47e3a7
@markstory markstory Merge pull request #869 from dereuromark/2.3-nld
Correcting iso standard for nld (dutch) - making dut the alias

Fixes #795
f55160e
@markstory markstory Merge pull request #871 from dereuromark/2.3-dispatch
move charset/App.encoding into CakeResponse
9c78aae
@markstory markstory Fix whitespace. eed59a9
@markstory markstory Fix coding standard error. e550332
@dereuromark dereuromark correcting coding-standards b7f1740
@dereuromark dereuromark after correcting nld the iso standard should be enforced for all lang…
…uages
0327043
@dereuromark dereuromark doc block correction a33b187
@markstory markstory Merge pull request #873 from dereuromark/coding-standards
correcting coding-standards
87fc861
@markstory markstory Merge pull request #874 from dereuromark/2.3-languages
after correcting nld the iso standard should be enforced for all langs
51245ce
@markstory markstory Merge branch 'master' into 2.3 59e948f
@ADmad ADmad Replace Model::read() with Model::find('first') in baked controller
Removed references to Ajax and Javascript helpers
035f727
@markstory markstory Merge pull request #878 from ADmad/2.3-bake-template
Replace Model::read() with Model::find('first') in baked controller
e1a0ce7
@dogmatic69 dogmatic69 fixing a error in the tests 095e8df
@markstory markstory Merge pull request #882 from dogmatic69/test-error
fixing a error in the tests
9ed901b
@dogmatic69 dogmatic69 Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
408e619
@andraskende andraskende formatting changes.. f5be83d
@andraskende andraskende removed 2 empty lines fa5d2c1
@dereuromark dereuromark making messages() and errors() reset themselves by default 7383298
@ADmad ADmad Merge pull request #866 from dereuromark/2.3-folder-reset
making messages() and errors() reset themselves by default
8efc641
@ADmad ADmad Fix failing tests ce9ad1f
@dereuromark
Collaborator

but that would only work on nix then (not on windows I assume - since folder permissions dont work there).

you probably need a skipIf in this case then.

Collaborator

wow, folder permissions work on windows8. there the tests still pass after your change.

@dereuromark

better $isDebug = !Configure::read('debug') ; - but isnt the variable wrong now? it should probably be $isNotDebug = !Configure::read('debug') ; - or the positive one and if (!$isDebug) checks

Owner

True, I'll update it.

ADmad and others added some commits
@ADmad ADmad Allow throwing exception instead of redirecting upon unauthorized acc…
…ess attempt. Closes #591
1c0492e
@markstory markstory Fix variable naming. 57f81da
@AD7six AD7six Load routes as late as possible.
As a concequence - routes will also work by default in the cli
5140baf
@AD7six AD7six unbrake Console/cake on osx 52f2060
@AD7six AD7six url encode nested named parameters in unmatched routes
reference: #2988
and 31033239bd06750358a8aea3542392209234278a
fa6defe
@ADmad ADmad Cache character set names a1aa73c
@markstory markstory Merge branch 'master' into 2.3 9a66768
@markstory markstory Fix code style errors. 57681ff
@dereuromark dereuromark default value null makes more sense. add test cases for false. 7bf08fd
@dereuromark dereuromark remove default value for debug's first argument 17be6d0
@ADmad ADmad Allow specifying tag for current page number. Closes #2892 61dd109
@markstory markstory Merge pull request #899 from dereuromark/2.3-more-tests
default value null makes more sense. add test cases for false.
7ea3ee4
@ADmad ADmad Fix incomplete patch 61dd1098d3 56a0eb0
@predominant predominant Removed spaces at the end of lines. 41ae19b
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
1aea9ac
@markstory markstory Merge branch 'master' into 2.3 1cc82ff
@dereuromark dereuromark allow ini files to have separators between sections for better readab…
…ility

dump now makes spaces between sections in init files
5a8092f
@markstory markstory Force field validation to use sha1
When using blowfish as your application's hashing strategy, form field
validation would fail horribly.  Forcing sha1 fixes this and restores
behavior consistent with 2.2.x

Fixes #3280
f457f07
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
0b0b361
@markstory markstory Remove bad test. d4631a6
@lorenzo lorenzo Fixed problems with resetSequence() not using the correct sequence name
in postgres
c00d58b
@AD7six AD7six use the right language domain
these messages are for developers, not end users
35686c9
@markstory markstory Merge pull request #905 from dereuromark/2.3-ini
allow ini files to have separators between sections for better readability
d75bd48
@ADmad ADmad Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/bootstrap.php
1763f46
@ADmad ADmad Moving the mb_* functions to bootstrap.php 3ee267d
@markstory markstory Merge branch 'master' into 2.3 d201030
@dogmatic69 dogmatic69 Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
641ba9f
@ceeram ceeram afterRender should not be triggered when callbacks is false 6fc019e
@markstory markstory Merge pull request #911 from dogmatic69/type-checks
Type checks
2841611
@markstory markstory Fix failing tests. c4b9fa6
@markstory markstory Fix lint error. 5786245
@markstory markstory Add some fixed orders.
Hopefully this makes tests in postgres more reliable.
9e07789
@markstory markstory Try to set order on more things. 83d307e
@dereuromark dereuromark solves ticket 3306 f3bbe89
@dereuromark dereuromark making tests pass on windows again cc43614
@renan renan Make app/Console/cake pwd insensitive on Mac OS X.
Follow up of [36e15a065b2a1b9fe93e22e62a9802d6e88a7004].
02cface
@markstory markstory Merge pull request #914 from dereuromark/2.3-i18n-extract
Normalize paths in generate pot files to always use /

Fixes #3306
d051b69
@rchavik rchavik CakeSchema: adds empty line between tables e614831
@markstory markstory Merge pull request #919 from rchavik/2.3
CakeSchema: adds empty line between tables
ab11d50
@ceeram ceeram Squashed commit of the following:
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Oct 26 14:40:24 2012 +0200

    Merge branch '2.3' into currency

commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 23:53:03 2012 +0200

    NumberHelper now also uses the default currency from CakeNumber, instead of default argument value

commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 18:01:35 2012 +0200

    Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
f4f4aa4
@dereuromark dereuromark cleanup 5324a8c
@dereuromark dereuromark coding standards regarding whitespaces 0f97819
@markstory markstory Merge pull request #923 from dereuromark/2.3-fixes
2.3 fixes
31a5401
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
c24bec6
@markstory markstory Merge branch 'master' into 2.3 c794e29
@lorenzo lorenzo Fixing failing test case in RssHelper 7715689
@lorenzo lorenzo Avoiding problems with relative paths in shell dispatcher 8538c0e
@markstory
Owner

This change is causing tests to fail both on jenkins and locally for me.

lorenzo and others added some commits
@lorenzo lorenzo Revert "Fixing failing test case in RssHelper"
This reverts commit 7715689523bd8ac19aa0d387e1d4087a487f5a6d.
8bca041
@markstory markstory Fix coding standard. f8d602c
@ADmad ADmad Fix coding standard error 1e50ead
@lorenzo lorenzo Update version number to 2.3.0-beta b75bb8e
@markstory markstory Merge branch 'master' into 2.3 478461d
@shama shama Code standards fixes f10c669
@lorenzo lorenzo Merge pull request #928 from shama/patch-cs
Code standards fixes
2ab3a46
@ceeram ceeram code optimizing and simplify _crypt(), see PR #853 0196c6f
@rchavik rchavik RedisEngine: authenticate connection if 'password' is set 7d84486
@ceeram ceeram fix fieldlist, refs PR808 and PR851
Squashed commit of the following:

commit 7007dba0eb836f852aaca95fada103bc4ba993a9
Merge: 3ca4d23 7d84486
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 10:53:39 2012 +0100

    Merge branch '2.3' into calinseciu-2.3

commit 3ca4d231bf80d2bb1c0572196f633da68c1a0db7
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Sep 23 12:45:00 2012 +0200

    more tests added

commit e6b12532655671aff2b966a9be89b2625a715e8f
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Sep 18 09:18:32 2012 +0200

    change methodname and visbilty

commit 70396265025190ab2fbc159911ec3e064cc44fb2
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 17:26:52 2012 +0200

    fix fieldlist, refs PR #808

commit e9db96bfe163609eeefba430d8353c822aabacb0
Merge: 99b798f adb8142
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 16:26:40 2012 +0200

    Merge branch '2.3' of git://github.com/calinseciu/cakephp into calinseciu-2.3

commit adb8142d2694692ec71a063ac2ad1b275f3a67c9
Author: calinseciu <calinseciu@gmail.com>
Date:   Thu Aug 30 17:57:50 2012 +0300

    Add foreignKey to whitelist in saveAssociated()

    Association's foreignKey doesn't get saved when saving hasMany associations since it's not in the model's whitelist after validation.
    This happens if you don't send the foreignKey with the associated records data.
b8607ca
@ceeram ceeram fix incorrect tests b18550c
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
60f9626
@lorenzo lorenzo Adding warning to home.ctp when DebugKit is not installed
Adding a list of official plugins to home.ctp
Removing old link to live.cakephp.org and replacing it with
plugins.cakephp.org
6c1bed3
@predominant predominant Merge pull request #938 from lorenzo/2.3-new-home
Helping newcomers find useful plugins
ac61bd4
@ADmad ADmad Remove duplicate App::uses() statement 570acfa
@larryb82 larryb82 XmlView: configure top level element name
Allow the top level element name to be configured by setting
XmlView.RootNodeName.
a60a730
@markstory markstory Fix whitespace. f53153b
@markstory markstory Update docs for the escape option in CakeNumber::currency()
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
fe4f9f2
@aleho aleho Use bytcode sequence for unicode ellipsis
The codepoint for "horizontal ellipsis" is 0x2026, which enables a more
robust display of that character on different systems.
c7fda56
@markstory markstory Merge pull request #945 from aleho/2.3
Use bytcode sequence for unicode ellipsis

Fixes #3356
7e00be8
@markstory markstory Fix failing tests using chr(226) instead of unicode codes. 8b7b139
@markstory markstory Call a few fewer methods. 6378aab
@markstory markstory Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
e0aab77
@sitedyno sitedyno Improve Blowfish Docblocks 895fcac
@rhelms rhelms Add CakeTestCase::getMockForModel convenience method
This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.
1672cff
@markstory markstory Merge pull request #948 from sitedyno/blowfish-updates
Blowfish Clarifications.
eb3e509
@markstory markstory commented on the diff
lib/Cake/TestSuite/ControllerTestCase.php
@@ -342,12 +342,7 @@ public function generate($controller, $mocks = array()) {
if ($methods === true) {
$methods = array();
}
- ClassRegistry::init($model);
- list($plugin, $name) = pluginSplit($model);
- $config = array_merge((array)$config, array('name' => $model));
- $_model = $this->getMock($name, $methods, array($config));
- ClassRegistry::removeObject($name);
- ClassRegistry::addObject($name, $_model);
+ $this->getMockForModel($model, $methods, $config);
@markstory Owner

I like that this exposes something we've been doing in ControllerTestCase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory
Owner

Since this is a new feature the pull request should really be targeted towards the 2.3 branch, not the master branch.

@rhelms

Close this one, as I've created a new pull request to put into the 2.3 branch

@rhelms rhelms closed this
@ravage84

SERVER_IIS seems to be an undocumented or rather not anymore documented config switch, which was , according to the posts in the Cake's Google group, used in the past to change the behavior of Cake to circumvent how IIS sets some enviornment variables.

https://groups.google.com/forum/?fromgroups&nomobile=true#!searchin/cake-php/SERVER_IIS

I suggest we either document it properly or remove it.
I'd tend to the latter...

Removed in fe809cd.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.