José Lorenzo Rodríguez
ddf046a246
Merge pull request #2694 from bar/patch-3
...
Correctly remove routing url from query string.
2014-01-22 05:15:03 -08:00
ADmad
4407cdb010
Avoid code duplication.
2014-01-22 11:36:45 +05:30
mark_story
61dd1c3f9d
Fix trailing whitespace.
2014-01-21 20:23:12 -05:00
Juan Basso
dae756c84a
Added option to allowed headers
2014-01-21 15:31:05 -05:00
Ber Clausen
5b4121f643
Update tests.
2014-01-21 16:56:37 -03:00
ADmad
84932fcc4a
Don't start a session if it's known to be empty.
...
If an app only reads/checks the session there's no need to start a
session to know that the read/checked session value is empty.
Fixes #1981
2014-01-22 01:17:16 +05:30
ber clausen
d241a06a65
Correctly remove routing url from query string.
...
It mostly happens when in nxing setups, because of location defined like:
try_files $uri $uri/ /app/webroot/index.php?$uri&$args;
2014-01-21 16:57:46 -02:00
Juan Basso
5d9d62ba57
Fixed doc description
2014-01-21 11:42:04 -05:00
Juan Basso
a8ea1c6b55
Fixed CS
2014-01-21 10:47:08 -05:00
Juan Basso
5af3da7fe6
Changed tests to support PHP 5.2 :(
2014-01-21 10:44:00 -05:00
Juan Basso
5d016a7dbf
Fixed code for PHP 5.2
2014-01-21 09:55:11 -05:00
Juan Basso
ec7196013c
Added support to cross origin requests
2014-01-21 09:44:49 -05:00
mark_story
55e1619c59
Fix issue with find(count) and TranslateBehavior.
...
Fixes #2667
2014-01-18 21:54:09 -05:00
Rob McVey
7a27650297
Test case that demonstrates issue with count and Translate
2014-01-18 21:49:07 -05:00
mark_story
46eda802e5
Fix mising connection parameter to schema objects.
...
When calling create/update the created schema object should be passed
the current connection.
Fixes #2668
2014-01-16 17:19:22 -05:00
mark_story
75dd2ff1fb
Merge branch 'master' into 2.5
2014-01-16 15:20:40 -05:00
José Lorenzo Rodríguez
8b5336ade1
Merge pull request #2654 from mouyang/2.5-responseCodes
...
allow additional status codes through constructor
2014-01-16 00:49:19 -08:00
Matthew Ouyang
0536e058f9
correct the option key
...
documentation fix
'statusCodes' instead of 'codes'
2014-01-16 00:09:21 -05:00
mark_story
f25e84f4fb
Don't select year 0 when there are all 0's.
...
Year 0 is almost never a 'good' selection value and causes odd behavior
when paired with MySQL.
Fixes #2658
2014-01-15 10:23:45 -05:00
Matthew Ouyang
7b27b0d1ab
add whitespace to end-of-file
2014-01-15 09:53:21 -05:00
Christian Winther
ace586e367
Merge pull request #2656 from makusu/fix-debugger-templates-array
...
fix multiple log array key definition on templates property in Debugger
2014-01-14 23:29:05 -08:00
Max Meiden Dasuki
9cc7c465d1
fix multiple log array key definition on templates property in Debugger
2014-01-15 15:14:00 +08:00
Matthew Ouyang
0661d7832b
add AllTestsTest for skeleton app
2014-01-14 17:51:50 -05:00
Matthew Ouyang
84eb46dbdc
allow additional status codes through constructor
...
through $options['statusCodes']
2014-01-14 11:18:57 -05:00
euromark
690f54ad9d
more corrections in order
2014-01-10 00:33:27 +01:00
euromark
3ff23c732f
unify and correct assert order
2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez
606362d519
Merge pull request #2636 from dereuromark/2.5-title-for-layout
...
Follow the deprecation note in the doc block of View class
2014-01-09 15:13:07 -08:00
euromark
97e43e5806
unify to expected
2014-01-09 16:52:21 +01:00
euromark
738b34c2d0
Correct assert param order
2014-01-09 16:50:27 +01:00
euromark
29e15386b2
Follow the deprecation note of 2.1 migration guide and switch to fetch(title)
...
correct assert order for test
2014-01-09 16:45:49 +01:00
Bryan Crowe
cd27012405
Simple docblock updates to CakeTime
2014-01-08 21:38:45 -05:00
Mark Story
9bf7513ba9
Merge pull request #2628 from pummra/patch-1
...
Add message to let user know that no controllers were generated.
2014-01-08 06:43:12 -08:00
mark_story
b20ca3f4e0
Fix errors with postgres tests.
2014-01-08 09:42:13 -05:00
pummra
5605ff48ab
Update ControllerTask.php
...
Removed $admin from message in regards to no controllers being baked in all() function
2014-01-08 12:23:03 +00:00
pummra
a981c7fa8c
Removed trailing whitespace.
2014-01-08 10:16:06 +00:00
pummra
0214ac403e
Update ControllerTask.php
...
Updated if statement for clarity and also fixed spelling mistake.
2014-01-08 10:10:40 +00:00
pummra
d41bb0b1b3
Update ControllerTask.php
...
Added an output message if no controllers are baked using the all() function.
2014-01-08 09:52:05 +00:00
Mark Story
7f2e0a29a4
Merge pull request #2624 from dereuromark/2.5-loggedin
...
2.5 loggedin
2014-01-07 11:27:39 -08:00
euromark
e3befe30df
deprecated loggedIn
2014-01-07 16:12:38 +01:00
Mark Story
cd9c135c88
Merge pull request #2601 from dereuromark/2.5-upgrade
...
2.5 upgrade
2014-01-07 06:43:10 -08:00
mark_story
312b2c3cd1
Merge branch 'translate-patch'
2014-01-06 21:21:25 -05:00
mark_story
3763350667
Add test for issue #2595
...
Fold conditions that did the same thing and add a test case.
Closes #2595
2014-01-06 21:21:13 -05:00
euromark
ecfd64c082
adding test
2014-01-06 21:07:00 +01:00
euromark
865ca7acd6
wording
2014-01-06 20:43:30 +01:00
euromark
1201887ad1
Clearer error message
2014-01-06 20:42:17 +01:00
euromark
483cd13a26
rename method
2014-01-06 20:00:45 +01:00
ADmad
18255bdcf3
Fixed typo in var name.
2014-01-06 02:32:34 +05:30
mark_story
5fd8883691
Merge branch 'master' into 2.5
2014-01-05 15:45:09 -05:00
euromark
3e48d2e082
Add return early statements for redirecting in controllers.
2014-01-04 13:18:14 +01:00
euromark
71fb17e092
keep name as well
2014-01-03 16:33:02 +01:00
Raffaele
a4f138813b
Return value if value are 0
...
Save correctly if the value is 0, but after the find is returned as an empty string.
2014-01-03 15:46:09 +01:00
euromark
85337a5d15
correct templates
2014-01-03 13:28:45 +01:00
euromark
a02ab67521
unify exception and error handling.
2014-01-03 12:42:52 +01:00
euromark
3d51bfee3b
Correct casing.
2014-01-03 04:09:19 +01:00
mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Mark Story
4ae1feaf2d
Merge pull request #2571 from cuppett/patch-1
...
Must double quote the schema name in query
2013-12-30 08:18:22 -08:00
ADmad
f37eb9ad4b
Merge pull request #2572 from bcrowe/hotfix-controllerBlocks
...
Update some grammar in Controller
2013-12-29 21:30:01 -08:00
Bryan Crowe
49bb441cef
Update some grammar in Controller
2013-12-30 00:13:26 -05:00
Stephen Cuppett
ed749fdc97
Must double quote the schema name in query
...
Schema names with reserved words such as "create" will fail this query without double quotes.
Attempted prepared statement with ? placeholder. This failed with the following CakePHP error:
Error: A Database connection using "Postgres" was missing or unable to connect.
The database server returned this error: SQLSTATE[42601]: Syntax error: 7 ERROR: syntax error at or near "$1" LINE 1: SET search_path TO $1 ^
2013-12-29 21:43:56 -05:00
euromark
2f02d0c755
Add missing pkpass mimetype
2013-12-30 01:19:09 +01:00
Rachman Chavik
c4f8289b53
Fix test by checking against an empty array instead of false
2013-12-27 12:37:39 +07:00
Rachman Chavik
c48afae2dc
Add test to prove issue when saving invalid tree data
2013-12-27 12:35:28 +07:00
mark_story
1daa27c0d7
Add tests for uncovered case of :0 replacements.
...
There were previously no tests for the :0, :1 style replacement markers
in DboSource. In fact I didn't even know it was a 'feature'.
2013-12-24 13:13:05 -05:00
Mark Story
1cb7e4f0ff
Merge pull request #1635 from dereuromark/master-dom-ids
...
Fix duplicate ID generation of for multiple checkboxes.
2013-12-24 07:02:38 -08:00
euromark
b392254c92
fix cs
2013-12-24 15:20:32 +01:00
mark_story
af9611d460
Update version number to 2.4.4
2013-12-23 21:44:46 -05:00
mark_story
99e4dbd827
Merge branch 'master' into 2.5
2013-12-23 11:58:07 -05:00
mark_story
70530135d6
Don't use FORWARDED_HOST when getting referer values.
...
HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the
original HTTP_HOST value. It has nothing to do with referer values.
Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header
in proxied setups, add a trustProxy parameter to host() and default it
to false. This maintains existing behavior and allows people to access
the proxied value.
Fixes #2537
2013-12-23 11:32:14 -05:00
Saleh Souzanchi
328125ad43
Merge branch 'master' into master-phpcs-error-fix
2013-12-23 11:43:54 +03:30
Mark Story
321347e52b
Merge pull request #2532 from bar/patch-2
...
Trivial continue.
fix phpcs error "Missing @throws tag in function comment"
2013-12-23 11:21:18 +03:30
Mark Story
fb8472ae40
Merge pull request #2532 from bar/patch-2
...
Trivial continue.
2013-12-22 20:03:56 -08:00
ber clausen
e0c85a18bc
Trivial continue.
2013-12-22 22:15:47 -02:00
ber clausen
4e70e44247
Parenthesis are preferred.
2013-12-22 22:10:37 -02:00
ber clausen
98962806cd
Double rainbow.
2013-12-22 21:47:19 -02:00
Ber Clausen
f30b43b4c9
Update documentation and typehint.
2013-12-21 22:02:45 -03:00
mark_story
62e89734ab
Throw exceptions from Hash::combine()
...
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.
Fixes #2470
2013-12-21 17:46:05 -05:00
Mark Story
0c4a5c59e4
Merge pull request #2520 from bar/2.5-dbosource-read
...
Document and try to order part of ```DboSource```.
2013-12-21 14:04:29 -08:00
José Lorenzo Rodríguez
60d2ece035
Merge pull request #2506 from dereuromark/2.5-string
...
Correct tokenize for empty strings.
2013-12-21 10:31:52 -08:00
Ber Clausen
c15f7de164
Re-expose DboSource::fetchAssociated() for BC.
...
Internally use protected methods to fetch hasMany and hasAndBelongsToMany
associations.
2013-12-21 11:34:40 -03:00
Ber Clausen
5ccb77e25d
Be consistent with the result set variable name.
2013-12-21 10:57:40 -03:00
Ber Clausen
0adc062cfa
Process query only when needed.
2013-12-21 10:57:40 -03:00
Ber Clausen
422be67a03
Avoid recalculating whether the relationship is a self join.
2013-12-21 10:57:40 -03:00
Ber Clausen
86b69964ef
Be more semantic with variable names.
...
Isue less loockups for deep arrays.
A bit of documentation added.
2013-12-21 10:57:40 -03:00
Ber Clausen
7a378c3b22
Conveniently fetch hasAndBelongsToMany associations from within a function (like hasMany).
...
Variable names should represent their values.
Remove unnecessary references.
2013-12-21 10:57:38 -03:00
Ber Clausen
60a8f0900b
Get Model associations only when needed.
2013-12-21 10:49:22 -03:00
Ber Clausen
8355d32bb1
Be more semantic indicating that association fields must be empty.
2013-12-21 10:49:22 -03:00
Mark Story
99c8503578
Merge pull request #2518 from bar/2.5-dbosource-getconstraint
...
Document DboSource::getConstraint().
2013-12-21 05:43:52 -08:00
Ber Clausen
5860cd4b8e
Still more documentation.
2013-12-21 07:04:45 -03:00
Ber Clausen
c5c8cb80ba
Document DboSource::getConstraint().
...
Also, update the function signature (to be compliant with other
functions) and type hint $LinkModel.
2013-12-21 06:24:23 -03:00
Ber Clausen
09188cc3d0
More documentation.
2013-12-21 06:11:31 -03:00
Ber Clausen
c1cdf190e3
Add documentation. Strict check.
2013-12-21 05:41:23 -03:00
Ber Clausen
1bdb783f91
Update documentation.
2013-12-21 05:39:42 -03:00
mark_story
a7ecf44007
Deprecated scaffold and scaffoldview.
...
They have already been removed in 3.0, so mark them accordingly.
2013-12-20 14:16:44 -05:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
mark_story
df4b978ce4
Clarify the docs for DboSource::fetchAll()
...
Refs #2508
2013-12-19 17:39:44 -05:00
mark_story
5bddc477a3
Fix incorrectly handled time values around 12:00:00
...
When using 12 hour formats & intervals, values around 12:00 were
incorrecly converted to midnight.
Fixes #2507
2013-12-19 17:36:27 -05:00
euromark
3ecce19732
Correct tokenize for empty strings.
2013-12-19 15:58:08 +01:00
Saleh Souzanchi
bbbf3076ab
undo remove end line break
2013-12-19 00:36:20 +03:30
Mark Story
ca2fb6fcfc
Merge pull request #2503 from dereuromark/master-string
...
Correct doc block
2013-12-18 09:27:00 -08:00
euromark
3100118a4e
Correct doc block
2013-12-18 12:10:23 +01:00
OKINAKA Kenshin
3433e10fbd
Fix Postgres for bigint primary key.
2013-12-18 14:58:18 +09:00
Saleh Souzanchi
4639d3597c
add DispatcherFilter Settings
2013-12-18 06:54:27 +03:30
ADmad
49a9d24ca7
By default use filter_var() to valid email addresses in CakeEmail.
...
Refs #2477
2013-12-18 01:07:40 +05:30
mark_story
30e139412d
Fix input type inference when type=>checkbox
...
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.
Fixes #2491
2013-12-16 23:26:20 -05:00
mark_story
44b7d013ae
Fix whitespace error.
2013-12-16 21:39:06 -05:00
mark_story
01be15d654
Don't always wipe a Model's _schema property when calling setSource()
...
Only wipe the internal schema cache if listSources() returned a useful
list of sources. Otherwise retain the old schema. This lets datasources
that don't implement listSources to be combined with models that define
static schema properties.
Fixes #2467
2013-12-16 14:42:21 -05:00
ADmad
27979286b2
Revert change done in 11f543f1f2
.
...
The change is unneeded now as Security::encrypt() no longer throws exception
for falsey values.
2013-12-15 20:29:41 +05:30
ADmad
8a666fb37e
Don't throw exception when trying to encrypt falsey value.
2013-12-15 19:28:56 +05:30
mark_story
ef899f0c93
Make API docs easier to read.
2013-12-14 23:08:07 -05:00
mark_story
47497029bb
Fix mixed tabs/spaces.
2013-12-14 23:03:34 -05:00
mark_story
e15d1652ed
Relax the 'my' and 'ym' date validation formats.
...
All other formats that include 'y' allow 2006 or 06. These formats are
now conformant with the other formats available.
Closes #2436
2013-12-14 23:02:12 -05:00
Mark Story
bf96ea36d9
Merge pull request #2482 from zoghal/2.5-cookie-fix2
...
fix CookieComponent - when write null or empty string
2013-12-14 16:21:58 -08:00
mark_story
15c390586f
Pull out some re-used subpatterns.
...
Having smaller segments makes reading the larger patterns simpler, and
allows for less duplication across the various patterns.
Refs #2436
2013-12-14 18:20:20 -05:00
mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
Saleh Souzanchi
11f543f1f2
fix CookieComponent - when write null or empty string
2013-12-15 02:15:36 +03:30
Mark Story
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
...
formatting app::uses blocks
2013-12-14 12:37:02 -08:00
Mark Story
e61ac62bfa
Merge pull request #2458 from bar/2.5-model-typehints
...
Add Model type hints, and ease testing for Model.
2013-12-14 12:34:58 -08:00
mark_story
79701af501
Make Hash::numeric() accept more numeric things.
...
Negative numbers and other stringy forms of numbers should be accepted.
The name Hash::numeric implies is_numeric which it now uses.
Fixes #2478
2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez
fc6edf4d9c
Fixed small coding standard error
2013-12-12 09:07:00 +01:00
ADmad
87440bba87
Fixed docblock. Closes #2476
2013-12-12 11:00:29 +05:30
mark_story
3b867a048e
Add test for saveMany + validate=false.
...
Closes #2468
2013-12-11 12:43:18 -05:00
Mark Story
8e6d26773c
Merge pull request #2438 from bar/2.5-console-options-format
...
Set console options in the same fashion for every shell/task.
2013-12-10 19:53:54 -08:00
Ber Clausen
2d67604182
Add more Model type hints, and ease the model testing replacing is_object() for '!== null'.
2013-12-10 00:20:12 -03:00
Ber Clausen
63a192ea39
Update DboSource::group():
...
* Update documentation.
* Add Model type hint.
* Bail early when fields are empty.
2013-12-10 00:18:19 -03:00
Ber Clausen
5c595b90d2
Remove is_object() calls when the test subject is already type hinted as a Model.
2013-12-10 00:18:18 -03:00
Ber Clausen
2f24de81cb
Model objects should be in CamelCase.
...
Add a Model type hint.
2013-12-10 00:18:18 -03:00
Mark Story
19122414fc
Merge pull request #2459 from bar/2.5-patch
...
Test for self join only when needed.
2013-12-09 18:55:31 -08:00
Ber Clausen
b7527c6c3b
Test for a self join only when needed.
2013-12-09 23:11:42 -03:00
Ber Clausen
2366e7c7b5
Make getConstraint() a tiny bit more readable.
2013-12-09 22:25:03 -03:00
Mark Story
a2f043d2a3
Merge pull request #2445 from young-steveo/2.5
...
CakeFixtureManager::load now calls CakeTestFixture::truncate
2013-12-09 09:23:02 -08:00
mark_story
2a58e529b7
Merge branch 'glorand-master'
...
Fix Hash::extract() operating on non-array data.
Closes #2433
2013-12-09 12:17:36 -05:00
mark_story
edcfe2d3a8
Add tests for #2433
2013-12-09 12:17:25 -05:00
José Lorenzo Rodríguez
6358741944
Merge pull request #2449 from cakephp/fix-session-cyclic-error
...
Fixed error in CakeSession that would call start() in an infinite loop
2013-12-09 02:18:21 -08:00
mark_story
48d2618c62
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Routing/Router.php
2013-12-08 21:25:59 -05:00
mark_story
abf4af14a8
Change quotes to keep postgres happy.
2013-12-08 11:58:26 -05:00
mark_story
530c95725f
Attempt to fix errors with postgres tests.
2013-12-08 11:46:17 -05:00
Jose Lorenzo Rodriguez
3a2c497206
Fixed failing test
2013-12-08 14:08:57 +01:00
Jose Lorenzo Rodriguez
70d5c37834
Ensuring session is configured before trying to destory it
2013-12-08 13:44:16 +01:00
Rachman Chavik
2d5a153c0d
Set 'order' to false to prevent issues with postgres
...
See: https://github.com/cakephp/cakephp/pull/2421#issuecomment-30074971
2013-12-08 16:40:22 +07:00
Rachman Chavik
98e645a1ea
Add test to prove issues with deleteAll with $order set
2013-12-08 16:39:56 +07:00
Jose Lorenzo Rodriguez
848a0ce217
Fiexed error in CakeSession that would call start() in an infinite loop
...
when the session is marked as invalid
2013-12-07 22:25:33 +01:00
Stephen Young
8645e05ab1
Removed leading underscores from ReflectionProperty variables in test case
2013-12-07 12:10:03 -05:00
Stephen Young
f0036b3ebc
CakeFixtureManager::load now calls CakeTestFixture::truncate
2013-12-07 09:47:06 -05:00
ADmad
738d0e2277
Fixed edge case which allowed login with empty password.
...
Ensure skipping call to FormAuthenticate::_checkFields() does not allow
logging in with empty password. Closes #2441 .
2013-12-07 18:40:08 +05:30
Brian Porter
bfdc41e8bb
Baked test methods are marked incomplete.
...
Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing.
It is much easier when _running_ tests to locate incomplete test methods.
Fixes 2437.
2013-12-05 22:54:26 -06:00
Ber Clausen
5c08c77b93
Set console options in the same fashion for every shell/task.
2013-12-05 22:59:01 -03:00
Gombos Lorand
764e368dc3
Check if the item is an array.
2013-12-05 12:03:07 +02:00
mark_story
85a9132c9b
Append / to the start/end of the mapResources prefix.
...
This makes the method easier to use and less error prone.
Fixes #2431
2013-12-04 21:46:59 -05:00
Eliu Florez
6ee5277c9f
Update CakeEventManager.php
...
Cast resultados de implementedEvents a una matriz.
e6f2c92005
2013-12-04 14:26:02 -04:30
mark_story
e6f2c92005
Cast results of implementedEvents to an array.
...
This makes using mocks much easier with event listeners as they don't
need to provide a returnValue for implementedEvents.
Refs #2333
2013-12-03 22:39:14 -05:00