Renan Gonçalves
1a89a3cb9d
Exiting with 1 when Exception::getCode() returns non-integer values.
...
From php.net/exception.getcode
> Returns the exception code as integer in Exception but possibly as other type in Exception descendants (for example as string in PDOException).
2014-06-26 13:26:20 +02:00
Mark Story
e9da7b8f80
Merge pull request #3596 from zeroasterisk/2.6
...
MySQL DbdSource alter field support 'after'
2014-06-25 23:10:29 -04:00
Nick Beeuwsaert
7cef19fe96
Changed View::element()
to have an appropriately named event
...
And also made it so when the event fires the subjects type is
`View::TYPE_ELEMENT`. Wrote some tests which I hope are done right I
don't really know the bes way to write a test for a event listener
2014-06-25 22:08:59 -05:00
mark_story
a2673d8bf0
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Core/App.php
2014-06-25 09:22:10 -04:00
mark_story
a40fa5cae9
Add test for #3754
2014-06-25 09:19:24 -04:00
Dan Voyce
239af0322e
Raise an exception when Hash::get() receives invalid parameters
...
I'm not sure on whether this is a problem with my local app but I have
seen it a couple of times in a couple of projects: Warning (2): Invalid
argument supplied for foreach() [CORE/Cake/Utility/Hash.php, line 52]
I think Hash::get should be able to handle this better rather than
throwing an error in a core Util file.
Refs #3754
2014-06-25 09:15:46 -04:00
euromark
b3507b199a
Update doc blocks regarding return $this
2014-06-25 00:06:51 +02:00
José Lorenzo Rodríguez
bf33e1cf57
Merge pull request #3761 from aka-toxa/master
...
improving acl perfomance
2014-06-24 21:58:30 +02:00
José Lorenzo Rodríguez
3df972faa2
Merge pull request #3782 from cakephp/issue-3779
...
Whitelist more URL-y characters in digest parsing.
2014-06-24 21:56:40 +02:00
José Lorenzo Rodríguez
e9e09bf19a
Merge pull request #3788 from dereuromark/master-composer
...
Fix composer app issues with cake.php
2014-06-24 21:56:01 +02:00
euromark
05709908a7
Fix composer app issues with cake.php
2014-06-24 17:49:18 +02:00
suzuki86
8f9589f7c8
Fix typo
2014-06-25 00:20:54 +09:00
euromark
26fe1265ab
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 11:52:29 +02:00
mark_story
b4bcd74e60
Whitelist more URL-y characters in digest parsing.
...
Android clients include a full URL instead of just the URI. Also handle
situations where URLencoded bytes and document fragments are used.
Refs #3779
2014-06-23 14:39:35 -04:00
Anatoliy Petrovskiy
ad678e3988
improving acl perfomance
2014-06-23 13:51:52 +03:00
mark_story
6bacc5bb46
Merge branch 'master' into 2.6
2014-06-22 21:25:06 -04:00
mark_story
59c3b73f7a
Skip autoloaders for APCIterator
...
We can skip autoloaders for this class as it is provided by
a C extension and will never come from userland code.
2014-06-22 21:22:00 -04:00
ADmad
9a1a965b1c
Update isAbsolute() to recognize stream wrapper paths.
...
This has the benefit that the realpath() method is not applied to a
registered stream wrapper in the constructor of the Folder class.
Using the realpath() method will break the stream.
Thank "davalb" for the original patch.
2014-06-22 13:43:14 +05:30
mark_story
ffe811935c
Remove else.
...
By returning early we can avoid the else statement entirely.
2014-06-20 16:07:47 -04:00
mark_story
e683616329
Apply patch from 'biesbjerg' to ApcEngine
...
This set of changes allows ApcEngine to work with APCu and newer
versions of APC.
Fixes #3749
2014-06-20 13:59:05 -04:00
Anatoliy Petrovskiy
bb15271622
improving acl perfomance by adding indexes on acl tables and reorganization joins in getting acl node function
2014-06-20 20:49:02 +03:00
euromark
d81d568cc0
make coredispatcher fully BC again
2014-06-20 14:05:18 +02:00
mark_story
497ecd3f80
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-06-19 21:41:02 -04:00
José Lorenzo Rodríguez
5f81a745c4
Merge pull request #3744 from markstory/2.6-missing-views
...
2.6 Improve missing view error pages
2014-06-19 20:40:02 +02:00
mark_story
8f3ce9c9c4
Filter out core paths from missing view/layout errors.
...
End developers shouldn't be dropping files in /lib/Cake so lets not tell
them to.
2014-06-19 10:03:00 -04:00
euromark
9c035ff315
doc block corrections
2014-06-19 13:25:36 +02:00
euromark
53a544d9f0
Improve toList to allow localization
2014-06-18 17:56:35 +02:00
Mark Story
282a5d1cb5
Merge pull request #3731 from cakephp/issue-3656
...
Fix TextHelper::autoLinkEmail() near HTML
Refs #3656
2014-06-18 09:53:30 -04:00
Mark Story
163cacbd1d
Merge pull request #3734 from voycey/patch-1
...
Add 'research' to the list of uninflected words.
2014-06-18 09:31:54 -04:00
mark_story
31956c2abb
Remove dead code.
...
The list of paths is now output on the default error page, we don't need
to make an educated guess here anymore.
2014-06-18 09:26:38 -04:00
Mark Story
c99c68684b
Merge pull request #3646 from nanapi/no-truncate-fixture
...
Don't truncate test fixtures when the table has been freshly created.
2014-06-18 09:18:24 -04:00
Mark Story
562ed73562
Merge pull request #3726 from dereuromark/master-console-cake-unification
...
DS console cake unification
2014-06-18 08:55:53 -04:00
mark_story
fecc687f81
Cleanup missing view/layout errors.
...
Fix formatting issues and make path listings correct.
2014-06-17 23:20:49 -04:00
Dan Voyce
4915639efb
Update Inflector.php
...
Added Research
2014-06-18 11:48:16 +10:00
mark_story
e548dfcaea
First pass at making MissingView/MissingLayout exceptions show all
...
paths.
Showing all the paths a template file could be located help expose
developers to the view path cascade and helps ensure we don't tell
people the wrong place to put a view file.
Refs #3712
2014-06-17 16:30:50 -04:00
euromark
6161aae54e
also bring template one in sync.
2014-06-17 13:08:13 +02:00
euromark
a927f5d954
remove wrong App::uses() call
2014-06-17 05:10:19 +02:00
Bryan Crowe
1db10b4dd1
Basic grammar update to BasicAuthenticate docblock
2014-06-16 21:48:35 -04:00
mark_story
9136f63874
Fix autoLinkEmail() not working when emails are adjacent to HTML.
...
When an email address is adjacent to HTML it should be autolinked
correctly.
Refs #3656
2014-06-16 21:48:30 -04:00
mark_story
74d8e9ea40
Convert test to use a dataprovider instead of multiple calls.
...
Dataproviders are generally a bit easier to work with in the future.
2014-06-16 21:46:34 -04:00
euromark
a9de83daeb
console cake cleanup and unification
...
remove duplicate define
2014-06-17 02:28:52 +02:00
mark_story
96df2c4b68
Update version number to 2.5.2
2014-06-14 21:36:39 -04:00
mark_story
fa19c34580
Fix Hash::extract() not matching 1/0 to true/false.
...
Historically [prop=1] has matched prop=true as well. This restores that
and also fixes [prop=0] not finding falsey values.
This makes the typing less strict in Hash::extract() but I don't think
it is unreasonable given PHP's type juggling.
Refs #3288
2014-06-12 11:30:48 -04:00
Mark Story
7ea6626a15
Merge pull request #3692 from MMS-Projects/i18n-refactor
...
Refactor i18n basics
2014-06-12 08:10:46 -04:00
Marlin Cremers
4f91e14cab
Refactor translation functions arguments handeling
2014-06-12 08:48:28 +02:00
mark_story
8e14b2f807
Merge branch 'master' into 2.6
2014-06-11 23:05:59 -04:00
Bryan Crowe
d8b4c3967c
Fix typo
2014-06-10 23:31:42 -04:00
ADmad
0b4ba0b049
Fix api docblocks for behaviors.
2014-06-10 00:38:44 +05:30
ADmad
4ee7cf6564
Remove lies from API docblock for BasicAuthenticate class.
...
Add info on how to configure for cookieless/stateless operation without redirection.
2014-06-08 14:05:08 +05:30
ADmad
4c83563501
Deprecate App::pluginPath()
2014-06-07 22:59:02 +05:30
mark_story
146053c980
Update datasource API docs.
2014-06-06 14:06:32 -04:00
mark_story
d8b0083632
Fix api doc errors in TestSuite/
2014-06-06 13:57:48 -04:00
mark_story
07b43403fb
Fix doc errors in Component/Acl.
2014-06-06 13:57:15 -04:00
Carl Sutton
4a4a35768b
simplify connect code for redis
2014-06-06 13:54:54 +01:00
mark_story
849ad9a4f5
Remove dead, untested and unreachable code in FormHelper.
...
Closes #3650
2014-06-06 08:17:49 -04:00
José Lorenzo Rodríguez
91224b0ec1
Merge pull request #3653 from markstory/2.6-html-css
...
Add once option to css().
2014-06-06 09:55:06 +02:00
José Lorenzo Rodríguez
932bf47481
Merge pull request #3604 from Haititi/2.6-save-atomic
...
2.6 add 'atomic' option to "save()" API - delivery
2014-06-05 13:55:52 +02:00
akiyan
6d2402fbf6
No truncate when drop table.
2014-06-05 13:37:22 +09:00
mark_story
ab5da2a09f
Fix the test suite package doc block errors.
2014-06-05 00:24:01 -04:00
mark_story
7058921275
Fix doc comment errors in Acl classes.
2014-06-05 00:15:45 -04:00
mark_story
758599e6f4
Add once option to css().
...
The default value is false for backwards compatibility. In 3.0, the
default will be made consistent with script().
Refs #1973
Refs #3628
2014-06-04 22:15:56 -04:00
ADmad
1d40f3e685
Fix API docblock CS errors.
2014-06-05 00:28:55 +05:30
Haithem BEN GHORBAL
31615ce415
add 'atomic' option to "save()" API
...
This commit adds a transaction context to 'save()' API in order to rollback
possible modifications done in some 'Model.beforeSave' listener callback.
This will allow cakephp 2.x to behave like 3.0 .
It uses try/catch to better handle transaction.
Previous save() API is renamed to protected _doSave() method.
A new save() method is created for transaction handling.
'atomic' option is disabled for internal 'save()' call.
2014-06-03 09:37:17 +02:00
mark_story
92eeef8ae0
Merge branch 'master' into 2.6
2014-06-02 22:57:25 -04:00
mark_story
55672b6df3
Merge branch 'router-stars' from Hikkijp
...
Refs #3582 , #3581
2014-06-02 22:38:27 -04:00
mark_story
4362f7bf8b
Add tests for CakeRoute::match() and trailing * routes.
...
Add tests for /pages/** routes, and fix coding standards errors.
Refs #3581
2014-06-02 22:37:37 -04:00
mark_story
9ba7abd89f
Merge branch 'FormAuthenticate_empty_fix' from KeinBaum
...
Closes #3624
2014-06-02 22:03:40 -04:00
mark_story
975e4c3af0
Allow username of 0 in basic authentication.
...
Refs #3624
2014-06-02 22:02:28 -04:00
mark_story
d1e4dfac47
Add tests for #3624
...
The username of '0' should be accepted by FormAuthenticate.
Refs #3624
2014-06-02 21:58:50 -04:00
KeinBaum
88b3629f4f
#3623 : Allow username "0" with FormAuthenticate
2014-06-02 19:11:02 +02:00
ADmad
e7debd8692
More API docblock CS fixes.
2014-06-02 18:27:11 +05:30
Stefan Dickmann
91907b5c6c
correct docblock
...
invalid certificate domain
2014-06-01 13:23:47 +02:00
mark_story
47ce5928e1
Fix api doc errors in Cache.
2014-05-31 22:02:55 -04:00
mark_story
86a071353d
Fix api doc comment errors in Error/
2014-05-31 21:57:17 -04:00
mark_story
fe2003888b
Fix api doc errors in basics.php
2014-05-31 21:53:54 -04:00
mark_story
15f63e9c81
Removing peer verification failure test.
...
Since we are not running a domain with an invalid certificate relying on
someone else to do that is quite unreliable.
2014-05-31 21:51:03 -04:00
Mark Story
e467457319
Merge pull request #3612 from cakephp/api-doc-comments
...
More API docblock fixes.
2014-05-31 19:12:20 -04:00
ADmad
3d9b2b80cb
More API docblock fixes.
2014-06-01 03:06:05 +05:30
MaziyarMK
596c1c27cb
added HTML for styling tables
...
added <thead> and <tbody> to table for easier styling of generated templates.
2014-05-31 20:50:29 +00:00
ADmad
543066f34a
Set default sort direction to 'asc'.
2014-05-30 19:43:09 +05:30
Mark Story
136f026f77
Merge pull request #3548 from dogmatic69/patch-3
...
Allow getting params the same way data() works
2014-05-29 21:49:09 -04:00
mark_story
7e8d378502
Merge branch 'master' into 2.6
2014-05-29 21:46:16 -04:00
ADmad
16df061d66
Fix api docblocks for View layer classes.
2014-05-30 01:23:12 +05:30
alan bount
c273ed8d2c
MySQL DbdSource alter field support 'after'
...
The ALTER FIELD for MySQL should support 'after' just like the ADD FIELD
2014-05-29 11:06:44 -04:00
Mark Story
a135378950
Merge pull request #3590 from Haititi/2.6-fix-habtm
...
2.6 fix save() with habtm returning error
2014-05-29 10:09:33 -04:00
David Yell
1e3730c988
Updated the default Cake routes to include a defaultRoute true flag to allow differentiation
...
Merge #3579 from davidyell/routing-markers onto 2.6
Fixes #3535
2014-05-29 00:55:51 -04:00
mark_story
390441d3b9
Accept older blowfish hashes.
...
Both `2a` and `2x` are valid types of blowfish hashes, that while being
older should be accepted.
Backport 00c94bd582b83f8b92228b750aea0e8816a4ea89 from 3.x to 2.5.x,
I see this as a bug fix as it fixes incompatibilities with hashes
created by hash_password().
Refs #3575
2014-05-28 22:53:21 -04:00
Haithem Ben Ghorbal
35c2a7ef31
restore previous (erroneous ?) behaviour
2014-05-29 02:36:13 +02:00
Haithem Ben Ghorbal
67af8b37db
clean code and remove unneeded checks
2014-05-28 23:53:47 +02:00
dogmatic69
59fe581912
adding doc block for tests related to CakeRequest::param()
2014-05-28 22:28:44 +01:00
ADmad
7a4244d0a6
More docblock CS fixes.
2014-05-28 22:09:54 +05:30
Haithem BEN GHORBAL
d4a0883cb9
fix typo/coding style
2014-05-28 18:31:03 +02:00
Haithem BEN GHORBAL
a8e410ee20
fix save with habtm returning false
2014-05-28 18:17:16 +02:00
mark_story
f6c868d706
Fix remaining doc block errors in Console/
2014-05-27 23:34:53 -04:00
mark_story
8f5acb0932
Fix CS errors in skel/
2014-05-27 23:21:32 -04:00
mark_story
bb58bbe642
Fix API doc errors in Console/
2014-05-27 23:16:05 -04:00
mark_story
2546b79c62
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-05-27 20:55:16 -04:00
mark_story
0c8406c034
Merge branch 'master' into 2.6
2014-05-27 20:55:06 -04:00
mark_story
edcbf4e92f
Manually port f287bc76c0
to 2.6
...
Git won't let me merge the changes as I have 'unstaged changes'.
2014-05-27 20:54:36 -04:00
Mark Story
f287bc76c0
Force .bat files to have CRLF endings.
...
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.
Hopefully this fixes the issue.
Fixes #3585
2014-05-27 19:06:08 -04:00