297 Commits

Author SHA1 Message Date
Dylan K. Taylor
d48af3f4ca Merge branch 'stable'
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/permission/BanEntry.php
#	src/permission/PermissionAttachmentInfo.php
2020-12-01 17:35:30 +00:00
Dylan K. Taylor
b550cf5163 phpunit 9.4.4 2020-12-01 17:32:27 +00:00
Dylan K. Taylor
215bac8dd7 phpstan 0.12.58 2020-11-30 22:11:43 +00:00
Dylan K. Taylor
3709ba172b Sync composer dependencies 2020-11-30 22:02:01 +00:00
Dylan K. Taylor
37ace19857 Updated netresearch/jsonmapper to 3.1.1 2020-11-26 23:39:57 +00:00
Dylan K. Taylor
bc208e11f4 phpstan 0.12.57 2020-11-21 18:07:14 +00:00
Dylan K. Taylor
7b865dc5a9 Updated composer dependencies 2020-11-21 17:55:32 +00:00
Dylan K. Taylor
e8e6b9304c phpstan 0.12.57 2020-11-21 17:46:32 +00:00
Dylan K. Taylor
29eccba5f0 Updated composer dependencies 2020-11-17 23:25:15 +00:00
Dylan K. Taylor
8e0cba56b8 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/tile/Tile.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
2020-11-12 22:10:47 +00:00
Dylan K. Taylor
9f3fb935b5 Update composer dependencies 2020-11-12 22:03:32 +00:00
Dylan K. Taylor
528726068e phpstan 0.12.54 2020-11-06 13:09:04 +00:00
Dylan K. Taylor
3aa902ff77 Updated composer dependencies 2020-11-06 13:07:28 +00:00
Dylan K. Taylor
bfdcc12e81 phpstan 0.12.54 2020-11-05 14:49:00 +00:00
Dylan K. Taylor
b2299e08e0 phpstan 0.12.53 2020-11-03 15:00:56 +00:00
Dylan K. Taylor
d7741050c5 Updated composer dependencies 2020-11-03 14:54:50 +00:00
Dylan K. Taylor
d6ed542fcd Merge remote-tracking branch 'origin/stable' into master
# Conflicts:
#	composer.json
#	composer.lock
#	src/CrashDump.php
#	src/pocketmine/Server.php
#	src/pocketmine/level/format/io/region/McRegion.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
#	tests/phpstan/configs/l8-baseline.neon
#	tests/travis/setup-php.yml
2020-10-26 16:18:53 +00:00
Dylan K. Taylor
a8980a0f67 phpstan 0.12.51 2020-10-24 17:10:31 +01:00
Dylan T
69aa7c5ac1
Support for Composer v2 (#3880) 2020-10-24 16:42:38 +01:00
Dylan K. Taylor
23e5ade77e Merge branch 'stable' into master
# Conflicts:
#	build/make-release.php
#	composer.lock
#	resources/vanilla
#	src/plugin/PluginDescription.php
#	src/pocketmine/entity/Human.php
2020-10-21 16:55:52 +01:00
dependabot-preview[bot]
4444a79468
Bump phpunit/phpunit from 9.4.1 to 9.4.2 (#3875) 2020-10-20 09:06:46 +00:00
Dylan K. Taylor
0f9d5f7011 ext-morton is now required and used for World::chunkHash() and World::chunkBlockHash() 2020-10-17 16:09:30 +01:00
dependabot-preview[bot]
4cbeee3ab8
Bump phpstan/phpstan from 0.12.49 to 0.12.50 (#3874) 2020-10-17 13:44:43 +00:00
Dylan K. Taylor
aa00bd5e31 Updated phpstan to 0.12.49 2020-10-13 17:39:24 +01:00
Dylan K. Taylor
0186468e47 updated composer dependencies 2020-10-13 17:38:06 +01:00
dependabot-preview[bot]
af4f30d1c8
Bump phpstan/phpstan from 0.12.48 to 0.12.49 (#3873) 2020-10-13 16:31:25 +00:00
dependabot-preview[bot]
b39afa20d1
Bump phpunit/phpunit from 9.4.0 to 9.4.1 (#3872) 2020-10-13 13:09:56 +00:00
Dylan K. Taylor
868d236ddc Updated composer dependencies 2020-10-06 12:39:19 +01:00
dependabot-preview[bot]
a110317d1b
Bump phpstan/phpstan from 0.12.47 to 0.12.48 (#3851) 2020-10-05 13:23:19 +00:00
dependabot-preview[bot]
74bef7f423
Bump phpunit/phpunit from 9.3.11 to 9.4.0 (#3850) 2020-10-02 11:02:17 +00:00
Dylan K. Taylor
201bdc069c phpstan 0.12.47 2020-10-01 22:07:43 +01:00
dependabot-preview[bot]
d8f8afe531
Bump phpstan/phpstan from 0.12.46 to 0.12.47 (#3844) 2020-09-30 10:51:33 +00:00
dependabot-preview[bot]
7dabf305f8
Bump phpstan/phpstan from 0.12.44 to 0.12.46 (#3841) 2020-09-29 07:01:51 +00:00
Dylan K. Taylor
28255e35d1 Updated composer dependencies 2020-09-26 13:18:38 +01:00
Dylan K. Taylor
05a94f35d6 Updated composer dependencies 2020-09-26 13:17:54 +01:00
Dylan K. Taylor
9dda99f844 Updated composer dependencies 2020-09-25 18:36:45 +01:00
dependabot-preview[bot]
0fc9170bbf
Bump phpstan/phpstan from 0.12.43 to 0.12.44 (#3838) 2020-09-25 13:20:29 +00:00
dependabot-preview[bot]
7e2efae024
Bump phpstan/phpstan from 0.12.42 to 0.12.43 (#3831) 2020-09-24 11:23:32 +00:00
dependabot-preview[bot]
e9fa07b550
Bump phpunit/phpunit from 9.3.10 to 9.3.11 (#3835) 2020-09-24 09:57:58 +00:00
dependabot-preview[bot]
8ac32824a2
Bump phpunit/phpunit from 9.3.9 to 9.3.10 (#3828) 2020-09-15 17:01:03 +00:00
dependabot-preview[bot]
1322defead
Bump phpunit/phpunit from 9.3.8 to 9.3.9 (#3825) 2020-09-12 12:32:33 +00:00
Dylan K. Taylor
0aee39027e Merge branch 'stable' into master
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/entity/Living.php
#	src/pocketmine/Player.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/block/Potato.php
#	src/pocketmine/block/Sugarcane.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/Chunk.php
#	src/pocketmine/level/format/io/leveldb/LevelDB.php
#	src/world/generator/GeneratorRegisterTask.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
#	tests/phpstan/configs/l8-baseline.neon
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMainLoggerTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMemoryLeakTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskPublishProgressRaceTest.php
2020-09-04 01:43:52 +01:00
Dylan K. Taylor
e87760c218 composer: do not install packages with min version higher than 7.3.0
running composer update on 7.4 will generate a lock file using the newest dependencies which work for the current PHP version, which usually isn't desirable for a project like this where developers might be using newer PHP versions than users.
2020-09-04 01:05:48 +01:00
Dylan K. Taylor
f9c2ed6200 composer: do not install packages with min version higher than 7.3.0
running composer update on 7.4 will generate a lock file using the newest dependencies which work for the current PHP version, which usually isn't desirable for a project like this where developers might be using newer PHP versions than users.
2020-09-04 01:00:26 +01:00
dependabot-preview[bot]
e47a711494
Bump phpstan/phpstan from 0.12.40 to 0.12.42 (#3812) 2020-09-03 14:13:14 +00:00
Dylan K. Taylor
2ae7ba275b Updated Composer dependencies 2020-09-02 12:15:29 +01:00
dependabot-preview[bot]
6aa0a82341
Bump phpstan/phpstan-strict-rules from 0.12.4 to 0.12.5 (#3807) 2020-09-01 10:00:39 +00:00
Dylan K. Taylor
37e453b875 Updated composer dependencies 2020-08-28 23:34:32 +01:00
dependabot-preview[bot]
b47d6bbc22
Bump phpstan/phpstan from 0.12.39 to 0.12.40 (#3800) 2020-08-27 11:45:20 +00:00
dependabot-preview[bot]
aa26ddf8b1
Bump phpunit/phpunit from 9.3.7 to 9.3.8 (#3799) 2020-08-27 11:44:54 +00:00