Commit graph

15897 commits

Author SHA1 Message Date
mark_story
3e28326d9c Fix Controller::beforeRedirect() and array return.
Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.

Fixes #2973
2012-06-24 12:03:31 -04:00
mark_story
35e0984bec Fix fatal error when E_STRICT is enabled.
If you have E_STRICT enabled and have a strict error in your files, you
would see a fatal error related to Debugger missing.  PHP won't autoload
classes if you are currently in an autoload call, and an error is
triggered.  Preloading Debugger + String in dev mode lets you see the
correct error.
2012-06-24 12:03:31 -04:00
Jelle Henkens
db7d5426ec CakeTime no longer sets the timezone out of its scope on the date object 2012-06-24 11:10:55 +01:00
mark_story
e2781a536a Fix whitespace error. 2012-06-23 21:03:15 -04:00
mark_story
5e54be4e5a Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303 better error message in MissingConnectionException when driver is not enabled 2012-06-23 11:42:26 +02:00
mark_story
13077a8f2f Add tests for previous commit. 2012-06-22 21:44:37 -04:00
Matt Hamann
a7ef245de5 Added 'helpers' to _applyConfig.
Allows default Helpers to be modified by EmailConfig setup.

Conflicts:

	lib/Cake/Network/Email/CakeEmail.php
2012-06-22 21:44:17 -04:00
mark_story
5c29c4d6e7 Merge branch '2.2-shell-command-sort' into 2.2
Closes #GH-695
2012-06-22 20:54:14 -04:00
mark_story
eb4056625d Re-add the sort option
Even though it does nothing, it should stick around as providing
it causes the shell to fail.
2012-06-22 20:53:53 -04:00
dogmatic69
058f48fc7b Showing the list of shells grouped by plugin
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.

Core and app shells are always listed last.
2012-06-22 20:53:44 -04:00
Ceeram
55f3cbe1f6 remove unneeded line 2012-06-22 14:44:47 +02:00
Ceeram
2f5f1b28bc Merge branch '2.2-validatorrules' into 2.2 2012-06-20 15:01:26 +02:00
Ceeram
71112d1225 No need to create new instance of ModelValidator when one is already created 2012-06-20 14:57:56 +02:00
Ceeram
60c611fa47 Parse rules in getField() 2012-06-20 14:54:32 +02:00
Jose Lorenzo Rodriguez
3908f0602c Update version number to 2.2.0-RC2 2012-06-19 21:02:39 -04:30
Jose Lorenzo Rodriguez
03d31b57f7 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099 Avoid using LC_ALL, on some installs this would cause error:
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7 Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error:
"setlocale(): Specified locale name is too long"
2012-06-19 18:33:51 +02:00
Ceeram
cf18e8d38b avoid unneeded query in delete() 2012-06-19 16:08:36 +02:00
mark_story
89b2eddf0b Try regexp as not all locales are available. 2012-06-18 23:45:44 -04:00
mark_story
6a1e9e80b2 Try LC_ALL instead. 2012-06-18 23:31:10 -04:00
mark_story
81611956f5 Update doc blocks.
Add missing @throws
2012-06-18 23:29:28 -04:00
mark_story
77fc8a9d33 Switch to de_DE
nl_NL doesn't seem to exist on the ci server.
2012-06-18 23:25:42 -04:00
mark_story
001e89bf3f Fix formatting with locales using , as decimal separator
Fixes #2958
2012-06-18 23:13:09 -04:00
mark_story
f9ddc9c64c Move error disabling to the error controller. 2012-06-18 22:08:39 -04:00
mark_story
3c824b586f Use $this->bootstrap.
$this->boostrap makes the output match the file changed.
2012-06-18 21:38:08 -04:00
AD7six
d5cf2765dd remove referencers to fixtures that don't exist 2012-06-18 16:40:37 +02:00
AD7six
a6954a7abc Bark if a fixture file is missing
A missing fixture file would previously be silently ignored
2012-06-18 15:28:00 +02:00
Ceeram
0df1e90eed show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925 2012-06-18 14:20:53 +02:00
mark_story
7ef83b89f5 Merge branch '2.1' into 2.2
h origin especially if it merges an updated upstream into a topic branch.
2012-06-17 20:54:59 -04:00
mark_story
fec6c1c6cb Fix security component causing black holes on error pages.
Fixes #2966
2012-06-17 20:50:00 -04:00
mark_story
54679023f9 Add support for DELETE + form encoded data.
Much like PUT, DELETE requests will automatically parse
form-urlencoded request bodies and set them as $this->data.
2012-06-17 20:03:45 -04:00
Ceeram
c5b19b658a Merge commit '74a0bd98c28991664fc0a3b0e8b34dc4f9dbf009' into 2.2 2012-06-15 09:42:22 +02:00
Ceeram
74a0bd98c2 throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype 2012-06-14 19:01:41 +02:00
AD7six
d01f0e9f67 correct tests to match desired behavior
by default we don't want fixtures pulled in from a different scope than
that of the test being baked
2012-06-14 13:38:17 +02:00
AD7six
23c37efc71 Load fixtures from a consistent location
If a test is baked for a plugin - it should by default look for fixtures in the
same plugin, otherwise it creates potentially complex inter-plugin/app
dependencies.
2012-06-14 13:28:35 +02:00
mark_story
5413143178 Don't modify app/Config/bootstrap when running tests. 2012-06-12 22:10:55 -04:00
mark_story
f625742a12 Make CakeSession use httponly by default.
Fixes #2955
2012-06-12 22:10:55 -04:00
Mark Story
f467785a8c Merge pull request #693 from dereuromark/2.2-html-link-fix
2.2 html link fix
2012-06-12 11:54:12 -07:00
euromark
ba62ecd21a whitespace 2012-06-12 16:59:16 +02:00
euromark
b32edfe378 fix double-encoding of external urls 2012-06-12 16:30:37 +02:00
José Lorenzo Rodríguez
5f0e0963db Merge pull request #692 from shama/patch-custom-validation
Fix custom validation methods with CakeValidationSet
2012-06-12 02:59:28 -07:00
Kyle Robinson Young
54745aada9 Fix custom validation methods with CakeValidationSet 2012-06-11 23:28:45 -07:00
Mark Story
645e981cf2 Merge pull request #690 from webtechnick/2.1
No longer suppress include error for PHPUnit loading.
2012-06-11 18:02:44 -07:00
Nick Baker
ae990cc0c6 Code cleanup, break if found, no reason to go through entire vendor list overwriting if found on first try. No reason to create variables we don't need. 2012-06-11 12:40:53 -06:00
Nick Baker
42809512f0 No longer suppress the include path to PHPUnit/Autoload.php as Autoload.php require_once() on two files, if either of them aren't there the shell exits without message. Explanation of issue here: http://www.webtechnick.com/wtn/blogs/view/247/Fixing_PHPUnit_for_CakePHP_2_x_testing_on_Mac_OS_X 2012-06-11 12:22:26 -06:00
mark_story
fddcdd622d Merge branch 'fitorec-console' into 2.2
Closes #GH-682
2012-06-10 21:57:38 -04:00
mark_story
f6b50a948e Small fixes for validation formatting.
* Remove additional out() calls.
* Remove extra punctuation.
* Fix code standards.
* Fix failing test.
2012-06-10 21:57:15 -04:00