Christian Winther
dc5cd988aa
Merge pull request #1467 from ADmad/feature/assets-url-config
...
Feature/assets url config
2013-08-02 01:21:37 -07:00
Mark Story
cd4f4de063
Merge pull request #1469 from sime/blackHole-camelcase
...
Camel case SecurityComponent::blackHole() method call
2013-08-01 21:14:43 -07: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
José Lorenzo Rodríguez
48df85d80d
Merge pull request #1466 from ADmad/bugfix/#3874
...
Ensure Configure::boostrap() doesn't overwrite existing configs under 'A...
2013-07-31 05:31:25 -07:00
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
Mark Story
e6452d6b9e
Merge pull request #1459 from ravage84/teardown
...
Added missing calls to setUp & teardown in tests
2013-07-28 17:54:10 -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
Christian Winther
4590b7d553
Merge pull request #1458 from ravage84/patch-2
...
Added return before redirects
2013-07-28 14:57:44 -07: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
ADmad
6da0a37e11
Merge pull request #1453 from Phally/2.4-merge
...
Merge master => 2.4
2013-07-26 22:20:14 -07:00
Phally
a70e004cda
Corrects bad merge.
...
Bad merge: d161b21ae1
Fixes #3938 .
2013-07-26 20:00:32 +02:00
Phally
933013f808
Test case to prove base urls are stripped.
...
Refs #3938 , #3916 .
2013-07-26 19:57:12 +02:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Christian Winther
b345a8f180
Merge pull request #1451 from Phally/master-3922
...
Strips the base off the generated URL from the AuthComponent.
2013-07-26 06:23:58 -07:00
Phally
f7eab23a5c
Strips the base off the generated URL from the AuthComponent.
...
Fixes #3922 .
2013-07-26 15:18:28 +02:00
David Gallagher
5937685817
Use ModelValidator::count() to count dynamiclly added validation rules
2013-07-26 22:44:59 +10:00
euromark
8b21710c95
whitespace correction
2013-07-25 13:26:21 +02:00
ADmad
802228f1d1
Merge pull request #1448 from dereuromark/2.4-remove-private
...
remove private in favor of protected visibility
2013-07-24 06:19:42 -07:00
euromark
24fa926ff9
remove private in favor of protected visibility
2013-07-22 21:08:05 +02:00
Christian Winther
5993ac39de
Merge pull request #1447 from Phally/master-bootstrap
...
Paths for App::build() require trailing /.
2013-07-22 05:37:50 -07:00
Phally
881e757a1e
Paths for App::build() require trailing /.
2013-07-22 13:51:09 +02:00
Christian Winther
1b3b4e6508
Merge pull request #1445 from Phally/master-3895-2
...
Fixes cake bake all. Refs #1443 .
2013-07-20 11:35:57 -07:00
Phally
5953171c7b
Fixes cake bake all. Refs #1443 .
2013-07-20 20:21:35 +02:00
Mark Story
09c21c5aa6
Merge pull request #1443 from Phally/master-3895
...
Replaces deprecated paginate() calls in controller bake templates.
2013-07-20 10:36:09 -07:00
Phally
6d6be87f8f
Replaces deprecated paginate() calls in controller bake templates.
...
Fixes #3895 .
2013-07-20 16:59:39 +02:00
mark_story
2d2721d2d9
Update docs for MySQL
...
MySQL supports a few non-standard options. Document them.
2013-07-19 23:01:16 -04:00
mark_story
8913f4fc08
Merge branch 'ssl_pdo_mysql' into 2.4
...
Merge pull request #1421 from mikescar/ssl_pdo_mysql
Fixes #556
2013-07-19 22:57:05 -04:00
Mike Scarborough
c780ded512
add SSL support to MySQL PDO connections
2013-07-19 22:56:51 -04:00
Mark Story
1402796047
Merge pull request #1441 from ravage84/ViewTestsCleanup
...
Added missing test + minor cleanup of ViewTests.php
2013-07-19 19:40:09 -07:00
Marc Würth
da8e50a48a
Added missing test + minor cleanup of ViewTests.php
...
Added missing block reset test through assign().
Also made some minor cleanup in ViewTests.php. Mostly docblocks (params, returns) but also some unused variables.
2013-07-20 01:43:07 +02:00
Phally
db1876d837
Adds order to the test models to make the results more predictable.
...
Even though there was some code in place to prevent results in random
order from PostgreSQL we were still experiencing this with Jenkins
and Travis.
This commit removes the old code that handled this. From now on this
will be handled differently. Every test model will order by its
primary key. You can disable this by changing the order property
of the model to `null`: `$testModel->order = null`.
2013-07-19 22:31:09 +02:00