Tigran Gabrielyan
f6e1c7ca3d
Improve code readability
2013-08-09 20:26:17 -07:00
Tigran Gabrielyan
777a46ff6d
Fix CS issue
2013-08-09 20:00:33 -07:00
Tigran Gabrielyan
34d848d0ca
Fixed order of assert params
2013-08-06 12:59:36 -07:00
Tigran Gabrielyan
a6e3bb37a6
Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself
...
Added ability to send multiple values with the same type of header in CakeResponse
2013-08-06 01:35:45 -07:00
José Lorenzo Rodríguez
a54c92fc0f
Merge pull request #1475 from cakephp/feature/2.4-mock-app-model
...
Make mocking random models easier
2013-08-05 00:22:53 -07:00
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
AD7six
ff856b7ebb
bark if the model doesn't exist
...
Getting the following warning:
ReflectionException: Class Mock_Foo_e187b1d1 does not have a
constructor, so you cannot pass any constructor arguments
Is a much less obvious way of saying "the class you're trying to mock
doesn't exist". Be more explicit
2013-08-03 16:00:34 +00:00
AD7six
35b4ac0286
make it possible to run this test on its own
...
Without setting up paths to the test_app - two of the tests will fail
Verify/demonstrate how to mock a model without a model existing
2013-08-03 16:00:04 +00:00
AD7six
46b28aae50
merge config in getMockForModel
...
Otherwise, to override just one key, it's necessary to set all the other
defaults too
2013-08-03 16:00:04 +00:00
Christian Winther
cd44c2afae
Merge pull request #1472 from ADmad/bugfix/3948
...
Fixed bug when using multi model fieldList and whitelists for all models...
2013-08-03 05:56:22 -07:00
Andy Dawson
f34388c53a
Merge pull request #1471 from cakephp/feature/2.4-pretty-print
...
pretty print json and xml responses in debug mode
2013-08-03 01:35:56 -07:00
mark_story
b5edcba309
Unlink files with full path.
2013-08-02 23:41:15 -04:00
mark_story
b999b4d9ae
Fix error when clearing FileCache.
...
I made a mistake in a previous commit that did not account for dir()
returning directory names.
2013-08-02 23:32:17 -04:00
mark_story
1b610a8d62
Move disabling of bootstrap mode to after init().
...
init() loads from the cache which can autoload additional classes. For
example the FileEngine adapter loads Inflector. Loading additional
classes causes the file_map cache to be re-written on each request when
using FileEngine. This results in degraded performance when using
FileEngine.
Fixes #3947
2013-08-02 23:20:13 -04:00
euromark
a5531f7419
fix casing
2013-08-03 04:32:39 +02:00
euromark
6c1e60953b
fix cs
2013-08-03 03:02:52 +02:00
mark_story
b3860b3992
Fix clearing files in multiple groups.
...
When using multiple groups on a cache config, clearing was not working
properly. Clearing un-used cache configs also failed when the
directories did not exist.
Fixes #3930
2013-08-02 17:56:27 -04:00
ADmad
a2e818e509
Deprecated ConsoleShell
2013-08-03 03:04:32 +05:30
ADmad
473e4f991f
Fixed bug when using multi model fieldList and whitelists for all models are not provided.
...
Fixes #3948
2013-08-03 02:49:41 +05:30
mark_story
19ac39963a
Remove duplicate code.
...
The conditions for persistParams() work should be self contained. Remove
this duplication.
2013-08-02 13:30:31 -04:00
mark_story
8209a298f7
Make CakeRoute::persistParams() more tolerant
...
Subclasses and instances may not always define persist options.
CakeRoute should be accepting of these differences.
Fixes #3957
2013-08-02 13:28:58 -04:00
AD7six
1643e10c74
pretty print json and xml responses in debug mode
2013-08-02 15:17:24 +00:00
Christian Winther
50b192eb1b
Merge pull request #1470 from uzyn/csfix
...
CS fix.
2013-08-02 04:49:09 -07:00
Andy Dawson
d7bc432202
Merge pull request #1468 from cakephp/feature/fix-console
...
Fix the console cli
2013-08-02 04:22:21 -07:00
Jose Lorenzo Rodriguez
d218313cf5
Removing legacy code that will not work on current versions of phpunit,
...
fixes #3955
2013-08-02 12:24:43 +02:00
U-Zyn Chua
585ac157c0
CS fix.
2013-08-02 18:19:13 +08:00
Simon Males
0adef209e3
Camel case SecurityComponent::blackHole() method call
2013-08-02 12:07:33 +08:00
Christian Winther
227f9aaa88
Merge pull request #1440 from Phally/master-postgres-fails
...
Adds order to the test models to make the results more predictable.
2013-08-01 02:38:33 -07:00
mark_story
5bd45ec65d
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-08-01 08:50:02 +00:00
AD7six
69be4bb1e8
Update the console shell for easier maintenance
2013-08-01 08:39:01 +00:00
mark_story
1202456ef2
Fix errors in ConsoleShell.
...
The switch statement was failing to evaluate conditions properly and
always attempted to run the bind command.
2013-07-31 23:51:30 -04:00
mark_story
810fd28186
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-07-31 23:41:49 -04:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
ADmad
b7cee8ff57
Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key.
...
Fixes #3874
2013-07-31 17:24:36 +05:30
mark_story
95b74bd9ef
Make sure ComponentCollection has the controller dependency.
...
Add setter method as changing ComponentCollection's constructor now is
not possible. This fixes issues where components that rely on
Collection->getController() in their constructor can work properly.
Fixes #3946
2013-07-30 09:09:52 -04:00
Mark Story
4c7bc11a08
Merge pull request #1461 from thegallagher/master
...
Required fields not recognised by FormHelper when only using ModelValidator::add()
2013-07-29 18:33:28 -07:00
David Gallagher
37ab0611ae
Fix whitespace
2013-07-30 11:26:49 +10:00
David Gallagher
35cc737261
Add for required fields when using only ModelValidator::add()
2013-07-30 11:11:49 +10:00
David Gallagher
bce0eb37b4
Don't need to check for empty because Model::validator() returns an interator
2013-07-30 11:09:43 +10:00
ADmad
a691e70065
Docblock and return type fixes
2013-07-29 19:13:31 +05:30
Mark Story
7269568ae6
Merge pull request #1460 from ravage84/cakeschematest-setup+teardown
...
Removed unused setup & teardown methods
2013-07-28 17:54:33 -07:00
Marc Würth
3a4f7815e8
Removed unused setup & teardown methods from MyAppSchema in CakeSchemaTest
2013-07-29 01:55:32 +02:00
Marc Würth
1cac1846a3
Added missing calls to setUp & tearDown in tests
2013-07-29 01:52:39 +02:00
Marc Würth
4a37ad5637
Added return before redirects
...
As recommended by the Cookbook:
http://book.cakephp.org/2.0/en/development/testing.html#testing-controllers
> When testing actions that contain redirect() and other code following the redirect it is generally a good idea to return when redirecting. The reason for this, is that redirect() is mocked in testing, and does not exit like normal. And instead of your code exiting, it will continue to run code following the redirect.
2013-07-28 23:44:07 +02:00
mark_story
8a81903e37
Fix FileEngine not clearing keys when groups are used.
...
Fixes #3930
2013-07-27 22:20:40 -04:00
mark_story
17b25388b3
Throw exceptions when '' is used as translation domain.
...
'' is never a good translation domain and often indicates developer
error. Treat it as a mistake and throw an exception.
Fixes #3939
2013-07-27 21:41:22 -04:00
mark_story
76aab0a635
Add failing test for #3930
2013-07-27 17:15:15 -04:00
mark_story
c28cde4e56
Update webroot files to fix an issue in ServerShell.
...
The previous fixes done in 2918ae9c7a
caused other issues preventing actions from being dispatched properly.
Fixes #3934
2013-07-27 17:01:35 -04:00
Phally
a70e004cda
Corrects bad merge.
...
Bad merge: d161b21ae1
Fixes #3938 .
2013-07-26 20:00:32 +02:00