Commit graph

18563 commits

Author SHA1 Message Date
Mark Story
2bcf787b74 Merge pull request #8780 from jrbasso/2.x-apcu-php7
2.x - Fix ApcEngine to work on PHP 7
2016-05-08 08:25:28 -04:00
Juan Basso
fa6e74ca22
Improved apc calls
Instead of calling the call_user_func_array it does the call directly. It is a little bit more verbose, but performs better.
2016-05-07 14:26:09 -04:00
Juan Basso
4a61f7f23c
Supporting APCu on PHP 7 2016-05-07 03:46:21 -04:00
Mark Story
5b83f702c9 Merge pull request #8759 from xhs345/patch-2
2.x cake bake Controller: Only add Flash component when required
2016-05-03 22:20:13 -04:00
xhs345
4d65091d0c Updated tests 2016-05-03 15:39:37 -07:00
mark_story
de87ac1b5b Remove link to google group.
Refs #8763
2016-05-03 17:50:27 -04:00
Mark Story
a88b6e8232 Merge pull request #8763 from ravage84/2.x-forum-link
Add new forum link to home page
2016-05-03 17:49:42 -04:00
mark_story
efc2526600 Appease PHPCS. 2016-05-03 17:46:29 -04:00
Mark Story
af77d93bf3 Merge pull request #8762 from cakephp-br/2.x
[2.*] Including CakePHP official forum link in default home page
2016-05-03 17:41:10 -04:00
mark_story
b6d631b987 Use strlen(). Comparing a string against a length will not do the right thing. 2016-05-03 17:27:16 -04:00
André Teixeira
695005dcfa Fixing indentation 2016-05-03 09:32:01 -03:00
Marc Würth
d640e6874a Add new forum link to home page 2016-05-03 14:19:25 +02:00
André Teixeira
bce571736c Including forum link 2016-05-03 09:11:30 -03:00
mark_story
8cd5a64c27 Update version number to 2.8.4 2016-05-02 22:18:41 -04:00
Alex
31cddbe48a Only add Flash component when required
If a user selected no to the question "Would you like to use Session flash messages?" it would still use the Flash component, but not use it
2016-05-02 14:37:47 -07:00
Mark Sch
61c0415734 Merge pull request #8756 from cakephp/issue-8628
Restore backwards compatibility with old 2.x in FormHelper.
2016-05-02 10:52:35 +02:00
Mark Sch
32cb25465f Make CS tests pass. 2016-05-02 10:42:42 +02:00
mark_story
ade9d8a811 Restore backwards compatibility with old 2.x in FormHelper.
Restore the behavior of the string 'action' option to its former glory.
While we've deprecated this it needs to continue working as it did
before.

Refs #8628
2016-05-01 22:21:23 -04:00
mark_story
ab79ab9c55 Fix short-array usage. 2016-04-30 14:14:45 -04:00
Mark Story
608560b073 Merge pull request #8746 from psaintjust/backport_8741_8690
Backport fixes for issues 8741 and 8690
2016-04-30 14:14:06 -04:00
Philippe Saint-Just
c2f028ab49 Fix spacing 2016-04-30 13:13:14 -04:00
Philippe Saint-Just
cd07850337 Merge branch 'backport-8741-8690' into 2.x 2016-04-30 13:11:34 -04:00
Mark Story
0934d02f0e Merge pull request #8728 from cakephp/issue-8723
Backport range parsing resiliancy fixes from 3.x
2016-04-29 09:49:31 -04:00
mark_story
af953700b8 Fix short array usage.
Refs FIVESMX-8723
2016-04-29 09:28:05 -04:00
mark_story
cf55767fa0 Backport range parsing resiliancy fixes from 3.x
Refs #8723
2016-04-28 22:27:37 -04:00
Mark Story
cbd54256e0 Merge pull request #8717 from bancer/2.x
added support for several european locales
2016-04-27 12:32:18 -04:00
Val Bancer
3368ae9b02 fixed locales alphabetical order 2016-04-27 14:59:47 +02:00
Val Bancer
3edbe1f5eb fixed locales alphabetical order 2016-04-27 14:04:40 +02:00
Val Bancer
f4866efffc restored deleted linebreak 2016-04-27 13:21:08 +02:00
Val Bancer
dee53e8298 added support for several european locales 2016-04-27 13:14:30 +02:00
José Lorenzo Rodríguez
c72ac14dc0 Merge pull request #8695 from cakephp/issue-8693
Use import options when generating fixtures
2016-04-24 22:38:30 +02:00
mark_story
9536a10d6d Make schema import plugin friendly.
The changes in #8694 pointed out that schema importing doesn't play nice
with plugins. This corrects that.
2016-04-23 16:18:15 -04:00
mark_story
3a75e8aa72 Use import options when going through execute()
The `records` and `schema` options should work when using execute().
Previously they were not working. Furthermore, the records option did
a non-sensical thing where it both set import=>records and generated
static records from the live table. The `records` option now enables
the generation of static data from a live table, as I think this is
a more common scenario.

