public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Update phpstan to latest

pull/10809/head
Jordi Boggiano 2022-05-25 22:02:22 +02:00
parent 202ef9031c
commit 5b067a1b29
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -1825,16 +1825,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.6.8", "version": "1.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "d76498c5531232cb8386ceb6004f7e013138d3ba" "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d76498c5531232cb8386ceb6004f7e013138d3ba", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
"reference": "d76498c5531232cb8386ceb6004f7e013138d3ba", "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1860,7 +1860,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.6.8" "source": "https://github.com/phpstan/phpstan/tree/1.7.1"
}, },
"funding": [ "funding": [
{ {
@ -1880,7 +1880,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-10T06:54:21+00:00" "time": "2022-05-24T09:05:09+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

3
src/Composer/Console/Application.php
View File

@ -135,7 +135,8 @@ class Application extends BaseApplication
$this->disablePluginsByDefault = $input->hasParameterOption('--no-plugins'); $this->disablePluginsByDefault = $input->hasParameterOption('--no-plugins');
$this->disableScriptsByDefault = $input->hasParameterOption('--no-scripts'); $this->disableScriptsByDefault = $input->hasParameterOption('--no-scripts');
if (Platform::getEnv('COMPOSER_NO_INTERACTION') || !Platform::isTty(defined('STDIN') ? STDIN : fopen('php://stdin', 'r'))) { $stdin = defined('STDIN') ? STDIN : fopen('php://stdin', 'r');
if (Platform::getEnv('COMPOSER_NO_INTERACTION') || $stdin === false || !Platform::isTty($stdin)) {
$input->setInteractive(false); $input->setInteractive(false);
} }

4
src/Composer/DependencyResolver/RuleSetIterator.php
View File

@ -75,7 +75,7 @@ class RuleSetIterator implements \Iterator
} }
$this->currentType = $this->types[$this->currentTypeOffset]; $this->currentType = $this->types[$this->currentTypeOffset];
} while (isset($this->types[$this->currentTypeOffset]) && !\count($this->rules[$this->currentType])); } while (0 === \count($this->rules[$this->currentType]));
} }
} }
@ -95,7 +95,7 @@ class RuleSetIterator implements \Iterator
} }
$this->currentType = $this->types[$this->currentTypeOffset]; $this->currentType = $this->types[$this->currentTypeOffset];
} while (isset($this->types[$this->currentTypeOffset]) && !\count($this->rules[$this->currentType])); } while (0 === \count($this->rules[$this->currentType]));
} }
public function valid(): bool public function valid(): bool

1
src/Composer/Package/BasePackage.php
View File

@ -53,7 +53,6 @@ abstract class BasePackage implements PackageInterface
* READ-ONLY: The package id, public for fast access in dependency solver * READ-ONLY: The package id, public for fast access in dependency solver
* @var int * @var int
* @internal * @internal
* @readonly
*/ */
public $id; public $id;
/** @var string */ /** @var string */

3
src/Composer/Util/Platform.php
View File

@ -201,6 +201,9 @@ class Platform
{ {
if ($fd === null) { if ($fd === null) {
$fd = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w'); $fd = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w');
if ($fd === false) {
return false;
}
} }
// detect msysgit/mingw and assume this is a tty because detection // detect msysgit/mingw and assume this is a tty because detection