ndm2
1015b38a27
Use convenience methods to create a (case-insensitive) negation matcher
2014-03-02 17:56:35 +01:00
Marlin Cremers
5795111391
Moved Limburgish to correct the order
2014-03-02 14:30:26 +01:00
Marlin Cremers
7ab028e9d7
Added the Limburgish language
2014-03-02 10:40:39 +01:00
mark_story
45cabd40fe
Update version number to 2.4.6
2014-03-01 21:22:04 -05:00
ndm2
70a1b87db6
Fix wrong test model association class name
2014-03-01 23:01:33 +01:00
ndm2
01e1b5ca61
Fix failing tests caused by already existing classes
2014-03-01 20:24:32 +01:00
ndm2
008ad3237c
Fix verification of expected invocations #2919
2014-03-01 19:06:17 +01:00
ADmad
a707709e1d
Added test for FormHelper::radio().
...
Tests generating radio input for field with model other than one used
in create(). Refs #2911 .
2014-02-28 02:34:16 +05:30
mark_story
706ddfccae
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-02-26 21:09:06 -05:00
mark_story
25f94f9b71
Add test to prove the fix made in pull/2899
...
Ensure that event listeners are not lost when merging the global and
local listeners.
Fixes #2897
Fixes #2899
2014-02-26 21:06:32 -05:00
ADmad
a0c399e374
Remove whitespace.
2014-02-26 10:40:53 +05:30
Saleh Souzanchi
9d4f3e92ab
fix issues #2897
2014-02-26 08:02:21 +03:30
mark_story
0f584c0e8b
Merge branch 'master' into 2.5
2014-02-24 21:19:17 -05:00
mark_story
0776b87214
Fix postLink() & postButton() with nested data.
...
Flatten deeply nested array data before generating hidden inputs.
This solves 'Array to string conversion' errors.
Closes #2894
2014-02-24 21:17:31 -05:00
Mark Story
e0e8f91d9e
Merge pull request #2866 from paddythenerd/master
...
Unsetting url both with & w/o this->base to allow proper handling when app n...
2014-02-24 20:27:25 -05:00
Mark Story
97ebfd6341
Merge pull request #2856 from cvandeplas/master
...
fixes issue #2855 where cafile is not set in HttpSocket
2014-02-21 22:29:35 -05:00
Patrick Barabe
08ba104543
Merge remote-tracking branch 'upstream/master'
2014-02-20 08:52:36 -07:00
Sam
62cb733988
One liner. Dont call function parseAccept() twice in RequestHandlerComponent.
2014-02-21 00:54:10 +11:00
mark_story
a80cbc205a
Simplify conditionals.
...
Set default values to remove else cases.
2014-02-19 21:46:53 -05:00
jalbertocr
8b2e1ab9e5
Don't do assignments inside conditionals.
2014-02-19 22:41:33 -03:00
jalbertocr
cdeb51167b
Fix types in docblocks.
2014-02-19 20:54:00 -03:00
jalbertocr
35f152b333
Make sure a datetime instance is valid to avoid fatal errors.
2014-02-19 20:50:30 -03:00
Patrick Barabe
a69aeb67c1
A better fix for issue #2711 . Allows url to be unset from request array regardless of this->base context
2014-02-19 13:37:01 -07:00
Patrick Barabe
a9d7792678
Unsetting url both with & w/o ->base to allow proper handling when app not hosted at server's DocumentRoot
2014-02-19 11:02:25 -07:00
AD7six
4e0627232c
account for localized floats more robustly.
...
Normalize floats, strings too, so that they are validated as
dddddddddd.dd
ref #2853
2014-02-19 15:04:25 +00:00
mark_story
b8c94fa5d4
Merge branch 'master' into 2.5
2014-02-18 22:19:12 -05:00
mark_story
0a51458ffd
Fix Validation::decimal() not working with localized floats.
...
Use similar workarounds as DboSource::value() for accepting localized
floats.
Fixes #2853
2014-02-18 22:18:56 -05:00
Mark Story
3d00ca9643
Merge pull request #2861 from ujwaltrivedi/master
...
Get unlimited number of slabs when clearing cache keys in memcache.
2014-02-18 20:46:50 -05:00
Ujwal Trivedi
1045a5e0a5
Update MemcacheEngine.php
...
removed 0 from getExtendedStats('slabs') in my last commit, someone point that out in the comment. Adding it back.
2014-02-18 18:40:17 -05:00
Christophe Vandeplas
f018e4ff4d
fixes issue #2855 where cafile is not set in HttpSocket
2014-02-18 09:39:56 +01:00
Mark Story
4353507ebb
Merge pull request #2852 from ujwaltrivedi/master
...
Update MemcacheEngine.php
2014-02-17 16:44:13 -05:00
Ujwal Trivedi
cb0580a91a
Update MemcacheEngine.php
...
removing variable assignment
2014-02-17 15:29:49 -05:00
mark_story
3433f4a1f0
Clean up changes code standards and tests.
...
Refs #2582
2014-02-17 11:03:49 -05:00
Jonas
b32deed4aa
changed FormHelper::secure() and FormHelper::end() to support attributes in the hidden CSRF-protection tags that are being generated for SecurityComponent to allow specification of additional html attributes like HTML5s "form" attribute. This allows separation of Form instantiation/controls and form data - for instance within html tables
...
improved tests for testing against additional attributes for Form::secure()
improved tests for testing against additional attributes for Form::end()
removed array cast, fixed test
fixed docblock format
format
Fixed a bug, this won't work as some forms are just empty
2014-02-17 10:54:02 -05:00
mark_story
a965903777
Merge branch 'master' into 2.5
2014-02-17 10:51:32 -05:00
mark_story
070b165527
Mark compatibility shims as deprecated.
...
Fixes #2845
2014-02-17 10:29:03 -05:00
Mark Story
c325a93998
Merge pull request #2741 from ADmad/2.5-mimetype
...
Added regex support to Validation::mimeType().
2014-02-17 10:10:48 -05:00
Ujwal Trivedi
91ef655854
Update MemcacheEngine.php
...
adding $limit=0 to clear function so it deletes all the keys for real
2014-02-17 02:51:00 -05:00
ADmad
9ae7f11a2a
Made mimetype check case insensitive.
2014-02-17 11:48:00 +05:30
mark_story
cde93ca7b9
2.x needs to be compatible with PHP<5.4
2014-02-16 21:37:28 -05:00
mark_story
3919f93149
Use simpler assertions.
2014-02-16 14:37:29 -05:00
mark_story
7a4cabe5d3
Add depth to log().
...
Much like dump() it is handy to be able to control the depth variables
are dumped out when logged.
Refs #2834
2014-02-16 14:35:32 -05:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
José Lorenzo Rodríguez
4f424007fa
Merge pull request #2822 from dereuromark/master-validation
...
Fix uploadError validation rule
2014-02-13 19:58:40 +01:00
AD7six
5334fe04c3
handle loose % signs in __() function
...
While it's passed to sprintf and translation markers may contain
variable placeholders (%s, %d) that doesn't mean translators need to be
aware of all relevant rules. A % sign in a translation message shouldn't
cause a warning (and no return) it should be handled as a literal
percent sign.
2014-02-13 15:30:16 +00:00
ADmad
54a395cc3e
Updated docblock.
...
BlowfishAuthenticate is deprecated.
2014-02-13 17:54:53 +05:30
euromark
1725386c16
Fix uploadError validation rule to work with OS Win. Here the error is string, not integer.
2014-02-12 21:52:18 +01:00
mark_story
827dc77a11
Fix incorrect assertion.
2014-02-11 22:00:24 -05:00
mark_story
96a37d5917
Fix temporary associations that replace fields not being restored.
...
When binding temporary associations, fields should be restored
in the afterFind as the association will have become unbound.
Fixes #2816
2014-02-11 21:56:05 -05:00
mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
ADmad
9de3418079
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
ADmad
d838e7b56f
Updated upgrade shell to change CakeRequest::onlyAllow() usages.
2014-02-10 18:18:09 +05:30
ADmad
1da79080ac
Updated bake templates to use CakeRequest::allowMethod()
2014-02-10 17:56:57 +05:30
ADmad
bea30e62cb
Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod().
...
Existing name is unintuitive and it's not easily apparent what
the method does. Closes #2803
2014-02-10 17:38:55 +05:30
Mark Story
7a72431442
Merge pull request #2770 from ukk1337/master
...
Added missing 'Session'-Component in bake
2014-02-09 16:04:25 -05:00
mark_story
91349c306e
Remove trailing whitespace.
...
Refs #2799
2014-02-09 16:03:37 -05:00
Mark Story
6b3a062927
Merge pull request #2799 from sam-at-github/master
...
Fixed prefixed action prefix reverse routing match. One liner.
2014-02-09 16:02:44 -05:00
Sam
f3cd0fc808
Test added for previous fix in CakeRoute.php. Refs #2797 .
2014-02-10 02:20:00 +11:00
Sam
a9059d4a4f
Fix formatting - one space too much. Refs #2799 .
2014-02-10 02:02:41 +11:00
Sam
7fd13d406c
Fixed prefixed action prefix reverse routing match. One liner.
2014-02-10 01:38:32 +11:00
Eric Martins
2793dca671
Fix ApiGen errors
2014-02-07 18:29:54 -02:00
Sam
9691e54248
Minor comments only. Added more explanation of $defaults parameter to Router::connect(). Trying to clarify how it relates to the routing destination and the template string tokens.
2014-02-06 20:34:02 +11:00
Sam
ae3c791b6c
Minor documentation corrections about Router::connect().
2014-02-06 18:41:37 +11:00
Mark Story
278349aff9
Merge pull request #2782 from jimmymadon/feature-clarify-acl-errors
...
Clarified ACL node lookup failed error.
2014-02-05 17:55:11 -05:00
ADmad
d9489257d3
Don't return true
from view classes' render() method.
...
It cause's Controller:render() to set the response body as `true`.
Refs #2780
2014-02-06 03:06:00 +05:30
Jimmy Madon
fcd41e45a7
Clarified ACL node lookup failed error.
...
Original error was ambiguous in stating whether the ARO node lookup failed or the ACO node lookup failed.
2014-02-05 18:25:14 +00:00
David Steinsland
f2b9aa5ca4
Fixed HTTP Status code when ajaxLogin is set
2014-02-05 16:05:02 +01:00
mark_story
be8ebfc005
Merge branch 'master' into 2.5
2014-02-05 09:22:46 -05:00
mark_story
919cb7d90e
Fix bake templates to generate functioning code.
...
Closes #2776
2014-02-05 09:21:49 -05:00
ukk1337
3cd6bb39bd
fixed coding standard errors
2014-02-04 15:37:23 +01:00
ukk1337
60c289fd68
removed indentation
2014-02-04 13:47:50 +01:00
ukk1337
9670a5af88
Added missing 'Session'-Compomnent in bake
...
If a Controller was baked interactively and one want to use Session flash messages, the required 'Session'-Component wasn't added to the $components-Array
2014-02-04 13:35:48 +01:00
AD7six
adc0bf3ded
BC fix for checkbox ids
...
Revert to previous behavior for id generation of checkboxes, This commit
can be reverted for 2.5+ is desired
Fixes #2733
2014-02-03 17:57:26 +00:00
mark_story
ecf5aec1ae
Add '@' to the list of characters removed from radio/checkbox ID.
...
This character can easily show up in email addresses and can cause
invalid HTML.
Refs #2733
2014-02-02 21:20:31 -05:00
José Lorenzo Rodríguez
e36c954da7
Merge pull request #2693 from ADmad/2.5-session-start
...
Don't start a session if it's known to be empty.
2014-02-01 04:08:48 -08:00
Mark Story
a6459a6c2f
Merge pull request #2740 from rchavik/2.5-event-manager-regression
...
RFC Fix: CakeEventManager regression
2014-01-31 07:10:46 -08:00
Mark Story
405f3a1cb9
Merge pull request #2752 from rchavik/2.4-postgres-alterschema
...
Fix: Changing boolean to integer for Postgres
2014-01-31 06:46:52 -08:00
Rachman Chavik
9f978e9bf7
Check event against listeners registered in local and global manager
...
Closes #2730
2014-01-31 16:52:29 +07:00
Rachman Chavik
35c22a291e
Add test to prove Event Manager regression
2014-01-31 16:52:26 +07:00
Rachman Chavik
59549b7ebe
Fix: Changing boolean to integer for Postgres
...
Closes #2751 , CakeDC/migrations#149
2014-01-31 15:14:20 +07:00
mark_story
4d57d3ce5b
Fix plugin path filtering when directories do not exist.
...
When paths do not exist we should correctly remove them from the output
paths.
Fixes #2748
2014-01-30 21:40:08 -05:00
mark_story
605351d0c9
Allow empty values in checkboxes.
...
Allow the checkbox value attribute to be empty. This is required to make
checkboxes with a value of 0.
Fixes #2717
2014-01-30 21:12:06 -05:00
Walter Nasich
a7f50e0ce7
Using sprintf to convert number into non-scientific notation
2014-01-30 19:07:23 -03:00
Walter Nasich
43604f64d5
Rendering a proper value for html5 attribute 'step'
2014-01-30 17:17:50 -03:00
Matt Alexander
dedefee87e
Fix link in comment
2014-01-30 10:07:45 -06:00
ADmad
2d10707d18
Added regex support to Validation::mimeType().
2014-01-30 21:05:04 +05:30
mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
Walker Hamilton
df2fc07940
Grammatical fix in API docs only
...
Grammatical fix in API docs only
reset
2014-01-29 11:51:29 -06:00
Mark Story
6eb5a38f22
Merge pull request #2692 from jrbasso/2.5-cors
...
Added support to cross origin requests
2014-01-29 06:45:11 -08:00
Mark Story
8db034cbf1
Merge pull request #2731 from joostdekeijzer/console-extract-not-handling-validation-quotes
...
Console Extract task doesn't handle validation messages with qoutes correctly
2014-01-29 06:43:23 -08:00
Mark Story
5629dfdcc3
Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebehavior
...
Fix Model::field() and TranslateBehavior::beforeFind() not working together.
Fixes #2721
2014-01-29 06:40:27 -08:00
joostdekeijzer
42daa25340
Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly
2014-01-29 14:53:52 +01:00
joostdekeijzer
987187ef8c
Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname')
2014-01-29 13:37:47 +01:00
joostdekeijzer
827c815cf1
correct property comment
2014-01-29 12:25:09 +01:00
Rachman Chavik
b83b59a9d7
Log errors instead of calling trigger_error()
2014-01-29 17:51:07 +07:00
mark_story
9b4c2f3c86
Update version number to 2.4.5
2014-01-26 15:06:00 -05:00
ADmad
c093804b35
Merge branch 'master' into 2.5
2014-01-26 17:39:50 +05:30
Giampaolo Falqui
ef08534460
Improves next() and prev() documentation
...
Adds the explanation for the URL available option, which is really useful when dealing with non-default CakePHP routes, now lacking from the official documentation.
2014-01-26 11:38:11 +01:00
mark_story
d7d8fc00d1
Check data with isset() before accessing it.
...
Don't blindly access data that may not exist.
Fixes #2712
2014-01-25 22:15:47 -05:00
mark_story
cf16ae055f
Remove pointless code.
...
After the changes in #2709 this code just heats the earth.
2014-01-25 22:13:42 -05:00
Melvin.Ross@gmail.com
7f496fad94
_Trailing_ and $this->keys also do not need to be urldecoded. Both _trailing_ and $this->keys gets set in _writeRoute, which also makes the regex that used to create the array $route.
...
Any keys in $route that match [_trailing_] or any values in $this->keys are put there through the exection of preg_match. The URL is decoded before being passed to preg_match, which means the values
inside of [_trailing_]etc. have already been decoded.
2014-01-24 17:44:31 -06:00
Melvin.Ross@gmail.com
83f37e48a9
Fix typo that removed '$' from '$key'
2014-01-24 16:33:59 -06:00
Melvin.Ross@gmail.com
8d6814e63f
Remove rawurldecode from the _parseArgs function in CakeRoute since urldecode is already called on the URL string in CakeRoute::parse() when creating the $route array that is passed to _parseArgs.
...
The result of the double urldecodes is parameters with meaningful '%' signs being stripped away on accident, and the web server reporting that the requested address doesn't exist.
2014-01-24 16:14:58 -06:00
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
euromark
8ebf004450
Also make DOM ids for radio element values unique.
2013-12-04 02:14:08 +01:00
euromark
587a04ab84
prevent possible XSS attack via form helper selects and unescaped output.
2013-12-04 01:51:39 +01:00
euromark
aae0f762dd
Collision free approach to resolve the DOM ID issue in a clean way. Fix to generation of ids for multiple checkboxes. Resolves ticket 4064.
2013-12-04 01:30:57 +01:00
ADmad
f3900e89fd
Fixed bug where deleteAll tried to delete same id multiple times.
...
Ensure find done in deleteAll only returns distinct ids. A wacky
combination of association and conditions can sometimes generate
multiple rows per id.
2013-12-03 22:18:17 +05:30
mark_story
8578708e76
Merge branch 'master' into 2.5
2013-12-01 21:37:37 -05:00
ADmad
c72def4840
Moved exception throwing to after paging info it set for request.
...
This fixes the regression caused in 2096d3f632
. When catching exception
thrown by PaginatorComponent::paginate() in controller, developer again
has access to paging info in request object.
Closes #2402
2013-11-30 19:00:08 +05:30
mark_story
a9ca1bdc58
Add tests and fix other cases where autoLinkEmail would fail.
...
Refs #2403
2013-11-29 22:57:43 -05:00
mark_story
7c66d0db50
Fix autoLink() when URLs contain email addresses.
...
Add whitespace lookbehind to ensure the email address is preceded by
whitespace, this obviously means that emails starting with word/symbols
are not detected, however those symbols are generally valid in an email
address anyways, and will form the local part.
Fixes #2403
2013-11-29 22:24:03 -05:00
mark_story
bbe4c659aa
Add tests for TextHelper::autoLink()
...
Add tests for email addresses embedded in urls.
Refs #2403
2013-11-29 21:57:08 -05:00
ADmad
155c7585e0
Fixed docblock
2013-11-29 00:14:43 +05:30
mark_story
97ab2c0e9b
Merge branch 'imsamurai-2.5' into 2.5
...
Add unsigned integer support to MySQL. Unsigned integers have not been
added to other databases as they either do not support them (postgres,
sqlserver) or they are 'faked' and don't do anything (sqlite).
Fixes #2321
2013-11-27 20:12:28 -05:00
mark_story
430ef88118
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
eb34e011e2
Update version number to 2.4.3
2013-11-24 21:25:25 -05:00
José Lorenzo Rodríguez
edc6fc6701
Merge pull request #2379 from rspenc29/2.5
...
Added support for passing additional flags to mysql connection
2013-11-24 01:07:58 -08:00
Rob Spencer
b8e32dd2b3
Adding flags override to additional pdo drivers
2013-11-24 01:04:17 -05:00
Rob Spencer
cda9320e96
Added support for passing additional flags to mysql connection
2013-11-24 00:47:06 -05:00
mark_story
eac6d7850f
Remove pointless array cast.
2013-11-23 12:36:15 -05:00
mark_story
5e77183afe
Fix failing tests when Console group was run in isolation.
2013-11-23 12:36:02 -05:00
mark_story
311189a662
Sort tables before returning them.
...
This fixes unsorted table lists in the various bake related tasks.
Fixes #2386
2013-11-23 12:34:16 -05:00
mark_story
d97cf79545
Add coverage for comma in email alias.
...
Closes #2381
2013-11-22 13:14:21 -05:00
mark_story
37e387fed2
Replace non-breaking spaces with Inflector::slug().
...
Fixes #2363
2013-11-22 10:13:10 -05:00
imsamurai
62a53d26bb
fix typo
2013-11-22 16:17:25 +02:00
mark_story
a4460ff228
Fix tests even better than before.
...
The current tests work on travis, but fail on jenkins. Fix that up.
2013-11-21 22:57:50 -05:00
mark_story
71312932e8
Merge branch 'master' into 2.5
2013-11-21 21:46:21 -05:00
mark_story
0e7b0ad111
Fix failing test.
2013-11-21 21:46:03 -05:00
ber clausen
1b9bf7b0fd
Always remove verify_host from SSL context.
...
It is only used to be able to set ```CN_match```.
2013-11-21 16:23:01 -02:00
José Lorenzo Rodríguez
df5fc2304a
Merge pull request #2289 from bar/2.5-optimize-dbosource
...
First part of the DboSource cleanup.
2013-11-21 01:02:36 -08:00
Eric Büttner
8c319c7dbc
fix the failing test case.
2013-11-20 12:26:03 +01:00
mark_story
1be40d5d64
Fix coding standards error.
...
Refs #2364
2013-11-19 18:36:52 -05:00
mark_story
ec38ee1c48
Only enable cacheSources if both the datasource + model agree on it.
...
This prevents models from flipping cacheSources on when the datasource
has it disabled already.
Refs #2364
2013-11-19 17:36:20 -05:00
mark_story
99fd6e40fe
Leave db->cacheSources unaltered.
...
When a model uses cacheSources = false, it should not have side effects
on the datasource.
Fixes #2364
2013-11-19 15:06:55 -05:00
davidsteinsland
c29d2abf69
Fixed test
2013-11-19 12:10:01 +01:00
davidsteinsland
22d9cd8a00
Fixed test case
2013-11-19 11:58:52 +01:00
davidsteinsland
881f81d01a
Fixed undefined constant
2013-11-19 11:50:28 +01:00
davidsteinsland
7056ccd38a
Added msgpack support for Memcached
2013-11-19 11:35:05 +01:00
imsamurai
f817beb8b6
change method public unsigned
to protected _unsigned
2013-11-19 10:55:44 +02:00
imsamurai
1313b81913
fix since
phpdoc tag for fixture
2013-11-19 10:48:51 +02:00
mark_story
3b8208be2e
Merge branch 'master' into 2.5
2013-11-18 21:49:13 -05:00
Matheus Pedroso
4677ddf490
Fix duplicated webroot path on HtmlHelper::meta('icon').
2013-11-18 23:38:01 -02:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Eric Büttner
1e3865acc7
formatting app::uses blocks (refs #2265 )
2013-11-18 11:56:00 +01:00
imsamurai
20dc92291e
fix broken test
2013-11-17 23:34:22 +02:00
imsamurai
0286e4120d
fix code style
2013-11-17 23:12:51 +02:00
imsamurai
8bcfe452da
not add unsigned
to not numeric fields, fix broken test, add new test
2013-11-17 23:10:53 +02:00
imsamurai
2f6122cb01
add unsigned
property in Model::describe
2013-11-17 22:37:01 +02:00
imsamurai
00fb663f90
remove numeric
from unsigned
config
2013-11-17 21:23:13 +02:00
imsamurai
1d9ecc6c94
Merge upstream/2.5 into 2.5
2013-11-17 21:13:25 +02:00
Marc Würth
229bd69903
Added link to three hash methods
2013-11-17 03:40:39 +01:00
mark_story
016c3aed44
Add test for saveAssociated and expression objects.
...
Add a test for #1514 . This issue was fixed during recent refactorings.
Closes #1514
2013-11-16 10:51:14 -05:00
mark_story
cee2801700
Add 'metadata' to the uninflected list.
...
Fixes #2332
2013-11-15 21:49:05 -05:00
mark_story
b6b8d83980
Remove non-portable data type from MySQL.
...
'numeric' is a non-portable type that is not supported by any other
database driver. Removing it now will prevent future problems.
2013-11-14 10:28:09 -05:00
Mark Story
17ae40f0ce
Merge pull request #2319 from ravage84/php-5-removal
...
Removed "PHP 5" from file header DocBlocks
2013-11-14 06:41:31 -08:00
imsamurai
f1a2c1a75c
add decimal type for unsigned
2013-11-14 10:56:51 +02:00
imsamurai
15805e668e
fix phpcs errors
2013-11-14 02:39:16 +02:00
imsamurai
7bc8dac453
fix phpcs errors
2013-11-14 02:19:41 +02:00
imsamurai
87fef89737
fix phpcs errors
2013-11-14 02:19:31 +02:00
imsamurai
fd64d952b5
change position from afterDefault to beforeDefault during to wrong order, add test
2013-11-14 01:36:27 +02:00
imsamurai
e35823e72a
fix tests, add numeric type for unsigned
2013-11-14 01:33:11 +02:00
imsamurai
5a40944a6f
fix test name testBuildColumn3 to testBuildColumnUnsigned
2013-11-14 01:20:21 +02:00
imsamurai
2fcb4c3c6c
- change check to strict for options
of $fieldParameters
...
- add `types` parameter and strict check if it present in `$fieldParameters` (if it present and not contain column type field parameter will be skipped)
- add `noVal` parameter to `$fieldParameters` if it present and not empty value of this parameter from column will be ignored
- add `unsigned` column type for integer, float and biginteger. If it set to `true` an 'UNSIGNED' will be add in sql column part, if not set or set not to `true` this parameter will be skipped
2013-11-14 01:11:30 +02:00
Marc Würth
7018997979
Fixed some copyright and license statements in the file header DocBlocks
2013-11-14 00:07:03 +01:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Marc Würth
ce47890e98
Replaced all remaining license references to the Open Group Test Suite License with the MIT License
2013-11-13 18:52:06 +01:00
Marc Würth
19b972cfeb
Implemented skipping of fields for the data validation rules when baking a model
2013-11-13 13:36:19 +01:00
Andy Dawson
d94c187adc
Merge pull request #2305 from kimegede/docblock-construct-destruct-return-void
...
Docblock construct destruct remove @return
2013-11-13 01:44:35 -08:00
Ber Clausen
ed142d8c89
Add missing type hints.
2013-11-13 00:09:45 -03:00
Ber Clausen
0e74a0757a
Keep insertQueryData() DRY, issue less lookups. Remove unused $assocData
...
and $LinkModel from the signature.
Model objects should be CamelCase.
2013-11-13 00:09:39 -03:00
Ber Clausen
52d425737a
Call getDataSource() instead of the directly calling
...
ConnectionManager::getDataSource().
2013-11-12 03:38:47 -03:00
Ber Clausen
c1f3d9c274
Model objects should be in CamelCase.
2013-11-12 01:37:38 -03:00
Ber Clausen
014d2dd2d9
Remove 'self' key from getConstraint() calculations because it is not necessary anymore.
2013-11-12 01:30:57 -03:00
Ber Clausen
e658e071d1
Remove unused variable from the signature.
2013-11-12 01:17:11 -03:00
Ber Clausen
67a65663a7
Assign before actually using it.
2013-11-12 01:13:55 -03:00
Ber Clausen
026565033b
Model objects variables should be CamelCase.
2013-11-12 00:49:06 -03:00
Ber Clausen
6b8a79be6d
Remove reference from the signature.
2013-11-12 00:29:36 -03:00
Ber Clausen
cb42b056ac
Remove the 'Line indented incorrectly' PHPCS error.
2013-11-12 00:08:39 -03:00
Ber Clausen
7f570f33e4
Unindent, and remove unnecessary getDataSource() call.
...
Also, objects should be CamelCase.
2013-11-12 00:01:18 -03:00
mark_story
a07608cbb9
Fix incorrect CSRF token fields when using postLink()
...
Creating a postLink after creating a GET form would result in the
incorrect fields being generated.
Fixes #2308
2013-11-11 21:56:55 -05:00
Ber Clausen
b35c9671ad
Explicitly build SQL statements, calling buildAssociationQuery().
2013-11-11 23:27:50 -03:00
Ber Clausen
f0fcaa1305
Improve generateAssociationQuery():
...
* bail early when $linkModel is Null (BC for now).
* move SQL fields warmup and SQL statement building to its own functions
(it will payoff later improving self documentation and readability).
* make assignments and function calls only when needed (depending on the
association type).
2013-11-11 23:27:50 -03:00
Ber Clausen
64f34b75a2
Fix a couple of failing tests.
2013-11-11 23:27:50 -03:00
Ber Clausen
dcadfcbcab
Remove inline assignment.
2013-11-11 23:27:50 -03:00
Ber Clausen
53c6df554c
Remove unused $resultSet argument from generateAssociationQuery().
2013-11-11 23:27:50 -03:00
Ber Clausen
5da05d9216
Remove unneeded test inside conditional.
2013-11-11 23:27:50 -03:00
Ber Clausen
f16695db5f
Move variables to logical blocks.
...
Unindent to ease readability, and avoid assigning variables when
unneeded.
Free a little memory before entering to recursive intensive loops.
2013-11-11 23:27:50 -03:00
Ber Clausen
fdb4b11d0b
Remove unnecessary call to getDataSource().
2013-11-11 23:27:50 -03:00
Ber Clausen
c9e0131d6a
Only generate query data for hasOne and belongsTo associations.
...
Avoid calling generateAssociationQuery():
* when the return value will never be usefull (True in this case)
* to avoid polluting $queryData with uneeded fields
Later, the SQL statement for the primary, and 'hasOne' plus 'belongsTo'
relationships, is built.
2013-11-11 23:27:50 -03:00
Ber Clausen
2532228844
Improve readability and optimize minimizing variable lookups.
2013-11-11 23:27:49 -03:00
mark_story
1f5d1eee98
Remove duplicated reference for behaviors in ClassRegistry
...
The 2nd key in the registry was to support persistModel which has long
since been removed. With this registry key not being used it can be
removed with reasonable safety.
Fixes #2306
2013-11-11 12:30:00 -05:00
Kim Egede Jakobsen
18e0dc95dd
Remove @return from docblock (for __construct && __destruct methods)
2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad
Try to make same comments for constructors.
...
Conflicts:
lib/Cake/I18n/L10n.php
2013-11-11 11:03:57 +01:00
mark_story
63d867c98b
Restore global event managers that were causing cascading failures.
...
Refs #2105
2013-11-10 22:35:00 -05:00
Andy Hobbs
3e373771d7
Corrected coding standards violations in CaKeEventManagerTest.php
...
- Changed combining of arrays in CakeEventManager::listeners() to be more efficient
Refs #2105
2013-11-10 22:34:50 -05:00
Andy Hobbs
7656ffd12e
Corrected coding standards violations in CateEventMAnagerTest.pnp
...
Refs #2105
2013-11-10 22:34:43 -05:00
Andy Hobbs
11db7c1631
Removed EventManager test that tested using a closure as it breaks compatability with php < 5.3.0
...
Refs #2105
2013-11-10 22:34:35 -05:00
Andy Hobbs
615f700d22
Added EventManager::prioritisedListeners() function to alow the global event manager to return unprocessed listeners array
...
Refs #2105
2013-11-10 22:34:27 -05:00
Andy Hobbs
e8984a9033
Profiles and optimised EventManager::listeners() function, reducing execution time by 14.5%
...
Refs #2105
2013-11-10 22:34:05 -05:00
mark_story
3561929be7
Merge branch 'master' into 2.5
2013-11-10 21:53:09 -05:00