adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-29 18:27:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18867 commits 7 branches 0 tags 44 MiB
Commit graph

18867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Story
7ef7ce2dbb Merge pull request #3706 from MelvinRoss/httpsocketheader 
Add support for specifying protocol in Cakesocket/HttpSocket.  Add HEAD function to HttpSocket
 2014-07-20 21:58:37 -04:00
mark_story
0dfce1abf3 Add . to the list of allowed characters. 
This was missed when the email validation rules were relaxed in
dc34d80f6f.

Fixes #4027
 2014-07-19 19:57:33 -04:00
mark_story
0aabc5d910 Merge branch 'master' into 2.6 2014-07-18 21:50:05 -04:00
Mark Story
dbe7329e54 Merge pull request #3703 from MMS-Projects/i18n-context-2.6 
Basic support for I18n contexts as requested by #2063
 2014-07-18 21:48:19 -04:00
Mark Story
52c8aa1b54 Merge pull request #4016 from ravage84/patch-1 
Added *.mo and .idea to .gitignore
 2014-07-18 14:04:44 -04:00
Marc Würth
78fb9b559a Added *.mo and .idea to .gitignore 2014-07-18 19:11:56 +02:00
Mark Story
91b4ee8984 Merge pull request #4008 from davidyell/patch-3 
Update ControllerTask.php
 2014-07-18 10:50:39 -04:00
David Yell
28ec1c40a5 When specifying Session as a component and using Session flash messages, you end up with 'Paginator, Session, Session' which doesn't make sense. Added an array_unique to remove any duplicated components. 2014-07-18 15:37:22 +01:00
ndm2
f03bf8067c Add some more exception message checks 2014-07-18 14:56:10 +02:00
ndm2
bf7d01ac66 Make SMTP auth reply code checks work properly. 2014-07-18 14:53:22 +02:00
Mark Story
d62d6061b2 Merge pull request #3906 from ravage84/hash-nest-exception 
Hash::nest() should throw an exception instead of returning an empty arr...
 2014-07-17 09:27:38 -04:00
Marlin Cremers
b47f91c47c Add context support to the I18n class which resolves cakephp/cakephp#2063 
This change adds Gettext context support to the I18n class. This
allows custom translations for verbs and nouns and more.
 2014-07-17 11:01:11 +02:00
mark_story
051d78c1a5 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Model/Model.php
 2014-07-16 23:11:58 -04:00
José Lorenzo Rodríguez
b6eb5624f8 Merge pull request #3985 from dogmatic69/patch-3 
Make the error message better for fixture errors
 2014-07-15 14:30:18 +02:00
Carl Sutton
8d58d93636 Make the error message better for fixture errors 
The stack trace has no details about which fixture is the actual problem.
 2014-07-15 13:21:48 +01:00
Melvin Ross
09a7020119 Fix spacing to conform to coding standards 2014-07-14 14:54:26 -05:00
Melvin Ross
0eaf650d9f Test for new HEAD function inside HttpSocket 2014-07-14 14:34:27 -05:00
José Lorenzo Rodríguez
070d80029f Merge pull request #3976 from davidyell/patch-2 
Update CONTRIBUTING.md
 2014-07-14 10:40:19 +02:00
David Yell
7b4c5236cf Update CONTRIBUTING.md 
Added some helpful links. Updated PHPUnit version requirement.
 2014-07-14 09:37:50 +01:00
Mark Story
5ebed62134 Merge pull request #3959 from chinpei215/master-issue3857-fix 
Fix a race condition problem

Fixes #3857
 2014-07-13 22:03:06 -04:00
chinpei215
ca93bbcd15 Fix CS 2014-07-14 01:21:09 +09:00
chinpei215
ace30fdd8a Fix a race condition problem 
Prevents Model::save() from generating a query with WHERE 1 = 1 on race condition.

Refs #3857
 2014-07-12 23:27:39 +09:00
mark_story
03c2a8b722 Unify datetime column default values between MySQL and Postgres. 
Datetime columns should have 'default' => null, in both Postgres and
MySQL.

Fixes #3837
 2014-07-11 23:10:16 -04:00
mark_story
9fd1a51a52 Merge branch 'master' into 2.6 2014-07-10 14:39:32 -04:00
mark_story
a098d96c94 Remove flaky test that was of questionable value. 2014-07-10 14:39:20 -04:00
Mark Story
b1af99a6ee Merge pull request #3933 from ADmad/2.6 
Deprecate $confirmMessage argument.
 2014-07-10 14:24:18 -04:00
