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
be35880b2f
Merge pull request #8692 from garethellis36/dont-override-shell-loggers
...
Don't override already-configured loggers
2016-04-22 16:05:03 -04:00
Gareth Ellis
bfb6ebb049
PHPCS fixes
2016-04-22 19:21:47 +01:00
Gareth Ellis
bc3a1fb6c5
Makes ShellTest::testShellLoggersDoNotGetOverridden actually useful
2016-04-22 19:18:29 +01:00
Gareth Ellis
153f04a976
Changes behaviour of _useLogger so that already-configured loggers are not overridden
2016-04-22 13:56:26 +01: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
Mark Story
b71e93a16e
Merge pull request #8663 from chinpei215/2.next-query-cache
...
2.next Add DboSource::flushQueryCache()
2016-04-18 18:03:37 -04:00
chinpei215
1826b4cb08
Add DboSource::flushQueryCache()
2016-04-19 00:01:06 +09: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
Mark Story
1706b89915
Merge pull request #8612 from cakephp/2.next-php7comp
...
2.next php7comp
2016-04-13 14:56:34 -04: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
chinpei215
5006cc396a
Add a test case to make sure of backward compatibility
2016-04-11 00:43:35 +09:00
Mark Sch
7207d8f16a
Remove class extension.
2016-04-10 16:38:03 +02:00
Mark Sch
e26cdc989d
Add class_alias()
2016-04-10 16:16:03 +02:00
mscherer
e84ff5e0d5
Fix doc block param types.
2016-04-08 15:12:48 +02:00
mscherer
657b1a1029
Fix doc block param types.
2016-04-08 15:02:03 +02:00
mscherer
bae4a11e5e
Rename test file.
2016-04-08 14:40:30 +02:00
mscherer
3e2b84052a
Add deprecated BC wrapper class.
2016-04-08 14:36:23 +02:00
mscherer
dda9e83ab6
Refactor Object to CakeObject for future PHP7 comp.
2016-04-08 14:33:26 +02:00
mark_story
79db545b69
Fix PHP 5.4 syntax.
2016-04-02 21:45:02 -04:00
mark_story
1333cc4b3e
Merge branch 'postlink-token' into 2.x
...
Fix inline postLink() calls corrupting the containing form's tampering
token.
Refs #8387
2016-04-01 23:08:41 -04:00
mark_story
c551faad46
Add tests for changes in #8387
...
Add tests covering the new behavior.
2016-04-01 23:08:31 -04:00
Mark Story
0a6a6c86c4
Merge pull request #8576 from cakephp/issue-8567
...
Allow N11 exchange numbers as valid.
2016-04-01 21:57:42 -04:00
mark_story
84fc9498b5
Allow N11 exchange numbers as valid.
...
The previous code and commit (fa3d4a0bb5
)
were incorrect about invalid exchange numbers as 1-800-211-4511 is
a real phone number.
I've also removed a duplicate alternation pattern.
Refs #8567
2016-03-31 22:38:16 -04:00