Refs #8693
2016-04-23 16:15:54 -04:00
mark_story
ce5d64b083 Remove whitespace. 2016-04-19 15:27:30 -04:00
Mark Story
c08119a36b Merge pull request #8677 from felixmaier1989/fix-mock-response-class
Mock CakeResponse
2016-04-19 15:26:55 -04:00
felixmaier1989
b081ef5a38 Mock CakeResponse
Ability to set the class name to use for mocking the response object
2016-04-19 14:50:40 +07:00
José Lorenzo Rodríguez
dec291061a Merge pull request #8658 from cakephp/empty-hashed-pw
Randomly generate a salt when the salt is '' or null.
2016-04-16 12:38:49 +02:00
mark_story
8b5023282e Randomly generate a salt when the salt is '' or null.
To prevent an issue where any value is accepted as a password when '' is
provided as the hashed password.

Refs #8650
2016-04-15 21:49:17 -04:00
Mark Story
c6d5bfb2b9 Merge pull request #8653 from cakephp/fix-2x-tests
Attempt to fix tests in 2.x
2016-04-15 15:37:47 -04:00
mark_story
f451efa511 Attempt to fix tests in 2.x
Relying on tv.eurosport.com having a bad peer name is pretty fragile.
However, we can more easily rely on their cert coming from a CA we no
longer trust.
2016-04-14 15:28:34 -04:00
Mark Story
78cda8c25d Merge pull request #8638 from ravage84/patch-5
Re-add the Equifax Secure Certificate Authority
2016-04-14 15:21:18 -04:00
Mark Story
34121515f3 Merge pull request #8647 from ravage84/2.x-well-known
Add commented-out Apache pass-through for .well-known directory
2016-04-14 15:14:58 -04:00
Mark Story
fba5439830 Merge pull request #8646 from ravage84/2.x-exceptions
Correct DocBlock for HttpException
2016-04-14 12:08:21 -04:00
Marc Würth
4dd72af12d Add commented-out Apache pass-through for .well-known directory
Refs https://github.com/cakephp/app/issues/368
2016-04-14 15:10:18 +02:00
Marc Würth
25a0796865 Correct DocBlock for HttpException
http://api.cakephp.org/2.8/class-HttpException.html

> Class HttpException
> Base class that all Exceptions extend.

Which is actually the short description of  CakeBaseException.

http://api.cakephp.org/2.8/class-CakeBaseException.html

Probably because the DocBlock was placed before the if clause.
2016-04-14 14:42:01 +02:00
Marc Würth
d9e5d0ca05 Re-add the Equifax Secure Certificate Authority
Port change 343e206360 from 3.x to 2.x
2016-04-13 12:27:59 +02:00
Mark Story
1d4e39a45a Merge pull request #8625 from cakephp/jrbasso/2.x-fix-doc
Fixed doc formatting on CakeResponse::cookie
2016-04-11 15:05:23 -04:00
Mark Story
d68342ed36 Merge pull request #8627 from ravage84/2.x-cacert.pem
Update bundled CA file
2016-04-11 15:04:45 -04:00
Marc Würth
4fd25e648c Update bundled CA file
Same as https://github.com/cakephp/cakephp/pull/8608 for 3.x
2016-04-11 13:55:28 +02:00
Juan Basso
718a7479e2 Fixed doc formatting on CakeResponse::cookie
Fixed doc to show properly in the documentation. This change was already applied on master.
2016-04-10 23:34:01 -04:00