mark_story
0b6c23d04f
Update schema reflection for postgres.
...
Use the schema reflection query from 3.x to provide access to the serial
column attributes. These attributes give a more reliable way to access
primary key data than comparing the primary key of the model. The old
approach failed when schema was generated and concrete model's were
missing.
Refs #10356
2017-03-26 22:23:41 -04:00
Sebastien Barre
e285df4f82
optimization, break early
2017-03-25 09:30:34 -04:00
Sebastien Barre
02a946b17b
Merge branch '2.x' of https://github.com/cakephp/cakephp into duplicate_primary
2017-03-25 09:28:11 -04:00
Nicola Beghin
7cd9d4381a
typo
2017-03-18 14:44:44 +01:00
Nicola Beghin
ca6ca9376e
refactoring to avoid tampering with $_SERVER
2017-03-18 13:34:26 +01:00
Mark Story
83e5ae522e
Merge pull request #10378 from mvdriel/make-error-class-in-formhelper-configurable
...
Make error class of div in FormHelper::input configurable
2017-03-17 22:48:50 -04:00
mark_story
ccc9006620
Unset the active user data on logout.
...
When using stateless authentication the current user should be cleared
after logout to maintain consistency with session based authentication.
Refs #10422
2017-03-16 11:31:20 -04:00
mark_story
c5e31e590d
Revise test case based on feedback in #10418
...
Try and change the test around to trigger the issue. I'm still not able
to reproduce the issue.
2017-03-15 21:33:19 -04:00
mark_story
9dbeeaa1fa
Add test for #10418
...
Show that find(list) does not drop keys with values = 0.
Refs #10418
2017-03-15 15:58:54 -04:00
Nicola Beghin
ff210b04d7
code style
2017-03-15 17:32:47 +01:00
Nicola Beghin
5fb1b71cb6
code style fix
2017-03-15 17:22:31 +01:00
Nicola Beghin
74f700882c
local variable optimization
2017-03-15 16:27:27 +01:00
Nicola Beghin
089a0ae087
using $request->header in place of $_SERVER['HTTP_AUTHORIZATION']
2017-03-15 15:06:39 +01:00
Nicola Beghin
a15c5c7a70
BasicAuthenticate - added check to avoid parsing if "Authorization: Bearer <token>" is in place
2017-03-15 14:08:17 +01:00
Nicola Beghin
f5795f05a5
BasicAuthenticate - code styling and strong type comparison
2017-03-15 13:59:56 +01:00
Sebastien Barre
3ad91204b9
Merge branch '2.x' of https://github.com/cakephp/cakephp into duplicate_primary
2017-03-14 11:11:14 -04:00
Sebastien Barre
1ebdc61fdc
clean up assertions now that we are dropping the fixture early
2017-03-09 23:11:17 -05:00
mark_story
e698891d09
Hash::filter() should not exclude 0.0
...
Refs #10385
2017-03-09 21:29:44 -05:00
Mark van Driel
25d597910f
Code cleanup
2017-03-08 23:19:37 +01:00
Mark van Driel
c8aefeb495
Cs fixes
2017-03-08 14:16:08 +01:00
Mark van Driel
708e960968
Fixed tests
2017-03-08 13:43:40 +01:00
Mark van Driel
4728586365
Make error class of div in FormHelper::input configurable
2017-03-08 13:15:00 +01:00
Sebastien Barre
a0e023d3a9
fix coding standard, skip Postgres
2017-03-06 15:58:03 -05:00
Sebastien Barre
3849df0f2f
fix duplicate primary keys for tables without models
2017-03-05 21:47:00 -05:00
Mark Story
8d0e1fadf7
Merge pull request #10113 from bancer/request-url-to-array
...
implemented Router::reverseToArray()
2017-03-02 23:07:40 -05:00
mark_story
03e7fa0710
Update version number to 2.9.6
2017-02-28 22:27:17 -05:00
kanonji
3978f87c58
Stringify values to avoid trap of in_array() type juggling
2017-02-28 03:33:50 +09:00
Mark Story
beff1176b0
Merge pull request #10213 from cakephp/issue-10196
...
Allow false/true to be read as keys in Hash::get().
2017-02-20 11:54:17 -05:00
Mischa ter Smitten
2304ca379a
PHPDoc fixes
...
Found with Phan
2017-02-17 16:59:35 +01:00
Marcin Stramek
5c1f60baba
#10230 - Extend available TLS encrypt methods in CakeSocket - formatting
2017-02-15 10:28:06 +01:00
Marcin Stramek
6b17567ea7
#10230 - Extend available TLS encrypt methods in CakeSocket
2017-02-15 10:25:00 +01:00
mark_story
84a15dc9df
Fix short-array usage.
2017-02-14 14:12:38 -05:00
mark_story
34158407b2
Exit early if SMTP connection fails.
...
If the SMTP connection is disconnected (read() returns false) we should
exit early and not wait for the read timeout. This has the added benefit
of making the mocks much simpler.
Refs #10221
2017-02-13 22:37:44 -05:00
mark_story
3f10a0227a
Allow false/true to be read as keys in Hash::get().
...
While these are not values within the documented types, there exist use
cases in CakeSession that necessitate these to be supported types.
Refs #10196
2017-02-13 21:50:51 -05:00
Livia Scapin
f7360266f0
Fix invalid return value hint
2017-02-08 13:48:22 +01:00
chinpei215
7944f512ad
Fix ModelTaskTest for tests passing
2017-01-30 03:22:50 +09:00
Mischa ter Smitten
043858d9e6
Fixed typo
2017-01-30 03:22:49 +09:00
Mischa ter Smitten
6818268a27
New Validation::(min|max)ByteLength() addition
2017-01-30 03:22:48 +09:00
Mischa ter Smitten
259972a785
Fix for incorrect @return phpdoccomment
2017-01-27 10:33:49 +01:00
Val Bancer
eb00f9aa7d
fixed code style
2017-01-26 23:52:14 +01:00
Val Bancer
0c8e3f1977
fixed unit tests
2017-01-26 23:39:47 +01:00
Val Bancer
0bf49966db
fixed unit test
2017-01-26 22:39:38 +01:00
Val Bancer
e0b0da86bf
fixed unit tests
2017-01-26 22:21:09 +01:00
Val Bancer
ebde8fdfb5
implemented Router::reverseToArray()
2017-01-26 21:52:26 +01:00
mark_story
7de6cf0aa5
Update version number to 2.9.5
2017-01-23 20:47:14 -05:00
Henrik Gemal
95e0820d62
add ru-ru
2017-01-21 19:58:50 +01:00
Markus Bauer
9b13381b0a
Fix error messages if PHP's mail() function fails
2017-01-17 19:42:57 +01:00
mark_story
273a8a2d7d
Add support for the parseHuge option.
...
Sometimes people need to load huge XML files. Add an option to enable
people to enable this flag.
Refs #10031
2017-01-13 21:26:54 -05:00
Mark Story
d40b39f18b
Merge pull request #9970 from cakephp/issue-9962
...
Fix query string parsing on requestAction()
2017-01-06 13:47:42 -05:00
chinpei215
94d9bcd674
Fix FlashHelper::render() cannot render default
messages
...
Fixes #9910
2017-01-05 19:00:52 +09:00
mark_story
304117d228
Fix query string parsing on requestAction()
...
This also fixes a long standing oddity around string URLs that include
a query string where the query string data would be duplicated.
Refs #9962
2017-01-04 22:34:19 -05:00
mark_story
e01f5989af
Use array conditions for joins.
...
Use array style conditions instead of using lower-level DboSource API
methods to create safe SQL.
Refs #9927
2016-12-28 23:18:30 -05:00
mark_story
95cafaec3b
Update version number to 2.9.4
2016-12-23 13:27:15 -05:00
mark_story
53bcc1550f
Fix PHPCS error.
2016-12-13 22:50:07 -05:00
mark_story
99af4bba83
Merge branch 'domingues-2x' into 2.x
...
Refs #9870
2016-12-13 22:48:12 -05:00
mark_story
3c44ddd10b
Add tests for #9870
2016-12-13 22:47:57 -05:00
Mark Story
4a4c83c3e9
Merge pull request #9859 from cakephp/debugger-encoding
...
2.x - Debugger encoding
2016-12-13 19:26:52 -05:00
domingues
4d77cb059d
Fix a bug in Xml::fromArray()
...
When creating from an array with elements like this: `[ "a" => [ 0 ] ]` or `[ "a" => [ '0' ] ]` it fails and produces XML like this `<a/>` instant of `<a>0</a>`.
The problem is that in PHP `empty('0')` is true, so an exception to this case is needed.
2016-12-13 16:16:12 +00:00
mark_story
ee7739a3bf
Try another approach to get the same error in all php versions.
2016-12-13 00:46:13 -05:00
mark_story
69afeb08af
Skip error encoding test in PHP5.3
...
Index errors work funny in PHP5.3, which makes testing them not work
like other versions of PHP.
2016-12-12 21:28:20 -05:00
chinpei215
21502db34a
Fix TreeBehavior does access property/method via model
2016-12-13 07:15:48 +09:00
mark_story
edfda47cf4
Fix missing HTML encoding in Debugger
...
Fix missing HTML encoding when error messages contain HTML. This can
happen when user data is used as an offset in an array in an unchecked
way.
Thanks to Teppei Fukuda for reporting this issue via the responsible
security disclosure process.
2016-12-10 08:47:13 -05:00
Mark Story
420336f536
Merge pull request #9843 from cakephp/php71
...
Add PHP7.1 to test matrix.
2016-12-07 21:40:54 -05:00
mark_story
12cdc247ac
Fix PHPCS errors.
2016-12-07 00:38:55 -05:00
mark_story
0a2a400ea4
Fix type error tests to work in PHP5 & PHP7.1
...
Catch the TypeErrors that are raised and make the match the PHP5
behavior of a converted error.
2016-12-06 21:21:52 -05:00
Mark Story
9e6e08704e
Merge pull request #9838 from cakephp/issue-9779
...
Fix CookieComponent erroring on corrupted data.
2016-12-05 16:44:24 -05:00
mark_story
e3221b1c38
Fix errors in php7.1
...
* The constructor of errors has changed in PHP 7.1
* mcrypt is no longer available in PHP 7.1 by default.
2016-12-05 16:14:33 -05:00
chinpei215
26731b93bf
Use ternary operator
2016-12-04 21:55:29 +09:00
chinpei215
b7481096c8
Fix redirectUrl issue when loginRedirect is empty
...
Fixes #9819
2016-12-04 20:06:24 +09:00
mark_story
934bb00b36
Add tests showing recent changes fix #9784
2016-12-03 14:14:57 -05:00
mark_story
27f951fb41
Don't emit errors when operating on corrupted cookie data.
...
When deleting from corrupted cookie data, there shouldn't be any errors.
Refs #9779
2016-12-03 14:10:47 -05:00
Henrik Gemal
75bb30f6b2
add new locales fixes #9825
2016-12-01 12:39:47 +01:00
mark_story
410df003e6
Update version number to 2.9.3
2016-11-27 21:25:11 -05:00
chinpei215
74c2ded872
Fix directory traversal of .ctp files
2016-11-27 18:14:44 +09:00
Mark Sch
02df9ff72e
Add a note about $boot
2016-11-26 18:10:37 +01:00
chinpei215
f9d2a52152
Revert "Remove dead code"
...
This reverts commit bf908762db
.
2016-11-27 01:25:01 +09:00
mark_story
bbb87b3e87
Use null instead of false for failure.
...
null is better to indicate that a thing doesn't exist.
2016-11-26 10:38:28 -05:00
Mark Story
ba9f62a7a0
Merge pull request #9747 from tersmitten/cache-does-not-expose-configured-engines
...
Expose Cache engines
2016-11-26 10:16:20 -05:00
mark_story
e057b5572c
Fix PHPCS.
2016-11-21 20:51:12 -05:00
mark_story
71b7d6211b
Fix AclNode constructor.
...
It should forward the settings from ClassRegistry::init() so that
aliases can be customized as needed.
Refs #9766
2016-11-19 22:30:18 -04:00
mark_story
66363e6bea
Add tests for #9766
...
I'm not able to reproduce incorrect aliases coming out of ClassRegistry.
As reported.
2016-11-19 10:02:09 -04:00
Marc Würth
5c184190c5
Improve doc block
2016-11-17 14:55:01 +01:00
Mischa ter Smitten
e71afa225e
Merge remote-tracking branch 'upstream/2.x' into make-it-possible-to-configure-cachemethodhashalgo-in-dbosource
2016-11-14 16:26:48 +01:00
Mark Story
de3a249199
Merge pull request #9749 from tersmitten/make-it-possible-to-filter-values-per-method-in-dbosourcecachemethod
...
Make it possible to filter values per method in DboSource::cacheMethod
2016-11-14 10:08:00 -05:00
Mischa ter Smitten
936b9924b3
Add tests for overridden cacheMethodFilter
2016-11-14 12:51:57 +01:00
Mischa ter Smitten
1952d2ee17
Add tests for cacheMethodFilter
2016-11-14 11:44:35 +01:00
Mischa ter Smitten
71535d2d2c
Change cacheMethodFilters to be a method
2016-11-14 11:15:08 +01:00
Mischa ter Smitten
5947c2346b
Fix failing test
2016-11-14 10:53:33 +01:00
Mischa ter Smitten
7ffb5c3600
Add tests for cacheMethodHasher
2016-11-14 10:00:47 +01:00
Mischa ter Smitten
e186ffc6d3
Change cacheMethodHashAlgo to be a method
2016-11-14 09:42:19 +01:00
Mischa ter Smitten
15ccf057f4
Make it possible to configure cacheMethodHashAlgo in DboSource
2016-11-12 00:18:13 +01:00
Mischa ter Smitten
58cc9b4596
Make it possible to filter values per method in DboSource::cacheMethod
2016-11-11 23:37:23 +01:00
Mischa ter Smitten
dec7f54ecb
Fixed typos
2016-11-11 21:43:43 +01:00
Mischa ter Smitten
94572ae384
Do not use deprecated assertIsA
2016-11-11 21:41:23 +01:00
Mischa ter Smitten
175503fafa
Expose engines
...
By implementing the `engine` method just like in version 3
2016-11-11 13:42:22 +01:00
Mark Story
f46f042001
Merge pull request #9717 from bancer/shell-webroot
...
accept webroot shell parameter
2016-11-08 21:12:50 -05:00
Val Bancer
38518c201c
doc blocks adjusted
2016-11-08 11:35:01 +01:00
Val Bancer
7ffa7acea6
fixed shell dispatcher failed unit test
2016-11-08 11:04:27 +01:00
Val Bancer
92e380737d
fixed failing shell dispatcher test
2016-11-08 10:44:08 +01:00
Val Bancer
467ee851bf
some refactoring to fix failed shell dispatcher tests
2016-11-08 10:03:46 +01:00