diff --git a/docs b/docs index 8a319f464..422f5aa4f 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 8a319f4642fc699965833ac98f270ff92bccc9ee +Subproject commit 422f5aa4f6c2cec63663d5b82f383113b4fab80f diff --git a/schemas b/schemas index 424aaa1ca..86b054b6f 160000 --- a/schemas +++ b/schemas @@ -1 +1 @@ -Subproject commit 424aaa1cad6da9b0266605fc3b6a11e7702cfda3 +Subproject commit 86b054b6f2790f42dfeeb033fa8f2288657ab3d9 diff --git a/tools/makephar.php b/tools/makephar.php index 3a22444b6..a7d3135e0 100755 --- a/tools/makephar.php +++ b/tools/makephar.php @@ -30,12 +30,16 @@ if (PHP_INT_SIZE < 8) { die("A 64-bit build of PHP is required to run MadelineProto, PHP 8.2 is required.".PHP_EOL); } +if (\extension_loaded("psr")) { + die("Please uninstall the psr extension to use MadelineProto!"); +} + if (\defined("MADELINE_PHAR")) { - throw new \Exception("Please do not include madeline.phar twice, use require_once \'madeline.phar\';!"); + die("Please do not include madeline.phar twice, use require_once \'madeline.phar\';!"); } if (!\defined(\'MADELINE_ALLOW_COMPOSER\') && \class_exists(\Composer\Autoload\ClassLoader::class)) { - throw new \Exception(\'Composer autoloader detected: madeline.phar is incompatible with Composer, please install MadelineProto using composer: https://docs.madelineproto.xyz/docs/INSTALLATION.html#composer-from-existing-project\'); + die(\'Composer autoloader detected: madeline.phar is incompatible with Composer, please install MadelineProto using composer: https://docs.madelineproto.xyz/docs/INSTALLATION.html#composer-from-existing-project\'); } \define(\'MADELINE_PHAR\', __FILE__);