Commit Graph

11333 Commits

Author SHA1 Message Date
818d0e19ab RCONInstance: remove always-false branch (readPacket() never returns null) 2020-01-11 21:54:03 +00:00
17720041a3 phpdoc: populate missing parameter typeinfo 2020-01-11 21:53:24 +00:00
9c8095b0b4 Merge branch 'stable' 2020-01-11 21:51:17 +00:00
c329ff7d4f SubChunk: remove nonsensical reference from internal function 2020-01-11 21:49:33 +00:00
96b91af66a Merge branch 'stable' 2020-01-11 21:41:38 +00:00
8794292788 remove &$var reference notations in phpdoc
this isn't required by the spec and PHPStan chokes on it. I was previously having it ignore these errors, but it turns out that PHPStan is not making use of extended typeinfo provided if it can't parse the tag, which is problematic on level 6 and also a problem for array-of-type. Therefore, we are going to have to take the hit.
2020-01-11 21:20:55 +00:00
43601e57bf Merge branch 'stable' 2020-01-09 21:08:16 +00:00
0a39e580e9 MainLogger: log exception chains in logException(), closes #2447
this method is simpler than #2447 and easier to apply to stable.
2020-01-09 21:01:12 +00:00
c4580dd56d MainLogger: extract a printErrorMessage() function from logException() 2020-01-09 20:51:13 +00:00
fab81d28bc MainLogger: always log exceptions with CRITICAL level
if we reached this point, it's almost always due to a general exception handler which doesn't know what else to do with the error.
2020-01-09 20:44:21 +00:00
05a450df87 Merge branch 'stable' 2020-01-09 20:16:17 +00:00
039478223e phpstan: enable MissingFunctionReturnTypehintRule 2020-01-09 20:14:15 +00:00
64b5db4bf2 bootstrap: add some @return annotations for phpstan 2020-01-09 20:13:53 +00:00
c85f4256c7 phpstan: enable MissingFunctionParameterTypehintRule 2020-01-09 20:10:15 +00:00
1192b8bdf1 bootstrap: add PhpDoc to critical_error to make phpstan happy
it wants phpdoc or typehints, and we can't provide typehints because bootstrap needs to be compatible with old PHP versions.
2020-01-09 20:09:33 +00:00
715a5c55f4 Merge branch 'stable' 2020-01-09 20:02:22 +00:00
6dcd2a4ece phpstan: start phasing in some level 6 checks 2020-01-09 19:56:04 +00:00
16bab02b13 actually use the DisallowEnumComparisonRule (derp) 2020-01-09 17:54:52 +00:00
aba71762e9 master-specific @var annotations 2020-01-09 17:50:01 +00:00
cda1143a79 Merge branch 'stable' 2020-01-09 17:17:42 +00:00
e0ed123236 Merge commit 'cda3e6f4dcc5a642c6c2597b77df7f29ecbb9397' 2020-01-09 16:49:04 +00:00
c73001d65e Merge commit 'e6a58e269099a7942d157a214beacc6c30f5617d' 2020-01-09 16:46:58 +00:00
220b28dd27 Merge commit '27350c4673dff62eed6d52633f4a0c776fdbd60c' 2020-01-09 15:29:39 +00:00
3fff0a0656 BigTree: evict unmaintained dead code
phpstan whines about all this stuff, and everything left is private, so we can get rid of it. Sadly we can't ditch the class without breaking BC, so that sticks with 4.0.
2020-01-09 14:26:46 +00:00
e1e1bfa5e3 CompressBatchedTask: remove useless code causing build failure
assuming that pthreads does not have leak issues, this code is pointless, and if pthreads does have leak issues, this may not prevent them anyway.
2020-01-09 14:19:35 +00:00
1eedac87b2 added missing @var property types (reported by phpstan) 2020-01-09 14:13:54 +00:00
cda3e6f4dc PluginDescription: clean up type information for extensions field 2020-01-09 11:20:01 +00:00
a733f094ac phpstan: added a custom rule to disallow strict equality operators on enum members
comparing enums with equality operators is unreliable because there is no guarantee that the enum objects won't be somehow duplicated, through serialization, cloning or ext-parallel dumb object copying. This means that two equal enum objects may not be thw same object.
2020-01-08 19:45:05 +00:00
e6a58e2690 format/leveldb: fix crash on truncated level.dat file 2020-01-08 09:55:03 +00:00
e76cc8eb33 RakLibPacketSender: fixed session leak on server-side disconnect 2020-01-07 11:32:23 +00:00
27350c4673 3.11.4 is next 2020-01-04 16:46:55 +00:00
0d5704b156 Release 3.11.3 3.11.3 2020-01-04 16:46:55 +00:00
fde888bf59 Merge commit 'f3550446267f975b33219bdde6aec8fbea614cb2' 2020-01-04 16:36:33 +00:00
40936c42f2 Empty merge of commit '4794ba236a551bd839bbb8565474c19f93d97c30' 2020-01-04 16:26:29 +00:00
305b4007d2 Merge commit '6490a49c702d0a3a9f62ffb915ffa22272f17b08'
# Conflicts:
#	resources/vanilla
#	tests/travis.sh
2020-01-04 16:25:40 +00:00
dd5be9692c Merge commit '5cd7e11b298a35bf796b41b577c28441e41ff411' 2020-01-04 16:24:29 +00:00
0050e12515 Merge commit '9232f4509c4b74718bce2d8f33ba71ca74b38d97'
# Conflicts:
#	resources/vanilla
2020-01-04 16:21:31 +00:00
d25e0c3d98 Merge commit 'cef77907c6b21e1fb167bc3085d00a5b1e740813'
# Conflicts:
#	resources/vanilla
#	src/timings/TimingsHandler.php
2020-01-04 16:21:05 +00:00
2cfb7000ae Empty merge of '06ec8b83978fcc52a7964d678a97c73b50a97aa8'
this change has been reverted, so this is just to bring the branches
inline.
2020-01-04 16:18:44 +00:00
f355044626 resources: do not remove client-side resource packs when forcing resources
I wanted to make this into a dedicated option, but it had some side effects (see 4794ba236a).
I'll settle for just disabling this useless behaviour, since we have other ways to force vanilla resources anyway; setting this flag to always-false has no user-facing effects anyway.
2020-01-04 16:14:08 +00:00
4794ba236a Revert "resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download"
This reverts commit 06ec8b8397.