ADmad
53259cb389 Deprecate $confirmMessage argument. 2014-07-10 23:31:51 +05:30
Mark Story
5af65f3a28 Merge pull request #3927 from chinpei215/master-h-opt 
A micro optimization of h()
 2014-07-10 12:30:03 -04:00
chinpei215
1a58b76e42 A micro optimization of h() 
In most cases, the first argument of h() will be a string.
 2014-07-10 20:53:10 +09:00
Mark
106d4ef12e Merge pull request #3925 from davidyell/patch-1 
Update Model.php
 2014-07-10 12:49:30 +02:00
David Yell
79be5e6805 Update Model.php 
Fixed the case on the link to the book, to match the anchor in the page.
 2014-07-10 10:46:48 +01:00
Mark Story
a8eab9b23a Merge pull request #3919 from dereuromark/2.6-trace 
2.6: Added a shorthand stackTrace() method
 2014-07-09 20:59:38 -04:00
euromark
ac0053d660 Added a shorthand stackTrace() method 2014-07-10 01:49:28 +02:00
mark_story
3a70d9c033 Merge branch 'master' into 2.6 2014-07-09 10:17:05 -04:00
Mark Story
77455e6eae Merge pull request #3913 from chinpei215/master-exception-renderer-fix 
Fix an infinite recursion caused by missing plugin
 2014-07-09 08:58:37 -04:00
chinpei215
0c1fc36b14 Fix an infinite recursion caused by missing plugin 
When a MissingPluginException has caught when rendering an exception,
we should disable the plugin as needed to prevent an infinite recursion.
 2014-07-09 15:55:41 +09:00
Marc Würth
c321a8fa93 Hash::nest() should throw an exception instead of returning an empty array 
Refs: https://github.com/cakephp/cakephp/pull/3498#issuecomment-48316204
 2014-07-08 13:01:02 +02:00
mark_story
b3dfad614a Correct pattern matching. 
Instead of 10 digits, it should limit at 10 groups.

Refs 1988e89e73
 2014-07-06 09:42:20 -04:00
Mark Story
1aa7331b0d Merge pull request #3888 from Schlaefer/fix-#3887-reusableCsrfExpires 
fixes #3887 CSRF reusable token expires
 2014-07-06 09:05:38 -04:00
Schlaefer
1e961a8aac increases time window in CSRF token expiry tests to 2 seconds 
travis-cs failed with 1 second margin
 2014-07-06 13:54:24 +02:00
Schlaefer
9fa7afa354 fixes #3887 CSRF reusable token expires 2014-07-06 10:39:00 +02:00
José Lorenzo Rodríguez
396725dc8c Merge pull request #3880 from markstory/incorrect-validation 
Fix issues with Validation::inList() and SecurityComponent
 2014-07-05 14:41:15 +02:00
euromark
009138b326 Fix CS 2014-07-05 13:49:50 +02:00
Mark Story
eb485f82b8 Merge pull request #3878 from ceeram/optimize 
minor optimisation, refs comments on 81875cfeb1b8e5c414cf9de3c96dd2dde50...
 2014-07-04 13:11:17 -04:00
Ceeram
a266a9493d minor optimisation, refs comments on 81875cfeb1 2014-07-04 17:25:41 +02:00
ADmad
1eccec02e4 Merge pull request #3872 from CostaC/response-sharable-fix 
Fix for CakeResponse::sharable() header to include private caches
 2014-07-04 10:32:51 +05:30
mark_story
3936cce4b8 Disallow hexadecimal input with inList. 
Instead of turning on/off strict mode based on the user supplied input,
cast everything to strings and always use a strict check. This avoids
the potential issue of a bad user using hexadecimal when they should not
be allowed to do so. Thanks to 'Kurita Takashi' for pointing this out.
 2014-07-03 22:10:49 -04:00
mark_story
1988e89e73 Add an upper bound to the POST data SecurityComponent will consider. 
'Kurita Takashi' has let us know that the previous patterns could be
abused by an evil doer. One could potentially send a very large deeply
nested POST data structure. Matching that structure could overflow the
PCRE limits causing a segmentation fault. Adding an upper bound will
solve the problem and I doubt anyone is doing POST data structures with
more than 10 levels of nesting.
 2014-07-03 22:02:00 -04:00
mark_story
765be87d88 Overwrite the schemaName property if it is not defined in the class. 
If a model class does not define a schemaName we should use the
datasource's schemaName. We can assume that people using schemaName want
to lock the model onto a specific schema given the changes in #3210

Fixes #3720
 2014-07-03 21:53:54 -04:00
Costa Caruso
8bfebd64fb Fix for failing test "Whitespace found at end of line" 2014-07-03 15:45:03 -04:00