1
0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-30 06:39:01 +01:00

Closure::fromCallable implemented in phabel

This commit is contained in:
Daniil Gentili 2021-04-06 16:50:56 +02:00
parent 2bf175e2bb
commit 4536586001
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
3 changed files with 6 additions and 7 deletions

View File

@ -6,6 +6,5 @@ rm -rf vendor/danog/madelineproto/docs
#php $(dirname $0)/prepare-5.php #php $(dirname $0)/prepare-5.php
#sed -i 's/handleConnectionWindowIncrement[(]\$windowSize[)]/handleConnectionWindowIncrement(int $windowSize)/g' vendor/amphp/http-client/src/Connection/Internal/Http2ConnectionProcessor.php #sed -i 's/handleConnectionWindowIncrement[(]\$windowSize[)]/handleConnectionWindowIncrement(int $windowSize)/g' vendor/amphp/http-client/src/Connection/Internal/Http2ConnectionProcessor.php
for f in $(grep -lr Closure::fromCallable vendor/);do
grep -qi CallableMaker $f || sed -ri 's/^\{/{ use \\MyCallableMaker;/g;s/\\Closure::fromCallable[(]\[(.+), (.+)\][)]/\1->callableFromInstanceMethod(\2)/g' $f #sed -ri 's/^\{/{ use \\MyCallableMaker;/g;s/\\Closure::fromCallable[(]\[(.+), (.+)\][)]/\1->callableFromInstanceMethod(\2)/g;s/Closure::fromCallable[(]\[(.+), (.+)\][)]/\1->callableFromInstanceMethod(\2)/g' $l
done

View File

@ -153,19 +153,19 @@ n
EOF EOF
} }
rm madeline.phar rm -f madeline.phar
echo "Testing with previous version..." echo "Testing with previous version..."
export ACTIONS_FORCE_PREVIOUS=1 export ACTIONS_FORCE_PREVIOUS=1
cp tests/testing.php tests/testingBackup.php cp tests/testing.php tests/testingBackup.php
runTest runTest
pkill -f 'MadelineProto worker .*' pkill -f 'MadelineProto worker .*' || echo
echo "Testing with new version (upgrade)..." echo "Testing with new version (upgrade)..."
php tools/makephar.php $HOME/phar5 "madeline$php$branch.phar" $GITHUB_SHA php tools/makephar.php $HOME/phar5 "madeline$php$branch.phar" $GITHUB_SHA
export ACTIONS_PHAR="madeline$php$branch.phar" export ACTIONS_PHAR="madeline$php$branch.phar"
runTestSimple runTestSimple
pkill -f 'MadelineProto worker .*' pkill -f 'MadelineProto worker .*' || echo
echo "Testing with new version (restart)" echo "Testing with new version (restart)"
cp tests/testingBackup.php tests/testing.php cp tests/testingBackup.php tests/testing.php

View File

@ -34,7 +34,7 @@ if ($loader) {
if (\in_array($class, ['Amp\\Sync\\Internal\\MutexStorage', 'Amp\\Sync\\Internal\\SemaphoreStorage', 'Amp\\Parallel\\Sync\\Internal\\ParcelStorage', 'Amp\\Parallel\\Context\\Internal\\Thread', 'Monolog\\Test\\TestCase', 'Phabel\\Composer\\Plugin'])) { if (\in_array($class, ['Amp\\Sync\\Internal\\MutexStorage', 'Amp\\Sync\\Internal\\SemaphoreStorage', 'Amp\\Parallel\\Sync\\Internal\\ParcelStorage', 'Amp\\Parallel\\Context\\Internal\\Thread', 'Monolog\\Test\\TestCase', 'Phabel\\Composer\\Plugin'])) {
continue; continue;
} }
if (str_ends_with($class, 'Test')) { if (str_ends_with($class, 'Test') || class_exists($class) || interface_exists($class)) {
continue; continue;
} }
//echo "Requiring $class => $file\n"; //echo "Requiring $class => $file\n";