Commit graph

5109 commits

Author SHA1 Message Date
Simon Males
50ad043092 View::get() default param test 2013-09-11 22:22:50 +08:00
Simon Males
0c3197a435 View::get() to support a fallback param 2013-09-11 11:10:27 +08:00
ADmad
c27aa99af9 Merge branch 'master' into 2.5 2013-09-08 20:36:40 +05:30
Ber Clausen
c3ee9a2058 JsonView should return null if no data is set, regardless of the type of '_serialize'.
It should also honor true/false/0/'' values.
2013-09-07 02:38:52 -03:00
Mark Story
f82814d7ac Merge pull request #1618 from dereuromark/master-cs
Remove last yoda conditions as per coding standards guidelines.
2013-09-06 11:11:24 -07:00
euromark
959988cfa1 Remove last yoda conditions as per coding standards guidelines. 2013-09-06 18:36:57 +02:00
mark_story
0891073d19 Add coding standards ignore comments to FileEngine
We normally disallow error supression but it is the only way to
atomically delete files.
2013-09-06 12:19:23 -04:00
davidsteinsland
45b3417bd7 Fixed race conditions for FileEngine 2013-09-06 15:46:01 +02:00
Mark Story
0f528c279a Merge pull request #1614 from okinaka/2.x-disused-code
Postgres::truncate(): Delete disused code.
2013-09-05 18:16:22 -07:00
Mark Story
66394f2201 Merge pull request #1610 from bar/php54-callback-signatures
Update Model/Behaviors callback signature to be PHP5.4+ compliant.

This may require updates to userland behaviours.
2013-09-05 11:11:15 -07:00
mark_story
6a6371b2d4 Fix CROSS JOINs
While seldomly used, CROSS joins should not generate invalid SQL.

Fixes #4050
2013-09-05 12:45:48 -04:00
mark_story
e3e4efba0a Add test for issue #3936
radio() method should accept an array for the label element.

Refs #3936
2013-09-05 11:04:47 -04:00
Christian Winther
a1866733a0 Merge pull request #1611 from ADmad/2.4-log-suffix
Dropping 'Log' suffix from log configs as per change in cb24dbb084.
2013-09-05 07:24:41 -07:00
mark_story
f22c4cf90b Merge branch 'master' into 2.5 2013-09-05 10:21:41 -04:00
mark_story
3c9500a3cb Fix whitespace error. 2013-09-05 10:21:24 -04:00
Mark Story
f191ff017b Merge pull request #1597 from aread22/master
Potential Fix for LightHouse Ticket #3936

Fixes #3936
2013-09-05 07:20:48 -07:00
Ber Clausen
c524645738 Update Model/Behaviors callback signature to be PHP5.4+ compliant. 2013-09-05 11:17:02 -03:00
ADmad
29d0e26710 Dropping 'Log' suffix from log configs as per change in cb24dbb084.
Reverts regressive change done in 7e28636a72.
2013-09-05 19:37:41 +05:30
Schlaefer
82da8d9d07 performance improvements in CakeTime::timeAgoInWords Edit
- rearranges code to move return statements before otherwise dead code
- only do translation if translated string is actually used
2013-09-05 12:22:28 +02:00
Hadrien Collongues
7e28636a72 Fix log classname in skeleton
Fixes "logger class File does not implement a write method."
It probably tries to use the utility File class instead of the logger
2013-09-05 11:20:39 +02:00
okinaka
e0f24d0ade Postgres::truncate(): Delete disused code. 2013-09-05 14:11:50 +09:00
aread22
cb056a5cbe Use FormHelper->label instead of HtmlHelper->useTag
Implementing suggested fix by mark_story
2013-09-04 13:32:36 -04:00
Rob McVey
7f44cc01b5 Plural of breif is breifs not breives 2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada Reorder inflection rules.
Place rules for words like 'archives' and 'relatives' before words like
'knives'.

Fixes #4040
2013-09-03 12:50:02 -04:00
mark_story
800ffa804b Fix invalid CSS in fixture files.
Fixes #4041
2013-09-03 09:55:04 -04:00
Marc Würth
84a669aa7a Shortened the if clause line length by doing it the @markstory style ;-)
Also shortened the line length  of some arrays
2013-09-02 20:38:31 +02:00
mark_story
59bb05b433 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
Alexander Hofbauer
78d5b69bec Load helpers of email view 2013-09-02 14:36:08 +02:00
Renan Gonçalves
6750a65e1b Merge pull request #1568 from markstory/2.5-encrypt
2.5 - Add Security::encrypt() and Security::decrypt()
2013-09-02 01:19:47 -07:00
mark_story
13b870d7e1 Fix coding standards error. 2013-09-01 21:44:45 -04:00
mark_story
229c824da6 Remove a default helper from View.
This goes back to the days of yore and combined with
b8320fdbb7 it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
2013-09-01 21:39:59 -04:00
aread22
4ab1c8c225 Format to CakePHP code sniffs 2013-09-01 21:08:17 -04:00
aread22
64bb74a7e8 Potential Fix for LightHouse Ticket #3936
I believe I found a fix for this issue. I am here at #CakeFest2013 and during the #HourOfContribution I ran across this issue.

