From a4bf4b6655603f8a587400ca59fd05e3dd09c187 Mon Sep 17 00:00:00 2001 From: Buster Neece Date: Sun, 10 Mar 2024 08:57:32 -0500 Subject: [PATCH] Switch back to mainline php-scanner, update other PHP deps. Changelogs summary: - phpunit/php-code-coverage updated from 11.0.1 to 11.0.2 patch See changes: https://github.com/sebastianbergmann/php-code-coverage/compare/11.0.1...11.0.2 Release notes: https://github.com/sebastianbergmann/php-code-coverage/releases/tag/11.0.2 - phpunit/phpunit updated from 11.0.4 to 11.0.5 patch See changes: https://github.com/sebastianbergmann/phpunit/compare/11.0.4...11.0.5 Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/11.0.5 - gettext/php-scanner updated from dev-master@8d5aa46 to v2.0.0 major See changes: https://github.com/php-gettext/PHP-Scanner/compare/BusterNeece:8d5aa46...php-gettext:v2.0.0 Release notes: https://github.com/php-gettext/PHP-Scanner/releases/tag/v2.0.0 - league/flysystem updated from 3.24.0 to 3.25.0 minor See changes: https://github.com/thephpleague/flysystem/compare/3.24.0...3.25.0 Release notes: https://github.com/thephpleague/flysystem/releases/tag/3.25.0 - aws/aws-sdk-php updated from 3.300.13 to 3.300.14 patch See changes: https://github.com/aws/aws-sdk-php/compare/3.300.13...3.300.14 Release notes: https://github.com/aws/aws-sdk-php/releases/tag/3.300.14 - league/flysystem-sftp-v3 updated from 3.23.1 to 3.25.0 minor See changes: https://github.com/thephpleague/flysystem-sftp-v3/compare/3.23.1...3.25.0 Release notes: https://github.com/thephpleague/flysystem-sftp-v3/releases/tag/3.25.0 - roave/security-advisories updated from dev-latest@b011d99 to dev-latest@bb15a6d See changes: https://github.com/Roave/SecurityAdvisories/compare/b011d99...bb15a6d - slevomat/coding-standard updated from 8.14.1 to 8.15.0 minor See changes: https://github.com/slevomat/coding-standard/compare/8.14.1...8.15.0 Release notes: https://github.com/slevomat/coding-standard/releases/tag/8.15.0 No security vulnerability advisories found. --- composer.json | 8 +-- composer.lock | 134 ++++++++++++++++++++++---------------------------- 2 files changed, 60 insertions(+), 82 deletions(-) diff --git a/composer.json b/composer.json index 38ca99d03..00fd7ef6b 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "doctrine/orm": "^3", "dragonmantank/cron-expression": "^3.1", "gettext/gettext": "^5", - "gettext/php-scanner": "dev-master", + "gettext/php-scanner": "^2", "gettext/translator": "^1.1", "guzzlehttp/guzzle": "^7.0", "intervention/image": "^3", @@ -170,12 +170,6 @@ "bin": [ "bin/console" ], - "repositories": [ - { - "type": "github", - "url": "https://github.com/busterneece/php-scanner" - } - ], "scripts": { "ci-import-locales": [ "bin/console locale:import" diff --git a/composer.lock b/composer.lock index 03893958d..8c7be081d 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": "af26e7589a18f6cc10b68e0830e7eb04", + "content-hash": "51e424d0099e99a1f4b376244844d555", "packages": [ { "name": "aws/aws-crt-php", @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.300.13", + "version": "3.300.14", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b1eb7307d30ebcfa4e156971f658c2d177434db3" + "reference": "f1e0c37d8403d7097c2c808c184137e6517d54be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b1eb7307d30ebcfa4e156971f658c2d177434db3", - "reference": "b1eb7307d30ebcfa4e156971f658c2d177434db3", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f1e0c37d8403d7097c2c808c184137e6517d54be", + "reference": "f1e0c37d8403d7097c2c808c184137e6517d54be", "shasum": "" }, "require": { @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.300.13" + "source": "https://github.com/aws/aws-sdk-php/tree/3.300.14" }, - "time": "2024-03-07T19:14:04+00:00" + "time": "2024-03-08T19:05:39+00:00" }, { "name": "azuracast/nowplaying", @@ -1863,16 +1863,16 @@ }, { "name": "gettext/php-scanner", - "version": "dev-master", + "version": "v2.0.0", "source": { "type": "git", - "url": "https://github.com/BusterNeece/PHP-Scanner.git", - "reference": "8d5aa4632230bf19f0bf2658032afaa7cdf04c8d" + "url": "https://github.com/php-gettext/PHP-Scanner.git", + "reference": "97e223d49d548df8893551d43476a6c63290f2be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BusterNeece/PHP-Scanner/zipball/8d5aa4632230bf19f0bf2658032afaa7cdf04c8d", - "reference": "8d5aa4632230bf19f0bf2658032afaa7cdf04c8d", + "url": "https://api.github.com/repos/php-gettext/PHP-Scanner/zipball/97e223d49d548df8893551d43476a6c63290f2be", + "reference": "97e223d49d548df8893551d43476a6c63290f2be", "shasum": "" }, "require": { @@ -1883,30 +1883,16 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^3", "oscarotero/php-cs-fixer-config": "^2", - "phpunit/phpunit": "^11", + "phpunit/phpunit": "^9", "squizlabs/php_codesniffer": "^3.0" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { "Gettext\\Scanner\\": "src" } }, - "autoload-dev": { - "psr-4": { - "Gettext\\Tests\\": "tests" - } - }, - "scripts": { - "test": [ - "phpunit", - "phpcs" - ], - "cs-fix": [ - "php-cs-fixer fix" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1930,9 +1916,9 @@ "support": { "email": "oom@oscarotero.com", "issues": "https://github.com/php-gettext/PHP-Scanner/issues", - "source": "https://github.com/BusterNeece/PHP-Scanner/tree/master" + "source": "https://github.com/php-gettext/PHP-Scanner/tree/v2.0.0" }, - "time": "2024-03-08T03:57:57+00:00" + "time": "2024-03-10T12:14:15+00:00" }, { "name": "gettext/translator", @@ -2921,16 +2907,16 @@ }, { "name": "league/flysystem", - "version": "3.24.0", + "version": "3.25.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "b25a361508c407563b34fac6f64a8a17a8819675" + "reference": "4c44347133618cccd9b3df1729647a1577b4ad99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675", - "reference": "b25a361508c407563b34fac6f64a8a17a8819675", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4c44347133618cccd9b3df1729647a1577b4ad99", + "reference": "4c44347133618cccd9b3df1729647a1577b4ad99", "shasum": "" }, "require": { @@ -2958,7 +2944,7 @@ "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", "microsoft/azure-storage-blob": "^1.1", - "phpseclib/phpseclib": "^3.0.34", + "phpseclib/phpseclib": "^3.0.36", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5.11|^10.0", "sabre/dav": "^4.6.0" @@ -2995,7 +2981,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.24.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.25.0" }, "funding": [ { @@ -3007,7 +2993,7 @@ "type": "github" } ], - "time": "2024-02-04T12:10:17+00:00" + "time": "2024-03-09T17:06:45+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -3136,16 +3122,16 @@ }, { "name": "league/flysystem-sftp-v3", - "version": "3.23.1", + "version": "3.25.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-sftp-v3.git", - "reference": "09d001860d6642e2bed75f9d2f9e9fa931a3a6be" + "reference": "7102bf14c18647b04acdf08075c94a7a52d7ac3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/09d001860d6642e2bed75f9d2f9e9fa931a3a6be", - "reference": "09d001860d6642e2bed75f9d2f9e9fa931a3a6be", + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/7102bf14c18647b04acdf08075c94a7a52d7ac3f", + "reference": "7102bf14c18647b04acdf08075c94a7a52d7ac3f", "shasum": "" }, "require": { @@ -3179,8 +3165,7 @@ "sftp" ], "support": { - "issues": "https://github.com/thephpleague/flysystem-sftp-v3/issues", - "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.23.1" + "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.25.0" }, "funding": [ { @@ -3192,7 +3177,7 @@ "type": "github" } ], - "time": "2024-01-26T18:25:23+00:00" + "time": "2024-03-09T15:59:56+00:00" }, { "name": "league/mime-type-detection", @@ -9730,7 +9715,7 @@ ], "support": { "issues": "https://github.com/zircote/swagger-php/issues", - "source": "https://github.com/zircote/swagger-php/tree/master" + "source": "https://github.com/zircote/swagger-php/tree/4.8.5" }, "time": "2024-03-07T23:56:26+00:00" } @@ -11404,16 +11389,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "11.0.1", + "version": "11.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "89702be0ad026873ef3a1605fe8726254eef4e2c" + "reference": "9e0a298b4dc6438a1e70ac8e1b3ea4980ae5a09b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/89702be0ad026873ef3a1605fe8726254eef4e2c", - "reference": "89702be0ad026873ef3a1605fe8726254eef4e2c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9e0a298b4dc6438a1e70ac8e1b3ea4980ae5a09b", + "reference": "9e0a298b4dc6438a1e70ac8e1b3ea4980ae5a09b", "shasum": "" }, "require": { @@ -11470,7 +11455,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.1" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.2" }, "funding": [ { @@ -11478,7 +11463,7 @@ "type": "github" } ], - "time": "2024-03-02T07:34:25+00:00" + "time": "2024-03-09T16:56:49+00:00" }, { "name": "phpunit/php-file-iterator", @@ -11727,16 +11712,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.0.4", + "version": "11.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3f4261269c91370e9b2b3f64cc76c617c442c35a" + "reference": "da2de3900beab025398ba37705b0f5ecafb3e1ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f4261269c91370e9b2b3f64cc76c617c442c35a", - "reference": "3f4261269c91370e9b2b3f64cc76c617c442c35a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/da2de3900beab025398ba37705b0f5ecafb3e1ab", + "reference": "da2de3900beab025398ba37705b0f5ecafb3e1ab", "shasum": "" }, "require": { @@ -11807,7 +11792,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.0.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.0.5" }, "funding": [ { @@ -11823,7 +11808,7 @@ "type": "tidelift" } ], - "time": "2024-02-29T16:21:10+00:00" + "time": "2024-03-09T12:12:14+00:00" }, { "name": "psy/psysh", @@ -11967,12 +11952,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "b011d993ca68a5c59d746b276756051550bbe026" + "reference": "bb15a6dc9a8493ace041a6de2929eb63ba0809ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b011d993ca68a5c59d746b276756051550bbe026", - "reference": "b011d993ca68a5c59d746b276756051550bbe026", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bb15a6dc9a8493ace041a6de2929eb63ba0809ef", + "reference": "bb15a6dc9a8493ace041a6de2929eb63ba0809ef", "shasum": "" }, "conflict": { @@ -12416,7 +12401,7 @@ "react/http": ">=0.7,<1.9", "really-simple-plugins/complianz-gdpr": "<6.4.2", "redaxo/source": "<=5.15.1", - "remdex/livehelperchat": "<3.99", + "remdex/livehelperchat": "<4.29", "reportico-web/reportico": "<=7.1.21", "rhukster/dom-sanitizer": "<1.0.7", "rmccue/requests": ">=1.6,<1.8", @@ -12505,7 +12490,7 @@ "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", - "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<5.3.15|>=5.4.3,<5.4.4|>=6.0.3,<6.0.4", "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", @@ -12699,7 +12684,7 @@ "type": "tidelift" } ], - "time": "2024-03-06T18:04:39+00:00" + "time": "2024-03-10T05:04:21+00:00" }, { "name": "sebastian/cli-parser", @@ -13626,32 +13611,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.14.1", + "version": "8.15.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926" + "reference": "7d1d957421618a3803b593ec31ace470177d7817" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926", - "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817", + "reference": "7d1d957421618a3803b593ec31ace470177d7817", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", "phpstan/phpdoc-parser": "^1.23.1", - "squizlabs/php_codesniffer": "^3.7.1" + "squizlabs/php_codesniffer": "^3.9.0" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.37", + "phpstan/phpstan": "1.10.60", "phpstan/phpstan-deprecation-rules": "1.1.4", - "phpstan/phpstan-phpunit": "1.3.14", - "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "8.5.21|9.6.8|10.3.5" + "phpstan/phpstan-phpunit": "1.3.16", + "phpstan/phpstan-strict-rules": "1.5.2", + "phpunit/phpunit": "8.5.21|9.6.8|10.5.11" }, "type": "phpcodesniffer-standard", "extra": { @@ -13675,7 +13660,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.14.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.15.0" }, "funding": [ { @@ -13687,7 +13672,7 @@ "type": "tidelift" } ], - "time": "2023-10-08T07:28:08+00:00" + "time": "2024-03-09T15:20:58+00:00" }, { "name": "softcreatr/jsonpath", @@ -14175,7 +14160,6 @@ "minimum-stability": "dev", "stability-flags": { "azuracast/nowplaying": 20, - "gettext/php-scanner": 20, "lstrojny/fxmlrpc": 20, "rlanvin/php-ip": 20, "supervisorphp/supervisor": 20,