From d2f1a3cf5be330f53e2be25e448e6adcfce23c82 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 4 Sep 2020 17:53:22 +0100 Subject: [PATCH 01/14] SubChunk: workaround opcache preloading constant issue non-class constants aren't stored during preloading phase and for some reason they aren't pre-resolved in opcode arrays. However, they are resolved by value when referenced by class constants, and class constants stick, so we can use those instead. --- src/pocketmine/level/format/SubChunk.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/pocketmine/level/format/SubChunk.php b/src/pocketmine/level/format/SubChunk.php index 773afbf86..01d5c19ad 100644 --- a/src/pocketmine/level/format/SubChunk.php +++ b/src/pocketmine/level/format/SubChunk.php @@ -38,6 +38,8 @@ if(!defined(__NAMESPACE__ . '\ZERO_NIBBLE_ARRAY')){ } class SubChunk implements SubChunkInterface{ + private const ZERO_NIBBLE_ARRAY = ZERO_NIBBLE_ARRAY; + /** @var string */ protected $ids; /** @var string */ @@ -68,7 +70,7 @@ class SubChunk implements SubChunkInterface{ substr_count($this->ids, "\x00") === 4096 and (!$checkLight or ( substr_count($this->skyLight, "\xff") === 2048 and - $this->blockLight === ZERO_NIBBLE_ARRAY + $this->blockLight === self::ZERO_NIBBLE_ARRAY )) ); } @@ -230,14 +232,14 @@ class SubChunk implements SubChunkInterface{ * reference to the const instead of duplicating the whole string. The string will only be duplicated when * modified, which is perfect for this purpose. */ - if($this->data === ZERO_NIBBLE_ARRAY){ - $this->data = ZERO_NIBBLE_ARRAY; + if($this->data === self::ZERO_NIBBLE_ARRAY){ + $this->data = self::ZERO_NIBBLE_ARRAY; } - if($this->skyLight === ZERO_NIBBLE_ARRAY){ - $this->skyLight = ZERO_NIBBLE_ARRAY; + if($this->skyLight === self::ZERO_NIBBLE_ARRAY){ + $this->skyLight = self::ZERO_NIBBLE_ARRAY; } - if($this->blockLight === ZERO_NIBBLE_ARRAY){ - $this->blockLight = ZERO_NIBBLE_ARRAY; + if($this->blockLight === self::ZERO_NIBBLE_ARRAY){ + $this->blockLight = self::ZERO_NIBBLE_ARRAY; } } } From d3ea29d52744ea3175e8dac0fea66be695f326d4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 9 Sep 2020 01:40:18 +0100 Subject: [PATCH 02/14] Release memory to OS on garbage collection ZMM often holds onto big chunks of memory after they aren't used anymore, which is fine in a webserver, but it's not OK for PM. --- src/pocketmine/MemoryManager.php | 2 ++ src/pocketmine/scheduler/GarbageCollectionTask.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pocketmine/MemoryManager.php b/src/pocketmine/MemoryManager.php index e61f9fb77..bf819fe03 100644 --- a/src/pocketmine/MemoryManager.php +++ b/src/pocketmine/MemoryManager.php @@ -40,6 +40,7 @@ use function fwrite; use function gc_collect_cycles; use function gc_disable; use function gc_enable; +use function gc_mem_caches; use function get_class; use function get_declared_classes; use function implode; @@ -273,6 +274,7 @@ class MemoryManager{ } $cycles = gc_collect_cycles(); + gc_mem_caches(); Timings::$garbageCollectorTimer->stopTiming(); diff --git a/src/pocketmine/scheduler/GarbageCollectionTask.php b/src/pocketmine/scheduler/GarbageCollectionTask.php index 2618c310b..093843d4b 100644 --- a/src/pocketmine/scheduler/GarbageCollectionTask.php +++ b/src/pocketmine/scheduler/GarbageCollectionTask.php @@ -25,11 +25,13 @@ namespace pocketmine\scheduler; use function gc_collect_cycles; use function gc_enable; +use function gc_mem_caches; class GarbageCollectionTask extends AsyncTask{ public function onRun(){ gc_enable(); gc_collect_cycles(); + gc_mem_caches(); } } From 4a88db7f43778f2e0b10921949c717a7c66e281f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 11 Sep 2020 14:30:22 +0100 Subject: [PATCH 03/14] travis: update pthreads to pmmp/pthreads@b81ab29df58fa0fb239a9d5ca1c2380a0d087feb --- tests/travis/setup-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/travis/setup-php.yml b/tests/travis/setup-php.yml index 6259fcb3c..708ef3077 100644 --- a/tests/travis/setup-php.yml +++ b/tests/travis/setup-php.yml @@ -8,7 +8,7 @@ before_script: - echo | pecl install channel://pecl.php.net/yaml-2.1.0 - git clone https://github.com/pmmp/pthreads.git - cd pthreads - - git checkout e0f514dfde01c5e7e9cf94c43615918af482a45c + - git checkout b81ab29df58fa0fb239a9d5ca1c2380a0d087feb - phpize - ./configure - make From 114df07622826708e70a0b379fb4229d336f866a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 11 Sep 2020 20:48:37 +0100 Subject: [PATCH 04/14] RegionLoader: specify type of unpack() return PHPStan has no idea what is going on in this code because unpack() returns mixed[]. Possibly it might be a good idea to implement a dynamic return type extension for this. --- src/pocketmine/level/format/io/region/RegionLoader.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pocketmine/level/format/io/region/RegionLoader.php b/src/pocketmine/level/format/io/region/RegionLoader.php index 7e614f609..4151fc3e0 100644 --- a/src/pocketmine/level/format/io/region/RegionLoader.php +++ b/src/pocketmine/level/format/io/region/RegionLoader.php @@ -303,6 +303,7 @@ class RegionLoader{ throw new CorruptedRegionException("Corrupted region header (unexpected end of file)"); } + /** @var int[] $data */ $data = unpack("N*", $headerRaw); for($i = 0; $i < 1024; ++$i){ From 0ff0b330471bf9c243838b53d5365b08cf30ad9e Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 11 Sep 2020 20:56:18 +0100 Subject: [PATCH 05/14] StatusCommand: avoid modulo operator on float this was detected by a custom PHPStan extension. --- src/pocketmine/command/defaults/StatusCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/command/defaults/StatusCommand.php b/src/pocketmine/command/defaults/StatusCommand.php index 60d49c2dc..85669451f 100644 --- a/src/pocketmine/command/defaults/StatusCommand.php +++ b/src/pocketmine/command/defaults/StatusCommand.php @@ -54,9 +54,9 @@ class StatusCommand extends VanillaCommand{ $server = $sender->getServer(); $sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Server status" . TextFormat::GREEN . " ----"); - $time = microtime(true) - \pocketmine\START_TIME; + $time = (int) (microtime(true) - \pocketmine\START_TIME); - $seconds = floor($time % 60); + $seconds = $time % 60; $minutes = null; $hours = null; $days = null; From c2d0605b1ea1bfba7126327b1dac4a2c57f6f6a2 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 11 Sep 2020 21:01:22 +0100 Subject: [PATCH 06/14] Entity: avoid implicit float truncation in getDirection() this didn't cause any bugs because of the way the function is written, but it might have in other circumstances. --- src/pocketmine/entity/Entity.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 4ba1c369c..1c9d73a7d 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -80,6 +80,7 @@ use function count; use function current; use function deg2rad; use function floor; +use function fmod; use function get_class; use function in_array; use function is_a; @@ -1312,7 +1313,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{ } public function getDirection() : ?int{ - $rotation = ($this->yaw - 90) % 360; + $rotation = fmod($this->yaw - 90, 360); if($rotation < 0){ $rotation += 360.0; } From d084b7a34b08a033041f0e7cc4f27139f28afc85 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 12 Sep 2020 01:38:13 +0100 Subject: [PATCH 07/14] RegionGarbageMap: add an extra overlap check this shouldn't ever be triggered, but we want to know if it does. --- .../level/format/io/region/RegionGarbageMap.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/level/format/io/region/RegionGarbageMap.php b/src/pocketmine/level/format/io/region/RegionGarbageMap.php index 6202007c8..d07652933 100644 --- a/src/pocketmine/level/format/io/region/RegionGarbageMap.php +++ b/src/pocketmine/level/format/io/region/RegionGarbageMap.php @@ -69,11 +69,14 @@ final class RegionGarbageMap{ /** @var RegionLocationTableEntry|null $prevEntry */ $prevEntry = null; foreach($usedMap as $firstSector => $entry){ - $expectedStart = ($prevEntry !== null ? $prevEntry->getLastSector() + 1 : RegionLoader::FIRST_SECTOR); - $actualStart = $entry->getFirstSector(); - if($expectedStart < $actualStart){ + $prevEndPlusOne = ($prevEntry !== null ? $prevEntry->getLastSector() + 1 : RegionLoader::FIRST_SECTOR); + $currentStart = $entry->getFirstSector(); + if($prevEndPlusOne < $currentStart){ //found a gap in the table - $garbageMap[$expectedStart] = new RegionLocationTableEntry($expectedStart, $actualStart - $expectedStart, 0); + $garbageMap[$prevEndPlusOne] = new RegionLocationTableEntry($prevEndPlusOne, $currentStart - $prevEndPlusOne, 0); + }elseif($prevEndPlusOne > $currentStart){ + //current entry starts inside the previous. This would be a bug since RegionLoader should prevent this + throw new AssumptionFailedError("Overlapping entries detected"); } $prevEntry = $entry; } From 1322defeada14589f0a21e040423227e93c74347 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 12 Sep 2020 12:32:33 +0000 Subject: [PATCH 08/14] Bump phpunit/phpunit from 9.3.8 to 9.3.9 (#3825) --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 15d35ecb9..91e1a8aa0 100644 --- a/composer.lock +++ b/composer.lock @@ -1139,16 +1139,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.1.7", + "version": "9.1.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2ef92bec3186a827faf7362ff92ae4e8ec2e49d2" + "reference": "f98f8466126d83b55b924a94d2244c53c216b8fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2ef92bec3186a827faf7362ff92ae4e8ec2e49d2", - "reference": "2ef92bec3186a827faf7362ff92ae4e8ec2e49d2", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f98f8466126d83b55b924a94d2244c53c216b8fb", + "reference": "f98f8466126d83b55b924a94d2244c53c216b8fb", "shasum": "" }, "require": { @@ -1208,7 +1208,7 @@ "type": "github" } ], - "time": "2020-09-03T07:09:19+00:00" + "time": "2020-09-07T08:07:10+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1437,16 +1437,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.3.8", + "version": "9.3.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "93d78d8e2a06393a0d0c1ead6fe9984f1af1f88c" + "reference": "60c90ba713075e83bd039db4760226df7ad9a5cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/93d78d8e2a06393a0d0c1ead6fe9984f1af1f88c", - "reference": "93d78d8e2a06393a0d0c1ead6fe9984f1af1f88c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60c90ba713075e83bd039db4760226df7ad9a5cb", + "reference": "60c90ba713075e83bd039db4760226df7ad9a5cb", "shasum": "" }, "require": { @@ -1460,7 +1460,7 @@ "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.1", "phar-io/version": "^3.0.2", - "php": "^7.3 || ^8.0", + "php": ">=7.3", "phpspec/prophecy": "^1.11.1", "phpunit/php-code-coverage": "^9.1.5", "phpunit/php-file-iterator": "^3.0.4", @@ -1532,7 +1532,7 @@ "type": "github" } ], - "time": "2020-08-27T06:30:58+00:00" + "time": "2020-09-11T12:42:34+00:00" }, { "name": "sebastian/cli-parser", From 8ac32824a279a03b740a1c61a947d5afdbd7160a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 17:01:03 +0000 Subject: [PATCH 09/14] Bump phpunit/phpunit from 9.3.9 to 9.3.10 (#3828) --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 91e1a8aa0..18f9196b0 100644 --- a/composer.lock +++ b/composer.lock @@ -1437,16 +1437,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.3.9", + "version": "9.3.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "60c90ba713075e83bd039db4760226df7ad9a5cb" + "reference": "919333f2d046a89f9238f15d09f17a8f0baa5cc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60c90ba713075e83bd039db4760226df7ad9a5cb", - "reference": "60c90ba713075e83bd039db4760226df7ad9a5cb", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/919333f2d046a89f9238f15d09f17a8f0baa5cc2", + "reference": "919333f2d046a89f9238f15d09f17a8f0baa5cc2", "shasum": "" }, "require": { @@ -1532,7 +1532,7 @@ "type": "github" } ], - "time": "2020-09-11T12:42:34+00:00" + "time": "2020-09-12T09:34:39+00:00" }, { "name": "sebastian/cli-parser", From e9fa07b550d130f600766642b33f8d23412a8a1b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 09:57:58 +0000 Subject: [PATCH 10/14] Bump phpunit/phpunit from 9.3.10 to 9.3.11 (#3835) --- composer.lock | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/composer.lock b/composer.lock index 18f9196b0..a10ccb068 100644 --- a/composer.lock +++ b/composer.lock @@ -612,16 +612,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.9.1", + "version": "v4.10.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28" + "reference": "1b479e7592812411c20c34d9ed33db3957bde66e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/88e519766fc58bd46b8265561fb79b54e2e00b28", - "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1b479e7592812411c20c34d9ed33db3957bde66e", + "reference": "1b479e7592812411c20c34d9ed33db3957bde66e", "shasum": "" }, "require": { @@ -660,7 +660,7 @@ "parser", "php" ], - "time": "2020-08-30T16:15:20+00:00" + "time": "2020-09-23T18:23:49+00:00" }, { "name": "phar-io/manifest", @@ -816,16 +816,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.1", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44" + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44", - "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", "shasum": "" }, "require": { @@ -864,20 +864,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-08-15T11:14:08+00:00" + "time": "2020-09-03T19:13:55+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651" + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", "shasum": "" }, "require": { @@ -909,7 +909,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2020-06-27T10:12:23+00:00" + "time": "2020-09-17T18:55:26+00:00" }, { "name": "phpspec/prophecy", @@ -1139,16 +1139,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.1.8", + "version": "9.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "f98f8466126d83b55b924a94d2244c53c216b8fb" + "reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f98f8466126d83b55b924a94d2244c53c216b8fb", - "reference": "f98f8466126d83b55b924a94d2244c53c216b8fb", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c9394cb9d07ecfa9351b96f2e296bad473195f4d", + "reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d", "shasum": "" }, "require": { @@ -1156,7 +1156,7 @@ "ext-libxml": "*", "ext-xmlwriter": "*", "nikic/php-parser": "^4.8", - "php": "^7.3 || ^8.0", + "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", "sebastian/code-unit-reverse-lookup": "^2.0.2", @@ -1208,7 +1208,7 @@ "type": "github" } ], - "time": "2020-09-07T08:07:10+00:00" + "time": "2020-09-19T05:29:17+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1437,16 +1437,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.3.10", + "version": "9.3.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "919333f2d046a89f9238f15d09f17a8f0baa5cc2" + "reference": "f7316ea106df7c9507f4fdaa88c47bc10a3b27a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/919333f2d046a89f9238f15d09f17a8f0baa5cc2", - "reference": "919333f2d046a89f9238f15d09f17a8f0baa5cc2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f7316ea106df7c9507f4fdaa88c47bc10a3b27a1", + "reference": "f7316ea106df7c9507f4fdaa88c47bc10a3b27a1", "shasum": "" }, "require": { @@ -1462,7 +1462,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.11.1", - "phpunit/php-code-coverage": "^9.1.5", + "phpunit/php-code-coverage": "^9.1.11", "phpunit/php-file-iterator": "^3.0.4", "phpunit/php-invoker": "^3.1", "phpunit/php-text-template": "^2.0.2", @@ -1532,7 +1532,7 @@ "type": "github" } ], - "time": "2020-09-12T09:34:39+00:00" + "time": "2020-09-24T08:08:49+00:00" }, { "name": "sebastian/cli-parser", From 7e2efae0244c5d8886ac76f02d5bda2171e8b077 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 11:23:32 +0000 Subject: [PATCH 11/14] Bump phpstan/phpstan from 0.12.42 to 0.12.43 (#3831) --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 2d37dc5fe..ac1d92ad0 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ocramius/package-versions": "^1.5" }, "require-dev": { - "phpstan/phpstan": "0.12.42", + "phpstan/phpstan": "0.12.43", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index a10ccb068..4f1fc9eda 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0acbc64f870a4758034898ef4f8a824d", + "content-hash": "22ea95c26192b5f61e1cfc2cb63fc462", "packages": [ { "name": "adhocore/json-comment", @@ -976,16 +976,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.42", + "version": "0.12.43", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "7c43b7c2d5ca6554f6231e82e342a710163ac5f4" + "reference": "54221b44766cb4bdfe40d1828d5bba5dd79c38c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7c43b7c2d5ca6554f6231e82e342a710163ac5f4", - "reference": "7c43b7c2d5ca6554f6231e82e342a710163ac5f4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/54221b44766cb4bdfe40d1828d5bba5dd79c38c6", + "reference": "54221b44766cb4bdfe40d1828d5bba5dd79c38c6", "shasum": "" }, "require": { @@ -1028,7 +1028,7 @@ "type": "tidelift" } ], - "time": "2020-09-02T13:14:53+00:00" + "time": "2020-09-19T21:19:38+00:00" }, { "name": "phpstan/phpstan-phpunit", From 0fc9170bbf8eee2484fdcb91f399a807fb8a985b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2020 13:20:29 +0000 Subject: [PATCH 12/14] Bump phpstan/phpstan from 0.12.43 to 0.12.44 (#3838) --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index ac1d92ad0..f0606fe05 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ocramius/package-versions": "^1.5" }, "require-dev": { - "phpstan/phpstan": "0.12.43", + "phpstan/phpstan": "0.12.44", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index 4f1fc9eda..16758bca6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "22ea95c26192b5f61e1cfc2cb63fc462", + "content-hash": "02113ed8ae4d8e008b919292fac5f6c4", "packages": [ { "name": "adhocore/json-comment", @@ -976,16 +976,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.43", + "version": "0.12.44", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "54221b44766cb4bdfe40d1828d5bba5dd79c38c6" + "reference": "330b45776ea77f167b150e24787412414a8fa469" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/54221b44766cb4bdfe40d1828d5bba5dd79c38c6", - "reference": "54221b44766cb4bdfe40d1828d5bba5dd79c38c6", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/330b45776ea77f167b150e24787412414a8fa469", + "reference": "330b45776ea77f167b150e24787412414a8fa469", "shasum": "" }, "require": { @@ -1028,7 +1028,7 @@ "type": "tidelift" } ], - "time": "2020-09-19T21:19:38+00:00" + "time": "2020-09-24T15:28:47+00:00" }, { "name": "phpstan/phpstan-phpunit", From 28255e35d1f5558341ab36aca15e3bea06a6c583 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 26 Sep 2020 13:18:38 +0100 Subject: [PATCH 13/14] Updated composer dependencies --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 16758bca6..756ef3cf5 100644 --- a/composer.lock +++ b/composer.lock @@ -612,16 +612,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.1", + "version": "v4.10.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1b479e7592812411c20c34d9ed33db3957bde66e" + "reference": "658f1be311a230e0907f5dfe0213742aff0596de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1b479e7592812411c20c34d9ed33db3957bde66e", - "reference": "1b479e7592812411c20c34d9ed33db3957bde66e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", + "reference": "658f1be311a230e0907f5dfe0213742aff0596de", "shasum": "" }, "require": { @@ -660,7 +660,7 @@ "parser", "php" ], - "time": "2020-09-23T18:23:49+00:00" + "time": "2020-09-26T10:30:38+00:00" }, { "name": "phar-io/manifest", From ed0053d0ee95e0b2787d1d7d8884adc295f52839 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 26 Sep 2020 13:20:45 +0100 Subject: [PATCH 14/14] Updated build/php submodule to pmmp/php-build-scripts@732ceba8470333c91d2584b21bbf939fa288713d --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index 3a3e3495c..732ceba84 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit 3a3e3495c3632c8bace9fa7e9f45c3b628d6fc18 +Subproject commit 732ceba8470333c91d2584b21bbf939fa288713d