mark_story
efbeab6199
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/console/libs/tasks/fixture.test.php
lib/Cake/Console/Command/Task/DbConfigTask.php
2011-09-03 00:48:09 +01:00
Renan Gonçalves
bc3828179b
Not using Folder if its a git repository.
2011-09-02 00:19:37 +02:00
Renan Gonçalves
65956ab863
Adding __d(...) to the upgrade shell messages. Althought there is no 'real' need for it its good to be aligned to the others shells.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
81c46a76b7
Not running 'git mv ...' if its dry-run.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
265c094f2f
Fixing the path to tests on upgrade shell and also fixing the option for git, it needs to be boolean.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
7ae89c3679
Checking if short options exist, fixed an warning caused by not checking it.
2011-09-01 22:10:42 +02:00
Mark Story mark@mark-story.com
6f8869631f
Fixing issue where divide by 0 errors would crop up on empty files.
2011-09-01 20:33:09 +01:00
Mark Story mark@mark-story.com
957a8d5c00
Fixing log files to directories a webserver doesn't always have write access too.
2011-09-01 20:24:39 +01:00
Mark Story mark@mark-story.com
41b22c5521
Fixing Router::mapResources() so it works with plugins.
...
Fixes #1956
2011-09-01 18:49:01 +01:00
Renan Gonçalves
b5bee102df
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-01 19:32:13 +02:00
Renan Gonçalves
edbe60e965
Overriding the files array, so it will not try to perform actions on files that no longer exists.
2011-09-01 19:31:32 +02:00
Mark Story mark@mark-story.com
36eca679fe
Adding an isset so a non-existant view isn't accessed.
...
Fixes #1954
2011-09-01 17:55:42 +01:00
Mark Story mark@mark-story.com
4d1f41dddc
Fixing failing tests cased by App::object() cache being warm.
...
Removing code duplicated in CakeTestCase methods.
Adding missing parent calls.
2011-09-01 00:38:08 +01:00
Mark Story mark@mark-story.com
572412ec6b
Removing bad integration test that wasn't required anymore.
2011-09-01 00:23:59 +01:00
Mark Story mark@mark-story.com
bb3a1d546b
Fixing RequesHandler::prefers(). It was previously entirely wrong.
...
It took the ordered list of accept types, and blindly assumed
the first in the list was the most preferred. This is an incorrect
assumption to make, as all types with the same q value are equal.
- Using CakeRequest::parseAccept() to access only the most preferred
content types.
- Using in_array() to check for the desired type.
- Updating tests for RequestHandler.
2011-09-01 00:20:54 +01:00
Mark Story mark@mark-story.com
e2f48b4a95
Refactoring how q values are parsed, as content types were
...
reversed for similar q value types. This causes issues in
RequestHandlerComponent.
2011-09-01 00:20:54 +01:00
Jose Lorenzo Rodriguez
ef4bb2239e
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-08-31 17:40:55 -04:30
Jose Lorenzo Rodriguez
b9b7516945
Merge remote-tracking branch 'ceeram/2.0-email' into 2.0
...
Conflicts:
lib/Cake/Network/Email/AbstractTransport.php
lib/Cake/Network/Email/CakeEmail.php
lib/Cake/Network/Email/DebugTransport.php
lib/Cake/Network/Email/MailTransport.php
lib/Cake/Network/Email/SmtpTransport.php
2011-08-31 17:39:41 -04:30
Mark Story mark@mark-story.com
8ce6c31708
Adding extra information about DboSource::fetchAll() and result caching.
2011-08-31 22:52:33 +01:00
Juan Basso
840d27bbb9
Fixed the allow method to parameters not be required.
2011-08-30 21:12:57 -04:00
Jose Lorenzo Rodriguez
6612cb3421
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-08-30 00:08:54 -04:30
Jose Lorenzo Rodriguez
a8b38beb9d
Fixing bug in SchemaShell where it would always force a read on all tables
2011-08-30 00:07:57 -04:30
Mark Story mark@mark-story.com
3a8b344208
Fixing issue where CakeTestCase would erase custom bootstrapped paths in tearDown().
...
Adding App::paths() to simplify getting all the paths App knows about.
Fixes #1934
2011-08-29 22:14:18 -04:00
Jose Lorenzo Rodriguez
0e85170f28
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-08-29 16:55:27 -04:30
Jose Lorenzo Rodriguez
40ba4005bd
Affecting the REQUEST_METHOD env variable in order to ease controller testing with different http verbs
2011-08-29 16:54:22 -04:30
Ceeram
0b00fb4fe0
fixing bug in deliver(), and adding more tests
2011-08-29 17:13:41 +02:00
Ceeram
4b093a858c
adding more testcases for CakeEmail
2011-08-29 16:02:00 +02:00
Ceeram
c5d0955cd0
adding back blank line
2011-08-29 11:39:08 +02:00
Ceeram
87ffd92c2b
Fixing transport test, as transport class now returns as stated in RFC 2822
2011-08-29 11:38:01 +02:00
Ceeram
3be9a8a5e8
debugtransport now also returns in correct format as stated in RFC 2822 2.3, updated tests
2011-08-29 11:21:46 +02:00
Mark Story
59c6b419e5
Merge branch '1.3' into merger
...
Conflicts:
cake/console/libs/bake.php
cake/libs/configure.php
cake/libs/controller/components/request_handler.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Utility/Validation.php
2011-08-28 22:08:49 -04:00
Ceeram
2efa3b0377
optmizing CakeEmail, and improving tests, transport class config() now returns configs array if no array is passed
2011-08-29 03:11:30 +02:00
mark_story
9ff922cbc7
App::objects() should skip directories and files starting with
...
`.`. These generally contain version control or OS metadata, and
not code CakePHP can use.
Fixes #1933
2011-08-28 15:36:19 -04:00
mark_story
4a7bd031e5
Adding a file_exists() check before unlinking cache files.
...
This prevents issues where two concurrent requests could
be clearing the same cache files.
Fixes #1936
2011-08-27 11:52:29 -04:00
mark_story
1a872e6544
Fixing CakeRequest::accepts() where ;q values on Accept header
...
were not respected.
Fixes #1940
2011-08-27 11:39:22 -04:00
mark_story
5df12a287e
Fixing failing tests caused by moving params[ext].
2011-08-27 10:36:11 -04:00
mark_story
02a6883b22
Using Folder class in CakeTestSuite, this fixes issues where
...
hidden directories from VCS would be added as test cases.
Fixes #1933
2011-08-27 10:34:08 -04:00
mark_story
682dc5e24b
Make Folder::tree use SPL Iterators.
2011-08-27 10:20:59 -04:00
mark_story
7656feb0bb
Converting internals of Folder::read() to use DirectoryIterator.
2011-08-27 10:20:59 -04:00
Jose Lorenzo Rodriguez
f94394f582
Removing routing url from query string in CakeRequest. This happens mostly with nginx setups
2011-08-27 01:29:50 -04:30
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
Ceeram
9300f094a5
fixing output for logs and accept log level from configs
2011-08-26 09:33:49 +02:00
mark_story
5955cc6ed7
Adding trimming of Accept headers to CakeRequest.
...
Fixes #1684
2011-08-25 22:28:02 -04:00
Ceeram
9e0ff5ad88
add Cakelog to send(), transport classes now all return in same format, fixing some typos
2011-08-26 02:31:18 +02:00
Ceeram
c93274a528
dropping first parameter for _applyConfig()
2011-08-25 16:50:30 +02:00
Ceeram
4cc5295400
more refactoring of CakeEmail
2011-08-25 16:03:39 +02:00
Juan Basso
c60abb1802
Fixed tests affected by the visibility changes.
2011-08-24 23:10:51 -04:00
Ceeram
0b8a3069eb
removing duplicate code, config() already applies configs now
2011-08-24 16:58:51 +02:00
mark_story
f060fdafb7
Adding the --debug flag that later versions of PHPUnit support.
2011-08-22 22:29:32 -04:00
mark_story
6acf024a2b
Fixing incorrect keying for ext routing parameter. It was
...
nested under params[url][ext]. This makes it unlike
all other routing parameters. Having the nested value
also makes reversing requests harder, and generating urls more
difficult.
Adding a test for Router::reverse() and extensions.
Fixes #1923 , fixes #1928
2011-08-22 22:26:02 -04:00