Currently in CakePHP 2.4 on Line 1522 - 1524 you can see the following code:

@@@ php
if ($label) {
	$optTitle = $this->Html->useTag('label', $tagName, '', $optTitle);
}
@@@

The $label variable here the is the $label array passed into the input method in Sethathi example above. The problem is that the $label array is completely ignored and instead a label is created using the HtmlHelper->useTag method.

I have what I believe is a fix for this issue but it hasn't been extensively tested. I tested against Sethathi example in the ticket and it produced the correct result.

The fix is simple. We detect if an array is passed in and then send it to the FormHelper label method instead of the HtmlHelper useTag method. The FormHelper label methods accepts an options array, so we pass in the $label array.

This will probably need to be fixed for checkbox also

"ask":https://cakephp.lighthouseapp.com/users/235987 helped me with this fix
2013-09-01 20:56:44 -04:00
Matt Reishus
bb98ac761f ConsoleInput::_canReadLine change from private -> protected 2013-09-01 17:15:51 -05:00
Matt Reishus
3b057cb82b Correct style 2013-09-01 16:58:23 -05:00
Matt Reishus
916d992162 Use readline in console when supported
$this->stdin->read(); will use readline if the system is detected to
support it.  In linux, you will be able to use the left and right arrow
keys to edit the current line, use the up and down keys to navigate
history, press ^U to delete the entire line, etc.

Before this, using arrow keys in linux will just spam characters like
^[[C^[[A^[[D^[[C^[[A^.  Useful for "Console/cake console"
2013-09-01 16:20:29 -05:00
Kim Egede Jakobsen
b64c7e3e84 Remove the $state === 'after' condition.
Can only be before / after.
2013-09-01 11:06:45 -07:00
euromark
eb71eeeac5 add scope for generateTreeList - resolves ticket 4028 2013-09-01 01:02:26 -07:00
José Lorenzo Rodríguez
fec646b69f Merge pull request #1588 from kimegede/caketime-docblock-update
Added @link CakeTime.
2013-08-31 21:59:11 -07:00
Kim Egede Jakobsen
539040aa07 Added @link CakeTime. 2013-08-31 21:56:15 -07:00
Phally
f4929c1b04 Strict checks for I18n::loadLocaleDefinition(). 2013-09-01 06:20:53 +02:00
Phally
4f91465af7 Safer way to prevent the array to string notice. 2013-09-01 06:16:10 +02:00
Ceeram
84c980f1f4 avoid notices when loading locale file
Conflicts:

	lib/Cake/Test/Case/I18n/I18nTest.php
2013-09-01 06:05:40 +02:00
euromark
a36456cc87 Correct doc blocks for AuthComponent 2013-08-31 19:58:10 -07:00
Kim Egede Jakobsen
fcf9f34392 Added @link to CakeNumber's docblock 2013-08-31 17:32:48 -07:00
Kim Egede Jakobsen
46d3d8e48e Added @link to all public functions there have documentation.
And correct a small 'typo'.
2013-08-31 17:12:29 -07:00
mark_story
b8ad7f314a Fix doc blocks. 2013-08-31 14:03:32 -04:00
mark_story
9b0e26cc21 Deprecate MemcacheEngine and update defaults for Memcached
People should switch to Memcached instead. The underlying extension is
better maintained and provides improved features and performance.

Collapse the persistent and persistentId settings, while also making
non-persistent connections the default. Persistent connections should be
an opt-in feature as having them enabled by default could go very wrong
on shared hosting environments.
2013-08-31 13:29:54 -04:00
mark_story
9e8c4ad285 Rename persistent_id to persistentId.
The new name is more consistent with other settings in CakePHP.
2013-08-31 13:15:53 -04:00
Mark Story
0f9560c5cf Merge pull request #1562 from kamisama/feature/2.5-memcached-cache-engine
2.5: Add Memcached storage engine for cache 

Fixes #3511
2013-08-31 10:12:16 -07:00