Commit graph

13718 commits

Author SHA1 Message Date
Mark Story
4485f597b7 Merge pull request #662 from jellehenkens/2.2-validation-natural-number
Adding validation rule for natural numbers
2012-05-27 11:01:31 -07:00
AD7six
5bcb1346ab allow loading namespaced classes
This permits, e.g.

App::uses('Ns\Foo', 'Plugin.Lib');
...
new Ns\Foo();
new \Ns\Foo(); // Or

to work
2012-05-27 19:59:07 +02:00
mark_story
4b8c469004 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
Rachman Chavik
907b3221ed logging: fix failing tests when called via webrunner 2012-05-25 23:52:33 +07:00
Rachman Chavik
3f6593311b logging: console support/format for new log types 2012-05-25 23:52:33 +07:00
Mark Story
9d76d3f88a Merge pull request #668 from jellehenkens/2.2-extract-improvement
Overwrite option to skip file exists warnings in cake i18n extract
2012-05-25 09:41:38 -07:00
Jelle Henkens
5656461025 Adding overwrite option to the i18n extract task 2012-05-25 17:01:56 +01:00
AD7six
af4a2efc33 allow baking tests for controllers with uses
if a controller has

	public $uses => array('MyPlugin.MyModel')

in their controller - the bake controller task will fail because `$controller->MyPlugin.MyModel`
doesn't exist
2012-05-25 13:09:52 +02:00
Jelle Henkens
f6a6e3381e Fixing typo in the docblock 2012-05-24 20:07:48 +01:00
mark_story
6725a30fe2 Fix funny warning. 2012-05-23 22:46:18 -04:00
mark_story
b27a3aab7b Set session.gc_maxlifetime by default.
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings.  Always set session.gc_maxlifetime so session files are
garbage collected correctly.

Fixes #2901
2012-05-23 22:25:19 -04:00
mark_story
ea9eee4c77 Fix array arguments being translated.
Fixes #2902
2012-05-23 21:02:41 -04:00
mark_story
aa85451159 Fix incorrect return type. 2012-05-23 19:52:29 -04:00
José Lorenzo Rodríguez
33eb46cd87 Merge pull request #666 from boast/patch-1
Fixed XmlArticle and XmlUser Models associations.
2012-05-22 21:41:04 -07:00
David Thalmann
81fedbba9c Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel test and does no longer try to use the 'default' datasource. 2012-05-23 07:19:06 +03:00
mark_story
5270721ade Remove bonus intval()
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.

Fixes #2897
2012-05-22 22:33:46 -04:00
mark_story
f414aae5d7 Update version number to 2.2.0-RC1 2012-05-22 21:43:17 -04:00
mark_story
c26df7001b Update version number to 2.1.3 2012-05-22 21:37:45 -04:00
mark_story
d6bf61cb36 Merge branch '2.1' into 2.2 2012-05-22 21:27:05 -04:00
mark_story
661feb8a1f Create signed tags. 2012-05-22 21:26:40 -04:00
mark_story
a393b20931 Add some doc blocks. 2012-05-22 21:14:26 -04:00
José Lorenzo Rodríguez
ed15634ccb Merge pull request #663 from jellehenkens/api-docs-mixed-params
Updating @param mixed docblock lines to proper multi type @param's
2012-05-22 08:38:23 -07:00
Jelle Henkens
ecd869d4e3 Changing int to integer 2012-05-22 16:34:07 +01:00
Jelle Henkens
7d080ea2d1 Adding an assert to check for zero prefixed numbers 2012-05-22 16:32:16 +01:00
mark_story
0ed6752110 Fix coding standards. 2012-05-21 20:29:00 -04:00
Norio Suzuki
f816f6ae1b Supported japanese legacy charset and changed to use upper case charset in Content-Type line 2012-05-21 20:28:59 -04:00
Mark Story
b0049921a4 Merge pull request #664 from tigrang/inputDefaults-setter
Making FormHelper::inputDefaults() code more readable
2012-05-21 15:06:45 -07:00
Tigran Gabrielyan
671c31218f Making FormHelper::inputDefaults() code more readable 2012-05-21 13:56:51 -07:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
ADmad
e58e3c5314 Fix regex for failing test on 5.2 2012-05-21 19:48:47 +05:30
Jelle Henkens
7546be6394 Adding a validation rule for checking natural numbers 2012-05-21 13:39:31 +01:00
Mark Story
4fd45c07f5 Merge pull request #660 from jellehenkens/2.2-http-socket-duplicate-code
Removing an unnecessary if statement in HttpSocket
2012-05-20 18:02:40 -07:00
José Lorenzo Rodríguez
bb368c569c Merge pull request #659 from tigrang/inputDefaults-setter
Input defaults setter for FormHelper
2012-05-20 16:40:20 -07:00
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