Commit graph

16333 commits

Author SHA1 Message Date
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
Mark Story
0c82058f98 Merge pull request #1601 from ravage84/schema-shell
Shortened the if clause line length by doing it the @markstory style ;-)
2013-09-02 12:43:12 -07: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
Mark Story
29ac5f1d8c Merge pull request #1600 from aleho/master
Load helpers of email view
2013-09-02 06:03:43 -07:00
Alexander Hofbauer
78d5b69bec Load helpers of email view 2013-09-02 14:36:08 +02:00
Mark Story
863abf2a7f Merge pull request #1599 from mvdriel/fix-identing
Fixed identing and spacing
2013-09-02 04:46:51 -07:00
Mark van Driel
38820e0a16 Fixed identing and spacing 2013-09-02 13:22:44 +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
José Lorenzo Rodríguez
5f4feb0729 Merge pull request #1594 from mreishus/feature-readline-support
Use readline in console when supported
2013-09-01 15:51:32 -07: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
63dfbe55f7 Added/removed newlines to make the code more readable. 2013-09-01 12:09:14 -07:00
Kim Egede Jakobsen
09bdad6ceb Reduce variable use/duplicate code. 2013-09-01 12:08:48 -07:00
José Lorenzo Rodríguez
64cf40558f Merge pull request #1592 from kimegede/model-after-find-if-condition-remove
Reduce if condtion for finds
2013-09-01 11:24:23 -07:00
Kim Egede Jakobsen
b64c7e3e84 Remove the $state === 'after' condition.
Can only be before / after.
2013-09-01 11:06:45 -07:00
Mark Story
1c080b2ec0 Merge pull request #1585 from dereuromark/2.4-generatetreelist-scope
Bugfix: Add scope for generateTreeList

Fixes #4028
2013-09-01 07:02:53 -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
José Lorenzo Rodríguez
87908a2bfa Merge pull request #1590 from Phally/master-lctime
Avoid notices when loading locale file
2013-08-31 21:49:00 -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
José Lorenzo Rodríguez
f91eb3b508 Merge pull request #1587 from kimegede/cakenumber-docblock-update
Added @link to CakeNumber's docblock
2013-08-31 17:41:45 -07:00
Kim Egede Jakobsen
fcf9f34392 Added @link to CakeNumber's docblock 2013-08-31 17:32:48 -07:00
José Lorenzo Rodríguez
f32760e200 Merge pull request #1586 from kimegede/hash-docblock-update
Hash docblock update
2013-08-31 17:20:26 -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
Mark Story
dcb6b77ab6 Merge pull request #1571 from gilleswittenberg/no_confirm
Add y/yes option to schema create and update subcommands
2013-08-31 09:44:25 -07:00
Phally
dbbd05d850 Updates the Travis button to the master branch. 2013-08-31 13:55:09 +02:00
Phally
28dbc5b89b PHPCS fixes. 2013-08-31 13:30:05 +02:00
ADmad
75e8facd2f Remove JS constant use from tests. 2013-08-31 11:45:59 +05:30
mark_story
83db877765 Update version number to 2.4.0 2013-08-30 16:03:49 -04:00
mark_story
4f237e6a93 Merge branch '2.4' making 2.4 into the master branch.
Conflicts:
	lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
mark_story
ca9a305679 Update version number to 2.3.10 2013-08-30 15:56:44 -04:00
mark_story
7bd2174c5b Refactor tests to use a data provider. 2013-08-30 15:36:18 -04:00
mark_story
94b602b684 Merge pull request #1456 'fix-for-3515' into 2.4
Conflicts:
	lib/Cake/Test/Case/View/ViewTest.php

Fixes #3515
2013-08-30 15:27:49 -04:00
Mark Story
824a6f700b Merge pull request #1563 from mvdriel/fix-i18n-extract
Extract category strings to separate .po files
2013-08-30 12:19:17 -07:00