mark_story
fd5a8a8d6b
Fix code standards.
...
Remove failing test, and fix coding standards.
2012-05-12 22:26:33 -04:00
Magnus Johansson
352fbde2ec
Move out HTML logic to Helper/TimeHelper.php. The Utility/CakeTime.php timeAgoInWords() now returns a string with the time, while the same function in Helper/TimeHelper.php may return an HTML element.
2012-05-12 22:26:33 -04:00
Magnus Johansson
9fa531d6e3
Added test cases for new features.
2012-05-12 22:26:33 -04:00
Magnus Johansson
0729aca706
Added some more intelligence to the CakeTime class
2012-05-12 22:25:48 -04:00
ADmad
14b7210d2b
Fixed server offset calculation
2012-05-13 06:20:29 +05:30
mark_story
9628910c86
Merge branch '2.1' into 2.2
2012-05-12 20:26:36 -04:00
mark_story
8103eae9f1
Make input prompt clearer in extract task.
...
Make the prompt display the paths that will be scanned. Hopefully
this makes the shell a bit easier to use and understand. Also
make the shell not accept 0 paths as a correct answer.
Fixes #2877
2012-05-12 20:26:11 -04:00
ADmad
0fdf9dd4d3
Merge pull request #649 from jellehenkens/2.2-router-test-typo
...
Fixing small variable typo in test case
2012-05-12 12:35:01 -07:00
Jelle Henkens
c2920aa3bf
Fixing small variable typo
2012-05-12 18:43:39 +01:00
mark_story
a3a2655fd5
Fix whitespace errors.
2012-05-11 21:38:21 -04:00
Mark Story
5d3291ba19
Merge pull request #645 from huoxito/2.2
...
Make controller test template extends ControllerTestCase instead of CakeTestCase
2012-05-11 17:35:34 -07:00
ADmad
eeff950cf9
Removing default null value for $data parameter. Refs GH pull request #646
2012-05-12 00:18:47 +05:30
Washington
287c7b432a
fix broken tests for TestTask class
2012-05-11 15:30:47 -03:00
Washington
c651bf25d3
remove stub class from controller tests template and mock condition to
...
make it extends ControllerTestCase
2012-05-11 14:51:56 -03:00
Rachman Chavik
335f3558a9
fixing null request returned by Router::getRequest()
...
fixes issues for Router::getRequest() called in a Plugin/Foo/routes.php
during bootstrap.
2012-05-11 22:16:17 +07:00
Rachman Chavik
e5b33627d5
minor updates to the logging changeset
...
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
2012-05-11 21:19:45 +07:00
Rachman Chavik
912a5f6d12
Merge branch '2.2-logging' into 2.2
2012-05-11 12:38:45 +07:00
Rachman Chavik
be9bcfd4b5
adding convenience methods for CakeLog
2012-05-11 12:37:01 +07:00
Rachman Chavik
6040d96710
adding scoped logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
a269a123c4
reorder constant definitions
2012-05-11 12:37:01 +07:00
Rachman Chavik
05243a1c0a
updating Shell tests related to Console logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
e11f6b7fe4
adding tests for ConsoleLog engine
2012-05-11 12:37:01 +07:00
Rachman Chavik
70177e4dbd
updating tests for CakeLog
...
- ObjectCollection operations
- Selective logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
68b49950af
fix ErrorHandlerTest
2012-05-11 12:37:01 +07:00
Rachman Chavik
bb090c54cf
changing Shell to use ConsoleLog
2012-05-11 12:37:00 +07:00
Rachman Chavik
d10727797b
new ConsoleLog logging engine
2012-05-11 12:37:00 +07:00
Rachman Chavik
5c4f741529
add default logging config in Config/bootstrap.php
2012-05-11 12:37:00 +07:00
Rachman Chavik
b71e814191
selective logging by scope
2012-05-11 12:37:00 +07:00
Rachman Chavik
49bc818d36
new base class Log/Engine/BaseLog
2012-05-11 12:37:00 +07:00
Rachman Chavik
aab1eb6c37
refactor to use ObjectCollection
2012-05-11 12:37:00 +07:00
Rachman Chavik
edb44aadea
Merge branch '2.1' into 2.2
2012-05-11 12:34:26 +07:00
Jose Lorenzo Rodriguez
fe659c0c33
Refactored FormHelper to take advantage of the new validator object
2012-05-10 23:14:26 -04:30
Jose Lorenzo Rodriguez
217bf85537
Implemented new method isEmptyAllowed in CakeValidationRule
2012-05-10 23:13:45 -04:30
Jose Lorenzo Rodriguez
785cf8354c
Fixing merge artifacts to make all tests pass
2012-05-10 22:36:55 -04:30
Jose Lorenzo Rodriguez
307197da9e
Merge branch '2.2' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-05-10 22:19:35 -04:30
Jose Lorenzo Rodriguez
efc3536adb
Fixing a couple errors introduced in previous commit
2012-05-10 22:04:55 -04:30
Jose Lorenzo Rodriguez
2b7c2ad691
Fixing doc blocks for CakeValidationRule and changing visibility for some methods
2012-05-10 21:51:54 -04:30
Jose Lorenzo Rodriguez
34531d9d7c
Cahnging doc in header for CakeValidationSet
2012-05-10 21:41:42 -04:30
Jose Lorenzo Rodriguez
c4202b7b22
Improving docs for CakeValidationSet
2012-05-10 21:39:53 -04:30
Jose Lorenzo Rodriguez
8c9c6b4a5a
Improving docs for ModelValidator
2012-05-10 21:27:01 -04:30
Rachman Chavik
15a74722b3
use LOGS constant
2012-05-11 08:33:53 +07:00
Jose Lorenzo Rodriguez
280893155a
Renaming CakeRule to CakeValidationRule
2012-05-10 21:01:44 -04:30
Rachman Chavik
539fa3a131
fixing method signature in test models
2012-05-10 20:55:47 -04:30
Rachman Chavik
a96e4397be
check extension before passing to addTestFile()
2012-05-10 20:55:47 -04:30
Rachman Chavik
89959afa63
fix incorrect __construct params for mock object
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
f06fbb0075
Making validateAssociated overwrite data consistently with validateMany
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
82e87791f6
Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
1481f82ec1
Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
7db2b97f87
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
e4c88d8cf9
Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit 0f54758e5ab4a42e4a03
2012-05-10 20:55:47 -04:30