unfortunately, this had some unanticipated side effects, thanks to
idiotic behaviour in the client ... when having optional downloads but
trying to force resources, the client chokes because it thinks the
server is forcing it to apply a pack that it doesn't have. Since
there's no way to detect when this problem occurs in the protocol, the
only option is to revert this.
2020-01-04 16:04:07 +00:00
6490a49c70 tests: drop lint.sh - no longer needed now that we have PHPStan 2020-01-04 15:23:53 +00:00
5cd7e11b29 Use specialized build script for Travis 2020-01-04 15:15:01 +00:00
08e3b8ffdc build: added specialized script to create a server phar
this is much easier to use than devtools, and allows us to make additional specializations for PM build that would otherwise just be a colossal pain in the ass.
2020-01-04 14:56:53 +00:00
9232f4509c TimingsHandler: don't bail on redundant attempts to stop non-running timers
while it would be nice to bail, providing the environment to allow bailing without breaking stuff requires some complex changes that would reduce performance when timings is not running. Considering the limited usefulness of bailing here anyway, and the fact that it just has to be prevented to not have side effects, it doesn't make a whole lot of sense right now.

closes #3261, closes #3269, closes #3254
2020-01-04 14:44:55 +00:00
cef77907c6 Timings: fixed grandparent timers not working correctly, closes #3229 2020-01-04 13:23:04 +00:00
06ec8b8397 resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download 2020-01-04 13:16:47 +00:00
cbc6bb29bc Merge commit 'ee08286ecaf76cd11914c5a3e914093b991c32db' 2020-01-04 12:08:47 +00:00
aaa81fb346 Merge commit 'a83211f96a64167f4334a83b12bef31b4b7d55d2' 2020-01-04 12:00:57 +00:00
9336b963a6 Merge commit '0b3c4ee4964faba76e1880abcf237fe6860f5248' 2020-01-04 12:00:20 +00:00