From 06e4c711afeddce676e8cc2d69188ca426327a94 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Thu, 5 Sep 2024 09:05:02 +0200 Subject: [PATCH 1/4] fix(php): add PHPStan for static code analysis --- .../algoliasearch-client-php/composer.lock | 374 ++++++++++-------- .../lib/ApiException.php | 2 - .../lib/Cache/NullCacheDriver.php | 16 +- .../lib/Configuration/ConfigWithRegion.php | 2 - .../lib/Configuration/Configuration.php | 2 - .../lib/Http/Psr7/BufferStream.php | 28 +- .../lib/Http/Psr7/PumpStream.php | 28 +- .../lib/Model/ModelInterface.php | 16 +- .../lib/ObjectSerializer.php | 39 +- clients/algoliasearch-client-php/phpstan.neon | 4 + config/generation.config.mjs | 6 +- .../algolia/codegen/AlgoliaPhpGenerator.java | 6 +- scripts/buildClients.ts | 7 + scripts/cli/index.ts | 6 +- templates/php/ApiException.mustache | 95 ----- templates/php/ConfigWithRegion.mustache | 26 -- templates/php/Configuration.mustache | 314 --------------- templates/php/ObjectSerializer.mustache | 341 ---------------- templates/php/composer.mustache | 18 +- templates/php/model.mustache | 8 +- templates/php/model_generic.mustache | 25 +- templates/php/snippets/method.mustache | 2 +- templates/php/tests/client/client.mustache | 4 +- .../php/tests/client/createClient.mustache | 4 +- templates/php/tests/client/tests.mustache | 2 +- templates/php/tests/e2e/e2e.mustache | 6 +- .../php/tests/requests/requests.mustache | 8 +- 27 files changed, 314 insertions(+), 1075 deletions(-) rename templates/php/ModelInterface.mustache => clients/algoliasearch-client-php/lib/Model/ModelInterface.php (84%) create mode 100644 clients/algoliasearch-client-php/phpstan.neon delete mode 100644 templates/php/ApiException.mustache delete mode 100644 templates/php/ConfigWithRegion.mustache delete mode 100644 templates/php/Configuration.mustache delete mode 100644 templates/php/ObjectSerializer.mustache diff --git a/clients/algoliasearch-client-php/composer.lock b/clients/algoliasearch-client-php/composer.lock index 0b10e25936..4b51a97760 100644 --- a/clients/algoliasearch-client-php/composer.lock +++ b/clients/algoliasearch-client-php/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8261da964bb108cdd9083509275bc94b", + "content-hash": "e7b0018bc5db5ae88dee804a6da3dda0", "packages": [ { "name": "guzzlehttp/psr7", - "version": "2.6.2", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "shasum": "" }, "require": { @@ -32,8 +32,8 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -104,7 +104,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.2" + "source": "https://github.com/guzzle/psr7/tree/2.7.0" }, "funding": [ { @@ -120,7 +120,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:05:35+00:00" + "time": "2024-07-18T11:15:46+00:00" }, { "name": "psr/http-factory", @@ -232,16 +232,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -276,9 +276,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "psr/simple-cache", @@ -443,30 +443,38 @@ }, { "name": "composer/pcre", - "version": "3.1.4", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "04229f163664973f68f38f6f73d917799168ef24" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", - "reference": "04229f163664973f68f38f6f73d917799168ef24", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -494,7 +502,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.4" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -510,20 +518,20 @@ "type": "tidelift" } ], - "time": "2024-05-27T13:40:54+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", "shasum": "" }, "require": { @@ -575,7 +583,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.2" }, "funding": [ { @@ -591,7 +599,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-07-12T11:35:52+00:00" }, { "name": "composer/xdebug-handler", @@ -708,16 +716,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" + "reference": "8520451a140d3f46ac33042715115e290cf5785f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", "shasum": "" }, "require": { @@ -757,7 +765,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { @@ -765,20 +773,20 @@ "type": "github" } ], - "time": "2024-02-07T09:43:46+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.59.3", + "version": "v3.64.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29" + "reference": "58dd9c931c785a79739310aef5178928305ffa67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29", - "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67", + "reference": "58dd9c931c785a79739310aef5178928305ffa67", "shasum": "" }, "require": { @@ -860,7 +868,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0" }, "funding": [ { @@ -868,28 +876,28 @@ "type": "github" } ], - "time": "2024-06-16T14:17:03+00:00" + "time": "2024-08-30T23:09:38+00:00" }, { "name": "graham-campbell/result-type", - "version": "v1.1.2", + "version": "v1.1.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945", + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2" + "phpoption/phpoption": "^1.9.3" }, "require-dev": { - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "type": "library", "autoload": { @@ -918,7 +926,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3" }, "funding": [ { @@ -930,7 +938,7 @@ "type": "tidelift" } ], - "time": "2023-11-12T22:16:48+00:00" + "time": "2024-07-20T21:45:45+00:00" }, { "name": "myclabs/deep-copy", @@ -1170,16 +1178,16 @@ }, { "name": "phpoption/phpoption", - "version": "1.9.2", + "version": "1.9.3", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", - "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", "shasum": "" }, "require": { @@ -1187,13 +1195,13 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "type": "library", "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "1.9-dev" @@ -1229,7 +1237,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" }, "funding": [ { @@ -1241,36 +1249,94 @@ "type": "tidelift" } ], - "time": "2023-11-12T21:59:55+00:00" + "time": "2024-07-20T21:41:07+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.12.1", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2", + "reference": "d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + } + ], + "time": "2024-09-03T19:55:22+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "11.0.5", + "version": "11.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "19b6365ab8b59a64438c0c3f4241feeb480c9861" + "reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/19b6365ab8b59a64438c0c3f4241feeb480c9861", - "reference": "19b6365ab8b59a64438c0c3f4241feeb480c9861", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ebdffc9e09585dafa71b9bffcdb0a229d4704c45", + "reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.0", + "nikic/php-parser": "^5.1.0", "php": ">=8.2", - "phpunit/php-file-iterator": "^5.0", - "phpunit/php-text-template": "^4.0", - "sebastian/code-unit-reverse-lookup": "^4.0", - "sebastian/complexity": "^4.0", - "sebastian/environment": "^7.0", - "sebastian/lines-of-code": "^3.0", - "sebastian/version": "^5.0", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^5.0.1", + "phpunit/php-text-template": "^4.0.1", + "sebastian/code-unit-reverse-lookup": "^4.0.1", + "sebastian/complexity": "^4.0.1", + "sebastian/environment": "^7.2.0", + "sebastian/lines-of-code": "^3.0.1", + "sebastian/version": "^5.0.1", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { "phpunit/phpunit": "^11.0" @@ -1282,7 +1348,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "11.0-dev" + "dev-main": "11.0.x-dev" } }, "autoload": { @@ -1311,7 +1377,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.5" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.6" }, "funding": [ { @@ -1319,20 +1385,20 @@ "type": "github" } ], - "time": "2024-07-03T05:05:37+00:00" + "time": "2024-08-22T04:37:56+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "5.0.1", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "6ed896bf50bbbfe4d504a33ed5886278c78e4a26" + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6ed896bf50bbbfe4d504a33ed5886278c78e4a26", - "reference": "6ed896bf50bbbfe4d504a33ed5886278c78e4a26", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6", + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6", "shasum": "" }, "require": { @@ -1372,7 +1438,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0" }, "funding": [ { @@ -1380,7 +1446,7 @@ "type": "github" } ], - "time": "2024-07-03T05:06:37+00:00" + "time": "2024-08-27T05:02:59+00:00" }, { "name": "phpunit/php-invoker", @@ -1568,16 +1634,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.2.6", + "version": "11.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1dc0fedac703199e8704de085e47dd46bac0dde4" + "reference": "8ed08766d9a2ed979a2f5fdbb95a0671523419c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1dc0fedac703199e8704de085e47dd46bac0dde4", - "reference": "1dc0fedac703199e8704de085e47dd46bac0dde4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8ed08766d9a2ed979a2f5fdbb95a0671523419c1", + "reference": "8ed08766d9a2ed979a2f5fdbb95a0671523419c1", "shasum": "" }, "require": { @@ -1587,25 +1653,25 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0", - "phpunit/php-file-iterator": "^5.0", - "phpunit/php-invoker": "^5.0", - "phpunit/php-text-template": "^4.0", - "phpunit/php-timer": "^7.0", - "sebastian/cli-parser": "^3.0", - "sebastian/code-unit": "^3.0", - "sebastian/comparator": "^6.0", - "sebastian/diff": "^6.0", - "sebastian/environment": "^7.0", - "sebastian/exporter": "^6.1.2", - "sebastian/global-state": "^7.0", - "sebastian/object-enumerator": "^6.0", - "sebastian/type": "^5.0", - "sebastian/version": "^5.0" + "phpunit/php-code-coverage": "^11.0.6", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-invoker": "^5.0.1", + "phpunit/php-text-template": "^4.0.1", + "phpunit/php-timer": "^7.0.1", + "sebastian/cli-parser": "^3.0.2", + "sebastian/code-unit": "^3.0.1", + "sebastian/comparator": "^6.0.2", + "sebastian/diff": "^6.0.2", + "sebastian/environment": "^7.2.0", + "sebastian/exporter": "^6.1.3", + "sebastian/global-state": "^7.0.2", + "sebastian/object-enumerator": "^6.0.1", + "sebastian/type": "^5.0.1", + "sebastian/version": "^5.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -1616,7 +1682,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "11.2-dev" + "dev-main": "11.3-dev" } }, "autoload": { @@ -1648,7 +1714,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.2.6" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.3.3" }, "funding": [ { @@ -1664,7 +1730,7 @@ "type": "tidelift" } ], - "time": "2024-07-03T05:51:49+00:00" + "time": "2024-09-04T13:34:52+00:00" }, { "name": "psr/container", @@ -2143,31 +2209,31 @@ }, { "name": "react/socket", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/reactphp/socket.git", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038" + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", "shasum": "" }, "require": { "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "php": ">=5.3.0", - "react/dns": "^1.11", + "react/dns": "^1.13", "react/event-loop": "^1.2", - "react/promise": "^3 || ^2.6 || ^1.2.1", - "react/stream": "^1.2" + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" }, "require-dev": { "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", - "react/async": "^4 || ^3 || ^2", + "react/async": "^4.3 || ^3.3 || ^2", "react/promise-stream": "^1.4", - "react/promise-timer": "^1.10" + "react/promise-timer": "^1.11" }, "type": "library", "autoload": { @@ -2211,7 +2277,7 @@ ], "support": { "issues": "https://github.com/reactphp/socket/issues", - "source": "https://github.com/reactphp/socket/tree/v1.15.0" + "source": "https://github.com/reactphp/socket/tree/v1.16.0" }, "funding": [ { @@ -2219,7 +2285,7 @@ "type": "open_collective" } ], - "time": "2023-12-15T11:02:10+00:00" + "time": "2024-07-26T10:38:09+00:00" }, { "name": "react/stream", @@ -2471,16 +2537,16 @@ }, { "name": "sebastian/comparator", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "131942b86d3587291067a94f295498ab6ac79c20" + "reference": "450d8f237bd611c45b5acf0733ce43e6bb280f81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/131942b86d3587291067a94f295498ab6ac79c20", - "reference": "131942b86d3587291067a94f295498ab6ac79c20", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/450d8f237bd611c45b5acf0733ce43e6bb280f81", + "reference": "450d8f237bd611c45b5acf0733ce43e6bb280f81", "shasum": "" }, "require": { @@ -2536,7 +2602,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.0.2" }, "funding": [ { @@ -2544,7 +2610,7 @@ "type": "github" } ], - "time": "2024-07-03T04:48:07+00:00" + "time": "2024-08-12T06:07:25+00:00" }, { "name": "sebastian/complexity", @@ -3224,16 +3290,16 @@ }, { "name": "symfony/console", - "version": "v7.1.2", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0aa29ca177f432ab68533432db0de059f39c92ae" + "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae", - "reference": "0aa29ca177f432ab68533432db0de059f39c92ae", + "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111", + "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111", "shasum": "" }, "require": { @@ -3297,7 +3363,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.2" + "source": "https://github.com/symfony/console/tree/v7.1.4" }, "funding": [ { @@ -3313,7 +3379,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T10:03:55+00:00" + "time": "2024-08-15T22:48:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3606,16 +3672,16 @@ }, { "name": "symfony/finder", - "version": "v7.1.1", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", - "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823", + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823", "shasum": "" }, "require": { @@ -3650,7 +3716,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.1" + "source": "https://github.com/symfony/finder/tree/v7.1.4" }, "funding": [ { @@ -3666,7 +3732,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-08-13T14:28:19+00:00" }, { "name": "symfony/options-resolver", @@ -4211,16 +4277,16 @@ }, { "name": "symfony/process", - "version": "v7.1.1", + "version": "v7.1.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "febf90124323a093c7ee06fdb30e765ca3c20028" + "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028", - "reference": "febf90124323a093c7ee06fdb30e765ca3c20028", + "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca", + "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca", "shasum": "" }, "require": { @@ -4252,7 +4318,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.1" + "source": "https://github.com/symfony/process/tree/v7.1.3" }, "funding": [ { @@ -4268,7 +4334,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-07-26T12:44:47+00:00" }, { "name": "symfony/service-contracts", @@ -4417,16 +4483,16 @@ }, { "name": "symfony/string", - "version": "v7.1.2", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8" + "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8", - "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8", + "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b", + "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b", "shasum": "" }, "require": { @@ -4484,7 +4550,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.2" + "source": "https://github.com/symfony/string/tree/v7.1.4" }, "funding": [ { @@ -4500,7 +4566,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:27:18+00:00" + "time": "2024-08-12T09:59:40+00:00" }, { "name": "theseer/tokenizer", @@ -4554,23 +4620,23 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.6.0", + "version": "v5.6.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" + "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", - "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2", + "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.1.2", + "graham-campbell/result-type": "^1.1.3", "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.2", + "phpoption/phpoption": "^1.9.3", "symfony/polyfill-ctype": "^1.24", "symfony/polyfill-mbstring": "^1.24", "symfony/polyfill-php80": "^1.24" @@ -4587,7 +4653,7 @@ "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "5.6-dev" @@ -4622,7 +4688,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1" }, "funding": [ { @@ -4634,7 +4700,7 @@ "type": "tidelift" } ], - "time": "2023-11-12T22:43:29+00:00" + "time": "2024-07-20T21:52:34+00:00" } ], "aliases": [], diff --git a/clients/algoliasearch-client-php/lib/ApiException.php b/clients/algoliasearch-client-php/lib/ApiException.php index bdc0e41fbc..c88c57de78 100644 --- a/clients/algoliasearch-client-php/lib/ApiException.php +++ b/clients/algoliasearch-client-php/lib/ApiException.php @@ -1,7 +1,5 @@ hwm = $hwm; } - public function __toString() + public function __toString(): string { return $this->getContents(); } - public function getContents() + public function getContents(): string { $buffer = $this->buffer; $this->buffer = ''; @@ -45,52 +45,52 @@ public function getContents() return $buffer; } - public function close() + public function close(): void { $this->buffer = ''; } - public function detach() + public function detach(): void { $this->close(); } - public function getSize() + public function getSize(): int { return mb_strlen($this->buffer); } - public function isReadable() + public function isReadable(): bool { return true; } - public function isWritable() + public function isWritable(): bool { return true; } - public function isSeekable() + public function isSeekable(): bool { return false; } - public function rewind() + public function rewind(): void { $this->seek(0); } - public function seek($offset, $whence = SEEK_SET) + public function seek($offset, $whence = SEEK_SET): void { throw new \RuntimeException('Cannot seek a BufferStream'); } - public function eof() + public function eof(): bool { return 0 === mb_strlen($this->buffer); } - public function tell() + public function tell(): int { throw new \RuntimeException('Cannot determine the position of a BufferStream'); } @@ -100,7 +100,7 @@ public function tell() * * @param mixed $length */ - public function read($length) + public function read($length): string { $currentLength = mb_strlen($this->buffer); @@ -122,7 +122,7 @@ public function read($length) * * @param mixed $string */ - public function write($string) + public function write($string): int { $this->buffer .= $string; diff --git a/clients/algoliasearch-client-php/lib/Http/Psr7/PumpStream.php b/clients/algoliasearch-client-php/lib/Http/Psr7/PumpStream.php index 541eec189e..c2846553e9 100644 --- a/clients/algoliasearch-client-php/lib/Http/Psr7/PumpStream.php +++ b/clients/algoliasearch-client-php/lib/Http/Psr7/PumpStream.php @@ -53,7 +53,7 @@ public function __construct(callable $source, array $options = []) $this->buffer = new BufferStream(); } - public function __toString() + public function __toString(): string { try { return copy_to_string($this); @@ -62,63 +62,63 @@ public function __toString() } } - public function close() + public function close(): void { $this->detach(); } - public function detach() + public function detach(): void { $this->tellPos = false; $this->source = null; } - public function getSize() + public function getSize(): ?int { return $this->size; } - public function tell() + public function tell(): int { return $this->tellPos; } - public function eof() + public function eof(): bool { return !$this->source; } - public function isSeekable() + public function isSeekable(): bool { return false; } - public function rewind() + public function rewind(): void { $this->seek(0); } - public function seek($offset, $whence = SEEK_SET) + public function seek($offset, $whence = SEEK_SET): void { throw new \RuntimeException('Cannot seek a PumpStream'); } - public function isWritable() + public function isWritable(): bool { return false; } - public function write($string) + public function write($string): int { throw new \RuntimeException('Cannot write to a PumpStream'); } - public function isReadable() + public function isReadable(): bool { return true; } - public function read($length) + public function read($length): string { $data = $this->buffer->read($length); $readLen = mb_strlen($data); @@ -134,7 +134,7 @@ public function read($length) return $data; } - public function getContents() + public function getContents(): string { $result = ''; while (!$this->eof()) { diff --git a/templates/php/ModelInterface.mustache b/clients/algoliasearch-client-php/lib/Model/ModelInterface.php similarity index 84% rename from templates/php/ModelInterface.mustache rename to clients/algoliasearch-client-php/lib/Model/ModelInterface.php index 5739c3b800..35eccec88e 100644 --- a/templates/php/ModelInterface.mustache +++ b/clients/algoliasearch-client-php/lib/Model/ModelInterface.php @@ -1,39 +1,35 @@ getRealPath(); - } - - return self::toString($value); - } - /** * Take value and turn it into a string suitable for inclusion in * the parameter. If it's a string, pass through unchanged diff --git a/clients/algoliasearch-client-php/phpstan.neon b/clients/algoliasearch-client-php/phpstan.neon new file mode 100644 index 0000000000..b1878ecde3 --- /dev/null +++ b/clients/algoliasearch-client-php/phpstan.neon @@ -0,0 +1,4 @@ +parameters: + excludePaths: + - vendor/* + level: max diff --git a/config/generation.config.mjs b/config/generation.config.mjs index c5dade82c2..f87c4052ce 100644 --- a/config/generation.config.mjs +++ b/config/generation.config.mjs @@ -99,10 +99,10 @@ export const patterns = [ 'clients/algoliasearch-client-php/lib/Api/*', 'clients/algoliasearch-client-php/lib/Model/**', '!clients/algoliasearch-client-php/lib/Model/AbstractModel.php', + '!clients/algoliasearch-client-php/lib/Model/ModelInterface.php', 'clients/algoliasearch-client-php/lib/Configuration/*', - 'clients/algoliasearch-client-php/lib/ApiException.php', - 'clients/algoliasearch-client-php/lib/ObjectSerializer.php', - 'clients/algoliasearch-client-php/lib/Algolia.php', + '!clients/algoliasearch-client-php/lib/Configuration/Configuration.php', + '!clients/algoliasearch-client-php/lib/Configuration/ConfigWithRegion.php', 'clients/algoliasearch-client-php/composer.json', // Python diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java index c0e9e15831..ff25805b47 100644 --- a/generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java +++ b/generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java @@ -44,9 +44,9 @@ public void processOpts() { supportingFiles.removeIf(file -> file.getTemplateFile().equals(".php-cs-fixer.dist.php")); supportingFiles.removeIf(file -> file.getTemplateFile().equals("phpunit.xml.mustache")); supportingFiles.removeIf(file -> file.getTemplateFile().equals("AbstractModel.php")); - - supportingFiles.add(new SupportingFile("Configuration.mustache", "lib/Configuration", "Configuration.php")); - supportingFiles.add(new SupportingFile("ConfigWithRegion.mustache", "lib/Configuration", "ConfigWithRegion.php")); + supportingFiles.removeIf(file -> file.getTemplateFile().equals("ApiException.mustache")); + supportingFiles.removeIf(file -> file.getTemplateFile().equals("ObjectSerializer.mustache")); + supportingFiles.removeIf(file -> file.getTemplateFile().equals("ModelInterface.mustache")); supportingFiles.add(new SupportingFile("client_config.mustache", "lib/Configuration", getClientName(client) + "Config.php")); supportingFiles.add(new SupportingFile("Algolia.mustache", "lib", "Algolia.php")); diff --git a/scripts/buildClients.ts b/scripts/buildClients.ts index e27850a342..0653d62724 100644 --- a/scripts/buildClients.ts +++ b/scripts/buildClients.ts @@ -32,6 +32,13 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B case 'kotlin': await run(`./gradle/gradlew -p ${cwd} assemble`, { language }); break; + case 'php': + // await runComposerInstall(); + // await run( + // `clients/algoliasearch-client-php/vendor/bin/phpstan analyse --memory-limit 512M -c clients/algoliasearch-client-php/phpstan.neon ${cwd}`, + // { language }, + // ); + break; case 'python': // there is no type checking for the playground or snippets if (buildType === 'client') { diff --git a/scripts/cli/index.ts b/scripts/cli/index.ts index 2e8939f3b6..3da8c8311b 100644 --- a/scripts/cli/index.ts +++ b/scripts/cli/index.ts @@ -3,6 +3,7 @@ import semver from 'semver'; import { buildClients, buildPlaygrounds, buildSnippets } from '../buildClients.js'; import { CI, CLIENTS, LANGUAGES, run, setVerbose } from '../common.js'; +import { getLanguageFolder } from '../config.js'; import { ctsGenerateMany } from '../cts/generate.js'; import { runCts } from '../cts/runCts.js'; import { startTestServer } from '../cts/testServer'; @@ -283,9 +284,10 @@ program .description('Executes a command inside the correct docker image') .addArgument(args.requiredLanguage) .argument('command...', 'The command to execute') - .action(async (language: Language, command: string[]) => { + .option('-c, --client', "Run the command in the client's folder") + .action(async (language: Language, command: string[], { client }) => { setVerbose(true); - await run(command.join(' '), { language }); + await run(command.join(' '), { language, cwd: client ? getLanguageFolder(language) : undefined }); }); program.parse(); diff --git a/templates/php/ApiException.mustache b/templates/php/ApiException.mustache deleted file mode 100644 index 1056167258..0000000000 --- a/templates/php/ApiException.mustache +++ /dev/null @@ -1,95 +0,0 @@ -responseHeaders = $responseHeaders; - $this->responseBody = $responseBody; - } - - /** - * Gets the HTTP response header - * - * @return string[]|null HTTP response header - */ - public function getResponseHeaders() - { - return $this->responseHeaders; - } - - /** - * Gets the HTTP body of the server response either as Json or string - * - * @return \stdClass|string|null HTTP body of the server response either as \stdClass or string - */ - public function getResponseBody() - { - return $this->responseBody; - } - - /** - * Sets the deserialized response object (during deserialization) - * - * @param mixed $obj Deserialized response object - * - * @return void - */ - public function setResponseObject($obj) - { - $this->responseObject = $obj; - } - - /** - * Gets the deserialized response object (during deserialization) - * - * @return mixed the deserialized response object - */ - public function getResponseObject() - { - return $this->responseObject; - } -} diff --git a/templates/php/ConfigWithRegion.mustache b/templates/php/ConfigWithRegion.mustache deleted file mode 100644 index 238a765fb5..0000000000 --- a/templates/php/ConfigWithRegion.mustache +++ /dev/null @@ -1,26 +0,0 @@ - $appId, - 'apiKey' => $apiKey, - 'region' => $region, - ]; - - return new static($config); - } - - public function getRegion() - { - return $this->config['region']; - } -} diff --git a/templates/php/Configuration.mustache b/templates/php/Configuration.mustache deleted file mode 100644 index eede8c89e8..0000000000 --- a/templates/php/Configuration.mustache +++ /dev/null @@ -1,314 +0,0 @@ -setAlgoliaApiKey($config['apiKey']); - $this->setAuth('x-algolia-api-key', $config['apiKey']); - - $this->setAppId($config['appId']); - $this->setAuth('x-algolia-application-id', $config['appId']); - - $config += $this->getDefaultConfiguration(); - $this->config = $config; - } - - public static function create($appId, $apiKey) - { - $config = [ - 'appId' => $appId, - 'apiKey' => $apiKey, - ]; - - return new static($config); - } - - /** - * Sets Auth - * - * @param string $authIdentifier API key identifier (authentication scheme) - * @param string $key API key or token - * - * @return $this - */ - public function setAuth($authIdentifier, $key) - { - $this->auths[$authIdentifier] = $key; - return $this; - } - - /** - * Gets Auth - * - * @param string $authIdentifier Auth identifier (authentication scheme) - * - * @return null|string API key or token - */ - public function getAuth($authIdentifier) - { - return isset($this->auths[$authIdentifier]) ? $this->auths[$authIdentifier] : null; - } - - /** - * Sets debug flag - * - * @param bool $debug Debug flag - * - * @return $this - */ - public function setDebug($debug) - { - $this->debug = $debug; - return $this; - } - - /** - * Gets the debug flag - * - * @return bool - */ - public function getDebug() - { - return $this->debug; - } - - /** - * Sets the debug file - * - * @param string $debugFile Debug file - * - * @return $this - */ - public function setDebugFile($debugFile) - { - $this->debugFile = $debugFile; - return $this; - } - - /** - * Gets the debug file - * - * @return string - */ - public function getDebugFile() - { - return $this->debugFile; - } - - public function getDefaultConfiguration() - { - return [ - 'appId' => '', - 'apiKey' => '', - 'hosts' => null, - 'hasFullHosts' => false, - 'readTimeout' => $this->defaultReadTimeout, - 'writeTimeout' => $this->defaultWriteTimeout, - 'connectTimeout' => $this->defaultConnectTimeout, - 'defaultHeaders' => [], - ]; - } - - public function getAppId() - { - return $this->config['appId']; - } - - public function setAppId($appId) - { - $this->config['appId'] = $appId; - - return $this; - } - - public function getAlgoliaApiKey() - { - return $this->config['apiKey']; - } - - public function setAlgoliaApiKey($apiKey) - { - $this->config['apiKey'] = $apiKey; - - return $this; - } - - public function getHosts() - { - return $this->config['hosts']; - } - - public function setHosts($hosts) - { - $this->config['hosts'] = $hosts; - - return $this; - } - - public function setFullHosts($hosts) - { - $this->config['hasFullHosts'] = true; - - return $this->setHosts($hosts); - } - - public function getHasFullHosts() - { - return $this->config['hasFullHosts']; - } - - public function getReadTimeout() - { - return $this->config['readTimeout']; - } - - public function setReadTimeout($readTimeout) - { - $this->config['readTimeout'] = $readTimeout; - - return $this; - } - - public function getWriteTimeout() - { - return $this->config['writeTimeout']; - } - - public function setWriteTimeout($writeTimeout) - { - $this->config['writeTimeout'] = $writeTimeout; - - return $this; - } - - public function getConnectTimeout() - { - return $this->config['connectTimeout']; - } - - public function setConnectTimeout($connectTimeout) - { - $this->config['connectTimeout'] = $connectTimeout; - - return $this; - } - - public function getDefaultHeaders() - { - return $this->config['defaultHeaders']; - } - - public function setDefaultHeaders(array $defaultHeaders) - { - $this->config['defaultHeaders'] = $defaultHeaders; - - return $this; - } - - /** - * Sets the user agent of the api client - * - * @param string $algoliaAgent the user agent of the api client - * - * @throws \InvalidArgumentException - * - * @return $this - */ - public function setAlgoliaAgent($algoliaAgent) - { - if (!is_string($algoliaAgent)) { - throw new \InvalidArgumentException('User-agent must be a string.'); - } - - $this->algoliaAgent = $algoliaAgent; - - return $this; - } - - /** - * Gets the user agent of the api client - * - * @return string user agent - */ - public function getAlgoliaAgent() - { - return $this->algoliaAgent; - } - - /** - * Gets the name of the client which the config belongs to - * - * @return string client name - */ - public function getClientName() - { - return $this->clientName; - } -} diff --git a/templates/php/ObjectSerializer.mustache b/templates/php/ObjectSerializer.mustache deleted file mode 100644 index 0ef306068a..0000000000 --- a/templates/php/ObjectSerializer.mustache +++ /dev/null @@ -1,341 +0,0 @@ -format('Y-m-d') : $data->format(self::$dateTimeFormat); - } - - if (is_array($data)) { - foreach ($data as $property => $value) { - $data[$property] = self::sanitizeForSerialization($value); - } - return $data; - } - - if (is_object($data)) { - $values = []; - if ($data instanceof ModelInterface) { - $formats = $data::modelFormats(); - foreach ($data::modelTypes() as $property => $modelTypes) { - $getter = $data::getters()[$property]; - $value = $data->$getter(); - if ($value !== null && !in_array($modelTypes, [{{{primitives}}}], true)) { - $callable = [$modelTypes, 'getAllowableEnumValues']; - if (is_callable($callable)) { - /** array $callable */ - $allowedEnumTypes = $callable(); - if (!in_array($value, $allowedEnumTypes, true)) { - $imploded = implode("', '", $allowedEnumTypes); - throw new \InvalidArgumentException("Invalid value for enum '$modelTypes', must be one of: '$imploded'"); - } - } - } - if ($value !== null) { - $values[$data::attributeMap()[$property]] = self::sanitizeForSerialization($value, $modelTypes, $formats[$property]); - } - } - } else { - foreach($data as $property => $value) { - $values[$property] = self::sanitizeForSerialization($value); - } - } - return (object)$values; - } else { - return (string)$data; - } - } - - /** - * Sanitize filename by removing path. - * e.g. ../../sun.gif becomes sun.gif - * - * @param string $filename filename to be sanitized - * - * @return string the sanitized filename - */ - public static function sanitizeFilename($filename) - { - if (preg_match("/.*[\/\\\\](.*)$/", $filename, $match)) { - return $match[1]; - } else { - return $filename; - } - } - - /** - * Take value and turn it into a string suitable for inclusion in - * the path, by url-encoding. - * - * @param string $value a string which will be part of the path - * - * @return string the serialized object - */ - public static function toPathValue($value) - { - return rawurlencode(self::toString($value)); - } - - /** - * Take value and turn it into a string suitable for inclusion in - * the query, by imploding comma-separated if it's an object. - * If it's a string, pass through unchanged. It will be url-encoded - * later. - * - * @param string[]|string|\DateTime $object an object to be serialized to a string - * - * @return string the serialized object - */ - public static function toQueryValue($object) - { - if (is_array($object)) { - return implode(',', $object); - } else { - return self::toString($object); - } - } - - /** - * Take value and turn it into a string suitable for inclusion in - * the header. If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * - * @param string $value a string which will be part of the header - * - * @return string the header string - */ - public static function toHeaderValue($value) - { - $callable = [$value, 'toHeaderValue']; - if (is_callable($callable)) { - return $callable(); - } - - return self::toString($value); - } - - /** - * Take value and turn it into a string suitable for inclusion in - * the http body (form parameter). If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * - * @param string|\SplFileObject $value the value of the form parameter - * - * @return string the form string - */ - public static function toFormValue($value) - { - if ($value instanceof \SplFileObject) { - return $value->getRealPath(); - } else { - return self::toString($value); - } - } - - /** - * Take value and turn it into a string suitable for inclusion in - * the parameter. If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * If it's a boolean, convert it to "true" or "false". - * - * @param string|bool|\DateTime $value the value of the parameter - * - * @return string the header string - */ - public static function toString($value) - { - if ($value instanceof \DateTime) { // datetime in ISO8601 format - return $value->format(self::$dateTimeFormat); - } elseif (is_bool($value)) { - return $value ? 'true' : 'false'; - } else { - return $value; - } - } - - /** - * Serialize an array to a string. - * - * @param array $collection collection to serialize to a string - * @param string $style the format use for serialization (csv, - * ssv, tsv, pipes, multi) - * @param bool $allowCollectionFormatMulti allow collection format to be a multidimensional array - * - * @return string - */ - public static function serializeCollection(array $collection, $style, $allowCollectionFormatMulti = false) - { - if ($allowCollectionFormatMulti && ('multi' === $style)) { - // http_build_query() almost does the job for us. We just - // need to fix the result of multidimensional arrays. - return preg_replace('/%5B[0-9]+%5D=/', '=', http_build_query($collection, '', '&')); - } - switch ($style) { - case 'pipeDelimited': - case 'pipes': - return implode('|', $collection); - - case 'tsv': - return implode("\t", $collection); - - case 'spaceDelimited': - case 'ssv': - return implode(' ', $collection); - - case 'simple': - case 'csv': - // Deliberate fall through. CSV is default format. - default: - return implode(',', $collection); - } - } - - /** - * Deserialize a JSON string into an object - * - * @param mixed $data object or primitive to be deserialized - * @param string $class class name is passed as a string - * @param string[] $httpHeaders HTTP headers - * @param string $discriminator discriminator if polymorphism is used - * - * @return object|array|null a single or an array of $class instances - */ - public static function deserialize($data, $class, $httpHeaders = null) - { - if (null === $data) { - return null; - } - - if (strcasecmp(substr($class, -2), '[]') === 0) { - $data = is_string($data) ? json_decode($data) : $data; - - if (!is_array($data)) { - throw new \InvalidArgumentException("Invalid array '$class'"); - } - - $subClass = substr($class, 0, -2); - $values = []; - foreach ($data as $key => $value) { - $values[] = self::deserialize($value, $subClass, null); - } - return $values; - } - - if (preg_match('/^(array<|map\[)/', $class)) { // for associative array e.g. array - $data = is_string($data) ? json_decode($data) : $data; - settype($data, 'array'); - $inner = substr($class, 4, -1); - $deserialized = []; - if (strrpos($inner, ",") !== false) { - $subClass_array = explode(',', $inner, 2); - $subClass = $subClass_array[1]; - foreach ($data as $key => $value) { - $deserialized[$key] = self::deserialize($value, $subClass, null); - } - } - return $deserialized; - } - - if ($class === 'object') { - settype($data, 'array'); - return $data; - } else if ($class === 'mixed') { - settype($data, gettype($data)); - return $data; - } - - if ($class === '\DateTime') { - // Some API's return an invalid, empty string as a - // date-time property. DateTime::__construct() will return - // the current time for empty input which is probably not - // what is meant. The invalid empty string is probably to - // be interpreted as a missing field/value. Let's handle - // this graceful. - if (!empty($data)) { - try { - return new \DateTime($data); - } catch (\Exception $exception) { - // Some API's return a date-time with too high nanosecond - // precision for php's DateTime to handle. This conversion - // (string -> unix timestamp -> DateTime) is a workaround - // for the problem. - return (new \DateTime())->setTimestamp(strtotime($data)); - } - } else { - return null; - } - } - - /** @psalm-suppress ParadoxicalCondition */ - if (in_array($class, [{{{primitives}}}], true)) { - settype($data, $class); - return $data; - } - - if (method_exists($class, 'getAllowableEnumValues')) { - if (!in_array($data, $class::getAllowableEnumValues(), true)) { - $imploded = implode("', '", $class::getAllowableEnumValues()); - throw new \InvalidArgumentException("Invalid value for enum '$class', must be one of: '$imploded'"); - } - return $data; - } else { - $data = is_string($data) ? json_decode($data) : $data; - - /** @var ModelInterface $instance */ - $instance = new $class(); - foreach ($instance::modelTypes() as $property => $type) { - $propertySetter = $instance::setters()[$property]; - - if (!isset($propertySetter) || !isset($data->{$instance::attributeMap()[$property]})) { - continue; - } - - if (isset($data->{$instance::attributeMap()[$property]})) { - $propertyValue = $data->{$instance::attributeMap()[$property]}; - $instance->$propertySetter(self::deserialize($propertyValue, $type, null)); - } - } - return $instance; - } - } -} diff --git a/templates/php/composer.mustache b/templates/php/composer.mustache index 759570b216..1ea878a1d3 100644 --- a/templates/php/composer.mustache +++ b/templates/php/composer.mustache @@ -1,10 +1,6 @@ { - {{#composerPackageName}} - "name": "{{.}}", - {{/composerPackageName}} - {{#packageVersion}} - "version": "{{.}}", - {{/packageVersion}} + "name": "algolia/algoliasearch-client-php", + "version": "{{packageVersion}}", "description": "API powering the features of Algolia.", "keywords": [ "openapitools", @@ -36,17 +32,15 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.0 || ^3.5.0", "phpunit/phpunit": "^11.0", - "vlucas/phpdotenv": "^5.4" + "vlucas/phpdotenv": "^5.4", + "phpstan/phpstan": "^1.12" }, "autoload": { - "psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" }, + "psr-4": { "Algolia\\AlgoliaSearch\\" : "lib/" }, "files": [ - "{{srcBasePath}}/Http/Psr7/functions.php" + "lib/Http/Psr7/functions.php" ] }, - "autoload-dev": { - "psr-4": { "{{escapedInvokerPackage}}\\Test\\" : "{{testBasePath}}/" } - }, "suggest": { "guzzlehttp/guzzle": "If you prefer to use Guzzle HTTP client instead of the Http Client implementation provided by the package" }, diff --git a/templates/php/model.mustache b/templates/php/model.mustache index 9e0fe1b1a2..17b93315c2 100644 --- a/templates/php/model.mustache +++ b/templates/php/model.mustache @@ -6,12 +6,10 @@ {{#model}} namespace {{modelPackage}}; -{{^isEnum}} -{{^parentSchema}} -{{/parentSchema}} -{{/isEnum}} -use \{{invokerPackage}}\ObjectSerializer; +use Algolia\AlgoliaSearch\ObjectSerializer; +use Algolia\AlgoliaSearch\Model\AbstractModel; +use Algolia\AlgoliaSearch\Model\ModelInterface; /** * {{classname}} Class Doc Comment diff --git a/templates/php/model_generic.mustache b/templates/php/model_generic.mustache index e20b3f100d..6ec9357d2e 100644 --- a/templates/php/model_generic.mustache +++ b/templates/php/model_generic.mustache @@ -1,4 +1,4 @@ -class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parentSchema}}implements ModelInterface, \ArrayAccess, \JsonSerializable{{/parentSchema}} +class {{classname}} extends AbstractModel implements ModelInterface, \ArrayAccess, \JsonSerializable { /** * Array of property to type mappings. Used for (de)serialization @@ -39,7 +39,7 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent */ public static function attributeMap() { - return {{#parentSchema}}parent::attributeMap() + {{/parentSchema}}self::$attributeMap; + return self::$attributeMap; } /** @@ -49,7 +49,7 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent */ public static function modelTypes() { - return self::$modelTypes{{#parentSchema}} + parent::modelTypes(){{/parentSchema}}; + return self::$modelTypes; } /** @@ -59,7 +59,7 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent */ public static function modelFormats() { - return self::$modelFormats{{#parentSchema}} + parent::modelFormats(){{/parentSchema}}; + return self::$modelFormats; } /** @@ -89,7 +89,7 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent */ public static function setters() { - return {{#parentSchema}}parent::setters() + {{/parentSchema}}self::$setters; + return self::$setters; } /** @@ -99,7 +99,7 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent */ public static function getters() { - return {{#parentSchema}}parent::getters() + {{/parentSchema}}self::$getters; + return self::$getters; } {{#vars}} @@ -129,26 +129,20 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent {{/isEnum}} {{/vars}} - {{^parentSchema}} /** * Associative array for storing property values * * @var mixed[] */ protected $container = []; - {{/parentSchema}} /** * Constructor * * @param mixed[] $data Associated array of property values */ - public function __construct(array $data = null) + public function __construct({{#hasVars}}array $data = null{{/hasVars}}) { - {{#parentSchema}} - parent::__construct($data); - - {{/parentSchema}} {{#vars}} if (isset($data['{{name}}'])) { $this->container['{{name}}'] = $data['{{name}}']; @@ -163,12 +157,7 @@ class {{classname}} extends \Algolia\AlgoliaSearch\Model\AbstractModel {{^parent */ public function listInvalidProperties() { - {{#parentSchema}} - $invalidProperties = parent::listInvalidProperties(); - {{/parentSchema}} - {{^parentSchema}} $invalidProperties = []; - {{/parentSchema}} {{#vars}} {{#required}} diff --git a/templates/php/snippets/method.mustache b/templates/php/snippets/method.mustache index 5f41ebbe49..aba2278a51 100644 --- a/templates/php/snippets/method.mustache +++ b/templates/php/snippets/method.mustache @@ -17,7 +17,7 @@ class Snippet{{client}} * * {{{description}}} */ - public function snippetFor{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}() + public function snippetFor{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}(): void { // >SEPARATOR {{method}} {{testName}} // Initialize the client diff --git a/templates/php/tests/client/client.mustache b/templates/php/tests/client/client.mustache index 714d990d86..20ec65111a 100644 --- a/templates/php/tests/client/client.mustache +++ b/templates/php/tests/client/client.mustache @@ -29,7 +29,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface /** * @return {{client}} */ - private function createClient($appId, $apiKey{{#hasRegionalHost}}, $region = '{{{defaultRegion}}}'{{/hasRegionalHost}}) + private function createClient($appId, $apiKey{{#hasRegionalHost}}, $region = '{{{defaultRegion}}}'{{/hasRegionalHost}}): {{client}} { $config = {{clientPrefix}}Config::create($appId, $apiKey{{#hasRegionalHost}}, $region{{/hasRegionalHost}}); $clusterHosts = {{client}}::getClusterHosts($config); @@ -38,7 +38,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface return new {{client}}($api, $config); } - public function sendRequest(RequestInterface $request, $timeout, $connectTimeout) + public function sendRequest(RequestInterface $request, $timeout, $connectTimeout): Response { $this->recordedRequest = [ 'request' => $request, diff --git a/templates/php/tests/client/createClient.mustache b/templates/php/tests/client/createClient.mustache index d0aa361254..7f604abf39 100644 --- a/templates/php/tests/client/createClient.mustache +++ b/templates/php/tests/client/createClient.mustache @@ -1,8 +1,8 @@ {{#useEchoRequester}} $client = $this->createClient( {{#parametersWithDataTypeMap.appId}}"{{parametersWithDataTypeMap.appId.value}}"{{/parametersWithDataTypeMap.appId}}{{^parametersWithDataTypeMap.appId}}null{{/parametersWithDataTypeMap.appId}}, - {{#parametersWithDataTypeMap.apiKey}}"{{parametersWithDataTypeMap.apiKey.value}}"{{/parametersWithDataTypeMap.apiKey}}{{^parametersWithDataTypeMap.apiKey}}null{{/parametersWithDataTypeMap.apiKey}}, - {{#parametersWithDataTypeMap.region}}"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{^parametersWithDataTypeMap.region}}null{{/parametersWithDataTypeMap.region}} + {{#parametersWithDataTypeMap.apiKey}}"{{parametersWithDataTypeMap.apiKey.value}}"{{/parametersWithDataTypeMap.apiKey}}{{^parametersWithDataTypeMap.apiKey}}null{{/parametersWithDataTypeMap.apiKey}}{{#hasRegionalHost}}, + {{#parametersWithDataTypeMap.region}}"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{^parametersWithDataTypeMap.region}}null{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}} ); {{^isError}}$this->assertIsObject($client);{{/isError}}{{/useEchoRequester}}{{#hasCustomHosts}} $client = {{client}}::createWithConfig({{clientPrefix}}Config::create("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}"{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}},"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}})->setFullHosts([{{#customHosts}}"http://{{host}}:{{port}}"{{^-last}},{{/-last}}{{/customHosts}}])); diff --git a/templates/php/tests/client/tests.mustache b/templates/php/tests/client/tests.mustache index 923f57352a..646b6b9013 100644 --- a/templates/php/tests/client/tests.mustache +++ b/templates/php/tests/client/tests.mustache @@ -1,6 +1,6 @@ {{#tests}} #[TestDox('{{{testName}}}')] -public function test{{testIndex}}{{testType}}() +public function test{{testIndex}}{{testType}}(): void { {{#autoCreateClient}} $client = $this->createClient(self::APP_ID, self::API_KEY); diff --git a/templates/php/tests/e2e/e2e.mustache b/templates/php/tests/e2e/e2e.mustache index 7c1433b452..b801725c77 100644 --- a/templates/php/tests/e2e/e2e.mustache +++ b/templates/php/tests/e2e/e2e.mustache @@ -27,7 +27,7 @@ if (getenv('ALGOLIA_APPLICATION_ID')) { #[CoversClass({{client}}::class)] class {{clientPrefix}}Test extends TestCase { - protected function union($expected, $received) + protected function union($expected, $received): mixed { if (is_array($expected)) { $res = []; @@ -42,7 +42,7 @@ class {{clientPrefix}}Test extends TestCase return $received; } - protected function getClient() + protected function getClient(): {{client}} { return {{client}}::create($_ENV['ALGOLIA_APPLICATION_ID'], $_ENV['{{e2eApiKey}}']{{#hasRegionalHost}},'{{defaultRegion}}' {{/hasRegionalHost}}); } @@ -50,7 +50,7 @@ class {{clientPrefix}}Test extends TestCase {{#blocksE2E}} {{#tests}} #[TestDox('{{{testName}}}')] - public function test{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}() + public function test{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}(): void { $client = $this->getClient(); $resp = {{> tests/method}}; diff --git a/templates/php/tests/requests/requests.mustache b/templates/php/tests/requests/requests.mustache index bdce4fc840..26982aa0fe 100644 --- a/templates/php/tests/requests/requests.mustache +++ b/templates/php/tests/requests/requests.mustache @@ -21,7 +21,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface { private $recordedRequests = []; - protected function assertRequests(array $requests) + protected function assertRequests(array $requests): void { $this->assertGreaterThan(0, count($requests)); $this->assertEquals(count($requests), count($this->recordedRequests)); @@ -62,14 +62,14 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface } } - public function sendRequest(RequestInterface $request, $timeout, $connectTimeout) + public function sendRequest(RequestInterface $request, $timeout, $connectTimeout): Response { $this->recordedRequests[] = $request; return new Response(200, [], '{}'); } - protected function getClient() + protected function getClient(): {{client}} { $config = {{clientPrefix}}Config::create('appID', 'apiKey'{{#hasRegionalHost}},'{{defaultRegion}}' {{/hasRegionalHost}}); $api = new ApiWrapper($this, $config, ClusterHosts::create('127.0.0.1')); @@ -80,7 +80,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface {{#blocksRequests}} {{#tests}} #[TestDox('{{{testName}}}')] - public function test{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}() + public function test{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}(): void { $client = $this->getClient(); {{> tests/method}}; From ff7c00bdb3e776780f6c5656c170c5286b095dd1 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Thu, 5 Sep 2024 09:15:17 +0200 Subject: [PATCH 2/4] yarn lock --- .../algoliasearch-client-javascript/yarn.lock | 332 ++++++++---------- 1 file changed, 150 insertions(+), 182 deletions(-) diff --git a/clients/algoliasearch-client-javascript/yarn.lock b/clients/algoliasearch-client-javascript/yarn.lock index d64953d88c..df303a4e6a 100644 --- a/clients/algoliasearch-client-javascript/yarn.lock +++ b/clients/algoliasearch-client-javascript/yarn.lock @@ -330,27 +330,15 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2": - version: 7.25.0 - resolution: "@babel/generator@npm:7.25.0" - dependencies: - "@babel/types": "npm:^7.25.0" - "@jridgewell/gen-mapping": "npm:^0.3.5" - "@jridgewell/trace-mapping": "npm:^0.3.25" - jsesc: "npm:^2.5.1" - checksum: 10/de3ce2ae7aa0c9585260556ca5a81ce2ce6b8269e3260d7bb4e47a74661af715184ca6343e9906c22e4dd3eed5ce39977dfaf6cded4d2d8968fa096c7cf66697 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.25.4": - version: 7.25.5 - resolution: "@babel/generator@npm:7.25.5" +"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.6, @babel/generator@npm:^7.7.2": + version: 7.25.6 + resolution: "@babel/generator@npm:7.25.6" dependencies: - "@babel/types": "npm:^7.25.4" + "@babel/types": "npm:^7.25.6" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10/e6d046afe739cfa706c40c127b7436731acb2a3146d408a7d89dbf16448491b35bc09b7d285cc19c2c1f8980d74b5a99df200d67c859bb5260986614685b0770 + checksum: 10/541e4fbb6ea7806f44232d70f25bf09dee9a57fe43d559e375536870ca5261ebb4647fec3af40dcbb3325ea2a49aff040e12a4e6f88609eaa88f10c4e27e31f8 languageName: node linkType: hard @@ -560,12 +548,12 @@ __metadata: linkType: hard "@babel/helpers@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/helpers@npm:7.25.0" + version: 7.25.6 + resolution: "@babel/helpers@npm:7.25.6" dependencies: "@babel/template": "npm:^7.25.0" - "@babel/types": "npm:^7.25.0" - checksum: 10/4fcb8167eba9853e30b8b235b81b923ef7b707396b0e23d7a4fa3e811729506755576cb9ec736e8b92cf19e5a1ec61e83d182904d8e6a0953803c6bebc2e1592 + "@babel/types": "npm:^7.25.6" + checksum: 10/43abc8d017b754619aa189d05e2bdb54aaf44f03ec0439e89b3e7c180d538adb01ce9014a1689f632a7e8b17655c72bfac0a92268476eec708b41d3ba0a65296 languageName: node linkType: hard @@ -581,14 +569,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4": - version: 7.25.4 - resolution: "@babel/parser@npm:7.25.4" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.6": + version: 7.25.6 + resolution: "@babel/parser@npm:7.25.6" dependencies: - "@babel/types": "npm:^7.25.4" + "@babel/types": "npm:^7.25.6" bin: parser: ./bin/babel-parser.js - checksum: 10/343b8a76c43549e370fe96f4f6d564382a6cdff60e9c3b8a594c51e4cefd58ec9945e82e8c4dfbf15ac865a04e4b29806531440760748e28568e6aec21bc9cb5 + checksum: 10/830aab72116aa14eb8d61bfa8f9d69fc8f3a43d909ce993cb4350ae14d3af1a2f740a54410a22d821c48a253263643dfecbc094f9608e6a70ce9ff3c0bbfe91a languageName: node linkType: hard @@ -727,24 +715,24 @@ __metadata: linkType: hard "@babel/plugin-syntax-import-assertions@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7" + version: 7.25.6 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.25.6" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/bd065cd73ae3dbe69e6f9167aa605da3df77d69bbad2ede95e4aa9e7af7744d5bc1838b928c77338ca62df7691a7adf6e608279be50c18e4b3c70cf77e3013d7 + checksum: 10/36a756a695e2f18d406bfdfd6823023e3810d13fdb27ec2a5cb90ae95326edb1e744e3451a8a31bf6bd91646236643c5e8024ecf71102cc93309ec80592ebb17 languageName: node linkType: hard "@babel/plugin-syntax-import-attributes@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7" + version: 7.25.6 + resolution: "@babel/plugin-syntax-import-attributes@npm:7.25.6" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/22fc50bd85a491bb8d22065f330a41f60d66f2f2d7a1deb73e80c8a4b5d7a42a092a03f8da18800650eca0fc14585167cc4e5c9fab351f0d390d1592347162ae + checksum: 10/5afeba6b8979e61e8e37af905514891920eab103a08b36216f5518474328f9fae5204357bfadf6ce4cc80cb96848cdb7b8989f164ae93bd063c86f3f586728c0 languageName: node linkType: hard @@ -1640,7 +1628,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.25.6": +"@babel/runtime@npm:7.25.6, @babel/runtime@npm:^7.8.4": version: 7.25.6 resolution: "@babel/runtime@npm:7.25.6" dependencies: @@ -1649,15 +1637,6 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.8.4": - version: 7.25.4 - resolution: "@babel/runtime@npm:7.25.4" - dependencies: - regenerator-runtime: "npm:^0.14.0" - checksum: 10/70d2a420c24a3289ea6c4addaf3a1c4186bc3d001c92445faa3cd7601d7d2fbdb32c63b3a26b9771e20ff2f511fa76b726bf256f823cdb95bc37b8eadbd02f70 - languageName: node - linkType: hard - "@babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0, @babel/template@npm:^7.3.3": version: 7.25.0 resolution: "@babel/template@npm:7.25.0" @@ -1670,39 +1649,28 @@ __metadata: linkType: hard "@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.25.4": - version: 7.25.4 - resolution: "@babel/traverse@npm:7.25.4" + version: 7.25.6 + resolution: "@babel/traverse@npm:7.25.6" dependencies: "@babel/code-frame": "npm:^7.24.7" - "@babel/generator": "npm:^7.25.4" - "@babel/parser": "npm:^7.25.4" + "@babel/generator": "npm:^7.25.6" + "@babel/parser": "npm:^7.25.6" "@babel/template": "npm:^7.25.0" - "@babel/types": "npm:^7.25.4" + "@babel/types": "npm:^7.25.6" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10/a85c16047ab8e454e2e758c75c31994cec328bd6d8b4b22e915fa7393a03b3ab96d1218f43dc7ef77c957cc488dc38100bdf504d08a80a131e89b2e49cfa2be5 - languageName: node - linkType: hard - -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4": - version: 7.25.2 - resolution: "@babel/types@npm:7.25.2" - dependencies: - "@babel/helper-string-parser": "npm:^7.24.8" - "@babel/helper-validator-identifier": "npm:^7.24.7" - to-fast-properties: "npm:^2.0.0" - checksum: 10/ccf5399db1dcd6dd87b84a6f7bc8dd241e04a326f4f038c973c26ccb69cd360c8f2276603f584c58fd94da95229313060b27baceb0d9b18a435742d3f616afd1 + checksum: 10/de75a918299bc27a44ec973e3f2fa8c7902bbd67bd5d39a0be656f3c1127f33ebc79c12696fbc8170a0b0e1072a966d4a2126578d7ea2e241b0aeb5d16edc738 languageName: node linkType: hard -"@babel/types@npm:^7.25.4": - version: 7.25.4 - resolution: "@babel/types@npm:7.25.4" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4": + version: 7.25.6 + resolution: "@babel/types@npm:7.25.6" dependencies: "@babel/helper-string-parser": "npm:^7.24.8" "@babel/helper-validator-identifier": "npm:^7.24.7" to-fast-properties: "npm:^2.0.0" - checksum: 10/d4a1194612d0a2a6ce9a0be325578b43d74e5f5278c67409468ba0a924341f0ad349ef0245ee8a36da3766efe5cc59cd6bb52547674150f97d8dc4c8cfa5d6b8 + checksum: 10/7b54665e1b51f525fe0f451efdd9fe7a4a6dfba3fd4956c3530bc77336b66ffe3d78c093796ed044119b5d213176af7cf326f317a2057c538d575c6cefcb3562 languageName: node linkType: hard @@ -2552,44 +2520,44 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:19.6.2": - version: 19.6.2 - resolution: "@nrwl/devkit@npm:19.6.2" +"@nrwl/devkit@npm:19.6.5": + version: 19.6.5 + resolution: "@nrwl/devkit@npm:19.6.5" dependencies: - "@nx/devkit": "npm:19.6.2" - checksum: 10/57d27d57739cf8a70fe25d9888e0c4e0e4a5d4592f1584b5e557be6dad926a4efca59785a5554c3c7bd2152ab56621816a0af90be8b37af9d19f90e7bbd789d2 + "@nx/devkit": "npm:19.6.5" + checksum: 10/ad641e112c9c4617d3029e9efa81b7e19f3b7ad0c72d1fc211dfd3df34351276698e5d9f72c44b8ca09403898d1eb11302f329ca80d2ed3813e93329f16e4ec9 languageName: node linkType: hard -"@nrwl/tao@npm:19.6.2": - version: 19.6.2 - resolution: "@nrwl/tao@npm:19.6.2" +"@nrwl/tao@npm:19.6.4": + version: 19.6.4 + resolution: "@nrwl/tao@npm:19.6.4" dependencies: - nx: "npm:19.6.2" + nx: "npm:19.6.4" tslib: "npm:^2.3.0" bin: tao: index.js - checksum: 10/aa1ad826ca7f76ea6d8928d56097ed015f059c81e94da621550a0f65007f1bb83cdb547f0b3448410d2b3514d0e73e12a23c5a854c90f8e2e26ae42018fa30db + checksum: 10/26b3d619c978d5d913a3947c28d7c096689237524d493ba9bd5b3d4dd748c2f7ab3d2639096a540109e96ee3114d97d2110c295d3bbd66b484bdcd255b6bd69d languageName: node linkType: hard -"@nrwl/tao@npm:19.6.4": - version: 19.6.4 - resolution: "@nrwl/tao@npm:19.6.4" +"@nrwl/tao@npm:19.6.5": + version: 19.6.5 + resolution: "@nrwl/tao@npm:19.6.5" dependencies: - nx: "npm:19.6.4" + nx: "npm:19.6.5" tslib: "npm:^2.3.0" bin: tao: index.js - checksum: 10/26b3d619c978d5d913a3947c28d7c096689237524d493ba9bd5b3d4dd748c2f7ab3d2639096a540109e96ee3114d97d2110c295d3bbd66b484bdcd255b6bd69d + checksum: 10/d9ed169c4077398ca3e9bd7c91ec42959cd9e766e62a4e47dd353107a56a71c709ad7f826f7125a57cdaf859350aa5a898fb1c2cd42137100ea7945a68fa1a75 languageName: node linkType: hard -"@nx/devkit@npm:19.6.2, @nx/devkit@npm:>=17.1.2 < 20": - version: 19.6.2 - resolution: "@nx/devkit@npm:19.6.2" +"@nx/devkit@npm:19.6.5, @nx/devkit@npm:>=17.1.2 < 20": + version: 19.6.5 + resolution: "@nx/devkit@npm:19.6.5" dependencies: - "@nrwl/devkit": "npm:19.6.2" + "@nrwl/devkit": "npm:19.6.5" ejs: "npm:^3.1.7" enquirer: "npm:~2.3.6" ignore: "npm:^5.0.4" @@ -2600,14 +2568,7 @@ __metadata: yargs-parser: "npm:21.1.1" peerDependencies: nx: ">= 17 <= 20" - checksum: 10/42690f4a3153362c6096fe83b18a121c1d44468ccb37f5e8a47749b32cfe29a2a6a93b80c247155c3387e858b5bba8ae6690230ce82cde5bc4511a8390acdc0f - languageName: node - linkType: hard - -"@nx/nx-darwin-arm64@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-darwin-arm64@npm:19.6.2" - conditions: os=darwin & cpu=arm64 + checksum: 10/fbd486074d7687599009c3731df2339698320d5ed9ff9b98f8806f485d23822da0158959564407bbae8138ffbff3954f9f65496d1aee3c062dc67907ee0c3dde languageName: node linkType: hard @@ -2618,10 +2579,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-darwin-x64@npm:19.6.2" - conditions: os=darwin & cpu=x64 +"@nx/nx-darwin-arm64@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-darwin-arm64@npm:19.6.5" + conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -2632,10 +2593,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-freebsd-x64@npm:19.6.2" - conditions: os=freebsd & cpu=x64 +"@nx/nx-darwin-x64@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-darwin-x64@npm:19.6.5" + conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -2646,10 +2607,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.6.2" - conditions: os=linux & cpu=arm +"@nx/nx-freebsd-x64@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-freebsd-x64@npm:19.6.5" + conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -2660,10 +2621,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-linux-arm64-gnu@npm:19.6.2" - conditions: os=linux & cpu=arm64 & libc=glibc +"@nx/nx-linux-arm-gnueabihf@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.6.5" + conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -2674,10 +2635,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-linux-arm64-musl@npm:19.6.2" - conditions: os=linux & cpu=arm64 & libc=musl +"@nx/nx-linux-arm64-gnu@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-linux-arm64-gnu@npm:19.6.5" + conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard @@ -2688,10 +2649,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-linux-x64-gnu@npm:19.6.2" - conditions: os=linux & cpu=x64 & libc=glibc +"@nx/nx-linux-arm64-musl@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-linux-arm64-musl@npm:19.6.5" + conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard @@ -2702,10 +2663,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-linux-x64-musl@npm:19.6.2" - conditions: os=linux & cpu=x64 & libc=musl +"@nx/nx-linux-x64-gnu@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-linux-x64-gnu@npm:19.6.5" + conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard @@ -2716,10 +2677,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-win32-arm64-msvc@npm:19.6.2" - conditions: os=win32 & cpu=arm64 +"@nx/nx-linux-x64-musl@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-linux-x64-musl@npm:19.6.5" + conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard @@ -2730,10 +2691,10 @@ __metadata: languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:19.6.2": - version: 19.6.2 - resolution: "@nx/nx-win32-x64-msvc@npm:19.6.2" - conditions: os=win32 & cpu=x64 +"@nx/nx-win32-arm64-msvc@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-win32-arm64-msvc@npm:19.6.5" + conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -2744,6 +2705,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-win32-x64-msvc@npm:19.6.5": + version: 19.6.5 + resolution: "@nx/nx-win32-x64-msvc@npm:19.6.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@octokit/auth-token@npm:^3.0.0": version: 3.0.4 resolution: "@octokit/auth-token@npm:3.0.4" @@ -3357,11 +3325,11 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 22.5.0 - resolution: "@types/node@npm:22.5.0" + version: 22.5.4 + resolution: "@types/node@npm:22.5.4" dependencies: undici-types: "npm:~6.19.2" - checksum: 10/89af3bd217b1559b645a9ed16d4ae3add75749814cbd8eefddd1b96003d1973afb1c8a2b23d69f3a8cc6c532e3aa185eaf5cc29a6e7c42c311a2aad4c99430ae + checksum: 10/d46e0abf437b36bdf89011287aa43873d68ea6f2521a11b5c9a033056fd0d07af36daf51439010e8d41c62c55d0b00e9b5e09ed00bb2617723f73f28a873903a languageName: node linkType: hard @@ -3810,13 +3778,13 @@ __metadata: linkType: hard "axios@npm:^1.6.2, axios@npm:^1.7.4": - version: 1.7.5 - resolution: "axios@npm:1.7.5" + version: 1.7.7 + resolution: "axios@npm:1.7.7" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10/6cbcfe943a84089f420a900a3a3aeb54ee94dcc9c2b81b150434896357be5d1079eff0b1bbb628597371e79f896b1bc5776df04184756ba99656ff31df9a75bf + checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 languageName: node linkType: hard @@ -4232,9 +4200,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001646": - version: 1.0.30001653 - resolution: "caniuse-lite@npm:1.0.30001653" - checksum: 10/cd9b1c0fe03249e593789a11a9ef14f987b385e60441748945916b19e74e7bc5c82c40d4836496a647586651898741aed1598ae0792114a9f0d7d7fdb2b7deb0 + version: 1.0.30001657 + resolution: "caniuse-lite@npm:1.0.30001657" + checksum: 10/5eb2f4e6dd114056d2c8563f70d9de9b0e7442622a2243ce902fbc00bce5b9951c8e8edd8bcb15a9d5dec1b849536d616f23611f18650e51d6c4912c09d3f179 languageName: node linkType: hard @@ -5098,9 +5066,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.4": - version: 1.5.13 - resolution: "electron-to-chromium@npm:1.5.13" - checksum: 10/b3de6dbca66e399eacd4f7e2b7603394c8949c9e724d838a45e092725005ff435aabfbf00f738e45451eb23147684f7f9251a5ed75619a539642b2bccea20b45 + version: 1.5.14 + resolution: "electron-to-chromium@npm:1.5.14" + checksum: 10/eb5e0304ae952bf258caeb5eec77cbd8e493f54312c228f68cae1e4f11a8b26aaa8fb11222aa9bcbd701970c4c3634275c44b714eafdea144defee135cd7956b languageName: node linkType: hard @@ -5305,9 +5273,9 @@ __metadata: linkType: hard "escalade@npm:^3.1.1, escalade@npm:^3.1.2": - version: 3.1.2 - resolution: "escalade@npm:3.1.2" - checksum: 10/a1e07fea2f15663c30e40b9193d658397846ffe28ce0a3e4da0d8e485fedfeca228ab846aee101a05015829adf39f9934ff45b2a3fca47bed37a29646bd05cd3 + version: 3.2.0 + resolution: "escalade@npm:3.2.0" + checksum: 10/9d7169e3965b2f9ae46971afa392f6e5a25545ea30f2e2dd99c9b0a95a3f52b5653681a84f5b2911a413ddad2d7a93d3514165072f349b5ffc59c75a899970d6 languageName: node linkType: hard @@ -5615,12 +5583,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.6": - version: 1.15.6 - resolution: "follow-redirects@npm:1.15.6" + version: 1.15.8 + resolution: "follow-redirects@npm:1.15.8" peerDependenciesMeta: debug: optional: true - checksum: 10/70c7612c4cab18e546e36b991bbf8009a1a41cf85354afe04b113d1117569abf760269409cb3eb842d9f7b03d62826687086b081c566ea7b1e6613cf29030bf7 + checksum: 10/7b804d27de4e0e5774b0cb4e09fa104f3db841856a10180e83fe7dbdc8d01625da0a3684b9ec99fc84f9ecf9cb9236a9872044fab1ea6944a95c29ec4552fec4 languageName: node linkType: hard @@ -8510,22 +8478,22 @@ __metadata: languageName: node linkType: hard -"nx@npm:19.6.2, nx@npm:>=17.1.2 < 20": - version: 19.6.2 - resolution: "nx@npm:19.6.2" +"nx@npm:19.6.4": + version: 19.6.4 + resolution: "nx@npm:19.6.4" dependencies: "@napi-rs/wasm-runtime": "npm:0.2.4" - "@nrwl/tao": "npm:19.6.2" - "@nx/nx-darwin-arm64": "npm:19.6.2" - "@nx/nx-darwin-x64": "npm:19.6.2" - "@nx/nx-freebsd-x64": "npm:19.6.2" - "@nx/nx-linux-arm-gnueabihf": "npm:19.6.2" - "@nx/nx-linux-arm64-gnu": "npm:19.6.2" - "@nx/nx-linux-arm64-musl": "npm:19.6.2" - "@nx/nx-linux-x64-gnu": "npm:19.6.2" - "@nx/nx-linux-x64-musl": "npm:19.6.2" - "@nx/nx-win32-arm64-msvc": "npm:19.6.2" - "@nx/nx-win32-x64-msvc": "npm:19.6.2" + "@nrwl/tao": "npm:19.6.4" + "@nx/nx-darwin-arm64": "npm:19.6.4" + "@nx/nx-darwin-x64": "npm:19.6.4" + "@nx/nx-freebsd-x64": "npm:19.6.4" + "@nx/nx-linux-arm-gnueabihf": "npm:19.6.4" + "@nx/nx-linux-arm64-gnu": "npm:19.6.4" + "@nx/nx-linux-arm64-musl": "npm:19.6.4" + "@nx/nx-linux-x64-gnu": "npm:19.6.4" + "@nx/nx-linux-x64-musl": "npm:19.6.4" + "@nx/nx-win32-arm64-msvc": "npm:19.6.4" + "@nx/nx-win32-x64-msvc": "npm:19.6.4" "@yarnpkg/lockfile": "npm:^1.1.0" "@yarnpkg/parsers": "npm:3.0.0-rc.46" "@zkochan/js-yaml": "npm:0.0.7" @@ -8591,26 +8559,26 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: 10/ab9cb35be1eb3862ec84fbf6813c0a78b74244f9b546769e362addab8b698a4b6cc47701def528656572061a3feb4920dbf3d4051c64b6b7f71cfc05f266e341 + checksum: 10/9826bb23b87803f1f28f3c4ab878992ca1d3aed7c5a3b9e0d3d5ae0b10884db6b1f929156e9053796e8e781ba2c4316899aacb782e92bdddeae43d6e6288141b languageName: node linkType: hard -"nx@npm:19.6.4": - version: 19.6.4 - resolution: "nx@npm:19.6.4" +"nx@npm:19.6.5, nx@npm:>=17.1.2 < 20": + version: 19.6.5 + resolution: "nx@npm:19.6.5" dependencies: "@napi-rs/wasm-runtime": "npm:0.2.4" - "@nrwl/tao": "npm:19.6.4" - "@nx/nx-darwin-arm64": "npm:19.6.4" - "@nx/nx-darwin-x64": "npm:19.6.4" - "@nx/nx-freebsd-x64": "npm:19.6.4" - "@nx/nx-linux-arm-gnueabihf": "npm:19.6.4" - "@nx/nx-linux-arm64-gnu": "npm:19.6.4" - "@nx/nx-linux-arm64-musl": "npm:19.6.4" - "@nx/nx-linux-x64-gnu": "npm:19.6.4" - "@nx/nx-linux-x64-musl": "npm:19.6.4" - "@nx/nx-win32-arm64-msvc": "npm:19.6.4" - "@nx/nx-win32-x64-msvc": "npm:19.6.4" + "@nrwl/tao": "npm:19.6.5" + "@nx/nx-darwin-arm64": "npm:19.6.5" + "@nx/nx-darwin-x64": "npm:19.6.5" + "@nx/nx-freebsd-x64": "npm:19.6.5" + "@nx/nx-linux-arm-gnueabihf": "npm:19.6.5" + "@nx/nx-linux-arm64-gnu": "npm:19.6.5" + "@nx/nx-linux-arm64-musl": "npm:19.6.5" + "@nx/nx-linux-x64-gnu": "npm:19.6.5" + "@nx/nx-linux-x64-musl": "npm:19.6.5" + "@nx/nx-win32-arm64-msvc": "npm:19.6.5" + "@nx/nx-win32-x64-msvc": "npm:19.6.5" "@yarnpkg/lockfile": "npm:^1.1.0" "@yarnpkg/parsers": "npm:3.0.0-rc.46" "@zkochan/js-yaml": "npm:0.0.7" @@ -8676,7 +8644,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: 10/9826bb23b87803f1f28f3c4ab878992ca1d3aed7c5a3b9e0d3d5ae0b10884db6b1f929156e9053796e8e781ba2c4316899aacb782e92bdddeae43d6e6288141b + checksum: 10/156ea4a83b5affd4120c2bab8ea98eeb52ca2dbbb425bc622282d141f161ef518fbbc57d832f2812cf225458314dd017007f6ab710b7e4a4f2fac3dfffedd1fa languageName: node linkType: hard @@ -9089,9 +9057,9 @@ __metadata: linkType: hard "picocolors@npm:^1.0.0, picocolors@npm:^1.0.1": - version: 1.0.1 - resolution: "picocolors@npm:1.0.1" - checksum: 10/fa68166d1f56009fc02a34cdfd112b0dd3cf1ef57667ac57281f714065558c01828cdf4f18600ad6851cbe0093952ed0660b1e0156bddf2184b6aaf5817553a5 + version: 1.1.0 + resolution: "picocolors@npm:1.1.0" + checksum: 10/a2ad60d94d185c30f2a140b19c512547713fb89b920d32cc6cf658fa786d63a37ba7b8451872c3d9fc34883971fb6e5878e07a20b60506e0bb2554dce9169ccb languageName: node linkType: hard @@ -10901,11 +10869,11 @@ __metadata: linkType: hard "uglify-js@npm:^3.1.4": - version: 3.19.2 - resolution: "uglify-js@npm:3.19.2" + version: 3.19.3 + resolution: "uglify-js@npm:3.19.3" bin: uglifyjs: bin/uglifyjs - checksum: 10/8b0af1fa5260e7f8bc3e9a1e08ae05023b7c96eeb8965e27f29724597389d4e703d4aa6f66e6cd87a14a84e431df73a358ee58c0afce6b615b40cc95fcbf4ec6 + checksum: 10/6b9639c1985d24580b01bb0ab68e78de310d38eeba7db45bec7850ab4093d8ee464d80ccfaceda9c68d1c366efbee28573b52f95e69ac792354c145acd380b11 languageName: node linkType: hard From ba7f1ad9e743644069fbaaa8f461be937f949462 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 5 Sep 2024 09:21:36 +0200 Subject: [PATCH 3/4] chore: carret nx? --- .../package.json | 2 +- .../algoliasearch-client-javascript/yarn.lock | 171 +----------------- 2 files changed, 3 insertions(+), 170 deletions(-) diff --git a/clients/algoliasearch-client-javascript/package.json b/clients/algoliasearch-client-javascript/package.json index ebc37949cf..2d15e097f0 100644 --- a/clients/algoliasearch-client-javascript/package.json +++ b/clients/algoliasearch-client-javascript/package.json @@ -31,7 +31,7 @@ "bundlesize": "0.18.2", "execa": "9.3.1", "lerna": "8.1.8", - "nx": "19.6.4", + "nx": "^19.6.0", "rollup": "4.21.2", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-typescript2": "0.36.0", diff --git a/clients/algoliasearch-client-javascript/yarn.lock b/clients/algoliasearch-client-javascript/yarn.lock index df303a4e6a..44826d856e 100644 --- a/clients/algoliasearch-client-javascript/yarn.lock +++ b/clients/algoliasearch-client-javascript/yarn.lock @@ -2529,18 +2529,6 @@ __metadata: languageName: node linkType: hard -"@nrwl/tao@npm:19.6.4": - version: 19.6.4 - resolution: "@nrwl/tao@npm:19.6.4" - dependencies: - nx: "npm:19.6.4" - tslib: "npm:^2.3.0" - bin: - tao: index.js - checksum: 10/26b3d619c978d5d913a3947c28d7c096689237524d493ba9bd5b3d4dd748c2f7ab3d2639096a540109e96ee3114d97d2110c295d3bbd66b484bdcd255b6bd69d - languageName: node - linkType: hard - "@nrwl/tao@npm:19.6.5": version: 19.6.5 resolution: "@nrwl/tao@npm:19.6.5" @@ -2572,13 +2560,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-darwin-arm64@npm:19.6.4" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@nx/nx-darwin-arm64@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-darwin-arm64@npm:19.6.5" @@ -2586,13 +2567,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-darwin-x64@npm:19.6.4" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@nx/nx-darwin-x64@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-darwin-x64@npm:19.6.5" @@ -2600,13 +2574,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-freebsd-x64@npm:19.6.4" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - "@nx/nx-freebsd-x64@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-freebsd-x64@npm:19.6.5" @@ -2614,13 +2581,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.6.4" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - "@nx/nx-linux-arm-gnueabihf@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.6.5" @@ -2628,13 +2588,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-linux-arm64-gnu@npm:19.6.4" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - "@nx/nx-linux-arm64-gnu@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-linux-arm64-gnu@npm:19.6.5" @@ -2642,13 +2595,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-linux-arm64-musl@npm:19.6.4" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - "@nx/nx-linux-arm64-musl@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-linux-arm64-musl@npm:19.6.5" @@ -2656,13 +2602,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-linux-x64-gnu@npm:19.6.4" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - "@nx/nx-linux-x64-gnu@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-linux-x64-gnu@npm:19.6.5" @@ -2670,13 +2609,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-linux-x64-musl@npm:19.6.4" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - "@nx/nx-linux-x64-musl@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-linux-x64-musl@npm:19.6.5" @@ -2684,13 +2616,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-win32-arm64-msvc@npm:19.6.4" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "@nx/nx-win32-arm64-msvc@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-win32-arm64-msvc@npm:19.6.5" @@ -2698,13 +2623,6 @@ __metadata: languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:19.6.4": - version: 19.6.4 - resolution: "@nx/nx-win32-x64-msvc@npm:19.6.4" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@nx/nx-win32-x64-msvc@npm:19.6.5": version: 19.6.5 resolution: "@nx/nx-win32-x64-msvc@npm:19.6.5" @@ -3548,7 +3466,7 @@ __metadata: bundlesize: "npm:0.18.2" execa: "npm:9.3.1" lerna: "npm:8.1.8" - nx: "npm:19.6.4" + nx: "npm:^19.6.0" rollup: "npm:4.21.2" rollup-plugin-node-globals: "npm:1.4.0" rollup-plugin-typescript2: "npm:0.36.0" @@ -8478,92 +8396,7 @@ __metadata: languageName: node linkType: hard -"nx@npm:19.6.4": - version: 19.6.4 - resolution: "nx@npm:19.6.4" - dependencies: - "@napi-rs/wasm-runtime": "npm:0.2.4" - "@nrwl/tao": "npm:19.6.4" - "@nx/nx-darwin-arm64": "npm:19.6.4" - "@nx/nx-darwin-x64": "npm:19.6.4" - "@nx/nx-freebsd-x64": "npm:19.6.4" - "@nx/nx-linux-arm-gnueabihf": "npm:19.6.4" - "@nx/nx-linux-arm64-gnu": "npm:19.6.4" - "@nx/nx-linux-arm64-musl": "npm:19.6.4" - "@nx/nx-linux-x64-gnu": "npm:19.6.4" - "@nx/nx-linux-x64-musl": "npm:19.6.4" - "@nx/nx-win32-arm64-msvc": "npm:19.6.4" - "@nx/nx-win32-x64-msvc": "npm:19.6.4" - "@yarnpkg/lockfile": "npm:^1.1.0" - "@yarnpkg/parsers": "npm:3.0.0-rc.46" - "@zkochan/js-yaml": "npm:0.0.7" - axios: "npm:^1.7.4" - chalk: "npm:^4.1.0" - cli-cursor: "npm:3.1.0" - cli-spinners: "npm:2.6.1" - cliui: "npm:^8.0.1" - dotenv: "npm:~16.4.5" - dotenv-expand: "npm:~11.0.6" - enquirer: "npm:~2.3.6" - figures: "npm:3.2.0" - flat: "npm:^5.0.2" - front-matter: "npm:^4.0.2" - fs-extra: "npm:^11.1.0" - ignore: "npm:^5.0.4" - jest-diff: "npm:^29.4.1" - jsonc-parser: "npm:3.2.0" - lines-and-columns: "npm:~2.0.3" - minimatch: "npm:9.0.3" - node-machine-id: "npm:1.1.12" - npm-run-path: "npm:^4.0.1" - open: "npm:^8.4.0" - ora: "npm:5.3.0" - semver: "npm:^7.5.3" - string-width: "npm:^4.2.3" - strong-log-transformer: "npm:^2.1.0" - tar-stream: "npm:~2.2.0" - tmp: "npm:~0.2.1" - tsconfig-paths: "npm:^4.1.2" - tslib: "npm:^2.3.0" - yargs: "npm:^17.6.2" - yargs-parser: "npm:21.1.1" - peerDependencies: - "@swc-node/register": ^1.8.0 - "@swc/core": ^1.3.85 - dependenciesMeta: - "@nx/nx-darwin-arm64": - optional: true - "@nx/nx-darwin-x64": - optional: true - "@nx/nx-freebsd-x64": - optional: true - "@nx/nx-linux-arm-gnueabihf": - optional: true - "@nx/nx-linux-arm64-gnu": - optional: true - "@nx/nx-linux-arm64-musl": - optional: true - "@nx/nx-linux-x64-gnu": - optional: true - "@nx/nx-linux-x64-musl": - optional: true - "@nx/nx-win32-arm64-msvc": - optional: true - "@nx/nx-win32-x64-msvc": - optional: true - peerDependenciesMeta: - "@swc-node/register": - optional: true - "@swc/core": - optional: true - bin: - nx: bin/nx.js - nx-cloud: bin/nx-cloud.js - checksum: 10/9826bb23b87803f1f28f3c4ab878992ca1d3aed7c5a3b9e0d3d5ae0b10884db6b1f929156e9053796e8e781ba2c4316899aacb782e92bdddeae43d6e6288141b - languageName: node - linkType: hard - -"nx@npm:19.6.5, nx@npm:>=17.1.2 < 20": +"nx@npm:19.6.5, nx@npm:>=17.1.2 < 20, nx@npm:^19.6.0": version: 19.6.5 resolution: "nx@npm:19.6.5" dependencies: From 63eed9ceb5caee1b75c7fab01a0ab3c4d651d4cf Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 5 Sep 2024 09:24:27 +0200 Subject: [PATCH 4/4] chore: actually --- clients/algoliasearch-client-javascript/package.json | 1 - clients/algoliasearch-client-javascript/yarn.lock | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/clients/algoliasearch-client-javascript/package.json b/clients/algoliasearch-client-javascript/package.json index 2d15e097f0..2abcba6a24 100644 --- a/clients/algoliasearch-client-javascript/package.json +++ b/clients/algoliasearch-client-javascript/package.json @@ -31,7 +31,6 @@ "bundlesize": "0.18.2", "execa": "9.3.1", "lerna": "8.1.8", - "nx": "^19.6.0", "rollup": "4.21.2", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-typescript2": "0.36.0", diff --git a/clients/algoliasearch-client-javascript/yarn.lock b/clients/algoliasearch-client-javascript/yarn.lock index 44826d856e..ef2c496391 100644 --- a/clients/algoliasearch-client-javascript/yarn.lock +++ b/clients/algoliasearch-client-javascript/yarn.lock @@ -3466,7 +3466,6 @@ __metadata: bundlesize: "npm:0.18.2" execa: "npm:9.3.1" lerna: "npm:8.1.8" - nx: "npm:^19.6.0" rollup: "npm:4.21.2" rollup-plugin-node-globals: "npm:1.4.0" rollup-plugin-typescript2: "npm:0.36.0" @@ -8396,7 +8395,7 @@ __metadata: languageName: node linkType: hard -"nx@npm:19.6.5, nx@npm:>=17.1.2 < 20, nx@npm:^19.6.0": +"nx@npm:19.6.5, nx@npm:>=17.1.2 < 20": version: 19.6.5 resolution: "nx@npm:19.6.5" dependencies: