From 9335c5e950b0aff29c159a562b253c59d587e30e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 19:56:55 +0000 Subject: [PATCH 1/2] Bump symfony/http-foundation from 5.4.2 to 5.4.46 Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 5.4.2 to 5.4.46. - [Release notes](https://github.com/symfony/http-foundation/releases) - [Changelog](https://github.com/symfony/http-foundation/blob/7.1/CHANGELOG.md) - [Commits](https://github.com/symfony/http-foundation/compare/v5.4.2...v5.4.46) --- updated-dependencies: - dependency-name: symfony/http-foundation dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 398 ++++++++++++++++++++++++-------------------------- 1 file changed, 189 insertions(+), 209 deletions(-) diff --git a/composer.lock b/composer.lock index 821e31838..0b2682606 100644 --- a/composer.lock +++ b/composer.lock @@ -5034,16 +5034,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.0", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced" + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", - "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", "shasum": "" }, "require": { @@ -5081,7 +5081,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" }, "funding": [ { @@ -5097,7 +5097,7 @@ "type": "tidelift" } ], - "time": "2021-11-01T23:48:49+00:00" + "time": "2022-01-02T09:55:41+00:00" }, { "name": "symfony/error-handler", @@ -5399,16 +5399,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.2", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ce952af52877eaf3eab5d0c08cc0ea865ed37313" + "reference": "168b77c71e6f02d8fc479db78beaf742a37d3cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce952af52877eaf3eab5d0c08cc0ea865ed37313", - "reference": "ce952af52877eaf3eab5d0c08cc0ea865ed37313", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/168b77c71e6f02d8fc479db78beaf742a37d3cab", + "reference": "168b77c71e6f02d8fc479db78beaf742a37d3cab", "shasum": "" }, "require": { @@ -5418,10 +5418,13 @@ "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "predis/predis": "~1.0", + "predis/predis": "^1.0|^2.0", "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/mime": "^4.4|^5.0|^6.0" + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0" }, "suggest": { "symfony/mime": "To use the file extension guesser" @@ -5452,7 +5455,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.2" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.46" }, "funding": [ { @@ -5468,7 +5471,7 @@ "type": "tidelift" } ], - "time": "2021-12-28T17:15:56+00:00" + "time": "2024-11-05T15:52:21+00:00" }, { "name": "symfony/http-kernel", @@ -5584,16 +5587,16 @@ }, { "name": "symfony/mime", - "version": "v5.4.2", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "1bfd938cf9562822c05c4d00e8f92134d3c8e42d" + "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/1bfd938cf9562822c05c4d00e8f92134d3c8e42d", - "reference": "1bfd938cf9562822c05c4d00e8f92134d3c8e42d", + "url": "https://api.github.com/repos/symfony/mime/zipball/8c1b9b3e5b52981551fc6044539af1d974e39064", + "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064", "shasum": "" }, "require": { @@ -5607,15 +5610,17 @@ "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<4.4" + "symfony/mailer": "<4.4", + "symfony/serializer": "<5.4.35|>=6,<6.3.12|>=6.4,<6.4.3" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", + "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/process": "^5.4|^6.4", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.2|^6.0" + "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3" }, "type": "library", "autoload": { @@ -5647,7 +5652,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.2" + "source": "https://github.com/symfony/mime/tree/v5.4.45" }, "funding": [ { @@ -5663,24 +5668,24 @@ "type": "tidelift" } ], - "time": "2021-12-28T17:15:56+00:00" + "time": "2024-10-23T20:18:32+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -5690,21 +5695,18 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5729,7 +5731,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -5745,7 +5747,7 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-iconv", @@ -5832,41 +5834,38 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5893,7 +5892,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -5909,47 +5908,43 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5980,7 +5975,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -5996,45 +5991,42 @@ "type": "tidelift" } ], - "time": "2021-09-14T14:02:44+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -6064,7 +6056,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -6080,24 +6072,24 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -6107,21 +6099,18 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6147,7 +6136,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -6163,83 +6152,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.24.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", @@ -6322,38 +6235,35 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -6385,7 +6295,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -6401,7 +6311,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:33+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", @@ -6718,16 +6628,16 @@ }, { "name": "symfony/string", - "version": "v6.0.2", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "bae261d0c3ac38a1f802b4dfed42094296100631" + "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/bae261d0c3ac38a1f802b4dfed42094296100631", - "reference": "bae261d0c3ac38a1f802b4dfed42094296100631", + "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a", + "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a", "shasum": "" }, "require": { @@ -6748,12 +6658,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -6783,7 +6693,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.2" + "source": "https://github.com/symfony/string/tree/v6.0.19" }, "funding": [ { @@ -6799,7 +6709,7 @@ "type": "tidelift" } ], - "time": "2021-12-16T22:13:01+00:00" + "time": "2023-01-01T08:36:10+00:00" }, { "name": "symfony/translation", @@ -7473,21 +7383,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -7525,9 +7435,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" } ], "packages-dev": [ @@ -10142,25 +10052,30 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.0", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -10186,9 +10101,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-01-04T19:58:01+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpspec/prophecy", @@ -12513,6 +12428,71 @@ ], "time": "2020-10-23T14:02:19+00:00" }, + { + "name": "symfony/polyfill-php72", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "metapackage", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, { "name": "symfony/stopwatch", "version": "v5.4.0", @@ -12637,5 +12617,5 @@ "php": "^7.4|^8.0" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.6.0" } From a9d05a5cd452ad9ccbd320920aa2e43f096035a2 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 6 Nov 2024 19:57:06 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- .../Models/Traits/Scope/AnnouncementScope.php | 8 ++++---- app/Domains/Auth/Events/Role/RoleCreated.php | 2 +- app/Domains/Auth/Events/Role/RoleDeleted.php | 2 +- app/Domains/Auth/Events/Role/RoleUpdated.php | 2 +- app/Domains/Auth/Events/User/UserCreated.php | 2 +- app/Domains/Auth/Events/User/UserDeleted.php | 2 +- app/Domains/Auth/Events/User/UserDestroyed.php | 2 +- app/Domains/Auth/Events/User/UserLoggedIn.php | 2 +- app/Domains/Auth/Events/User/UserRestored.php | 2 +- .../Auth/Events/User/UserStatusChanged.php | 2 +- app/Domains/Auth/Events/User/UserUpdated.php | 2 +- .../Backend/User/DeactivatedUserController.php | 2 +- .../Frontend/Auth/LoginController.php | 2 +- .../Frontend/Auth/SocialController.php | 4 ++-- .../Auth/Http/Middleware/AdminCheck.php | 2 +- .../Auth/Http/Middleware/PasswordExpires.php | 2 +- .../Auth/Http/Middleware/SuperAdminCheck.php | 2 +- .../TwoFactorAuthenticationStatus.php | 2 +- app/Domains/Auth/Http/Middleware/UserCheck.php | 2 +- .../Auth/Http/Middleware/UserTypeCheck.php | 4 ++-- .../Auth/Listeners/RoleEventListener.php | 6 +++--- .../Auth/Listeners/UserEventListener.php | 16 ++++++++-------- .../Models/Traits/Attribute/UserAttribute.php | 2 +- .../Auth/Models/Traits/Method/UserMethod.php | 2 +- .../Models/Traits/Scope/PermissionScope.php | 8 ++++---- .../Auth/Models/Traits/Scope/RoleScope.php | 4 ++-- .../Auth/Models/Traits/Scope/UserScope.php | 18 +++++++++--------- app/Domains/Auth/Rules/UnusedPassword.php | 2 +- app/Domains/Auth/Services/UserService.php | 10 +++++----- app/Helpers/Global/GeneralHelper.php | 2 +- app/Helpers/Global/LocaleHelper.php | 18 ++++++------------ app/Helpers/Global/SystemHelper.php | 5 ++--- app/Http/Controllers/LocaleController.php | 2 +- app/Models/Traits/Uuid.php | 4 ++-- app/Services/BaseService.php | 10 +++++----- ...0_02_25_034148_create_permission_tables.php | 4 ++-- database/seeders/Traits/TruncateTable.php | 4 ++-- 37 files changed, 80 insertions(+), 87 deletions(-) diff --git a/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php b/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php index cf5366970..c2d57bcd4 100644 --- a/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php +++ b/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php @@ -8,7 +8,7 @@ trait AnnouncementScope { /** - * @param $query + * @param $query * @return mixed */ public function scopeEnabled($query) @@ -17,8 +17,8 @@ public function scopeEnabled($query) } /** - * @param $query - * @param $area + * @param $query + * @param $area * @return mixed */ public function scopeForArea($query, $area) @@ -30,7 +30,7 @@ public function scopeForArea($query, $area) } /** - * @param $query + * @param $query * @return mixed */ public function scopeInTimeFrame($query) diff --git a/app/Domains/Auth/Events/Role/RoleCreated.php b/app/Domains/Auth/Events/Role/RoleCreated.php index 4acc86a9e..569b2f685 100644 --- a/app/Domains/Auth/Events/Role/RoleCreated.php +++ b/app/Domains/Auth/Events/Role/RoleCreated.php @@ -18,7 +18,7 @@ class RoleCreated public $role; /** - * @param $role + * @param $role */ public function __construct(Role $role) { diff --git a/app/Domains/Auth/Events/Role/RoleDeleted.php b/app/Domains/Auth/Events/Role/RoleDeleted.php index 0626e02cb..3c680ec81 100644 --- a/app/Domains/Auth/Events/Role/RoleDeleted.php +++ b/app/Domains/Auth/Events/Role/RoleDeleted.php @@ -18,7 +18,7 @@ class RoleDeleted public $role; /** - * @param $role + * @param $role */ public function __construct(Role $role) { diff --git a/app/Domains/Auth/Events/Role/RoleUpdated.php b/app/Domains/Auth/Events/Role/RoleUpdated.php index afb06c02c..ef4c8801d 100644 --- a/app/Domains/Auth/Events/Role/RoleUpdated.php +++ b/app/Domains/Auth/Events/Role/RoleUpdated.php @@ -18,7 +18,7 @@ class RoleUpdated public $role; /** - * @param $role + * @param $role */ public function __construct(Role $role) { diff --git a/app/Domains/Auth/Events/User/UserCreated.php b/app/Domains/Auth/Events/User/UserCreated.php index 716e0e478..567e6f043 100644 --- a/app/Domains/Auth/Events/User/UserCreated.php +++ b/app/Domains/Auth/Events/User/UserCreated.php @@ -18,7 +18,7 @@ class UserCreated public $user; /** - * @param $user + * @param $user */ public function __construct(User $user) { diff --git a/app/Domains/Auth/Events/User/UserDeleted.php b/app/Domains/Auth/Events/User/UserDeleted.php index d0f5da921..c5fc69fb1 100644 --- a/app/Domains/Auth/Events/User/UserDeleted.php +++ b/app/Domains/Auth/Events/User/UserDeleted.php @@ -18,7 +18,7 @@ class UserDeleted public $user; /** - * @param $user + * @param $user */ public function __construct(User $user) { diff --git a/app/Domains/Auth/Events/User/UserDestroyed.php b/app/Domains/Auth/Events/User/UserDestroyed.php index 20d78a023..363fee24d 100644 --- a/app/Domains/Auth/Events/User/UserDestroyed.php +++ b/app/Domains/Auth/Events/User/UserDestroyed.php @@ -18,7 +18,7 @@ class UserDestroyed public $user; /** - * @param $user + * @param $user */ public function __construct(User $user) { diff --git a/app/Domains/Auth/Events/User/UserLoggedIn.php b/app/Domains/Auth/Events/User/UserLoggedIn.php index 8cb31c619..e4e736610 100644 --- a/app/Domains/Auth/Events/User/UserLoggedIn.php +++ b/app/Domains/Auth/Events/User/UserLoggedIn.php @@ -18,7 +18,7 @@ class UserLoggedIn public $user; /** - * @param $user + * @param $user */ public function __construct(User $user) { diff --git a/app/Domains/Auth/Events/User/UserRestored.php b/app/Domains/Auth/Events/User/UserRestored.php index 7c65c2b18..161f1e667 100644 --- a/app/Domains/Auth/Events/User/UserRestored.php +++ b/app/Domains/Auth/Events/User/UserRestored.php @@ -18,7 +18,7 @@ class UserRestored public $user; /** - * @param $user + * @param $user */ public function __construct(User $user) { diff --git a/app/Domains/Auth/Events/User/UserStatusChanged.php b/app/Domains/Auth/Events/User/UserStatusChanged.php index 5f7953efc..d78a83308 100644 --- a/app/Domains/Auth/Events/User/UserStatusChanged.php +++ b/app/Domains/Auth/Events/User/UserStatusChanged.php @@ -26,7 +26,7 @@ class UserStatusChanged * UserStatusChanged constructor. * * @param User $user - * @param $status + * @param $status */ public function __construct(User $user, $status) { diff --git a/app/Domains/Auth/Events/User/UserUpdated.php b/app/Domains/Auth/Events/User/UserUpdated.php index a4b37b370..7e9da52b4 100644 --- a/app/Domains/Auth/Events/User/UserUpdated.php +++ b/app/Domains/Auth/Events/User/UserUpdated.php @@ -18,7 +18,7 @@ class UserUpdated public $user; /** - * @param $user + * @param $user */ public function __construct(User $user) { diff --git a/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php b/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php index 75dd9b898..9322febeb 100644 --- a/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php +++ b/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php @@ -37,7 +37,7 @@ public function index() /** * @param Request $request * @param User $user - * @param $status + * @param $status * @return mixed * * @throws \App\Exceptions\GeneralException diff --git a/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php b/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php index f99ad03a8..6c0916b6a 100644 --- a/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php +++ b/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php @@ -93,7 +93,7 @@ protected function attemptLogin(Request $request) * The user has been authenticated. * * @param Request $request - * @param $user + * @param $user * @return mixed */ protected function authenticated(Request $request, $user) diff --git a/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php b/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php index a6d393826..14ab2f005 100644 --- a/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php +++ b/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php @@ -12,7 +12,7 @@ class SocialController { /** - * @param $provider + * @param $provider * @return \Symfony\Component\HttpFoundation\RedirectResponse */ public function redirect($provider) @@ -21,7 +21,7 @@ public function redirect($provider) } /** - * @param $provider + * @param $provider * @param UserService $userService * @return \Illuminate\Http\RedirectResponse * diff --git a/app/Domains/Auth/Http/Middleware/AdminCheck.php b/app/Domains/Auth/Http/Middleware/AdminCheck.php index e6734bb8a..7fe919ac4 100644 --- a/app/Domains/Auth/Http/Middleware/AdminCheck.php +++ b/app/Domains/Auth/Http/Middleware/AdminCheck.php @@ -11,7 +11,7 @@ class AdminCheck { /** - * @param $request + * @param $request * @param Closure $next * @return mixed */ diff --git a/app/Domains/Auth/Http/Middleware/PasswordExpires.php b/app/Domains/Auth/Http/Middleware/PasswordExpires.php index 7d15544bf..f1076a0a0 100644 --- a/app/Domains/Auth/Http/Middleware/PasswordExpires.php +++ b/app/Domains/Auth/Http/Middleware/PasswordExpires.php @@ -11,7 +11,7 @@ class PasswordExpires { /** - * @param $request + * @param $request * @param Closure $next * @return \Illuminate\Http\RedirectResponse|mixed * diff --git a/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php b/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php index 67d3e44be..40335f8c9 100644 --- a/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php +++ b/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php @@ -10,7 +10,7 @@ class SuperAdminCheck { /** - * @param $request + * @param $request * @param Closure $next * @return mixed */ diff --git a/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php b/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php index aac56b3dd..4891def34 100644 --- a/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php +++ b/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php @@ -10,7 +10,7 @@ class TwoFactorAuthenticationStatus { /** - * @param $request + * @param $request * @param Closure $next * @param string $status * @return mixed diff --git a/app/Domains/Auth/Http/Middleware/UserCheck.php b/app/Domains/Auth/Http/Middleware/UserCheck.php index fdd682e36..9311f39b0 100644 --- a/app/Domains/Auth/Http/Middleware/UserCheck.php +++ b/app/Domains/Auth/Http/Middleware/UserCheck.php @@ -11,7 +11,7 @@ class UserCheck { /** - * @param $request + * @param $request * @param Closure $next * @return mixed */ diff --git a/app/Domains/Auth/Http/Middleware/UserTypeCheck.php b/app/Domains/Auth/Http/Middleware/UserTypeCheck.php index c065fd3f7..9bbb1a1fc 100644 --- a/app/Domains/Auth/Http/Middleware/UserTypeCheck.php +++ b/app/Domains/Auth/Http/Middleware/UserTypeCheck.php @@ -10,9 +10,9 @@ class UserTypeCheck { /** - * @param $request + * @param $request * @param Closure $next - * @param $type + * @param $type * @return mixed */ public function handle($request, Closure $next, $type) diff --git a/app/Domains/Auth/Listeners/RoleEventListener.php b/app/Domains/Auth/Listeners/RoleEventListener.php index 0c631e610..b3ca36154 100644 --- a/app/Domains/Auth/Listeners/RoleEventListener.php +++ b/app/Domains/Auth/Listeners/RoleEventListener.php @@ -12,7 +12,7 @@ class RoleEventListener { /** - * @param $event + * @param $event */ public function onCreated($event) { @@ -29,7 +29,7 @@ public function onCreated($event) } /** - * @param $event + * @param $event */ public function onUpdated($event) { @@ -46,7 +46,7 @@ public function onUpdated($event) } /** - * @param $event + * @param $event */ public function onDeleted($event) { diff --git a/app/Domains/Auth/Listeners/UserEventListener.php b/app/Domains/Auth/Listeners/UserEventListener.php index ac430c7ca..dfd3cd955 100644 --- a/app/Domains/Auth/Listeners/UserEventListener.php +++ b/app/Domains/Auth/Listeners/UserEventListener.php @@ -17,7 +17,7 @@ class UserEventListener { /** - * @param $event + * @param $event */ public function onLoggedIn($event) { @@ -29,7 +29,7 @@ public function onLoggedIn($event) } /** - * @param $event + * @param $event */ public function onPasswordReset($event) { @@ -39,7 +39,7 @@ public function onPasswordReset($event) } /** - * @param $event + * @param $event */ public function onCreated($event) { @@ -60,7 +60,7 @@ public function onCreated($event) } /** - * @param $event + * @param $event */ public function onUpdated($event) { @@ -79,7 +79,7 @@ public function onUpdated($event) } /** - * @param $event + * @param $event */ public function onDeleted($event) { @@ -89,7 +89,7 @@ public function onDeleted($event) } /** - * @param $event + * @param $event */ public function onRestored($event) { @@ -99,7 +99,7 @@ public function onRestored($event) } /** - * @param $event + * @param $event */ public function onDestroyed($event) { @@ -109,7 +109,7 @@ public function onDestroyed($event) } /** - * @param $event + * @param $event */ public function onStatusChanged($event) { diff --git a/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php b/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php index 65bc674bf..30fd16748 100644 --- a/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php +++ b/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php @@ -10,7 +10,7 @@ trait UserAttribute { /** - * @param $password + * @param $password */ public function setPasswordAttribute($password): void { diff --git a/app/Domains/Auth/Models/Traits/Method/UserMethod.php b/app/Domains/Auth/Models/Traits/Method/UserMethod.php index 51e061530..28302521d 100644 --- a/app/Domains/Auth/Models/Traits/Method/UserMethod.php +++ b/app/Domains/Auth/Models/Traits/Method/UserMethod.php @@ -42,7 +42,7 @@ public function hasAllAccess(): bool } /** - * @param $type + * @param $type * @return bool */ public function isType($type): bool diff --git a/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php b/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php index 2dbafd5d5..3a490072e 100644 --- a/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php +++ b/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php @@ -8,7 +8,7 @@ trait PermissionScope { /** - * @param $query + * @param $query * @return mixed */ public function scopeIsMaster($query) @@ -18,7 +18,7 @@ public function scopeIsMaster($query) } /** - * @param $query + * @param $query * @return mixed */ public function scopeIsParent($query) @@ -27,7 +27,7 @@ public function scopeIsParent($query) } /** - * @param $query + * @param $query * @return mixed */ public function scopeIsChild($query) @@ -36,7 +36,7 @@ public function scopeIsChild($query) } /** - * @param $query + * @param $query * @return mixed */ public function scopeSingular($query) diff --git a/app/Domains/Auth/Models/Traits/Scope/RoleScope.php b/app/Domains/Auth/Models/Traits/Scope/RoleScope.php index 8f3473e4e..33aedc2ac 100644 --- a/app/Domains/Auth/Models/Traits/Scope/RoleScope.php +++ b/app/Domains/Auth/Models/Traits/Scope/RoleScope.php @@ -8,8 +8,8 @@ trait RoleScope { /** - * @param $query - * @param $term + * @param $query + * @param $term * @return mixed */ public function scopeSearch($query, $term) diff --git a/app/Domains/Auth/Models/Traits/Scope/UserScope.php b/app/Domains/Auth/Models/Traits/Scope/UserScope.php index d9c59f7fc..4f4f96384 100644 --- a/app/Domains/Auth/Models/Traits/Scope/UserScope.php +++ b/app/Domains/Auth/Models/Traits/Scope/UserScope.php @@ -8,8 +8,8 @@ trait UserScope { /** - * @param $query - * @param $term + * @param $query + * @param $term * @return mixed */ public function scopeSearch($query, $term) @@ -21,7 +21,7 @@ public function scopeSearch($query, $term) } /** - * @param $query + * @param $query * @return mixed */ public function scopeOnlyDeactivated($query) @@ -30,7 +30,7 @@ public function scopeOnlyDeactivated($query) } /** - * @param $query + * @param $query * @return mixed */ public function scopeOnlyActive($query) @@ -39,8 +39,8 @@ public function scopeOnlyActive($query) } /** - * @param $query - * @param $type + * @param $query + * @param $type * @return mixed */ public function scopeByType($query, $type) @@ -49,7 +49,7 @@ public function scopeByType($query, $type) } /** - * @param $query + * @param $query * @return mixed */ public function scopeAllAccess($query) @@ -60,7 +60,7 @@ public function scopeAllAccess($query) } /** - * @param $query + * @param $query * @return mixed */ public function scopeAdmins($query) @@ -69,7 +69,7 @@ public function scopeAdmins($query) } /** - * @param $query + * @param $query * @return mixed */ public function scopeUsers($query) diff --git a/app/Domains/Auth/Rules/UnusedPassword.php b/app/Domains/Auth/Rules/UnusedPassword.php index 283ac9928..11be82e63 100644 --- a/app/Domains/Auth/Rules/UnusedPassword.php +++ b/app/Domains/Auth/Rules/UnusedPassword.php @@ -22,7 +22,7 @@ class UnusedPassword implements Rule * * UnusedPassword constructor. * - * @param $user + * @param $user */ public function __construct($user) { diff --git a/app/Domains/Auth/Services/UserService.php b/app/Domains/Auth/Services/UserService.php index f1bdaeac2..e1c28ec3f 100644 --- a/app/Domains/Auth/Services/UserService.php +++ b/app/Domains/Auth/Services/UserService.php @@ -31,7 +31,7 @@ public function __construct(User $user) } /** - * @param $type + * @param $type * @param bool|int $perPage * @return mixed */ @@ -68,8 +68,8 @@ public function registerUser(array $data = []): User } /** - * @param $info - * @param $provider + * @param $info + * @param $provider * @return mixed * * @throws GeneralException @@ -205,7 +205,7 @@ public function updateProfile(User $user, array $data = []): User /** * @param User $user - * @param $data + * @param $data * @param bool $expired * @return User * @@ -232,7 +232,7 @@ public function updatePassword(User $user, $data, $expired = false): User /** * @param User $user - * @param $status + * @param $status * @return User * * @throws GeneralException diff --git a/app/Helpers/Global/GeneralHelper.php b/app/Helpers/Global/GeneralHelper.php index 57e7c5b98..750187fdc 100644 --- a/app/Helpers/Global/GeneralHelper.php +++ b/app/Helpers/Global/GeneralHelper.php @@ -18,7 +18,7 @@ function appName() /** * Create a new Carbon instance from a time. * - * @param $time + * @param $time * @return Carbon * * @throws Exception diff --git a/app/Helpers/Global/LocaleHelper.php b/app/Helpers/Global/LocaleHelper.php index 8748c8c48..100353bb3 100644 --- a/app/Helpers/Global/LocaleHelper.php +++ b/app/Helpers/Global/LocaleHelper.php @@ -3,9 +3,8 @@ use Carbon\Carbon; if (! function_exists('setAllLocale')) { - /** - * @param $locale + * @param $locale */ function setAllLocale($locale) { @@ -17,9 +16,8 @@ function setAllLocale($locale) } if (! function_exists('setAppLocale')) { - /** - * @param $locale + * @param $locale */ function setAppLocale($locale) { @@ -28,9 +26,8 @@ function setAppLocale($locale) } if (! function_exists('setPHPLocale')) { - /** - * @param $locale + * @param $locale */ function setPHPLocale($locale) { @@ -39,9 +36,8 @@ function setPHPLocale($locale) } if (! function_exists('setCarbonLocale')) { - /** - * @param $locale + * @param $locale */ function setCarbonLocale($locale) { @@ -50,9 +46,8 @@ function setCarbonLocale($locale) } if (! function_exists('setLocaleReadingDirection')) { - /** - * @param $locale + * @param $locale */ function setLocaleReadingDirection($locale) { @@ -71,9 +66,8 @@ function setLocaleReadingDirection($locale) } if (! function_exists('getLocaleName')) { - /** - * @param $locale + * @param $locale * @return mixed */ function getLocaleName($locale) diff --git a/app/Helpers/Global/SystemHelper.php b/app/Helpers/Global/SystemHelper.php index c78ca3fb1..60ac65e18 100644 --- a/app/Helpers/Global/SystemHelper.php +++ b/app/Helpers/Global/SystemHelper.php @@ -5,7 +5,7 @@ * Loops through a folder and requires all PHP files * Searches sub-directories as well. * - * @param $folder + * @param $folder */ function includeFilesInFolder($folder) { @@ -27,9 +27,8 @@ function includeFilesInFolder($folder) } if (! function_exists('includeRouteFiles')) { - /** - * @param $folder + * @param $folder */ function includeRouteFiles($folder) { diff --git a/app/Http/Controllers/LocaleController.php b/app/Http/Controllers/LocaleController.php index dbf171133..8a2b5c6c3 100644 --- a/app/Http/Controllers/LocaleController.php +++ b/app/Http/Controllers/LocaleController.php @@ -8,7 +8,7 @@ class LocaleController { /** - * @param $locale + * @param $locale * @return \Illuminate\Http\RedirectResponse */ public function change($locale) diff --git a/app/Models/Traits/Uuid.php b/app/Models/Traits/Uuid.php index 637f73c3d..4cd5a966e 100644 --- a/app/Models/Traits/Uuid.php +++ b/app/Models/Traits/Uuid.php @@ -10,8 +10,8 @@ trait Uuid { /** - * @param $query - * @param $uuid + * @param $query + * @param $uuid * @return mixed */ public function scopeUuid($query, $uuid) diff --git a/app/Services/BaseService.php b/app/Services/BaseService.php index 117318b73..cd52583ad 100644 --- a/app/Services/BaseService.php +++ b/app/Services/BaseService.php @@ -142,7 +142,7 @@ public function get() /** * Get the specified model record from the database. * - * @param $id + * @param $id * @return \Illuminate\Database\Eloquent\Model */ public function getById($id) @@ -155,8 +155,8 @@ public function getById($id) } /** - * @param $item - * @param $column + * @param $item + * @param $column * @param array $columns * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|object|null */ @@ -172,7 +172,7 @@ public function getByColumn($item, $column, array $columns = ['*']) /** * Delete the specified model record from the database. * - * @param $id + * @param $id * @return bool|null * * @throws \Exception @@ -263,7 +263,7 @@ public function whereIn($column, $values) /** * Set Eloquent relationships to eager load. * - * @param $relations + * @param $relations * @return $this */ public function with($relations) diff --git a/database/migrations/2020_02_25_034148_create_permission_tables.php b/database/migrations/2020_02_25_034148_create_permission_tables.php index f4fcf646b..597b96475 100644 --- a/database/migrations/2020_02_25_034148_create_permission_tables.php +++ b/database/migrations/2020_02_25_034148_create_permission_tables.php @@ -54,7 +54,7 @@ public function up() ->onDelete('cascade'); $table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'], - 'model_has_permissions_permission_model_type_primary'); + 'model_has_permissions_permission_model_type_primary'); }); Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) { @@ -70,7 +70,7 @@ public function up() ->onDelete('cascade'); $table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'], - 'model_has_roles_role_model_type_primary'); + 'model_has_roles_role_model_type_primary'); }); Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) { diff --git a/database/seeders/Traits/TruncateTable.php b/database/seeders/Traits/TruncateTable.php index 80900fcb0..7a1c622e1 100644 --- a/database/seeders/Traits/TruncateTable.php +++ b/database/seeders/Traits/TruncateTable.php @@ -10,7 +10,7 @@ trait TruncateTable { /** - * @param $table + * @param $table * @return bool */ protected function truncate($table) @@ -23,7 +23,7 @@ protected function truncate($table) return DB::statement('TRUNCATE TABLE '.$table.' RESTART IDENTITY CASCADE'); case 'sqlite': case 'sqlsrv': - return DB::statement('DELETE FROM '.$table); + return DB::statement('DELETE FROM '.$table); } return false;