Fix some PHPStan errors/..
parent
59603a357a
commit
095c36ecf8
|
@ -58,7 +58,7 @@ jobs:
|
||||||
- php-version: "8.2"
|
- php-version: "8.2"
|
||||||
dependencies: highest-ignore
|
dependencies: highest-ignore
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
experimental: false
|
experimental: true
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout"
|
- name: "Checkout"
|
||||||
|
|
|
@ -23,6 +23,7 @@ jobs:
|
||||||
php-version:
|
php-version:
|
||||||
- "7.2"
|
- "7.2"
|
||||||
- "8.1"
|
- "8.1"
|
||||||
|
fail-fast: false
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout"
|
- name: "Checkout"
|
||||||
|
|
|
@ -174,10 +174,10 @@ class Compiler
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($extraFiles) {
|
if ($extraFiles) {
|
||||||
throw new \RuntimeException('These files were expected but not added to the phar, they might be excluded or gone from the source package:'.PHP_EOL.implode(PHP_EOL, $extraFiles));
|
throw new \RuntimeException('These files were expected but not added to the phar, they might be excluded or gone from the source package:'.PHP_EOL.var_export($extraFiles, true));
|
||||||
}
|
}
|
||||||
if ($unexpectedFiles) {
|
if ($unexpectedFiles) {
|
||||||
throw new \RuntimeException('These files were unexpectedly added to the phar, make sure they are excluded or listed in $extraFiles:'.PHP_EOL.implode(PHP_EOL, $unexpectedFiles));
|
throw new \RuntimeException('These files were unexpectedly added to the phar, make sure they are excluded or listed in $extraFiles:'.PHP_EOL.var_export($unexpectedFiles, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add bin/composer
|
// Add bin/composer
|
||||||
|
|
|
@ -223,7 +223,7 @@ class InstallationManager
|
||||||
};
|
};
|
||||||
|
|
||||||
$handleInterruptsUnix = function_exists('pcntl_async_signals') && function_exists('pcntl_signal');
|
$handleInterruptsUnix = function_exists('pcntl_async_signals') && function_exists('pcntl_signal');
|
||||||
$handleInterruptsWindows = function_exists('sapi_windows_set_ctrl_handler') && PHP_SAPI === 'cli';
|
$handleInterruptsWindows = PHP_VERSION_ID >= 70400 && function_exists('sapi_windows_set_ctrl_handler') && PHP_SAPI === 'cli';
|
||||||
$prevHandler = null;
|
$prevHandler = null;
|
||||||
$windowsHandler = null;
|
$windowsHandler = null;
|
||||||
if ($handleInterruptsUnix) {
|
if ($handleInterruptsUnix) {
|
||||||
|
|
|
@ -114,7 +114,7 @@ class ZipDownloaderTest extends TestCase
|
||||||
|
|
||||||
$this->setPrivateProperty('hasZipArchive', true);
|
$this->setPrivateProperty('hasZipArchive', true);
|
||||||
$downloader = new MockedZipDownloader($this->io, $this->config, $this->httpDownloader);
|
$downloader = new MockedZipDownloader($this->io, $this->config, $this->httpDownloader);
|
||||||
$zipArchive = $this->getMockBuilder('ZipArchive')->onlyMethods(['open', 'extractTo'])->getMock();
|
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
||||||
$zipArchive->expects($this->once())
|
$zipArchive->expects($this->once())
|
||||||
->method('open')
|
->method('open')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
|
@ -137,10 +137,10 @@ class ZipDownloaderTest extends TestCase
|
||||||
$this->setPrivateProperty('hasZipArchive', true);
|
$this->setPrivateProperty('hasZipArchive', true);
|
||||||
$downloader = new MockedZipDownloader($this->io, $this->config, $this->httpDownloader);
|
$downloader = new MockedZipDownloader($this->io, $this->config, $this->httpDownloader);
|
||||||
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
||||||
$zipArchive->expects($this->at(0))
|
$zipArchive->expects($this->once())
|
||||||
->method('open')
|
->method('open')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
$zipArchive->expects($this->at(1))
|
$zipArchive->expects($this->once())
|
||||||
->method('extractTo')
|
->method('extractTo')
|
||||||
->will($this->throwException(new \ErrorException('Not a directory')));
|
->will($this->throwException(new \ErrorException('Not a directory')));
|
||||||
|
|
||||||
|
@ -158,10 +158,10 @@ class ZipDownloaderTest extends TestCase
|
||||||
$this->setPrivateProperty('hasZipArchive', true);
|
$this->setPrivateProperty('hasZipArchive', true);
|
||||||
$downloader = new MockedZipDownloader($this->io, $this->config, $this->httpDownloader);
|
$downloader = new MockedZipDownloader($this->io, $this->config, $this->httpDownloader);
|
||||||
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
||||||
$zipArchive->expects($this->at(0))
|
$zipArchive->expects($this->once())
|
||||||
->method('open')
|
->method('open')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
$zipArchive->expects($this->at(1))
|
$zipArchive->expects($this->once())
|
||||||
->method('extractTo')
|
->method('extractTo')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
|
|
||||||
|
@ -189,7 +189,7 @@ class ZipDownloaderTest extends TestCase
|
||||||
->will($this->returnValue('output'));
|
->will($this->returnValue('output'));
|
||||||
|
|
||||||
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
||||||
$processExecutor->expects($this->at(0))
|
$processExecutor->expects($this->once())
|
||||||
->method('executeAsync')
|
->method('executeAsync')
|
||||||
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ class ZipDownloaderTest extends TestCase
|
||||||
->will($this->returnValue('output'));
|
->will($this->returnValue('output'));
|
||||||
|
|
||||||
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
||||||
$processExecutor->expects($this->at(0))
|
$processExecutor->expects($this->once())
|
||||||
->method('executeAsync')
|
->method('executeAsync')
|
||||||
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
||||||
|
|
||||||
|
@ -246,15 +246,15 @@ class ZipDownloaderTest extends TestCase
|
||||||
->will($this->returnValue('output'));
|
->will($this->returnValue('output'));
|
||||||
|
|
||||||
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
||||||
$processExecutor->expects($this->at(0))
|
$processExecutor->expects($this->once())
|
||||||
->method('executeAsync')
|
->method('executeAsync')
|
||||||
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
||||||
|
|
||||||
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
||||||
$zipArchive->expects($this->at(0))
|
$zipArchive->expects($this->once())
|
||||||
->method('open')
|
->method('open')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
$zipArchive->expects($this->at(1))
|
$zipArchive->expects($this->once())
|
||||||
->method('extractTo')
|
->method('extractTo')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
|
|
||||||
|
@ -286,15 +286,15 @@ class ZipDownloaderTest extends TestCase
|
||||||
->will($this->returnValue('output'));
|
->will($this->returnValue('output'));
|
||||||
|
|
||||||
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
$processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();
|
||||||
$processExecutor->expects($this->at(0))
|
$processExecutor->expects($this->once())
|
||||||
->method('executeAsync')
|
->method('executeAsync')
|
||||||
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
->will($this->returnValue(\React\Promise\resolve($procMock)));
|
||||||
|
|
||||||
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
$zipArchive = $this->getMockBuilder('ZipArchive')->getMock();
|
||||||
$zipArchive->expects($this->at(0))
|
$zipArchive->expects($this->once())
|
||||||
->method('open')
|
->method('open')
|
||||||
->will($this->returnValue(true));
|
->will($this->returnValue(true));
|
||||||
$zipArchive->expects($this->at(1))
|
$zipArchive->expects($this->once())
|
||||||
->method('extractTo')
|
->method('extractTo')
|
||||||
->will($this->returnValue(false));
|
->will($this->returnValue(false));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue