ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
Marc Würth
|
2bbd391972
|
Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
|
2013-05-29 20:19:14 +02:00 |
|
ADmad
|
a10275fb8b
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
|
2013-05-05 14:36:46 +05:30 |
|
mark_story
|
2b0e10eebb
|
Exclude domain names starting with -
Related to 479aefc438
Refs #3414
|
2013-04-29 21:31:30 -04:00 |
|
spiliot
|
dbe90cae71
|
removed duplicate test case
```$this->assertFalse(Validation::money('text'));```
is now tested only once
|
2013-04-29 00:20:35 +03:00 |
|
spiliot
|
2d7f6fc707
|
Added tests
|
2013-04-22 03:42:19 +03:00 |
|
mark_story
|
041c2d289f
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Shell.php
|
2013-03-26 20:31:54 -04:00 |
|
mark_story
|
83de70efcf
|
Tighten Canadian postal code validation.
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.
Fixes #3708
|
2013-03-17 18:14:56 -04:00 |
|
mark_story
|
e97b3acebb
|
Merge branch 'master' into 2.4
|
2013-03-14 20:54:42 -04:00 |
|
Yuya Takeyama
|
14c81fe052
|
Fix alphaNumeric validation
|
2013-03-14 20:10:17 +09:00 |
|
Marc Würth
|
33fbace4c7
|
Added 'ym'- & 'y'-date validation
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
|
2013-02-15 14:35:20 +01:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
euromark
|
11a88042bd
|
fix doc block endings
|
2013-01-11 15:06:54 +01:00 |
|
Jose Lorenzo Rodriguez
|
0f5fa290ed
|
Merge remote-tracking branch 'origin/master' into 2.3
|
2012-12-01 23:19:53 +01:00 |
|
mark_story
|
479aefc438
|
Update TLD validation to accept gTLD variations
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.
Fixes #3414
|
2012-11-30 22:11:57 -05:00 |
|
mark_story
|
59e948fb1b
|
Merge branch 'master' into 2.3
|
2012-09-28 21:20:24 -04:00 |
|
mark_story
|
99edef0abc
|
Re-order assertions.
Group the true/false assertions.
|
2012-09-27 21:39:14 -04:00 |
|
Mark Story
|
07c5102de5
|
Merge pull request #850 from ceeram/2.2-filesize
Add CakeNumber::fromReadableSize() and Validation::filesize()
|
2012-09-17 17:55:23 -07:00 |
|
mark_story
|
d3105332dc
|
Fix coding standards errors.
|
2012-09-01 12:14:15 +01:00 |
|
Ber Clausen
|
63548267e9
|
Refactor Validator::decimal() to be more flexible with decimal
separators and PHP magic.
Lots of testing added.
|
2012-08-27 23:25:17 -03:00 |
|
Ber Clausen
|
b75a6b440a
|
Treat float numbers with trailing zeroes removed by PHP, accordingly.
Revert #2800 (28bd6880df ) regex changes. Also add more tests.
Signed-off-by: mark_story <mark@mark-story.com>
|
2012-08-24 22:22:12 -04:00 |
|
mark_story
|
162d3bcb29
|
Fix whitespace errors.
|
2012-07-23 22:44:05 -04:00 |
|
U-Zyn Chua
|
e7c4064a69
|
Fix URL validation to allow underscores in subdomain.
|
2012-07-19 20:51:33 +08:00 |
|
Ceeram
|
6ec0afcf5d
|
Add CakeNumber::fromReadableSize() and Validation::filesize()
|
2012-06-26 12:17:25 +02:00 |
|
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
|
74a0bd98c2
|
throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype
|
2012-06-14 19:01:41 +02:00 |
|
mark_story
|
76dd49145a
|
Merge branch '2.1' into 2.2
|
2012-06-10 20:34:20 -04:00 |
|
mark_story
|
b2e82871f1
|
Attempt to fix failing build.
|
2012-06-10 20:08:17 -04:00 |
|
mark_story
|
7ae660c779
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
|
2012-06-10 20:05:25 -04:00 |
|
mark_story
|
454fae9bd0
|
Fix Validation::ip() not respecting type.
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.
Fixes #2944
|
2012-06-10 19:37:44 -04:00 |
|
Florian Krämer
|
e3a6e9e169
|
Adding uploadError() and mimeType() to the Validation class
|
2012-05-28 00:32:30 +02:00 |
|
Jelle Henkens
|
7d080ea2d1
|
Adding an assert to check for zero prefixed numbers
|
2012-05-22 16:32:16 +01:00 |
|
Jelle Henkens
|
7546be6394
|
Adding a validation rule for checking natural numbers
|
2012-05-21 13:39:31 +01:00 |
|
Ceeram
|
fe0c7d348a
|
add strict parameter to inList() and multiple()
|
2012-05-07 16:29:13 +02:00 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
Cauan Cabral
|
18aa5a040f
|
Include test to .0 and .00 decimals
|
2012-04-17 20:22:32 -04:00 |
|
Cauan Cabral
|
28bd6880df
|
Make Validation::decimal accept integers
Fix #2800
Force locale of ValidationTests with en_US to ensure decimal dot separator
|
2012-04-17 20:22:22 -04:00 |
|
mark_story
|
1efee89169
|
Fix most coding standards issues in Test/Case/Utility
|
2012-03-13 22:59:20 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
Majna
|
32f5b6f191
|
Fix failing test.
|
2012-03-07 19:27:23 +01:00 |
|
Majna
|
4543a4cb88
|
Make Validation class more strict when checking values in list.
Use in_array() with 'strict' param. Affected rules are Validation::inList() and Validation::multiple().
|
2012-03-07 18:52:48 +01:00 |
|
Kyle Robinson Young
|
45ec5d73c5
|
Add missing visibility keywords
|
2012-02-16 23:13:12 -08:00 |
|
mark_story
|
69a69d48a2
|
Add test for Validation::url() + sftp.
|
2012-01-19 22:04:10 -05:00 |
|
Kyle Robinson Young
|
51f9837db4
|
Code standards formatting
|
2011-12-15 22:52:07 -08:00 |
|
mark_story
|
645ef47878
|
Fix multiple date formats in Validation::date()
Fixes #2364
|
2011-12-12 20:21:10 -05:00 |
|
Kyle Robinson Young
|
1e1c7a036d
|
Code consistency formatting tweaks
|
2011-12-06 12:52:48 -08:00 |
|
Kyle Robinson Young
|
5388237099
|
Consistently setting setUp() and tearDown() on test cases
|
2011-12-04 13:27:51 -08:00 |
|
mark_story
|
c9bd97309f
|
Merge branch '1.3' into merger
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
|
2011-10-01 22:38:20 -04: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 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Jose Lorenzo Rodriguez
|
fb264d9671
|
Adding a datetime validation method to the Validation class, closes #1021
|
2011-07-15 01:20:37 -04:30 |
|
Mark Story
|
91a1cf81f3
|
Merge branch '1.3' into merger
Conflicts:
app/Config/acl.ini.php
app/config/database.php.default
app/webroot/css.php
app/webroot/css/cake.generic.css
cake/basics.php
cake/bootstrap.php
cake/config/paths.php
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/bake.php
cake/console/libs/i18n.php
cake/console/libs/shell.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/testsuite.php
cake/console/templates/default/classes/test.ctp
cake/console/templates/default/views/home.ctp
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/views/elements/email/text/default.ctp
cake/console/templates/skel/webroot/css.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cake_session.php
cake/libs/configure.php
cake/libs/controller/component.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/error.php
cake/libs/magic_db.php
cake/libs/model/behaviors/acl.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/errors/missing_behavior_class.ctp
cake/libs/view/errors/missing_behavior_file.ctp
cake/libs/view/errors/missing_component_class.ctp
cake/libs/view/errors/missing_component_file.ctp
cake/libs/view/errors/missing_connection.ctp
cake/libs/view/errors/missing_controller.ctp
cake/libs/view/errors/missing_helper_class.ctp
cake/libs/view/errors/missing_helper_file.ctp
cake/libs/view/errors/missing_layout.ctp
cake/libs/view/errors/missing_model.ctp
cake/libs/view/errors/missing_scaffolddb.ctp
cake/libs/view/errors/missing_table.ctp
cake/libs/view/errors/missing_view.ctp
cake/libs/view/errors/private_action.ctp
cake/libs/view/errors/scaffold_error.ctp
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/xml.php
cake/libs/view/media.php
cake/libs/view/pages/home.ctp
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/index.ctp
cake/libs/view/scaffolds/view.ctp
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/console/libs/acl.test.php
cake/tests/cases/console/libs/api.test.php
cake/tests/cases/console/libs/bake.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/console/libs/tasks/db_config.test.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/plugin.test.php
cake/tests/cases/console/libs/tasks/project.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/console/libs/tasks/view.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/configure.test.php
cake/tests/cases/libs/controller/component.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/media.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/groups/acl.group.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/cache.group.php
cake/tests/groups/components.group.php
cake/tests/groups/configure.group.php
cake/tests/groups/console.group.php
cake/tests/groups/controller.group.php
cake/tests/groups/database.group.php
cake/tests/groups/helpers.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/model.group.php
cake/tests/groups/no_cross_contamination.group.php
cake/tests/groups/routing_system.group.php
cake/tests/groups/socket.group.php
cake/tests/groups/test_suite.group.php
cake/tests/groups/view.group.php
cake/tests/groups/xml.group.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_test_suite_dispatcher.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/reporter/cake_base_reporter.php
cake/tests/lib/reporter/cake_cli_reporter.php
cake/tests/lib/reporter/cake_text_reporter.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/libs/library.php
cake/tests/test_app/libs/log/test_app_log.php
cake/tests/test_app/plugins/test_plugin/config/load.php
cake/tests/test_app/plugins/test_plugin/config/more.load.php
cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
cake/tests/test_app/vendors/Test/MyTest.php
cake/tests/test_app/vendors/Test/hello.php
cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
cake/tests/test_app/vendors/shells/sample.php
cake/tests/test_app/vendors/somename/some.name.php
cake/tests/test_app/vendors/welcome.php
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
lib/Cake/Console/Templates/skel/webroot/test.php
lib/Cake/Console/cake.bat
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Log/CakeLog.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/test_app/View/Emails/html/custom.ctp
lib/Cake/Test/test_app/View/Emails/text/custom.ctp
lib/Cake/TestSuite/templates/header.php
lib/Cake/Utility/Sanitize.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
|
2011-06-23 12:48:06 -07:00 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
Juan Basso
|
aacb921695
|
Pattern to use skipIf in tests.
|
2011-05-30 20:51:36 -04:00 |
|
Renan Gonçalves
|
438050dcaa
|
Adding 'public' visibility to all public methods.
|
2011-05-30 22:02:32 +02:00 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|