Composer update with phpstan fix

2025-10-26 07:56:07 +01:00 · 2021-02-09 21:56:08 +02:00
parent b534fbb364
commit 6ed28c5fb8
3 changed files with 37 additions and 37 deletions
--- a/composer.lock
+++ b/composer.lock
@@ -3343,25 +3343,26 @@
    "packages-dev": [
        {
            "name": "behat/gherkin",
-            "version": "v4.7.1",
+            "version": "v4.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd"
+                "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
-                "reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd",
+                "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.6"
+                "php": "~7.2|~8.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~5.7|~6|~7",
-                "symfony/phpunit-bridge": "~2.7|~3|~4",
-                "symfony/yaml": "~2.3|~3|~4"
+                "cucumber/cucumber": "dev-gherkin-16.0.0",
+                "phpunit/phpunit": "~8|~9",
+                "symfony/phpunit-bridge": "~3|~4|~5",
+                "symfony/yaml": "~3|~4|~5"
            },
            "suggest": {
                "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -3400,9 +3401,9 @@
            ],
            "support": {
                "issues": "https://github.com/Behat/Gherkin/issues",
-                "source": "https://github.com/Behat/Gherkin/tree/v4.7.1"
+                "source": "https://github.com/Behat/Gherkin/tree/v4.8.0"
            },
-            "time": "2021-01-26T16:24:32+00:00"
+            "time": "2021-02-04T12:44:21+00:00"
        },
        {
            "name": "codeception/codeception",
@@ -4491,16 +4492,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "0.12.70",
+            "version": "0.12.74",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "07f0ef37f5f876e8cee44cc8ea0ec3fe80d499ee"
+                "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/07f0ef37f5f876e8cee44cc8ea0ec3fe80d499ee",
-                "reference": "07f0ef37f5f876e8cee44cc8ea0ec3fe80d499ee",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2",
+                "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2",
                "shasum": ""
            },
            "require": {
@@ -4531,7 +4532,7 @@
            "description": "PHPStan - PHP Static Analysis Tool",
            "support": {
                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.70"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.74"
            },
            "funding": [
                {
@@ -4547,7 +4548,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-27T17:06:47+00:00"
+            "time": "2021-02-08T15:00:25+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
@@ -4920,16 +4921,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.5.1",
+            "version": "9.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360"
+                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7bdf4085de85a825f4424eae52c99a1cec2f360",
-                "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f661659747f2f87f9e72095bb207bceb0f151cb4",
+                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4",
                "shasum": ""
            },
            "require": {
@@ -5007,7 +5008,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.2"
            },
            "funding": [
                {
@@ -5019,7 +5020,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-01-17T07:42:25+00:00"
+            "time": "2021-02-02T14:45:58+00:00"
        },
        {
            "name": "psr/http-client",
@@ -6039,7 +6040,7 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v5.2.2",
+            "version": "v5.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/browser-kit.git",
@@ -6090,7 +6091,7 @@
            "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v5.2.2"
+                "source": "https://github.com/symfony/browser-kit/tree/v5.2.3"
            },
            "funding": [
                {
@@ -6110,7 +6111,7 @@
        },
        {
            "name": "symfony/css-selector",
-            "version": "v5.2.2",
+            "version": "v5.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
@@ -6155,7 +6156,7 @@
            "description": "Converts CSS selectors to XPath expressions",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.2.2"
+                "source": "https://github.com/symfony/css-selector/tree/v5.2.3"
            },
            "funding": [
                {
@@ -6175,7 +6176,7 @@
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v5.2.2",
+            "version": "v5.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dom-crawler.git",
@@ -6229,7 +6230,7 @@
            "description": "Eases DOM navigation for HTML and XML documents",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v5.2.2"
+                "source": "https://github.com/symfony/dom-crawler/tree/v5.2.3"
            },
            "funding": [
                {
@@ -6249,16 +6250,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v5.2.2",
+            "version": "v5.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "196f45723b5e618bf0e23b97e96d11652696ea9e"
+                "reference": "4adc8d172d602008c204c2e16956f99257248e03"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/196f45723b5e618bf0e23b97e96d11652696ea9e",
-                "reference": "196f45723b5e618bf0e23b97e96d11652696ea9e",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03",
+                "reference": "4adc8d172d602008c204c2e16956f99257248e03",
                "shasum": ""
            },
            "require": {
@@ -6290,7 +6291,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.2.2"
+                "source": "https://github.com/symfony/finder/tree/v5.2.3"
            },
            "funding": [
                {
@@ -6306,7 +6307,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-27T10:01:46+00:00"
+            "time": "2021-01-28T22:06:19+00:00"
        },
        {
            "name": "theseer/tokenizer",
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -242,7 +242,7 @@ class Assets extends PropertyObject
           $this->order[$orderKey] = 0;
        }

-        $options['order'] = ++$this->order[$orderKey];
+        $options['order'] = $this->order[$orderKey]++;

        // Create asset of correct type
        $asset_object = new $type();
--- a/system/src/Grav/Console/Gpm/IndexCommand.php
+++ b/system/src/Grav/Console/Gpm/IndexCommand.php
@@ -219,6 +219,7 @@ class IndexCommand extends GpmCommand
        $method = 'is' . $type . 'Installed';
        $installed = $this->gpm->{$method}($package->slug);

+        $result = '';
        if ($installed) {
            $method = 'is' . $type . 'Enabled';
            $enabled = $this->gpm->{$method}($package->slug);
@@ -227,8 +228,6 @@ class IndexCommand extends GpmCommand
            } elseif ($enabled === false) {
                $result = '<red>disabled</red>';
            }
-        } else {
-            $result = '';
        }

        return $result;