From 36495bffe944538839b2aeb446c87ff086b4c32e Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Wed, 5 Feb 2020 23:11:29 +0100
Subject: [PATCH] Improve composer reporter

---
 .../MadelineProto/MTProtoSession/CallHandler.php    |  1 -
 tests/danog/MadelineProto/DataCenterTest.php        |  2 +-
 tools/phar.php                                      | 13 +++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/danog/MadelineProto/MTProtoSession/CallHandler.php b/src/danog/MadelineProto/MTProtoSession/CallHandler.php
index 9fbdfd07..8876539a 100644
--- a/src/danog/MadelineProto/MTProtoSession/CallHandler.php
+++ b/src/danog/MadelineProto/MTProtoSession/CallHandler.php
@@ -24,7 +24,6 @@ use Amp\Promise;
 use danog\MadelineProto\Async\AsyncParameters;
 use danog\MadelineProto\TL\Exception;
 use danog\MadelineProto\Tools;
-use function Amp\Promise\all;
 
 /**
  * Manages method and object calls.
diff --git a/tests/danog/MadelineProto/DataCenterTest.php b/tests/danog/MadelineProto/DataCenterTest.php
index 84faf70f..a6f63686 100644
--- a/tests/danog/MadelineProto/DataCenterTest.php
+++ b/tests/danog/MadelineProto/DataCenterTest.php
@@ -74,7 +74,7 @@ final class DataCenterTest extends TestCase
 
         $API->getLogger()->logger("Testing protocol $protocol using transport $transport, ".($obfuscated ? 'obfuscated ' : 'not obfuscated ').($test_mode ? 'test DC ' : 'main DC ').($ipv6 ? 'IPv6' : 'IPv4'));
 
-        sleep(1);
+        \sleep(1);
         try {
             Tools::wait($datacenter->dcConnect(2));
         } finally {
diff --git a/tools/phar.php b/tools/phar.php
index 15970ee5..8bb1c72a 100644
--- a/tools/phar.php
+++ b/tools/phar.php
@@ -82,18 +82,23 @@ function ___install_madeline()
         $phar = \file_get_contents(\sprintf($phar_template, $release_branch));
 
         if ($phar) {
-            $extractVersions = static function () {
-                if (!\file_exists('phar://madeline.phar/vendor/composer/installed.json')) {
+            $extractVersions = static function ($ext = '') {
+                if (!\file_exists("phar://madeline.phar$ext/vendor/composer/installed.json")) {
                     return [];
                 }
-                $composer = \json_decode(\file_get_contents('phar://madeline.phar/vendor/composer/installed.json'), true);
+                $composer = \json_decode(\file_get_contents("phar://madeline.phar$ext/vendor/composer/installed.json"), true) ?: [];
                 $packages = [];
                 foreach ($composer as $dep) {
                     $packages[$dep['name']] = $dep['version_normalized'];
                 }
                 return $packages;
             };
-            $previous = $extractVersions();
+            $previous = [];
+            if (\file_exists('madeline.phar')) {
+                \copy('madeline.phar', 'madeline.phar.old');
+                $previous = $extractVersions('.old');
+                \unlink('madeline.phar.old');
+            }
             $previous['danog/madelineproto'] = 'old';
 
             \file_put_contents('madeline.phar', $phar);