From 41147b26f260f01773ff1fd7a2eba86f7d2b4894 Mon Sep 17 00:00:00 2001 From: James Collins Date: Thu, 25 May 2023 07:35:33 +1000 Subject: [PATCH 1/2] dependency updates --- composer.lock | 81 +++++++++++---------- package-lock.json | 176 +++++++++++++++++++++++----------------------- 2 files changed, 130 insertions(+), 127 deletions(-) diff --git a/composer.lock b/composer.lock index 98e7a69..beaaeba 100644 --- a/composer.lock +++ b/composer.lock @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.269.0", + "version": "3.271.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78" + "reference": "707552cfb1fa37e8e501d2c70afa9bc2e61104c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78", - "reference": "6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/707552cfb1fa37e8e501d2c70afa9bc2e61104c0", + "reference": "707552cfb1fa37e8e501d2c70afa9bc2e61104c0", "shasum": "" }, "require": { @@ -83,7 +83,8 @@ "guzzlehttp/promises": "^1.4.0", "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5" + "php": ">=5.5", + "psr/http-message": "^1.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", @@ -100,7 +101,6 @@ "paragonie/random_compat": ">= 2", "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", "psr/cache": "^1.0", - "psr/http-message": "^1.0", "psr/simple-cache": "^1.0", "sebastian/comparator": "^1.2.3 || ^4.0", "yoast/phpunit-polyfills": "^1.0" @@ -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.269.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.271.1" }, - "time": "2023-04-26T18:21:04+00:00" + "time": "2023-05-24T18:20:35+00:00" }, { "name": "brick/math", @@ -3577,16 +3577,16 @@ }, { "name": "psr/http-message", - "version": "2.0", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", - "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { @@ -3595,7 +3595,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -3610,7 +3610,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "http://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -3624,9 +3624,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/2.0" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2023-04-04T09:54:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -3731,16 +3731,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.17", + "version": "v0.11.18", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "3dc5d4018dabd80bceb8fe1e3191ba8460569f0a" + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3dc5d4018dabd80bceb8fe1e3191ba8460569f0a", - "reference": "3dc5d4018dabd80bceb8fe1e3191ba8460569f0a", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", "shasum": "" }, "require": { @@ -3801,9 +3801,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.17" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" }, - "time": "2023-05-05T20:02:42+00:00" + "time": "2023-05-23T02:31:11+00:00" }, { "name": "ralouphie/getallheaders", @@ -7418,37 +7418,40 @@ }, { "name": "nunomaduro/collision", - "version": "v7.1.0", + "version": "v7.5.2", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "2b97fed4950cf0ff148c18b853975ec8ea135e90" + "reference": "76b3cabda0aabda455fc3b9db6c3615f5a87c7ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/2b97fed4950cf0ff148c18b853975ec8ea135e90", - "reference": "2b97fed4950cf0ff148c18b853975ec8ea135e90", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/76b3cabda0aabda455fc3b9db6c3615f5a87c7ff", + "reference": "76b3cabda0aabda455fc3b9db6c3615f5a87c7ff", "shasum": "" }, "require": { - "filp/whoops": "^2.14.6", + "filp/whoops": "^2.15.2", "nunomaduro/termwind": "^1.15.1", "php": "^8.1.0", - "symfony/console": "^6.2.7" + "symfony/console": "^6.2.8" + }, + "conflict": { + "phpunit/phpunit": "<10.1.2" }, "require-dev": { - "brianium/paratest": "^7.1.0", - "laravel/framework": "^10.2.0", - "laravel/pint": "^1.6.0", - "laravel/sail": "^1.21.1", + "brianium/paratest": "^7.1.3", + "laravel/framework": "^10.8.0", + "laravel/pint": "^1.9.0", + "laravel/sail": "^1.21.4", "laravel/sanctum": "^3.2.1", "laravel/tinker": "^2.8.1", - "nunomaduro/larastan": "^2.4.1", - "orchestra/testbench-core": "^8.0.3", - "pestphp/pest": "^2.0.0", - "phpunit/phpunit": "^10.0.14", - "sebastian/environment": "^6.0.0", - "spatie/laravel-ignition": "^2.0.0" + "nunomaduro/larastan": "^2.6.0", + "orchestra/testbench-core": "^8.5.0", + "pestphp/pest": "^2.5.2", + "phpunit/phpunit": "^10.1.1", + "sebastian/environment": "^6.0.1", + "spatie/laravel-ignition": "^2.1.0" }, "type": "library", "extra": { @@ -7507,7 +7510,7 @@ "type": "patreon" } ], - "time": "2023-03-03T10:00:22+00:00" + "time": "2023-04-22T22:12:40+00:00" }, { "name": "phar-io/manifest", diff --git a/package-lock.json b/package-lock.json index 392027a..534699e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,9 +43,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.21.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz", - "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==", + "version": "7.21.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.9.tgz", + "integrity": "sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g==", "bin": { "parser": "bin/babel-parser.js" }, @@ -704,9 +704,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.37.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz", - "integrity": "sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==", + "version": "8.40.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.0.tgz", + "integrity": "sha512-nbq2mvc/tBrK9zQQuItvjJl++GTN5j06DaPtp3hZCpngmG6Q3xoyEmd0TwZI0gAy/G1X0zhGBbr2imsGFdFV0g==", "peer": true, "dependencies": { "@types/estree": "*", @@ -734,9 +734,9 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" }, "node_modules/@types/node": { - "version": "20.2.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz", - "integrity": "sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==" + "version": "20.2.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz", + "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==" }, "node_modules/@types/semver": { "version": "7.5.0", @@ -750,15 +750,15 @@ "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.6.tgz", - "integrity": "sha512-sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.7.tgz", + "integrity": "sha512-BL+jYxUFIbuYwy+4fF86k5vdT9lT0CNJ6HtwrIvGh0PhH8s0yy5rjaKH2fDCrz5ITHy07WCzVGNvAmjJh4IJFA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.6", - "@typescript-eslint/type-utils": "5.59.6", - "@typescript-eslint/utils": "5.59.6", + "@typescript-eslint/scope-manager": "5.59.7", + "@typescript-eslint/type-utils": "5.59.7", + "@typescript-eslint/utils": "5.59.7", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -784,14 +784,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.6.tgz", - "integrity": "sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.7.tgz", + "integrity": "sha512-VhpsIEuq/8i5SF+mPg9jSdIwgMBBp0z9XqjiEay+81PYLJuroN+ET1hM5IhkiYMJd9MkTz8iJLt7aaGAgzWUbQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.6", - "@typescript-eslint/types": "5.59.6", - "@typescript-eslint/typescript-estree": "5.59.6", + "@typescript-eslint/scope-manager": "5.59.7", + "@typescript-eslint/types": "5.59.7", + "@typescript-eslint/typescript-estree": "5.59.7", "debug": "^4.3.4" }, "engines": { @@ -811,13 +811,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.6.tgz", - "integrity": "sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.7.tgz", + "integrity": "sha512-FL6hkYWK9zBGdxT2wWEd2W8ocXMu3K94i3gvMrjXpx+koFYdYV7KprKfirpgY34vTGzEPPuKoERpP8kD5h7vZQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.6", - "@typescript-eslint/visitor-keys": "5.59.6" + "@typescript-eslint/types": "5.59.7", + "@typescript-eslint/visitor-keys": "5.59.7" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -828,13 +828,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.6.tgz", - "integrity": "sha512-A4tms2Mp5yNvLDlySF+kAThV9VTBPCvGf0Rp8nl/eoDX9Okun8byTKoj3fJ52IJitjWOk0fKPNQhXEB++eNozQ==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.7.tgz", + "integrity": "sha512-ozuz/GILuYG7osdY5O5yg0QxXUAEoI4Go3Do5xeu+ERH9PorHBPSdvD3Tjp2NN2bNLh1NJQSsQu2TPu/Ly+HaQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.6", - "@typescript-eslint/utils": "5.59.6", + "@typescript-eslint/typescript-estree": "5.59.7", + "@typescript-eslint/utils": "5.59.7", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -855,9 +855,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.6.tgz", - "integrity": "sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.7.tgz", + "integrity": "sha512-UnVS2MRRg6p7xOSATscWkKjlf/NDKuqo5TdbWck6rIRZbmKpVNTLALzNvcjIfHBE7736kZOFc/4Z3VcZwuOM/A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -868,13 +868,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.6.tgz", - "integrity": "sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.7.tgz", + "integrity": "sha512-4A1NtZ1I3wMN2UGDkU9HMBL+TIQfbrh4uS0WDMMpf3xMRursDbqEf1ahh6vAAe3mObt8k3ZATnezwG4pdtWuUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.6", - "@typescript-eslint/visitor-keys": "5.59.6", + "@typescript-eslint/types": "5.59.7", + "@typescript-eslint/visitor-keys": "5.59.7", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -895,17 +895,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.6.tgz", - "integrity": "sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.7.tgz", + "integrity": "sha512-yCX9WpdQKaLufz5luG4aJbOpdXf/fjwGMcLFXZVPUz3QqLirG5QcwwnIHNf8cjLjxK4qtzTO8udUtMQSAToQnQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.6", - "@typescript-eslint/types": "5.59.6", - "@typescript-eslint/typescript-estree": "5.59.6", + "@typescript-eslint/scope-manager": "5.59.7", + "@typescript-eslint/types": "5.59.7", + "@typescript-eslint/typescript-estree": "5.59.7", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -921,12 +921,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.6", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.6.tgz", - "integrity": "sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q==", + "version": "5.59.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.7.tgz", + "integrity": "sha512-tyN+X2jvMslUszIiYbF0ZleP+RqQsFVpGrKI6e0Eet1w8WmhsAtmzaqm8oM8WJQ1ysLwhnsK/4hYHJjOgJVfQQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.6", + "@typescript-eslint/types": "5.59.7", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1696,9 +1696,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001488", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz", - "integrity": "sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==", + "version": "1.0.30001489", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001489.tgz", + "integrity": "sha512-x1mgZEXK8jHIfAxm+xgdpHpk50IN3z3q3zP261/WS+uvePxW8izXuCu6AHz0lkuYTlATDehiZ/tNyYBdSQsOUQ==", "funding": [ { "type": "opencollective", @@ -2028,9 +2028,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.402", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.402.tgz", - "integrity": "sha512-gWYvJSkohOiBE6ecVYXkrDgNaUjo47QEKK0kQzmWyhkH+yoYiG44bwuicTGNSIQRG3WDMsWVZJLRnJnLNkbWvA==", + "version": "1.4.405", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.405.tgz", + "integrity": "sha512-JdDgnwU69FMZURoesf9gNOej2Cms1XJFfLk24y1IBtnAdhTcJY/mXnokmpmxHN59PcykBP4bgUU98vLY44Lhuw==", "peer": true }, "node_modules/emoji-regex": { @@ -2040,9 +2040,9 @@ "dev": true }, "node_modules/enhanced-resolve": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz", - "integrity": "sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==", + "version": "5.14.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz", + "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==", "peer": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -2206,9 +2206,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.13.0.tgz", - "integrity": "sha512-aBz9A8WB4wmpnVv0pYUt86cmH9EkcwWzgEwecBxMoRNhQjTL5i4sqadnwShv/hOdr8Hbl8XANGV7dtX9UQIAyA==", + "version": "9.14.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.14.0.tgz", + "integrity": "sha512-4O7EuiqPGVQA1wYCzLvCzsBTv9JIPHLHhrf0k55DLzbwtmJbSw2TKS0G/l7pOwi9RWMSkjIT7ftChU5gZpgnJw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.3.0", @@ -2479,11 +2479,11 @@ "dev": true }, "node_modules/focus-trap": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.0.tgz", - "integrity": "sha512-yI7FwUqU4TVb+7t6PaQ3spT/42r/KLEi8mtdGoQo2li/kFzmu9URmalTvw7xCCJtSOyhBxscvEAmvjeN9iHARg==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.3.tgz", + "integrity": "sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==", "dependencies": { - "tabbable": "^6.1.1" + "tabbable": "^6.1.2" } }, "node_modules/fontaine": { @@ -2842,9 +2842,9 @@ "dev": true }, "node_modules/laravel-vite-plugin": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-0.7.7.tgz", - "integrity": "sha512-/KsnyNUOMylBVLvGz1VlL1ukxyQeMQUz4zmnMflYe8fAWzLvjHDXnbh6fLgIrzAmevzNjYm/TUqmD5Io0+kqhg==", + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-0.7.8.tgz", + "integrity": "sha512-HWYqpQYHR3kEQ1LsHX7gHJoNNf0bz5z5mDaHBLzS+PGLCTmYqlU5/SZyeEgObV7z7bC/cnStYcY9H1DI1D5Udg==", "dev": true, "dependencies": { "picocolors": "^1.0.0", @@ -3031,9 +3031,9 @@ } }, "node_modules/mlly": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.2.1.tgz", - "integrity": "sha512-1aMEByaWgBPEbWV2BOPEMySRrzl7rIHXmQxam4DM8jVjalTQDjpN2ZKOLUrwyhfZQO7IXHml2StcHMhooDeEEQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.3.0.tgz", + "integrity": "sha512-HT5mcgIQKkOrZecOjOX3DJorTikWXwsBfpcr/MGBkhfWcjiqvnaL/9ppxvIUXfjT6xt4DVIAsN9fMUz1ev4bIw==", "dev": true, "dependencies": { "acorn": "^8.8.2", @@ -3104,9 +3104,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", - "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz", + "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==", "peer": true }, "node_modules/normalize-path": { @@ -3534,9 +3534,9 @@ } }, "node_modules/rollup": { - "version": "3.22.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.22.0.tgz", - "integrity": "sha512-imsigcWor5Y/dC0rz2q0bBt9PabcL3TORry2hAa6O6BuMvY71bqHyfReAz5qyAqiQATD1m70qdntqBfBQjVWpQ==", + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.23.0.tgz", + "integrity": "sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==", "bin": { "rollup": "dist/bin/rollup" }, @@ -3873,9 +3873,9 @@ } }, "node_modules/tabbable": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.1.1.tgz", - "integrity": "sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==" + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.1.2.tgz", + "integrity": "sha512-qCN98uP7i9z0fIS4amQ5zbGBOq+OSigYeGvPy7NDk8Y9yncqDZ9pRPgfsc2PJIVM9RrJj7GIfuRgmjoUU9zTHQ==" }, "node_modules/tapable": { "version": "2.2.1", @@ -3887,9 +3887,9 @@ } }, "node_modules/terser": { - "version": "5.17.4", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.4.tgz", - "integrity": "sha512-jcEKZw6UPrgugz/0Tuk/PVyLAPfMBJf5clnGueo45wTweoV8yh7Q7PEkhkJ5uuUbC7zAxEcG3tqNr1bstkQ8nw==", + "version": "5.17.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.6.tgz", + "integrity": "sha512-V8QHcs8YuyLkLHsJO5ucyff1ykrLVsR4dNnS//L5Y3NiSXpbK1J+WMVUs67eI0KTxs9JtHhgEQpXQVHlHI92DQ==", "peer": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -4566,9 +4566,9 @@ "dev": true }, "node_modules/webpack": { - "version": "5.83.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.83.1.tgz", - "integrity": "sha512-TNsG9jDScbNuB+Lb/3+vYolPplCS3bbEaJf+Bj0Gw4DhP3ioAflBb1flcRt9zsWITyvOhM96wMQNRWlSX52DgA==", + "version": "5.84.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.0.tgz", + "integrity": "sha512-XezNK3kwJq6IyeoZmZ1uEqQs+42nTqIi4jYM/YjLwaJedUC1N3bwnCC0+UcnHJPfqWX0kGrQnMIvZZyWYaIZrA==", "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -4577,10 +4577,10 @@ "@webassemblyjs/wasm-edit": "^1.11.5", "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.14.0", + "enhanced-resolve": "^5.14.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", From c6c639afc21ca63f2fbd521584e45d360423a37c Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 24 May 2023 21:36:42 +0000 Subject: [PATCH 2/2] Apply code style --- app/Enum/CurlErrorCodes.php | 4 +- app/Enum/Enum.php | 6 +-- .../Controllers/Api/AttachmentController.php | 16 ++++---- app/Http/Controllers/Api/OCRController.php | 38 ++++++++++--------- .../Api/SubscriptionController.php | 3 +- app/Models/Permission.php | 1 + tests/Feature/ContactFormTest.php | 2 + 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/app/Enum/CurlErrorCodes.php b/app/Enum/CurlErrorCodes.php index 64316ee..9429f13 100644 --- a/app/Enum/CurlErrorCodes.php +++ b/app/Enum/CurlErrorCodes.php @@ -80,7 +80,7 @@ class CurlErrorCodes extends Enum public const CURLE_RTSP_SESSION_ERROR = 86; public const CURLE_FTP_BAD_FILE_LIST = 87; public const CURLE_CHUNK_FAILED = 88; - + /** * Curl Error messages @@ -163,7 +163,7 @@ class CurlErrorCodes extends Enum 86 => 'CURLE_RTSP_SESSION_ERROR.', 87 => 'CURLE_FTP_BAD_FILE_LIST.', 88 => 'CURLE_CHUNK_FAILED.', - + ]; } diff --git a/app/Enum/Enum.php b/app/Enum/Enum.php index 6bf900b..5596e01 100644 --- a/app/Enum/Enum.php +++ b/app/Enum/Enum.php @@ -8,7 +8,7 @@ class Enum { /** * Message list - * + * * @var array> */ public static $messages = []; @@ -57,12 +57,12 @@ class Enum /** * Returns a message from the enum subclass - * + * * @return string */ public static function getMessage(int $messageIndex, string $defaultMessage = 'Unknown'): string { - if(array_key_exists($messageIndex, self::$messages) === true) { + if (array_key_exists($messageIndex, self::$messages) === true) { return self::$messages[$messageIndex]; } diff --git a/app/Http/Controllers/Api/AttachmentController.php b/app/Http/Controllers/Api/AttachmentController.php index 36a5acc..6586734 100644 --- a/app/Http/Controllers/Api/AttachmentController.php +++ b/app/Http/Controllers/Api/AttachmentController.php @@ -29,7 +29,7 @@ class AttachmentController extends ApiController /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function store(Request $request) @@ -40,7 +40,7 @@ class AttachmentController extends ApiController /** * Display the specified resource. * - * @param \App\Models\Attachment $attachment + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ public function show(Attachment $attachment) @@ -51,7 +51,7 @@ class AttachmentController extends ApiController /** * Show the form for editing the specified resource. * - * @param \App\Models\Attachment $attachment + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ public function edit(Attachment $attachment) @@ -62,11 +62,11 @@ class AttachmentController extends ApiController /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param \App\Models\Attachment $attachment + * @param \Illuminate\Http\Request $request + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ - public function update(Request $request, Attachment $attachment) + public function update(Request $request, Attachment $attachment) { // } @@ -74,10 +74,10 @@ class AttachmentController extends ApiController /** * Remove the specified resource from storage. * - * @param \App\Models\Attachment $attachment + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ - public function destroy(Attachment $attachment) + public function destroy(Attachment $attachment) { // } diff --git a/app/Http/Controllers/Api/OCRController.php b/app/Http/Controllers/Api/OCRController.php index cc02fd1..045f18d 100644 --- a/app/Http/Controllers/Api/OCRController.php +++ b/app/Http/Controllers/Api/OCRController.php @@ -32,7 +32,7 @@ class OCRController extends ApiController $data = ['ocr' => []]; $filters = $request->get('filters', ['tesseract']); - if(is_array($filters) === false) { + if (is_array($filters) === false) { $filters = explode(',', $filters); } @@ -52,9 +52,12 @@ class OCRController extends ApiController // We need progress updates to break the connection mid-way curl_setopt($ch, CURLOPT_BUFFERSIZE, 128); // more progress info curl_setopt($ch, CURLOPT_NOPROGRESS, false); - curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function( - $downloadSize, $downloaded, $uploadSize, $uploaded - ) use($maxDownloadSize) { + curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function ( + $downloadSize, + $downloaded, + $uploadSize, + $uploaded + ) use ($maxDownloadSize) { return ($downloaded > $maxDownloadSize) ? 1 : 0; }); @@ -62,9 +65,9 @@ class OCRController extends ApiController $curlError = curl_errno($ch); $curlSize = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD); curl_close($ch); - if($curlError !== 0) { + if ($curlError !== 0) { $error = 'File size is larger then allowed'; - if($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) { + if ($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) { $error = CurlErrorCodes::getMessage($curlError); } @@ -77,8 +80,8 @@ class OCRController extends ApiController // tesseract (overall) $ocr = null; - foreach($filters as $filterItem) { - if(str_starts_with($filterItem, 'tesseract') === true) { + foreach ($filters as $filterItem) { + if (str_starts_with($filterItem, 'tesseract') === true) { $ocr = new TesseractOCR(); $ocr->image($urlDownloadFilePath); if ($tesseractOEM !== null) { @@ -95,11 +98,10 @@ class OCRController extends ApiController } // Image Filter Function - $tesseractImageFilterFunc = function($filter, $options = null) use($curlResult, $curlSize, $ocr) { + $tesseractImageFilterFunc = function ($filter, $options = null) use ($curlResult, $curlSize, $ocr) { $result = ''; $img = imagecreatefromstring($curlResult); if ($img !== false && (($options !== null && imagefilter($img, $filter, $options) === true) || ($options === null && imagefilter($img, $filter) === true))) { - ob_start(); imagepng($img); $imgData = ob_get_contents(); @@ -108,7 +110,7 @@ class OCRController extends ApiController $ocr->imageData($imgData, $imgDataSize); imagedestroy($img); - + $result = $ocr->run(500); } @@ -116,7 +118,7 @@ class OCRController extends ApiController }; // Image Scale Function - $tesseractImageScaleFunc = function($scaleFunc) use ($curlResult, $ocr) { + $tesseractImageScaleFunc = function ($scaleFunc) use ($curlResult, $ocr) { $result = ''; $srcImage = imagecreatefromstring($curlResult); $srcWidth = imagesx($srcImage); @@ -133,7 +135,7 @@ class OCRController extends ApiController $imgData = ob_get_contents(); ob_end_clean(); $imgDataSize = strlen($imgData); - + imagedestroy($srcImage); imagedestroy($dstImage); @@ -143,7 +145,7 @@ class OCRController extends ApiController }; // filter: tesseract - if(in_array('tesseract', $filters) === true) { + if (in_array('tesseract', $filters) === true) { $data['ocr']['tesseract'] = $ocr->run(500); } @@ -154,14 +156,14 @@ class OCRController extends ApiController // filter: tesseract.double_scale if (in_array('tesseract.double_scale', $filters) === true) { - $data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function($size) { + $data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function ($size) { return $size * 2; }); } // filter: tesseract.half_scale if (in_array('tesseract.half_scale', $filters) === true) { - $data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function($size) { + $data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function ($size) { return $size / 2; }); } @@ -187,12 +189,12 @@ class OCRController extends ApiController } // filter: keras - if(in_array('keras', $filters) === true) { + if (in_array('keras', $filters) === true) { $cmd = '/usr/bin/python3 ' . base_path() . '/scripts/keras_oc.py ' . urlencode($url); $command = escapeshellcmd($cmd); $output = shell_exec($cmd); if ($output !== null && strlen($output) > 0) { - $output = substr($output, strpos($output, '----------START----------') + 25); + $output = substr($output, (strpos($output, '----------START----------') + 25)); } else { $output = ''; } diff --git a/app/Http/Controllers/Api/SubscriptionController.php b/app/Http/Controllers/Api/SubscriptionController.php index 3b5bfc2..4ff80c6 100644 --- a/app/Http/Controllers/Api/SubscriptionController.php +++ b/app/Http/Controllers/Api/SubscriptionController.php @@ -35,7 +35,8 @@ class SubscriptionController extends ApiController return $this->respondAsResource( $collection, ['isCollection' => true, - 'appendData' => ['total' => $total]] + 'appendData' => ['total' => $total] + ] ); } diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 4b392e2..5c35923 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -21,6 +21,7 @@ class Permission extends Model 'user', ]; + /** * Get the User associated with this model * diff --git a/tests/Feature/ContactFormTest.php b/tests/Feature/ContactFormTest.php index 736bcf2..3bb7f94 100644 --- a/tests/Feature/ContactFormTest.php +++ b/tests/Feature/ContactFormTest.php @@ -1,4 +1,5 @@