Paul Redmond
a993a7a50d
Fixing typo in view property during unset()
2012-08-24 23:11:25 -07:00
mark_story
b2f62f46c5
Fix failing tests in postgres.
2012-08-24 22:37:23 -04:00
Ber Clausen
b75a6b440a
Treat float numbers with trailing zeroes removed by PHP, accordingly.
...
Revert #2800 (28bd6880df
2012-08-24 22:22:12 -04:00
Ceeram
f06ce1324d
Merge branch '2.2-habtmmerge'
2012-08-24 10:45:45 +02:00
mark_story
dcc5a95482
Only split on ; for TABLE related statements.
...
Fixes #3142
2012-08-23 23:11:00 -04:00
Ceeram
cb80338c7d
avoid duplication in return value when saving habtm
2012-08-24 00:50:46 +02:00
Ceeram
c5ebbc991c
Revert "Merge pull request #784 from ceeram/habtmmerge"
...
This reverts commit fa5aa6278f88604ac757
2012-08-23 16:00:41 +02:00
Ceeram
fb0053753e
avoid duplication in returned results for habtm
2012-08-22 13:03:47 +02:00
mark_story
88604ac757
Replace is_a with instanceof.
2012-08-21 08:47:58 -04:00
Renan Gonçalves
172e4bed5d
Fix STRICT warnings on PHP 5.4
2012-08-21 13:08:43 +02:00
mark_story
00f3e7e441
Fix silent failures.
...
Fixes #3133
2012-08-20 16:19:34 -04:00
mark_story
e75fdd21ee
Add tests to show caseinsensitive nature of detectors.
...
Closes #3132
2012-08-20 11:43:10 -04:00
Stephen Cuppett
7e5f326300
Fix STRICT warnings on PHP 5.4
2012-08-19 17:00:26 -04:00
Mark Story
08e4362d40
Merge pull request #772 from bar/master-fix-phpreader
...
The actual config file must always have .php extension.
2012-08-16 11:00:27 -07:00
mark_story
8146cc4db4
Update mime types of various powerpoint extensions.
...
Fixes #3121
2012-08-15 23:14:57 -04:00
mark_story
73f29069de
Fix issue where omitting a base class would break test generation.
...
Fixes #3115
2012-08-15 20:59:56 -04:00
ADmad
7ac01154f7
Merge branch '2.2-configure'
2012-08-15 20:09:25 +05:30
ADmad
18c5a4aee5
Make file extension optional for Configure reader adapter's dump function.
2012-08-15 19:38:58 +05:30
mark_story
cdc70fc427
Make RequestHandlerComponent better simulate GET requests.
...
Modify the global state to simulate a GET request. This avoids issues
where PUT data would be processed during simulated redirect.
Fixes #3113
2012-08-14 12:46:47 -04:00
mark_story
e183e91b17
Make CakeRequest work with content-type headers that include a charset.
...
Refs #3113
2012-08-14 12:42:05 -04:00
ber clausen
0dec093f48
The actual config file must always have .php extension.
2012-08-13 23:50:58 -03:00
ADmad
65e63c51c8
More missing parent calls.
2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3
Adding missing calls to parent.
2012-08-12 02:13:10 +05:30
ADmad
4a483b4897
If cache is disabled in app and js cache file is not written don't return script tag with file url.
...
Instead return script block with inline js content.
2012-08-12 01:08:05 +05:30
ceeram
ebb0ceb6a0
Merge pull request #764 from ceeram/2.2-2998
...
2.2 2998
2012-08-09 09:21:42 -07:00
mark_story
b29cc6a9b6
Try again at fixing errors in 5.2
2012-08-08 23:09:44 -04:00
mark_story
c94a684be8
Try to fix recursion issues in PHP5.2.
2012-08-08 22:42:44 -04:00
mark_story
dca050fbd6
Fix errors with recursion in debug()
...
Fixes #3102
2012-08-08 22:30:27 -04:00
Justin A. Barnes
476bd80644
Fix cake bake project always finding CakePHP libs in php include_path.
...
Cake shell was adding the CakePHP libs to php include_path resulting in
producing baked projects without hardcoded CAKE_CORE_INCLUDE_PATH when
hardcoded CAKE_CORE_INCLUDE_PATH is needed.
Refs #GH-755
Signed-off-by: mark_story <mark@mark-story.com>
2012-08-07 20:52:37 -04:00
Nicholas de Jong
d4fa5d000c
Allow an App to define its own LOGS and CACHE paths outside TMP
2012-08-05 14:55:22 +10:00
mark_story
dbe3234b56
Refactor help to show up on console -h as well.
2012-08-04 13:57:14 -04:00
mark_story
d7f1bf52b1
Fix route commands in ConsoleShell.
...
Apply patch from 'Ludovic Pouzenc' to fix route features in the console
shell.
Fixes #3096
2012-08-04 13:44:35 -04:00
mark_story
73b1c0ac1c
Fix off by one error.
...
Fixes #3094
2012-08-03 23:34:44 -04:00
mark_story
c96e364cbb
Fix incorrect expiry of sessions.
...
Fixes #3088
2012-08-02 21:03:53 -04:00
mark_story
cffc36e4e0
Fix notice error when impossible conditions are created.
...
Fixes #3084
2012-08-01 23:05:56 -04:00
Mark Story
2728c6253e
Merge pull request #728 from boast/patch-2
...
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
2012-08-01 19:41:04 -07:00
Ceeram
2a0a5f2afa
Use the returned response instance from the event
2012-07-31 18:39:05 +02:00
mark_story
9b94133f0d
Fix uncaught exceptions when generating view cache files
...
Fixes #3016
2012-07-30 21:27:21 -04:00
Schlaefer
af8c5716fc
Added test for RSS to allow namespace tags if namespace is specified
...
If a namespace prefix is defined it's prefix should not be stripped
from the tag: `<dc:creator>` stays `<dc:creator>`.
Other prefixes are still stripped from the tag name.
This test is missing in 19f0e72d58
2012-07-30 10:10:19 +02:00
mark_story
4541510e26
Fix notice error when a missing action error is hit.
2012-07-29 22:37:41 -04:00
mark_story
7b939186a1
Fix ( and ) not being correctly handled by autoLinkUrls
...
Fixes #3077
2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58
fix #2858 RSS helper bug with namedspaced keys
...
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
2012-07-29 14:24:46 +02:00
Rachman Chavik
5413b672eb
use is_subclass_of instead of comparing Acl.classname
2012-07-28 15:00:17 +07:00
mark_story
27e2132a13
Generated SQL should not contain multi-column primary keys
...
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.
Fixes #3069
2012-07-27 22:31:49 -04:00
ADmad
99813e97b3
Implemented feature to allow individual "empty" values for date time select elements
2012-07-28 01:47:21 +05:30
Kyle Robinson Young
cbf5328b33
Fix failing test with controller task listAll
2012-07-25 22:12:55 -07:00
Mark Story
4dd532d3a9
Merge pull request #724 from SimonEast/h_encoding
...
Prevent booleans from being encoded (converted to strings) by h() function
2012-07-25 18:17:12 -07:00
Mark Story
a03166c5b6
Merge pull request #739 from tigrang/router-validate-route-fix
...
Fixed issue where restoring the default route class would cause an exception.
2012-07-25 18:16:21 -07:00
Mark Story
b99be9878a
Merge pull request #738 from zpencerq/authcomponentproblem
...
Auth Component can't return false from user($key)
2012-07-25 16:05:29 -07:00
Tigran Gabrielyan
851aa8bef4
Fixed issue in _validateRouteClass where setting defaultRouteClass back to CakeRoute would throw an exception
2012-07-25 14:13:25 -07:00
Spencer Ellinor
8a41fb0c34
Fix issue and remove unneccesary code. The (fixed) conditional doesn't do anything, since if Hash::get returns null, the function still returns null.
2012-07-25 15:09:22 -04:00
Spencer Ellinor
6c1b05a5d4
Modify test case to show the issue.
2012-07-25 15:06:56 -04:00
mark_story
7d74f3e598
Increase context depth in error messages.
...
Fixes #3063
2012-07-24 23:39:48 -04:00
mark_story
70c714d600
Fix incorrect context being used for excerpt.
...
Fixes #3064
2012-07-24 23:37:37 -04:00
mark_story
162d3bcb29
Fix whitespace errors.
2012-07-23 22:44:05 -04:00
mark_story
66b296527f
Add type check to prevent errors related to Hash::get()
...
Fixes #3041
2012-07-23 22:33:58 -04:00
David Thalmann
f926ae7637
Clean up string concatenations and refactored some reused strings into variables.
...
Refs #GH-729
Signed-off-by: mark_story <mark@mark-story.com>
2012-07-23 22:30:28 -04:00
mark_story
35bf3097cd
Fixing missing imports in generated tests.
...
Fixes #3059
2012-07-23 21:25:55 -04:00
mark_story
e6ef218600
Fix associated translations being inserted.
...
Due to changes introduced in [1c0b6c076aFixes #3057
2012-07-22 20:59:24 -04:00
mark_story
6286b43329
Make tests pass on windows.
...
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.
Refs #3055
2012-07-21 20:59:05 -04:00
mark_story
a27e171f0f
Invert default log configuration.
...
Windows only has 4 log levels instead of 8. This causes notice errors
when trying to use 'alert' and a few other levels.
Fixes #3055
2012-07-21 20:42:46 -04:00
mark_story
ab6fab6675
Add missing import.
2012-07-21 20:42:46 -04:00
David Thalmann
78de6e276a
Removed inline method calls in curly braced string concat's.
2012-07-22 03:40:49 +03:00
David Thalmann
d9b5ec1a3a
Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
2012-07-21 22:07:51 +03:00
Simon East
1ea457e40e
Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9
2012-07-20 12:48:57 +10:00
Mark Story
f65b52bf11
Merge pull request #722 from uzyn/bugfix/url-validation
...
Fix URL validation to allow underscores in subdomain.
2012-07-19 12:40:30 -07:00
U-Zyn Chua
e7c4064a69
Fix URL validation to allow underscores in subdomain.
2012-07-19 20:51:33 +08:00
mark_story
473d55f091
Allow 1 second of slip.
2012-07-18 22:22:57 -04:00
mark_story
3b46cd43f1
Add logging and error when fixture creation fails.
...
This helps people find and solve issues faster/easier.
Fixes #3044
2012-07-17 22:48:50 -04:00
mark_story
a63dd9ee9d
Fix incorrect formatting in TreeBehavior.
...
Fixes #3045
2012-07-17 21:06:41 -04:00
mark_story
928de97338
Add additional tests for error triggering on missing validator.
...
Closes #3039
2012-07-15 19:47:28 -04:00
mark_story
cc44130fc0
Update version number to 2.2.1
2012-07-14 16:42:59 -04:00
mark_story
fb92bde0fe
Loosen exception types.
2012-07-14 16:18:21 -04:00
mark_story
22d4cb3794
Allow warnings for Xml entities.
...
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
2012-07-14 16:08:54 -04:00
mark_story
a7c79e5da2
Fix warnings when deleting records that do not exist.
...
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
6c905411ba
Fix XML decoding attack via external entities.
2012-07-14 11:53:37 -04:00
mark_story
46f8de72a2
Fix web runner showing fails as passes when show_passes is on.
...
Fixes #3035
2012-07-13 22:58:07 -04:00
mark_story
8fc5726920
Remove trailing whitespace.
2012-07-11 21:39:32 -04:00
mark_story
3baaecc81c
Type check before unset()
...
Calling unset() on string indices fails fatally on 5.3.x and lower.
Fixes #3027
2012-07-11 15:54:24 -04:00
mark_story
b7415525c8
Fix missing line breaks.
...
Fixes #3028
2012-07-11 15:51:07 -04:00
Jose Lorenzo Rodriguez
db247558b0
Correctly passing ellipsis options to all internal method calls insie
...
PaginatorHelper::numbers(), under some combinations of modulus/limit
it would not get passed even though there are pages in between to show
2012-07-10 20:46:56 -04:30
Jose Lorenzo Rodriguez
39715bcd89
Adding missing afterValidate callback to behaviors, Fixes #3024
2012-07-10 20:35:26 -04:30
Ilie Pandia
73d44c5f6b
Fixed some typos in the comments in this file. This helps with type
...
hinting in IDEs that support that.
2012-07-08 07:33:14 +03:00
mark_story
5e680cb292
Add tests for translate + partial fields.
...
Refs #3009
2012-07-07 12:03:29 -04:00
Thomas von Hassel
1c0b6c076a
Update afterSave to ensure created entires have all translated fields present
...
Without all fields being present, find() will be unable to find the
translated records.
Fixes #3009
2012-07-07 12:03:29 -04:00
Jose Lorenzo Rodriguez
ed4493da0c
Automatic console logging streams were not respecting --quiet
2012-07-06 16:05:15 -04:30
mark_story
591022f182
Make test case use SERVER_NAME conditionally.
2012-07-05 22:56:45 -04:00
mark_story
f528bb29ba
Fix lint error.
2012-07-05 22:50:54 -04:00
Mark Story
ae01d473c3
Merge pull request #707 from SimonEast/fix_CakeEmailTest
...
Fix for CakeEmailTest.php that failed unless using 'localhost'
2012-07-05 19:40:54 -07:00
Rodrigo Moyle
e10f6f57a3
Fix notice error when parsing input data.
...
Prevent error in CakeRequest from parsing input data in
PUT and DELETE requests.
Fixes #3002
Signed-off-by: mark_story <mark@mark-story.com>
2012-07-05 22:06:02 -04:00
Simon East
de703a2692
Fix for CakeEmailTest.php that failed unless using 'localhost'
2012-07-06 11:59:39 +10:00
mark_story
e61f636bc7
Fix double base dir in image() with fullBase.
...
Fixes #2991
2012-07-03 20:48:17 -04:00
Rachman Chavik
22373868bb
if blackHoleCallback is set, requests _must_ get blackholed
2012-07-03 19:27:02 +07:00
Ceeram
18b860ed1a
keeping methods BC, load() now returns false again when configname not default and not configured
2012-07-03 12:43:33 +02:00
Ceeram
19ba09286d
Make load() and dump() more consistent with each other, create new PhpReader for default if not configured yet.
...
Fixes #2998
2012-07-03 12:20:00 +02:00
Rachman Chavik
86a74e3887
fix: windows console may not have ansi color support
2012-07-03 12:41:29 +07:00
mark_story
31033239bd
Add missing urlencoding to nested named parameters.
...
Fixes #2988
2012-07-02 23:34:53 -04:00
Jose Lorenzo Rodriguez
4b3a8ea348
Update version number to 2.2.0
2012-07-01 18:25:14 -04:30
Jose Lorenzo Rodriguez
ec7ec73b66
Merge branch '2.1' into 2.2
2012-07-01 17:35:24 -04:30
mark_story
87677e4cdf
Fix possible notice errors.
2012-06-26 23:31:22 -04:00
Alberto Leal
7d93c57bd3
Use the diff style provided by PHPUnit in the webrunner.
...
Displaying actual vs expected messages when the result is an array or string.
Fixes #GH-699
2012-06-26 19:53:49 -04:00
José Lorenzo Rodríguez
476209df03
Changing docs in CakeRequest:accepts() as they were misleading, you are required to pass a correct mimetype and not an alias
2012-06-26 14:38:07 -05:30
ADmad
76f93178a8
Tweaked Validation::extension()
2012-06-25 19:15:52 +05:30
mark_story
ad5345887a
Refactor tests.
...
Use generators to reduce some duplication.
2012-06-24 21:57:00 -04:00
mark_story
3f78216e96
Revert changes in behavior made to timeAgoInWords()
...
Changes made in [0729aca706
2012-06-24 20:54:47 -04:00
mark_story
eb7b66b37c
Revert default value of allowEmpty.
...
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods. Move some tests around and update tests that
probably should have been failing before.
Fixes #2983
2012-06-24 20:06:14 -04:00
ADmad
b2ccdd46e5
Fixed test failing when server's timezone is not UTC
2012-06-24 23:11:52 +05:30
mark_story
503bc06c70
Mark fixtures as created if they exist.
...
Fixes #2905
2012-06-24 12:57:54 -04:00
Juan Basso
ecdf0e6c6c
Optimization for Hash method
2012-06-24 12:47:30 -04:00
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
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
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
Kyle Robinson Young
54745aada9
Fix custom validation methods with CakeValidationSet
2012-06-11 23:28:45 -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
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
Fitorec
1bcb8daf21
Adding case 'datetime' to validation guesses.
...
In ModelTask->fieldValidation added option "datetime"
2012-06-10 21:56:43 -04:00
Fitorec
c090845117
Fixing coding style.
2012-06-10 21:56:43 -04:00
Fitorec
207b918b59
Removing the case
2012-06-10 21:56:39 -04:00
Fitorec
fa2a75c3f1
Add the numbers format console menus, showing the validation options in 2 columns.
2012-06-10 21:56:30 -04:00
mark_story
76dd49145a
Merge branch '2.1' into 2.2
2012-06-10 20:34:20 -04:00
mark_story
c31858635f
Don't OR options together.
...
By default FILTER_VALIDATE_IP does both.
2012-06-10 20:29:48 -04:00
mark_story
963f1ca449
Don't |= with null.
2012-06-10 20:21:59 -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
0a182b918f
Fix $depth being decremented by 2.
...
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.
Fixes #2946
2012-06-10 20:00:34 -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
ADmad
9ce216b09d
Revert "Fix missing view variables."
...
Commit 7416c537416c530a2
2012-06-11 02:36:51 +05:30
ADmad
fa0d1c7997
Fix layout path value causing View to generate layout paths with extra slash at end
2012-06-10 22:19:39 +05:30
Jose Lorenzo Rodriguez
5ba5f906e6
Adding new test case for ModelValidator
2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
2a90baae0c
Forgot to include complete patch in last commit :(
...
Note: It's not good to commit while watching tv
2012-06-09 15:01:27 -04:30
Jose Lorenzo Rodriguez
d13deb7da2
Fixing param usage introduced in previous commit
2012-06-09 14:52:03 -04:30
Jose Lorenzo Rodriguez
a2c2902dd6
Renaming param in CakeTime::format() to make its purpose more obvious,
...
added some examples in doc block
2012-06-09 08:45:46 -04:30
Jose Lorenzo Rodriguez
0d013f8da5
Fixing CakeTime, the actual params for format() is $date and $format,
...
and not the other way around :)
2012-06-09 08:28:39 -04:30
José Lorenzo Rodríguez
56b2b8a8da
Merge pull request #687 from fiblan/xcache_cli
...
Xcache is not available for php-cli
2012-06-08 04:35:29 -07:00
fiblan
d2ac734da6
Xcache is not available for php-cli
2012-06-08 11:14:22 +02:00
Jelle Henkens
c8e58b50ba
Adding cake core message extraction in cake extract
2012-06-07 23:55:36 +01:00
AD7six
43b37cd608
Revert "actually, just ensure the path is slash terminated"
...
This reverts commit e88a2bcdbb
2012-06-07 23:32:43 +02:00
AD7six
e88a2bcdbb
actually, just ensure the path is slash terminated
...
that way we're all good
2012-06-07 23:29:49 +02:00
AD7six
72a36a0929
correct path in error message for a missing component
...
PluginNameController/Component
becomes
PluginName/Controller/Component
2012-06-07 23:05:32 +02:00
AD7six
33c112b353
doesn'st need to be a verbose level message
...
other create mesages are output normally
2012-06-07 23:03:53 +02:00
AD7six
488ba9ef85
Make baking a plugin more user friendly.
...
Changed the text when the plugin already exists to indicate that the task stops
intentionally.
If there are folder errors - report them in the cli.
Choose the last plugin path by default
Modify the app's bootstrap file if it's not being (obviously) loaded already.
This means it is now possible to do:
Console/cake bake plugin MyPlugin
Console/cake bake model MyPlugin.MyModel
Previously the above would result in an error (which only if you know), you'd
fix by editing your Config/bootstrap.php file by hand before retrying to bake
your model.
2012-06-07 09:04:02 +02:00
mark_story
f3464b002f
Remove duplicate code.
...
Use a shutdown function to close the session off.
This removes a bit of icky code and continues to allow
objects to be used as session handlers.
2012-06-06 21:01:16 -04:00
AD7six
2335ef1a13
remove pseudo-mock code
...
Not required, not used by any committed code
2012-06-06 23:08:40 +02:00
AD7six
a56ec8d6cf
Correct TestTask tests
...
there will not be a setUp function for Controller tests
there will not be a tearDown
there will be no returned constructor logic from generateConstructor
all because for a controller test - you'd ordinarilly just call this->testAction
2012-06-06 23:04:18 +02:00
AD7six
b509bdb04b
Automatically handle PUT requests
...
make the following "just work"
curl -X PUT -d foo=bar http://...
2012-06-06 22:59:37 +02:00
AD7six
d1475b1fd3
initialize $construct variable
2012-06-06 22:24:15 +02:00
AD7six
a5fabcc1dc
No startup and teardown for controller tests
...
and.. no startup/teardown functions unless they are actually going to do more
than just call parent
2012-06-06 21:06:37 +02:00
Jose Lorenzo Rodriguez
51635c2ca6
Merge remote-tracking branch 'origin/2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e
Fixing yet another issue related to beforeValidate and
...
validateAssociated
2012-06-06 10:07:01 -04:30
AD7six
ad7b5bfb88
fix whitespace
...
tabs for indentation
spaces for alignment
2012-06-06 14:32:43 +02:00
Rachman Chavik
8966f1b324
create CakeRequest in View instead of in CakeEmail
2012-06-04 22:21:41 +07:00
Rachman Chavik
e821c27f54
remove unnecessary lines
2012-06-04 09:18:36 +07:00
Rachman Chavik
9bafc5a3bb
CakeEmail: create request object before rendering
...
Closes #2931
2012-06-04 09:18:29 +07:00
mark_story
fceb028499
Fix code style errors.
2012-06-03 21:11:34 -04:00
Jelle Henkens
0e34bd4b1d
Suggest current path in bake project if dir is empty
2012-06-03 14:01:03 +01:00
mark_story
8da42dfcfa
Merge branch '2.1' into 2.2
2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb
Fix page 0 issue.
...
Refs #2929
2012-06-02 20:56:38 -04:00
mark_story
15a423ad70
Restrict page number passed to view.
...
Limit the page number to the max page number when passing data to the
view. This prevents the helper from generating a huge number of links.
Fixes #2929
2012-06-02 20:26:09 -04:00
mark_story
157e243eee
Change named capture group syntax.
...
This increases compatibility with really old version of
PCRE used on CentOS.
Refs #GH-681
2012-06-02 10:09:58 -04:00
Ceeram
4c6453501e
Merge branch '2.1' into 2.2
2012-06-02 01:47:21 +02:00
Ceeram
048dc8d254
casting schema to array, fixes error for array_keys when return is null
2012-06-02 01:39:53 +02:00
Jelle Henkens
e5eb7b490e
Preventing cache collisions by adding the the datasource key
2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605
Replacing crc32 with md5 for less collisions in method caching
2012-06-01 10:42:26 +01:00
Rachman Chavik
07d9a75fcb
Helpers in custom CakeErrorController are lost
...
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.
This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing. This causes Controller::$helpers to be reset with
default values.
2012-06-01 15:28:06 +07:00
Rachman Chavik
483d7124dd
debug() may output path that is incorrectly truncated
...
This happens when debug is called in core source files that resides in
a different directory to the app.
2012-06-01 15:28:06 +07:00
mark_story
55c4ad3c1c
Fix coding standards errors.
...
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
Mark Story
085ad0bb42
Merge pull request #672 from sitedyno/cookie-encryption-#471
...
Add stronger encryption, and make it available in cookiecomponent.
Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
2012-05-31 17:44:49 -07:00
Ceeram
6c9b2a1fec
Fix user() return value for nested data
2012-05-31 15:13:24 +02:00
Mark Story
119377422e
Merge pull request #674 from colares/ticket-2787
...
Add table attributes per column
Fixes #2787
2012-05-30 18:29:56 -07:00
mark_story
01b3135a63
You should be able to regex match null/''
...
Fixes #2926
2012-05-30 21:28:18 -04:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700
Allow Set::extract() to match null.
...
Fixes #2926
2012-05-30 21:19:46 -04:00
Tigran Gabrielyan
1367e5b927
Fixed failing test case
2012-05-30 15:26:59 -07:00
Ceeram
acbb2bebc9
adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions
2012-05-30 21:29:05 +02:00
Thiago Colares
6262a074f6
Breaking tableHeaders description in two lines
2012-05-30 09:34:10 -03:00
Heath Nail
304d001dfb
Implement rijndael optional cookie encryption.
2012-05-30 03:49:25 -04:00
Thiago Colares
fad7b0705f
Increasing testTableHeaders case
2012-05-29 23:30:06 -03:00
Thiago Colares
c65d4318cf
Enhancement in HtmlHelper > tableHeaders. Each tablename also can be a key that points to an array with a set of attributes to its specific tag
2012-05-29 23:28:57 -03:00
Jelle Henkens
ab1f336e21
Adding timeout and port options to the redis cache engine
2012-05-29 23:39:56 +01:00
Ceeram
25c7a27495
fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed.
2012-05-29 09:46:00 +02:00
mark_story
0bfcd49249
Fix unbindTranslation not unbinding.
...
There were documented use cases that have never worked. Fix that.
Also rename a method so it better describes what it does.
Fixes #2913
2012-05-27 21:25:55 -04:00
José Lorenzo Rodríguez
06476a22da
Fixing failing tests caused by adding new validator, blind editing... hoping for the best
2012-05-27 19:48:46 -05:30
José Lorenzo Rodríguez
18c3fa79c9
Merge pull request #671 from burzum/2.2-validation
...
2.2 validation methods
2012-05-27 18:09:03 -07:00
mark_story
115b2c1495
Rename joined to _joined to hopefully prevent issues.
2012-05-27 20:43:15 -04:00
Florian Krämer
fea4ae6523
Changing File->info() to File->mime() in Validation::mimeType()
2012-05-28 00:48:22 +02:00
Florian Krämer
e3a6e9e169
Adding uploadError() and mimeType() to the Validation class
2012-05-28 00:32:30 +02:00
Majna
364c293e16
Add test for belongsTo and hasOne optimization.
2012-05-27 23:16:20 +02:00
Majna
ce2fc6c83d
Improve belongsTo and hasOne for unneeded queries when recursive > 1.
...
Reuse already joined data for 'belongsTo' and 'hasOne' associations instead of running unneeded queries for each record.
Fixes #47
2012-05-27 23:15:20 +02:00
mark_story
1c0f97ea67
Fix some minor code style issues.
2012-05-27 14:20:19 -04:00
mark_story
9232df839d
Fix failing tests because of new validator.
2012-05-27 14:17:34 -04:00
mark_story
233e7d6c6b
Fix coding standards error.
2012-05-27 14:06:29 -04:00
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
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
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
