diff --git a/composer.json b/composer.json index 6856e34..41e3924 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.4.99" + "php": "8.0.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -33,20 +33,20 @@ } }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "enlightn/security-checker": "^1.10" }, "require-dev": { - "doctrine/migrations": "^2.0 || ^3.0", + "doctrine/migrations": "^2.0 || ^3.5.2", "guzzlehttp/guzzle": "^7.5.0", "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-loader": "^2.0", + "laminas/laminas-loader": "^2.9", "mikey179/vfsstream": "^1.6.11", - "php-amqplib/php-amqplib": "^2.0 || ^3.0", + "php-amqplib/php-amqplib": "^2.0 || ^3.4", "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", + "psalm/plugin-phpunit": "^0.18.3", "predis/predis": "^2.0.3", - "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0.14", "vimeo/psalm": "^4.29.0" }, "conflict": { diff --git a/composer.lock b/composer.lock index 9c46ec5..af08549 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0b79e0e60b53a7b235491a70a430e0d7", + "content-hash": "dfa22555d5015ce39e5cdabb464a05f1", "packages": [ { "name": "enlightn/security-checker", @@ -3078,27 +3078,27 @@ }, { "name": "laminas/laminas-loader", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-loader.git", - "reference": "d0589ec9dd48365fd95ad10d1c906efd7711c16b" + "reference": "51ed9c3fa42d1098a9997571730c0cbf42d078d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/d0589ec9dd48365fd95ad10d1c906efd7711c16b", - "reference": "d0589ec9dd48365fd95ad10d1c906efd7711c16b", + "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/51ed9c3fa42d1098a9997571730c0cbf42d078d3", + "reference": "51ed9c3fa42d1098a9997571730c0cbf42d078d3", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "conflict": { "zendframework/zend-loader": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", - "phpunit/phpunit": "^9.3" + "laminas/laminas-coding-standard": "~2.4.0", + "phpunit/phpunit": "~9.5.25" }, "type": "library", "autoload": { @@ -3130,7 +3130,7 @@ "type": "community_bridge" } ], - "time": "2021-09-02T18:30:53+00:00" + "time": "2022-10-16T12:50:49+00:00" }, { "name": "mikey179/vfsstream", @@ -6216,11 +6216,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "platform-dev": [], "platform-overrides": { - "php": "7.4.99" + "php": "8.0.99" }, "plugin-api-version": "2.3.0" } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4c9790d..9693552 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -159,9 +159,6 @@ - - string - $a $a @@ -183,14 +180,11 @@ null null - - bcdiv(bcpow(bcadd($a, $b), 2), bcmul(4, $t), $precision) - $b $b $b - $x + bcsqrt(2) CpuPerformance @@ -200,9 +194,6 @@ - - $this->dir - $path @@ -223,14 +214,14 @@ current($nonDirs) current($unreadable) + + $this->dir + DirReadable - - $this->dir - $path @@ -249,6 +240,9 @@ $nonDirs[] $unwritable[] + + $this->dir + DirWritable @@ -264,13 +258,10 @@ $free - + $a $a $k - $this->path - $this->path - $this->path @@ -281,9 +272,8 @@ int - + $bytes - $this->path $x[$i] @@ -302,12 +292,6 @@ ! is_float($free) $free === false || ! is_float($free) - - $this->path - - - $this->path - @@ -341,9 +325,6 @@ - - $this->extensions - $extensionName @@ -371,6 +352,9 @@ $ext $ext + + $this->extensions + ExtensionLoaded diff --git a/src/Check/DiskFree.php b/src/Check/DiskFree.php index 97acb05..2de36d6 100644 --- a/src/Check/DiskFree.php +++ b/src/Check/DiskFree.php @@ -126,6 +126,15 @@ class DiskFree extends AbstractCheck implements CheckInterface 3 => 1073741824, // 2^30 == 1024^3 ]; + /** + * The disk path to check. + * + * @internal + * + * @var string + */ + public $path; + /** * @param int|string $size Minimum disk size in bytes or a valid byte string (IEC, SI or Jedec). * @param string $path The disk path to check, i.e. '/tmp' or 'C:' (defaults to /)