mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-06 11:57:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'da9731e'

Browse Source 
# Conflicts:
#	phpstan.neon.dist
#	resources/vanilla
#	src/PocketMine.php
This commit is contained in:
Dylan K. Taylor 2020-04-25 12:20:23 +01:00
commit bb8ef3ff6d
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpstan.neon.dist
View File

@ -140,19 +140,3 @@ parameters:
count: 2 count: 2
path: src/world/format/io/FormatConverter.php path: src/world/format/io/FormatConverter.php
-
message: "#^Constant pocketmine\\\\COMPOSER_AUTOLOADER_PATH not found\\.$#"
path: src
-
message: "#^Constant pocketmine\\\\GIT_COMMIT not found\\.$#"
path: src
-
message: "#^Constant pocketmine\\\\PLUGIN_PATH not found\\.$#"
path: src
-
message: "#^Constant pocketmine\\\\VERSION not found\\.$#"
path: src

13
src/PocketMine.php
View File

@ -182,18 +182,17 @@ namespace pocketmine {
}else{ }else{
$bootstrap = dirname(__FILE__, 2) . '/vendor/autoload.php'; $bootstrap = dirname(__FILE__, 2) . '/vendor/autoload.php';
} }
define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){ if($bootstrap === false or !is_file($bootstrap)){
require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
if(extension_loaded('parallel')){
\parallel\bootstrap(\pocketmine\COMPOSER_AUTOLOADER_PATH);
}
}else{
critical_error("Composer autoloader not found at " . $bootstrap); critical_error("Composer autoloader not found at " . $bootstrap);
critical_error("Please install/update Composer dependencies or use provided builds."); critical_error("Please install/update Composer dependencies or use provided builds.");
exit(1); exit(1);
} }
define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
if(extension_loaded('parallel')){
\parallel\bootstrap(\pocketmine\COMPOSER_AUTOLOADER_PATH);
}
\ErrorUtils::setErrorExceptionHandler(); \ErrorUtils::setErrorExceptionHandler();

10
tests/phpstan/bootstrap.php
View File

@ -21,4 +21,12 @@
declare(strict_types=1); declare(strict_types=1);
define('pocketmine\_PHPSTAN_ANALYSIS', true); define('pocketmine\_PHPSTAN_ANALYSIS', true);
//TODO: these need to be defined properly or removed
define('pocketmine\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__, 2) . '/vendor/autoload.php');
define('pocketmine\DATA', '');
define('pocketmine\GIT_COMMIT', str_repeat('00', 20));
define('pocketmine\PLUGIN_PATH', '');
define('pocketmine\START_TIME', microtime(true));
define('pocketmine\VERSION', '9.9.9');