Jose Lorenzo Rodriguez
9cceb1553f
Improving ModelValidator::add() to allow multiple rules to be defined at once
2012-05-20 18:51:00 -04:30
Tigran Gabrielyan
57ad5e2573
Made FormHelper::inputDefaults() alawys return inputDefaults array
2012-05-20 15:51:48 -07:00
Jelle Henkens
327f809016
Removing duplicate if statement
2012-05-20 23:12:50 +01:00
ADmad
cfd9d8a815
Added CakeTime::listIdentifiers()
2012-05-21 03:05:42 +05:30
Tigran Gabrielyan
fd0dd7ec04
Updating FormHelper::create to use new inputDefaults() method
2012-05-20 13:44:54 -07:00
Tigran Gabrielyan
1d77ad393c
Added FormHelper::inputDefaults setter/getter method
2012-05-20 13:41:55 -07:00
mark_story
024e30eb42
Fix coding standards errors.
...
Adding a private property allows fixing of 4 naming standards
errors.
2012-05-20 16:06:41 -04:00
mark_story
16a1a0ee79
Fix coding standards.
2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64
Merge branch '2.2-validator' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
Mark Story
94a58bd35d
Merge pull request #657 from shama/patch-phpunit
...
Update PHPUnit install instructions
2012-05-20 09:09:33 -07:00
Kyle Robinson Young
3f7cbf561b
Update PHPUnit install instructions
2012-05-19 22:06:45 -07:00
Jose Lorenzo Rodriguez
16847b0d97
Backporting changes form 2.2 to fix some edge cases on deep saving. Fixes #2879
2012-05-19 21:14:23 -04:30
Jose Lorenzo Rodriguez
dc8c731ccb
Fixed failing test case
2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6
Merge branch '2.1' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/models.php
2012-05-19 15:39:44 -04:30
Ceeram
7dbd6bc3a2
make sure model data is moved to alias, even when first key in data is assoc model
...
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
2012-05-19 14:41:16 -04:30
Mark Story
df684ca9fe
Merge pull request #656 from jellehenkens/2.2-coding-conventions
...
Fixing code conventions
2012-05-19 08:56:02 -07:00
mark_story
7107cd6631
Fix fatal error when checking for PHPUnit.
...
Doubly including PHPUnit/Autoload.php causes fatal errors.
Having access to one of the PHPUnit classes means phpunit exists as
well.
Fixes #2890
2012-05-19 11:35:55 -04:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
ADmad
d5b5327f70
Merge pull request #653 from jellehenkens/2.2-cake-time-date-time-objects
...
Support for DateTime objects in the CakeTime Utility class
2012-05-17 11:55:56 -07:00
Jelle Henkens
5fe22cfc8d
Adding support for DateTime objects in the CakeTime Utility class
2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a
CakeTime::format crashed when timezone is passed
2012-05-17 19:05:45 +07:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c
HTML escape context variables.
...
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.
Clean up some internals in Debugger::outputError(). There were
a few duplicate data structures, and $$ variables.
Fixes #2884
2012-05-16 21:07:45 -04:00
Mark Story
fd216c4dda
Merge pull request #655 from jellehenkens/2.2-app-dir-tests
...
Updating CakeSchema test case to test non standard app folder names
2012-05-16 09:52:17 -07:00
Rachman Chavik
c9b801b96d
making CakeLog to work with bogus $type and $scope
...
closes #2881
2012-05-16 08:16:20 +07:00
mark_story
a37bdba8fe
Revert accidental change.
2012-05-15 21:07:43 -04:00
mark_story
7d9f441020
Add documentation.
2012-05-15 21:00:18 -04:00
Jelle Henkens
110536d575
Fixing CakeSchema to test APP_DIR with different names than all lowercase
2012-05-15 21:41:11 +01:00
mark_story
0faaedfff5
Split up tests.
...
Fix API usage in tests.
2012-05-14 21:32:31 -04:00
mark_story
cbd6cafed7
The event manager should be re-used.
...
View::__construct() gets the controller's event manager,
only to override it the first time getEventManager() is called.
Don't overwrite the Controller's event manager as it allows plugins
to more easily hook into the view process.
2012-05-14 21:18:09 -04:00
Rachman Chavik
6bb29ea03b
changing CakeLog::_autoConfig for better bc
...
closes #2880
2012-05-15 08:16:55 +07:00
Mark Story
405aacc0fc
Merge pull request #654 from jellehenkens/2.2-schema-shell-test
...
Fixing test assert for APP_DIR scenarios with non standard folder names
2012-05-13 17:30:30 -07:00
Jelle Henkens
ef270b95c7
Fixing test assert for APP_DIR scenarios with non standard folder names
2012-05-13 18:12:31 +01:00
ADmad
07c901dfd0
Merge pull request #651 from jellehenkens/2.2-cake-time-fixes
...
CakeTime::nice() and CakeTime::niceShort() do not respect the timezone if no date is passed
2012-05-13 05:50:51 -07:00
Jelle Henkens
0d9506fa2e
Fixing issue where nice and niceShort did not use the timezone if no dateString is passed
2012-05-13 13:43:06 +01:00
Rachman Chavik
6ede36f8e0
removing unneeded LOG_* constant checks
2012-05-13 18:51:57 +07:00
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
Rachman Chavik
595cad84b3
ensure that plain CakeLogInterface still works
2012-05-13 18:51:57 +07:00
Rachman Chavik
8e8763d69d
change to match syslog levels & customizable levels
2012-05-13 18:51:57 +07:00
ADmad
88fe559ec5
Merge pull request #650 from jellehenkens/2.2-code-formatting
...
Fixing code formatting for extract() calls
2012-05-13 04:43:21 -07:00
Jelle Henkens
dbd826f794
Removing extra space in the extract() calls
2012-05-13 10:37:50 +01:00
mark_story
64f03acd4c
Fix code standards errors.
2012-05-12 23:28:43 -04:00
mark_story
d9244048b6
Fix hard coded date.
2012-05-12 23:25:11 -04:00
mark_story
579aff5ad3
Fix error with options.
2012-05-12 22:35:49 -04:00
mark_story
176ec2df0c
Add documentation on additional options.
2012-05-12 22:26:34 -04:00
mark_story
683146de14
Add a few more tests.
2012-05-12 22:26:34 -04:00
mark_story
0edbe0a123
Fix more whitespace.
2012-05-12 22:26:34 -04:00
mark_story
14bfd83dad
Reduce complexity in timeAgoInWords.
...
All the special cases were handled by the deeply
nested if.
2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea
Fix whitespace and formatting.
2012-05-12 22:26:33 -04:00
