diff --git a/composer.json b/composer.json index c8928578..a1660803 100644 --- a/composer.json +++ b/composer.json @@ -2,19 +2,24 @@ "name": "com.appleple/google-translate", "description": "a-blog cms extension.", "scripts": { - "lint": "vendor/bin/phpcs --standard=phpcs.xml", - "format": "vendor/bin/phpcbf --standard=phpcs.xml", - "post-install-cmd": "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility", - "post-update-cmd" : "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility" + "lint": "vendor/bin/phpcs --standard=phpcs.xml", + "format": "vendor/bin/phpcbf --standard=phpcs.xml", + "check:version": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 8.1-8.4 --ignore=./src/vendor/* ./src", + "post-install-cmd": "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility", + "post-update-cmd": "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility" }, "require-dev": { - "squizlabs/php_codesniffer": "3.*", - "phpcompatibility/php-compatibility": "*" + "squizlabs/php_codesniffer": "^3.13", + "phpcompatibility/php-compatibility": "^9.3", + "dealerdirect/phpcodesniffer-composer-installer": "^1.1" }, "prefer-stable" : true, "config": { "platform": { "php": "8.3" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true } } } diff --git a/composer.lock b/composer.lock index 3e072127..b06300ce 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,105 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3770c95b21a173656a92db573e566b9c", + "content-hash": "d5b266bbf5b0e71c11b0af444b7cc0cd", "packages": [], "packages-dev": [ + { + "name": "dealerdirect/phpcodesniffer-composer-installer", + "version": "v1.1.2", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/composer-installer.git", + "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1", + "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.2", + "php": ">=5.4", + "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + }, + "require-dev": { + "composer/composer": "^2.2", + "ext-json": "*", + "ext-zip": "*", + "php-parallel-lint/php-parallel-lint": "^1.4.0", + "phpcompatibility/php-compatibility": "^9.0", + "yoast/phpunit-polyfills": "^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Franck Nijhof", + "email": "opensource@frenck.dev", + "homepage": "https://frenck.dev", + "role": "Open source developer" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer Standards Composer Installer Plugin", + "keywords": [ + "PHPCodeSniffer", + "PHP_CodeSniffer", + "code quality", + "codesniffer", + "composer", + "installer", + "phpcbf", + "phpcs", + "plugin", + "qa", + "quality", + "standard", + "standards", + "style guide", + "stylecheck", + "tests" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/composer-installer/issues", + "security": "https://github.com/PHPCSStandards/composer-installer/security/policy", + "source": "https://github.com/PHPCSStandards/composer-installer" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" + } + ], + "time": "2025-07-17T20:45:56+00:00" + }, { "name": "phpcompatibility/php-compatibility", "version": "9.3.5", @@ -71,16 +167,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.1", + "version": "3.13.4", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909" + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/267a4405fff1d9c847134db3a3c92f1ab7f77909", - "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119", + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119", "shasum": "" }, "require": { @@ -145,9 +241,13 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2024-03-31T21:03:09+00:00" + "time": "2025-09-05T05:47:09+00:00" } ], "aliases": [], @@ -158,7 +258,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.0" + "php": "8.3" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.2.0" } diff --git a/docs/README.md b/docs/README.md index 995f1123..6e65ddef 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,9 +5,9 @@ a-blog cms のための「Google Translation API」連携拡張アプリにな ## 動作条件 -* php 7.2.5 以上 +* php: 8.1 – 8.4 (8.5+ not tested yet) * a-blog cms for Professional or Enterprise のみ（現状スタンダードライセンスでの利用はライセンス違反となります） -* a-blog cms Ver. 3.1.0 以上 +* a-blog cms: >= Ver. 3.2.11 (3.3+ not tested yet) ## ダウンロード @@ -15,14 +15,41 @@ a-blog cms のための「Google Translation API」連携拡張アプリにな ## 事前準備 -### 「Google Translate API Key」の取得 +### サービスアカウントの設定と JSON 取得（Cloud Translation API） -[Google API Console](https://console.developers.google.com/) にログインし、以下の作業を行います。 +#### 1. プロジェクト作成 -* ライブラリで **Cloud Translation API** の有効化 -* 認証情報で **APIキー** の作成 +- G[Google Cloud Console](https://console.developers.google.com/) にログイン +- 新規プロジェクトを作成 +- プロジェクト ID（Project ID）をメモ -APIキーは必ず、**キーの制限** をかけるようにしてください。ただし、**HTTPリファラー** での制限はできませんので、IPアドレスによる制限をかけてください。 +#### 2. Cloud Translation API を有効化 + +- 作成したプロジェクトを選択 +- 「API とサービス」→「ライブラリ」 +- Cloud Translation API を検索して 有効化 + +``` +※ ここで課金が必要になる場合があります。GCP 側で 請求先アカウント（Billing） が未設定だと API 利用で弾かれることがあります（権限/有効化はできても実行時に失敗するケースがあるため、必要なら Billing も確認）。 +``` + +#### 3. サービスアカウント作成 + +- 「IAM と管理」→「サービスアカウント」 +- サービスアカウントを作成 + +#### 4. 権限（ロール）を付与 + +- 対象プロジェクトで、作成したサービスアカウントにロールを付与 +- ロール: **Cloud Translation API ユーザー** を付与 + +#### 5. JSON キー発行（秘密鍵） + +- サービスアカウント詳細 →「鍵」タブ +- 「鍵を追加」→「新しい鍵を作成」→ JSON +- ダウンロードした JSON を サーバーに設置 +- Web 公開ディレクトリ外に配置（例: /var/app/credentials/translate-sa.json） +- 権限は最小限（例: chmod 600、所有者を実行ユーザーに） ### a-blog cms の設計 @@ -52,7 +79,8 @@ zipファイルをダウンロードし、解凍したディレクトリ（Googl |設定項目|説明| |:---|:---| |ベース言語|翻訳元となる言語を設定します| -|Google Translate API Key|事前準備で用意した **APIキー** を設定します| +|プロジェクトID|事前準備で用意した **プロジェクトID** を設定します| +|サービスアカウントJSONパス|事前準備で用紙したJSONのパスを絶対パスで設定します| |カテゴリー作成|翻訳先の記事を作成するときに、カテゴリーも自動で複製するか設定します| |ベース言語（このブログ）と関連づける他言語ブログを設定|ベース言語のブログと翻訳先のブログの関連を設定します| |訳対象のフィールドを設定します|翻訳対象のカスタムフィールド名を指定します| diff --git a/package-lock.json b/package-lock.json index 49776596..5e1fedf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -128,9 +128,9 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "dependencies": { "balanced-match": "^1.0.0", @@ -497,9 +497,9 @@ } }, "node_modules/readdir-glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "dependencies": { "balanced-match": "^1.0.0" @@ -715,9 +715,9 @@ } }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -1010,9 +1010,9 @@ }, "dependencies": { "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "requires": { "balanced-match": "^1.0.0" diff --git a/src/DuplicateEntry.php b/src/DuplicateEntry.php index 84d8dee9..d3f36f2d 100644 --- a/src/DuplicateEntry.php +++ b/src/DuplicateEntry.php @@ -2,19 +2,18 @@ namespace Acms\Plugins\GoogleTranslate; -use App; -use DB; +use Acms\Services\Facades\Application; +use Acms\Services\Facades\Common; +use Acms\Services\Facades\Config; +use Acms\Services\Facades\Entry; +use Acms\Services\Facades\Database as DB; use SQL; use ACMS_RAM; -use Common; -use Config; -use Entry; -use Storage; -use Field; -use ACMS_Hook; class DuplicateEntry { + use \Acms\Traits\Common\AssetsTrait; + protected $config; public function __construct() @@ -29,152 +28,79 @@ public function dupe($eid, $newEid, $targetBid) if (empty($targetBid)) { $targetBid = $bid; } - - //-------- - // column - $map = []; - $SQL = SQL::newSelect('column'); - $SQL->addWhereOpr('column_entry_id', $eid); - $SQL->addWhereOpr('column_blog_id', $bid); - $q = $SQL->get(dsn()); - if ($DB->query($q, 'fetch') && ($row = $DB->fetch($q))) { - do { - $type = detectUnitTypeSpecifier($row['column_type']); - switch ($type) { - case 'image': - $oldAry = explodeUnitData($row['column_field_2']); - $newAry = []; - foreach ($oldAry as $old) { - $info = pathinfo($old); - $dirname = empty($info['dirname']) ? '' : $info['dirname'] . '/'; - $ext = empty($info['extension']) ? '' : '.' . $info['extension']; - $newOld = $dirname . uniqueString() . $ext; - $path = ARCHIVES_DIR . $old; - $large = otherSizeImagePath($path, 'large'); - $tiny = otherSizeImagePath($path, 'tiny'); - $square = otherSizeImagePath($path, 'square'); - $newPath = ARCHIVES_DIR . $newOld; - $newLarge = otherSizeImagePath($newPath, 'large'); - $newTiny = otherSizeImagePath($newPath, 'tiny'); - $newSquare = otherSizeImagePath($newPath, 'square'); - copyFile($path, $newPath); - copyFile($large, $newLarge); - copyFile($tiny, $newTiny); - copyFile($square, $newSquare); - $newAry[] = $newOld; - } - $row['column_field_2'] = implodeUnitData($newAry); - break; - case 'file': - $oldAry = explodeUnitData($row['column_field_2']); - $newAry = []; - foreach ($oldAry as $old) { - $info = pathinfo($old); - $dirname = empty($info['dirname']) ? '' : $info['dirname'] . '/'; - $ext = empty($info['extension']) ? '' : '.' . $info['extension']; - $newOld = $dirname . uniqueString() . $ext; - $path = ARCHIVES_DIR . $old; - $newPath = ARCHIVES_DIR . $newOld; - copyFile($path, $newPath); - - $newAry[] = $newOld; - } - $row['column_field_2'] = implodeUnitData($newAry); - break; - case 'custom': - $old = $row['column_field_6']; - $Field = null; - if (function_exists('acmsDangerUnserialize')) { - $Field = acmsDangerUnserialize($old); - } else { - $Field = acmsUnserialize($old); - } - $this->fieldDupe($Field, $targetBid); - $row['column_field_6'] = acmsSerialize($Field); - break; - default: - break; - } - $newClid = $DB->query(SQL::nextval('column_id', dsn()), 'seq'); - $map[intval($row['column_id'])] = $newClid; - $row['column_id'] = $newClid; - $row['column_entry_id'] = $newEid; - $row['column_blog_id'] = $targetBid; - - $SQL = SQL::newInsert('column'); - foreach ($row as $fd => $val) { - $SQL->addInsert($fd, $val); - } - $DB->query($SQL->get(dsn()), 'exec'); - } while ($row = $DB->fetch($q)); + $approval = ACMS_RAM::entryApproval($eid); + $sourceRvid = null; + if ($approval === 'pre_approval') { + $sourceRvid = 1; } + //------- + // unit + $unitRepository = Application::make('unit-repository'); + $collection = $unitRepository->loadUnits( + eid: $eid, + rvid: $sourceRvid, + options: ['setPrimaryImage' => true] + ); + $newCollection = clone $collection; + $newCollection->walk(function (\Acms\Services\Unit\Contracts\Model $unit) use ($newEid, $targetBid) { + if (is_null($unit->getId())) { + throw new \RuntimeException( + 'Unit ID must not be null. Unexpected state: unit data already exists in database.' + ); + } + $unit->setEntryId($newEid); + $unit->setBlogId($targetBid); + $unit->handleDuplicate(); + $unit->insertDataTrait($unit, false); + }); + //------- // entry + $entryRepository = Application::make('entry.repository'); + assert($entryRepository instanceof \Acms\Services\Entry\EntryRepository); $SQL = SQL::newSelect('entry'); $SQL->addWhereOpr('entry_id', $eid); $SQL->addWhereOpr('entry_blog_id', $bid); $row = $DB->query($SQL->get(dsn()), 'row'); - $title = $row['entry_title']; - $code = $row['entry_code']; - - $uid = intval($row['entry_user_id']); + $title = $row['entry_title'] . config('entry_title_duplicate_suffix'); + $code = ('on' == config('entry_code_title')) ? + stripWhitespace($title) : + config('entry_code_prefix') . $newEid; + if (!!config('entry_code_extension') and !strpos($code, '.')) { + $code .= ('.' . config('entry_code_extension')); + } + $uid = intval($row['entry_user_id']); if (!($cid = intval($row['entry_category_id']))) { $cid = null; }; - //------ // sort - $SQL = SQL::newSelect('entry'); - $SQL->setSelect('entry_sort'); - $SQL->addWhereOpr('entry_blog_id', $bid); - $SQL->setOrder('entry_sort', 'DESC'); - $SQL->setLimit(1); - $esort = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - $SQL = SQL::newSelect('entry'); - $SQL->setSelect('entry_user_sort'); - $SQL->addWhereOpr('entry_user_id', $uid); - $SQL->addWhereOpr('entry_blog_id', $bid); - $SQL->setOrder('entry_user_sort', 'DESC'); - $SQL->setLimit(1); - $usort = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - $SQL = SQL::newSelect('entry'); - $SQL->setSelect('entry_category_sort'); - $SQL->addWhereOpr('entry_category_id', $cid); - $SQL->addWhereOpr('entry_blog_id', $bid); - $SQL->setOrder('entry_category_sort', 'DESC'); - $SQL->setLimit(1); - $csort = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - $row['entry_id'] = $newEid; - $row['entry_status'] = 'close'; - $row['entry_title'] = $title; - $row['entry_code'] = $code; - if ($this->config->get('google_translate_app_update_datetime_as_duplicate_entry') === 'on') { + $esort = $entryRepository->nextSort($targetBid); + $usort = $entryRepository->nextUserSort($uid, $targetBid); + $csort = $entryRepository->nextCategorySort($cid, $targetBid); + + $row['entry_id'] = $newEid; + $row['entry_status'] = 'close'; + $row['entry_approval'] = 'none'; + $row['entry_title'] = $title; + $row['entry_code'] = $code; + if (config('update_datetime_as_duplicate_entry') !== 'off') { $row['entry_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); } - $row['entry_posted_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); - $row['entry_updated_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); - $row['entry_hash'] = md5(SYSTEM_GENERATED_DATETIME . date('Y-m-d H:i:s', REQUEST_TIME)); - if ( - isset($row['entry_primary_image']) && - isset($map[$row['entry_primary_image']]) && - !empty($map[$row['entry_primary_image']]) - ) { - $row['entry_primary_image'] = $map[$row['entry_primary_image']]; - } else { - $row['entry_primary_image'] = null; - } - $row['entry_sort'] = $esort; - $row['entry_user_sort'] = $usort; - $row['entry_category_sort'] = $csort; - $row['entry_user_id'] = SUID; - $row['entry_blog_id'] = $targetBid; - $SQL = SQL::newInsert('entry'); + $row['entry_posted_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); + $row['entry_updated_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); + $row['entry_hash'] = md5(SYSTEM_GENERATED_DATETIME . date('Y-m-d H:i:s', REQUEST_TIME)); + $primaryImageUnit = $collection->getPrimaryImageUnit(); + $row['entry_primary_image'] = $primaryImageUnit ? $primaryImageUnit->getId() : null; + $row['entry_sort'] = $esort; + $row['entry_user_sort'] = $usort; + $row['entry_category_sort'] = $csort; + $row['entry_user_id'] = SUID; + $row['entry_blog_id'] = $targetBid; + $SQL = SQL::newInsert('entry'); foreach ($row as $fd => $val) { - if ($fd == 'entry_current_rev_id') { + if ($fd === 'entry_current_rev_id' || $fd === 'entry_reserve_rev_id') { continue; } $SQL->addInsert($fd, $val); @@ -183,20 +109,22 @@ public function dupe($eid, $newEid, $targetBid) //----- // tag - $SQL = SQL::newSelect('tag'); + $SQL = SQL::newSelect('tag'); $SQL->addWhereOpr('tag_entry_id', $eid); $SQL->addWhereOpr('tag_blog_id', $bid); - $q = $SQL->get(dsn()); - if ($DB->query($q, 'fetch') && ($row = $DB->fetch($q))) { + $q = $SQL->get(dsn()); + $statement = $DB->query($q, 'exec'); + + if ($statement && ($row = $DB->next($statement))) { + $insert = SQL::newBulkInsert('tag'); do { $row['tag_entry_id'] = $newEid; - $rpw['tag_blog_id'] = $targetBid; - $Insert = SQL::newInsert('tag'); - foreach ($row as $fd => $val) { - $Insert->addInsert($fd, $val); - } - $DB->query($Insert->get(dsn()), 'exec'); - } while ($row = $DB->fetch($q)); + $row['tag_blog_id'] = $targetBid; + $insert->addInsert($row); + } while ($row = $DB->next($statement)); + if ($insert->hasData()) { + $DB->query($insert->get(dsn()), 'exec'); + } } //-------------- @@ -207,7 +135,10 @@ public function dupe($eid, $newEid, $targetBid) //------- // field $Field = loadEntryField($eid); - $this->fieldDupe($Field, $targetBid); + $this->duplicateFieldsTrait($Field); + foreach ($Field->listFields() as $fd) { + $this->conversionId($Field, $fd, $targetBid); + } Common::saveField('eid', $newEid, $Field, null, null, '', $targetBid); Common::saveFulltext('eid', $newEid, Common::loadEntryFulltext($newEid), $targetBid); @@ -220,222 +151,88 @@ public function dupe($eid, $newEid, $targetBid) $this->geoDuplicate($eid, $newEid, $targetBid); } - public function approvalDupe($eid, $newEid, $bid = null) + public function approvalDupe($eid, $newEid, $targetBid) { - if (empty($bid)) { - $bid = ACMS_RAM::entryBlog($eid); - } - $DB = DB::singleton(dsn()); - $approval = ACMS_RAM::entryApproval($eid); - $sourceDir = ARCHIVES_DIR; - $sourceRev = false; + $DB = DB::singleton(dsn()); + $bid = ACMS_RAM::entryBlog($eid); + $approval = ACMS_RAM::entryApproval($eid); + $sourceRev = false; if ($approval === 'pre_approval') { - $sourceDir = REVISON_ARCHIVES_DIR; - $sourceRev = true; + $sourceRev = true; } - //-------- - // column - $map = []; - if ($sourceRev) { - $SQL = SQL::newSelect('column_rev'); - $SQL->addWhereOpr('column_rev_id', 1); - } else { - $SQL = SQL::newSelect('column'); - } - $SQL->addWhereOpr('column_entry_id', $eid); - $SQL->addWhereOpr('column_blog_id', $bid); - $q = $SQL->get(dsn()); - if ($DB->query($q, 'fetch') && ($row = $DB->fetch($q))) { - do { - $type = detectUnitTypeSpecifier($row['column_type']); - switch ($type) { - case 'image': - $oldAry = explodeUnitData($row['column_field_2']); - $newAry = []; - foreach ($oldAry as $old) { - $info = pathinfo($old); - $dirname = empty($info['dirname']) ? '' : $info['dirname'] . '/'; - $ext = empty($info['extension']) ? '' : '.' . $info['extension']; - $newOld = $dirname . uniqueString() . $ext; - $path = $sourceDir . $old; - $large = otherSizeImagePath($path, 'large'); - $tiny = otherSizeImagePath($path, 'tiny'); - $square = otherSizeImagePath($path, 'square'); - $newPath = REVISON_ARCHIVES_DIR . $newOld; - $newLarge = otherSizeImagePath($newPath, 'large'); - $newTiny = otherSizeImagePath($newPath, 'tiny'); - $newSquare = otherSizeImagePath($newPath, 'square'); - copyFile($path, $newPath); - copyFile($large, $newLarge); - copyFile($tiny, $newTiny); - copyFile($square, $newSquare); - - $newAry[] = $newOld; - } - $row['column_field_2'] = implodeUnitData($newAry); - break; - case 'file': - $oldAry = explodeUnitData($row['column_field_2']); - $newAry = []; - foreach ($oldAry as $old) { - $old = $row['column_field_2']; - $info = pathinfo($old); - $dirname = empty($info['dirname']) ? '' : $info['dirname'] . '/'; - $ext = empty($info['extension']) ? '' : '.' . $info['extension']; - $newOld = $dirname . uniqueString() . $ext; - $path = $sourceDir . $old; - $newPath = REVISON_ARCHIVES_DIR . $newOld; - copyFile($path, $newPath); - - $newAry[] = $newOld; - } - $row['column_field_2'] = implodeUnitData($newAry); - break; - case 'custom': - $old = $row['column_field_6']; - - $Field = acmsUnserialize($old); - foreach ($Field->listFields() as $fd) { - if (!strpos($fd, '@path')) { - continue; - } - $base = substr($fd, 0, (-1 * strlen('@path'))); - $set = false; - foreach ($Field->getArray($fd, true) as $i => $path) { - if (!Storage::isFile($sourceDir . $path)) { - continue; - } - $info = pathinfo($path); - $dirname = empty($info['dirname']) ? '' : $info['dirname'] . '/'; - Storage::makeDirectory(REVISON_ARCHIVES_DIR . $dirname); - $ext = empty($info['extension']) ? '' : '.' . $info['extension']; - $newPath = $dirname . uniqueString() . $ext; - - $path = $sourceDir . $path; - $largePath = otherSizeImagePath($path, 'large'); - $tinyPath = otherSizeImagePath($path, 'tiny'); - $squarePath = otherSizeImagePath($path, 'square'); - - $newLargePath = otherSizeImagePath($newPath, 'large'); - $newTinyPath = otherSizeImagePath($newPath, 'tiny'); - $newSquarePath = otherSizeImagePath($newPath, 'square'); - - Storage::copy($path, REVISON_ARCHIVES_DIR . $newPath); - Storage::copy($largePath, REVISON_ARCHIVES_DIR . $newLargePath); - Storage::copy($tinyPath, REVISON_ARCHIVES_DIR . $newTinyPath); - Storage::copy($squarePath, REVISON_ARCHIVES_DIR . $newSquarePath); - - - if (!$set) { - $Field->delete($fd); - $Field->delete($base . '@largePath'); - $Field->delete($base . '@tinyPath'); - $Field->delete($base . '@squarePath'); - $set = true; - } - $Field->add($fd, $newPath); - if (Storage::isReadable($largePath)) { - $Field->add($base . '@largePath', $newLargePath); - } - if (Storage::isReadable($tinyPath)) { - $Field->add($base . '@tinyPath', $newTinyPath); - } - if (Storage::isReadable($squarePath)) { - $Field->add($base . '@squarePath', $newSquarePath); - } - } - } - $row['column_field_6'] = acmsSerialize($Field); - break; - default: - break; - } - $newClid = $DB->query(SQL::nextval('column_id', dsn()), 'seq'); - $map[intval($row['column_id'])] = $newClid; - $row['column_id'] = $newClid; - $row['column_entry_id'] = $newEid; - - $SQL = SQL::newInsert('column_rev'); - foreach ($row as $fd => $val) { - $SQL->addInsert($fd, $val); - } - if (!$sourceRev) { - $SQL->addInsert('column_rev_id', 1); - } - $DB->query($SQL->get(dsn()), 'exec'); - } while ($row = $DB->fetch($q)); - } + //------ + // unit + $unitRepository = Application::make('unit-repository'); + assert($unitRepository instanceof \Acms\Services\Unit\Repository); + $rvid = $sourceRev ? 1 : null; + $collection = $unitRepository->loadUnits( + eid: $eid, + rvid: $rvid, + options: ['setPrimaryImage' => true] + ); + $newCollection = clone $collection; + $newCollection->walk(function (\Acms\Services\Unit\Contracts\Model $unit) use ($newEid, $targetBid) { + if (is_null($unit->getId())) { + throw new \RuntimeException( + 'Unit ID must not be null. Unexpected state: unit data already exists in database.' + ); + } + $unit->setEntryId($newEid); + $unit->setRevId(1); + $unit->setBlogId($targetBid); + $unit->handleDuplicate(); + $unit->insertDataTrait($unit, true); + }); //------- // entry + $entryRepository = Application::make('entry.repository'); + assert($entryRepository instanceof \Acms\Services\Entry\EntryRepository); if ($sourceRev) { - $SQL = SQL::newSelect('entry_rev'); + $SQL = SQL::newSelect('entry_rev'); $SQL->addWhereOpr('entry_rev_id', 1); } else { - $SQL = SQL::newSelect('entry'); + $SQL = SQL::newSelect('entry'); } $SQL->addWhereOpr('entry_id', $eid); $SQL->addWhereOpr('entry_blog_id', $bid); $row = $DB->query($SQL->get(dsn()), 'row'); - $title = $row['entry_title']; - $code = $row['entry_code']; - - $uid = intval($row['entry_user_id']); + $title = $row['entry_title'] . config('entry_title_duplicate_suffix'); + $code = ('on' == config('entry_code_title')) ? stripWhitespace($title) : config('entry_code_prefix') . $newEid; + if (!!config('entry_code_extension') and !strpos($code, '.')) { + $code .= ('.' . config('entry_code_extension')); + } + $uid = intval($row['entry_user_id']); if (!($cid = intval($row['entry_category_id']))) { $cid = null; }; //------ // sort - $SQL = SQL::newSelect('entry'); - $SQL->setSelect('entry_sort'); - $SQL->addWhereOpr('entry_blog_id', $bid); - $SQL->setOrder('entry_sort', 'DESC'); - $SQL->setLimit(1); - $esort = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - $SQL = SQL::newSelect('entry'); - $SQL->setSelect('entry_user_sort'); - $SQL->addWhereOpr('entry_user_id', $uid); - $SQL->addWhereOpr('entry_blog_id', $bid); - $SQL->setOrder('entry_user_sort', 'DESC'); - $SQL->setLimit(1); - $usort = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - $SQL = SQL::newSelect('entry'); - $SQL->setSelect('entry_category_sort'); - $SQL->addWhereOpr('entry_category_id', $cid); - $SQL->addWhereOpr('entry_blog_id', $bid); - $SQL->setOrder('entry_category_sort', 'DESC'); - $SQL->setLimit(1); - $csort = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - $row['entry_id'] = $newEid; - $row['entry_status'] = 'close'; - $row['entry_title'] = $title; - $row['entry_code'] = $code; - if ($this->config->get('google_translate_app_update_datetime_as_duplicate_entry') === 'on') { + $esort = $entryRepository->nextSort($bid); + $usort = $entryRepository->nextUserSort($uid, $bid); + $csort = $entryRepository->nextCategorySort($cid, $bid); + + $row['entry_id'] = $newEid; + $row['entry_status'] = 'close'; + $row['entry_title'] = $title; + $row['entry_code'] = $code; + if (config('update_datetime_as_duplicate_entry') !== 'off') { $row['entry_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); } - $row['entry_posted_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); - $row['entry_updated_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); - $row['entry_hash'] = md5(SYSTEM_GENERATED_DATETIME . date('Y-m-d H:i:s', REQUEST_TIME)); - if ( - isset($row['entry_primary_image']) && - isset($map[$row['entry_primary_image']]) && - !empty($map[$row['entry_primary_image']]) - ) { - $row['entry_primary_image'] = $map[$row['entry_primary_image']]; - } else { - $row['entry_primary_image'] = null; - } - $row['entry_sort'] = $esort; - $row['entry_user_sort'] = $usort; - $row['entry_category_sort'] = $csort; - $row['entry_user_id'] = SUID; - $SQL = SQL::newInsert('entry'); + $row['entry_posted_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); + $row['entry_updated_datetime'] = date('Y-m-d H:i:s', REQUEST_TIME); + $row['entry_hash'] = md5(SYSTEM_GENERATED_DATETIME . date('Y-m-d H:i:s', REQUEST_TIME)); + $primaryImageUnit = $collection->getPrimaryImageUnit(); + $row['entry_primary_image'] = $primaryImageUnit ? $primaryImageUnit->getId() : null; + $row['entry_sort'] = $esort; + $row['entry_user_sort'] = $usort; + $row['entry_category_sort'] = $csort; + $row['entry_user_id'] = SUID; + $row['entry_blog_id'] = $targetBid; + $SQL = SQL::newInsert('entry'); foreach ($row as $fd => $val) { if ( !in_array($fd, [ @@ -448,7 +245,10 @@ public function approvalDupe($eid, $newEid, $bid = null) 'entry_rev_memo', 'entry_rev_user_id', 'entry_rev_datetime', - 'entry_current_rev_id' + 'entry_current_rev_id', + 'entry_reserve_rev_id', + 'entry_lock_datetime', + 'entry_lock_uid', ], true) ) { $SQL->addInsert($fd, $val); @@ -458,11 +258,12 @@ public function approvalDupe($eid, $newEid, $bid = null) $SQL->addInsert('entry_last_update_user_id', SUID); $DB->query($SQL->get(dsn()), 'exec'); - $SQL = SQL::newInsert('entry_rev'); + $SQL = SQL::newInsert('entry_rev'); foreach ($row as $fd => $val) { if ( !in_array($fd, [ 'entry_current_rev_id', + 'entry_reserve_rev_id', 'entry_last_update_user_id', 'entry_rev_id', 'entry_rev_user_id', @@ -479,22 +280,27 @@ public function approvalDupe($eid, $newEid, $bid = null) //----- // tag - $SQL = SQL::newSelect('tag'); + $SQL = SQL::newSelect($sourceRev ? 'tag_rev' : 'tag'); $SQL->addWhereOpr('tag_entry_id', $eid); $SQL->addWhereOpr('tag_blog_id', $bid); - $q = $SQL->get(dsn()); - if ($DB->query($q, 'fetch') && ($row = $DB->fetch($q))) { + if ($sourceRev) { + $SQL->addWhereOpr('tag_rev_id', 1); + } + $q = $SQL->get(dsn()); + $statement = $DB->query($q, 'exec'); + if ($statement && ($row = $DB->next($statement))) { + $insert = SQL::newBulkInsert('tag_rev'); do { - $row['tag_entry_id'] = $newEid; - $Insert = SQL::newInsert('tag_rev'); - foreach ($row as $fd => $val) { - $Insert->addInsert($fd, $val); - } + $row['tag_entry_id'] = $newEid; if (!$sourceRev) { - $Insert->addInsert('tag_rev_id', 1); + $row['tag_rev_id'] = 1; + $row['tag_blog_id'] = $targetBid; } - $DB->query($Insert->get(dsn()), 'exec'); - } while ($row = $DB->fetch($q)); + $insert->addInsert($row); + } while ($row = $DB->next($statement)); + if ($insert->hasData()) { + $DB->query($insert->get(dsn()), 'exec'); + } } //-------------- @@ -504,85 +310,57 @@ public function approvalDupe($eid, $newEid, $bid = null) } else { $subCategory = loadSubCategories($eid); } - Entry::saveSubCategory($newEid, $cid, implode(',', $subCategory['id']), $bid, 1); + Entry::saveSubCategory($newEid, $cid, implode(',', $subCategory['id']), $targetBid, 1); //------- // field if ($sourceRev) { - $Field = loadEntryField($eid, 1); + $Field = loadEntryField($eid, 1); } else { - $Field = loadEntryField($eid); + $Field = loadEntryField($eid); } - + $this->duplicateFieldsTrait($Field); foreach ($Field->listFields() as $fd) { - $this->conversionId($Field, $fd, $bid); - if (!strpos($fd, '@path')) { - continue; - } - $set = false; - $base = substr($fd, 0, (-1 * strlen('@path'))); - foreach ($Field->getArray($fd, true) as $i => $path) { - if (!Storage::isFile($sourceDir . $path)) { - continue; - } - $info = pathinfo($path); - $dirname = empty($info['dirname']) ? '' : $info['dirname'] . '/'; - Storage::makeDirectory(REVISON_ARCHIVES_DIR . $dirname); - $ext = empty($info['extension']) ? '' : '.' . $info['extension']; - $newPath = $dirname . uniqueString() . $ext; - - $path = $sourceDir . $path; - $largePath = otherSizeImagePath($path, 'large'); - $tinyPath = otherSizeImagePath($path, 'tiny'); - $squarePath = otherSizeImagePath($path, 'square'); - - $newLargePath = otherSizeImagePath($newPath, 'large'); - $newTinyPath = otherSizeImagePath($newPath, 'tiny'); - $newSquarePath = otherSizeImagePath($newPath, 'square'); - - Storage::copy($path, REVISON_ARCHIVES_DIR . $newPath); - Storage::copy($largePath, REVISON_ARCHIVES_DIR . $newLargePath); - Storage::copy($tinyPath, REVISON_ARCHIVES_DIR . $newTinyPath); - Storage::copy($squarePath, REVISON_ARCHIVES_DIR . $newSquarePath); - - if (!$set) { - $Field->delete($fd); - $Field->delete($base . '@largePath'); - $Field->delete($base . '@tinyPath'); - $Field->delete($base . '@squarePath'); - $set = true; - } - $Field->add($fd, $newPath); - if (Storage::isReadable($largePath)) { - $Field->add($base . '@largePath', $newLargePath); - } - if (Storage::isReadable($tinyPath)) { - $Field->add($base . '@tinyPath', $newTinyPath); - } - if (Storage::isReadable($squarePath)) { - $Field->add($base . '@squarePath', $newSquarePath); - } - } + $this->conversionId($Field, $fd, $targetBid); } + Common::saveField('eid', $newEid, $Field, null, null, '', $targetBid); Entry::saveFieldRevision($newEid, $Field, 1); + Common::saveFulltext('eid', $newEid, Common::loadEntryFulltext($newEid), $targetBid); } + /** + * 関連エントリーの複製 + * @param int $eid 複製元のエントリーID + * @param int $newEid 複製先のエントリーID + * @return void + */ protected function relationDupe($eid, $newEid) { - $DB = DB::singleton(dsn()); $SQL = SQL::newSelect('relationship'); $SQL->addWhereOpr('relation_id', $eid); - $all = $DB->query($SQL->get(dsn()), 'all'); + $all = DB::query($SQL->get(dsn()), 'all'); + $sql = SQL::newBulkInsert('relationship'); foreach ($all as $row) { - $SQL = SQL::newInsert('relationship'); - $SQL->addInsert('relation_id', $newEid); - $SQL->addInsert('relation_eid', $row['relation_eid']); - $SQL->addInsert('relation_order', $row['relation_order']); - $DB->query($SQL->get(dsn()), 'exec'); + $sql->addInsert([ + 'relation_id' => $newEid, + 'relation_eid' => $row['relation_eid'], + 'relation_type' => $row['relation_type'], + 'relation_order' => $row['relation_order'], + ]); + } + if ($sql->hasData()) { + DB::query($sql->get(dsn()), 'exec'); } } + /** + * 位置情報の複製 + * @param int $eid 複製元のエントリーID + * @param int $newEid 複製先のエントリーID + * @param int $targetBid 複製先のブログID + * @return void + */ protected function geoDuplicate($eid, $newEid, $targetBid = BID) { $DB = DB::singleton(dsn()); @@ -598,88 +376,6 @@ protected function geoDuplicate($eid, $newEid, $targetBid = BID) } } - protected function fieldDupe(&$Field, $targetBid = BID) - { - foreach ($Field->listFields() as $fd) { - $this->conversionId($Field, $fd, $targetBid); - - if (preg_match('/(.*?)@path$/', $fd, $match)) { - $_fd = $match[1]; - - // カスタムフィールドグループ対応 - $ary_path = $Field->getArray($_fd . '@path'); - if (is_array($ary_path) && count($ary_path) > 0) { - $int_filedindex = 0; - $Old_Field = new Field(); - $Old_Field->set($_fd . '@path', $Field->getArray($_fd . '@path')); - $Old_Field->set($_fd . '@largePath', $Field->getArray($_fd . '@largePath')); - $Old_Field->set($_fd . '@tinyPath', $Field->getArray($_fd . '@tinyPath')); - $Old_Field->set($_fd . '@squarePath', $Field->getArray($_fd . '@squarePath')); - - foreach ($ary_path as $path) { - if ( - Storage::isFile(ARCHIVES_DIR . $path) && - preg_match('@^(.*?)([^/]+)(\.[^.]+)$@', $path, $match) - ) { - $dirname = $match[1]; - $basename = $match[2]; - $extension = $match[3]; - - $info = [ - 'field' => $_fd, - 'dirname' => $dirname, - 'newBasename' => uniqueString(), - 'extension' => $extension, - ]; - - foreach ( - [ - '' => '@path', - 'large-' => '@largePath', - 'tiny-' => '@tinyPath', - 'square-' => '@squarePath', - ] as $pfx => $name - ) { - $info['name'] = $name; - $info['pfx'] = $pfx; - $this->filesDupe($Field, $Old_Field, $info, $int_filedindex); - } - $int_filedindex++; - } - } - } - } - } - } - - protected function filesDupe(&$Field, &$Old_Field, $info, $int_filedindex) - { - $key = $info['name']; - $pfx = $info['pfx']; - $_fd = $info['field']; - $dirname = $info['dirname']; - $newBasename = $info['newBasename']; - $extension = $info['extension']; - - if ( - $path = $Old_Field->get($_fd . $key, null, $int_filedindex) && - Storage::isFile(ARCHIVES_DIR . $path) - ) { - $newPath = $dirname . $pfx . $newBasename . $extension; - - Storage::copy(ARCHIVES_DIR . $path, ARCHIVES_DIR . $newPath); - if (HOOK_ENABLE) { - $Hook = ACMS_Hook::singleton(); - $Hook->call('mediaCreate', ARCHIVES_DIR . $newPath); - } - if ($int_filedindex == 0) { - $Field->setField($_fd . $key, $newPath); - } else { - $Field->addField($_fd . $key, $newPath); - } - } - } - /** * @param $Field * @param $fd @@ -764,7 +460,7 @@ protected function conversionBlogId(&$Field, $fd, $targetBid) */ protected function conversionCategoryId(&$Field, $fd, $targetBid) { - $engine = App::make('google_translate.engine'); + $engine = Application::make('google_translate.engine'); $translationCidFields = $this->config->getArray('translationCidFieldName'); if (in_array($fd, $translationCidFields, true)) { $cidValue = $Field->getArray($fd); diff --git a/src/Engine.php b/src/Engine.php index 17aff9c1..aad7a5c0 100644 --- a/src/Engine.php +++ b/src/Engine.php @@ -2,13 +2,15 @@ namespace Acms\Plugins\GoogleTranslate; -use DB; +use Acms\Services\Facades\Database as DB; +use Acms\Services\Facades\Common; +use Acms\Services\Facades\Config; +use Acms\Services\Facades\Application; +use Acms\Services\Unit\Contracts\Model; use SQL; use ACMS_RAM; use ACMS_Filter; use Field; -use Common; -use Config; class Engine { @@ -345,20 +347,12 @@ protected function buildFieldData($eid, $targetField) * エントリーユニットのレスポンスデータ組み立て * * @param int $eid - * @return array + * @return \Acms\Services\Unit\UnitCollection[] */ protected function buildUnitData($eid) { - $item = []; - $units = loadColumn($eid); - foreach ($units as $unit) { - $type = detectUnitTypeSpecifier($unit['type']); - if (!in_array($type, ['text', 'table', 'media', 'image', 'file'], true)) { - continue; - } - $item[] = $unit; - } - return $item; + $unitService = Application::make('unit-repository'); + return $unitService->loadUnits($eid); } protected function changeParentCategory($cid, $toPid, $targetBid) @@ -438,7 +432,6 @@ protected function changeParentCategory($cid, $toPid, $targetBid) $toLeft = intval($row['category_right']); $toRight = $toLeft + 1; $toSort = intval($row['category_sort']) + 1; - ; } //----- diff --git a/src/GET/GoogleTranslate/CategoryList.php b/src/GET/GoogleTranslate/CategoryList.php index e6f0b3ca..fda97b8f 100644 --- a/src/GET/GoogleTranslate/CategoryList.php +++ b/src/GET/GoogleTranslate/CategoryList.php @@ -13,6 +13,7 @@ class CategoryList extends ACMS_GET { public function get() { + return ''; if (empty(CID)) { return ''; } diff --git a/src/GoogleTranslate.php b/src/GoogleTranslate.php index 6a9085ba..d99c6e00 100644 --- a/src/GoogleTranslate.php +++ b/src/GoogleTranslate.php @@ -2,13 +2,21 @@ namespace Acms\Plugins\GoogleTranslate; +use Google\Cloud\Translate\V3\Client\TranslationServiceClient; +use Google\Cloud\Translate\V3\TranslateTextRequest; + class GoogleTranslate { /** - * @var \Google\Cloud\Translate\TranslateClient + * @var TranslationServiceClient */ protected $client; + /** + * @var string + */ + protected $parent; + /** * @var string */ @@ -46,11 +54,13 @@ class GoogleTranslate /** * GoogleTranslate constructor. - * @param \Google\Cloud\Translate\TranslateClient $client + * @param TranslationServiceClient $client + * @param string $parent */ - public function __construct($client) + public function __construct($client, $parent) { $this->client = $client; + $this->parent = $parent; } /** @@ -67,8 +77,10 @@ public function setTargetLanguage($targetLang) */ public function addText($key, $txt) { - $this->textKeys[] = $key; - $this->textTranslations[] = $txt; + if ($txt) { + $this->textKeys[] = $key; + $this->textTranslations[] = $txt; + } } /** @@ -77,8 +89,10 @@ public function addText($key, $txt) */ public function addHtml($key, $txt) { - $this->htmlKeys[] = $key; - $this->htmlTranslations[] = $txt; + if ($txt) { + $this->htmlKeys[] = $key; + $this->htmlTranslations[] = $txt; + } } /** @@ -119,16 +133,34 @@ public function getHtml($key) public function translate() { if (count($this->textTranslations) > 0) { - $this->textTranslated = $this->client->translateBatch($this->textTranslations, [ - 'target' => $this->targetLanguage, - 'format' => 'text', - ]); + $request = new TranslateTextRequest(); + $request->setParent($this->parent); + $request->setContents($this->textTranslations); + $request->setMimeType('text/plain'); + $request->setTargetLanguageCode($this->targetLanguage); + + $response = $this->client->translateText($request); + $translations = $response->getTranslations(); + + $this->textTranslated = []; + foreach ($translations as $translation) { + $this->textTranslated[] = ['text' => $translation->getTranslatedText()]; + } } if (count($this->htmlTranslations) > 0) { - $this->htmlTranslated = $this->client->translateBatch($this->htmlTranslations, [ - 'target' => $this->targetLanguage, - 'format' => 'html', - ]); + $request = new TranslateTextRequest(); + $request->setParent($this->parent); + $request->setContents($this->htmlTranslations); + $request->setMimeType('text/html'); + $request->setTargetLanguageCode($this->targetLanguage); + + $response = $this->client->translateText($request); + $translations = $response->getTranslations(); + + $this->htmlTranslated = []; + foreach ($translations as $translation) { + $this->htmlTranslated[] = ['text' => $translation->getTranslatedText()]; + } } } } diff --git a/src/Import.php b/src/Import.php index 524a72e5..f4960167 100644 --- a/src/Import.php +++ b/src/Import.php @@ -52,9 +52,10 @@ public function decode($json) /** * @param int $eid * @param string $json + * @param \Acms\Services\Unit\UnitCollection $units * @throws \Acms\Plugins\GoogleTranslate\Exceptions\NotFoundException */ - public function import($eid, $json) + public function import($eid, $json, $units) { $entry = $this->decode($json); if ($entry->langCode === 'ja') { @@ -67,7 +68,7 @@ public function import($eid, $json) if (empty($model)) { throw new NotFoundException('Target not found.'); } - $this->buildEntry($model, $entry); + $this->buildEntry($model, $entry, $units); $model->save(); $this->updateStatus($eid); } @@ -83,8 +84,9 @@ protected function updateStatus($eid) /** * @param \Acms\Plugins\GoogleTranslate\Contracts\Model $model * @param object $entry + * @param \Acms\Services\Unit\UnitCollection $units */ - protected function buildEntry(&$model, $entry) + protected function buildEntry(&$model, $entry, $units) { // entry foreach ($model->columns as $column) { @@ -93,60 +95,8 @@ protected function buildEntry(&$model, $entry) } } - // unit - if (property_exists($entry, 'units') && is_array($entry->units)) { - foreach ($entry->units as $new) { - $clid = $new->clid; - foreach ($model->units as $i => $current) { - if (is_array($current) && $current['clid'] === $clid) { - $type = detectUnitTypeSpecifier($new->type); - switch ($type) { - case 'text': - $current['text'] = $new->text; - break; - case 'table': - $current['table'] = $new->table; - break; - case 'media': - case 'image': - $current['caption'] = $new->caption; - $current['alt'] = $new->alt; - break; - case 'file': - $current['caption'] = $new->caption; - break; - } - $current['id'] = uniqueString(); - $model->units[$i] = $current; - break; - } elseif (is_object($current) && $current->getId() === $clid) { - $type = detectUnitTypeSpecifier($new->type); - switch ($type) { - case 'text': - $current->setField1($new->text); - break; - case 'table': - $current->setField1($new->table); - break; - case 'media': - $current->setField2($new->caption); - $current->setField3($new->alt); - break; - case 'image': - $current->setField1($new->caption); - $current->setField4($new->alt); - break; - case 'file': - $current->setField1($new->caption); - break; - } - $current->setTempId(uniqueString()); - $model->units[$i] = $current; - break; - } - } - } - } + // units + $model->units = $units; // field if (property_exists($entry, 'fields') && is_array($entry->fields)) { diff --git a/src/Models/Entry.php b/src/Models/Entry.php index da61253a..b695de4d 100644 --- a/src/Models/Entry.php +++ b/src/Models/Entry.php @@ -4,16 +4,16 @@ use Acms\Plugins\GoogleTranslate\Contracts\Model; use Acms\Services\Facades\Application; -use DB; +use Acms\Services\Facades\Entry as EntryHelper; +use Acms\Services\Facades\Common; +use Acms\Services\Facades\Database as DB; use SQL; use Field; -use Common; -use Acms\Services\Entry\Helper as EntryHelper; class Entry extends Model { - private const SORT_ENTRY = 1; - private const SORT_USER = 2; + private const SORT_ENTRY = 1; + private const SORT_USER = 2; private const SORT_CATEGORY = 3; /** @@ -36,6 +36,7 @@ public function __construct($entry = null) $this->approval = 'none'; $this->form_status = ''; $this->title = ''; + $this->link = ''; $this->datetime = $now; $this->start_datetime = '1000-01-01 00:00:00'; $this->end_datetime = '9999-12-31 23:59:59'; @@ -43,16 +44,22 @@ public function __construct($entry = null) $this->updated_datetime = $now; $this->summary_range = null; $this->indexing = 'on'; + $this->members_only = 'off'; $this->primary_image = null; $this->current_rev_id = 0; + $this->reserve_rev_id = 0; $this->last_update_user_id = 1; $this->hash = md5(SYSTEM_GENERATED_DATETIME . $now); $this->category_id = null; $this->user_id = 1; $this->form_id = 0; $this->blog_id = 1; + $this->delete_uid = null; + $this->lock_datetime = '1000-01-01 00:00:00'; + $this->lock_uid = 0; + $this->fields = new Field(); - $this->units = []; + $this->units = null; if (empty($entry)) { $this->init(); @@ -137,9 +144,9 @@ public function load($item) $this->fields = loadEntryField($this->id); // ablogcms v3.1.23 からリファクタリングによりメソッドがなくなっている問題の解決 - if (method_exists(EntryHelper::class, 'saveColumn')) { + if (method_exists(\Acms\Services\Entry\Helper::class, 'saveColumn')) { $this->units = loadColumn($this->id); - foreach ($this->units as & $unit) { + foreach ($this->units as &$unit) { $type = detectUnitTypeSpecifier($unit['type']); if ($type === 'custom') { $unit['field'] = acmsUnserialize($unit['field']); @@ -151,8 +158,7 @@ public function load($item) $unitService = Application::make('unit-repository'); $this->units = $unitService->loadUnits($this->id); - foreach ($this->units as & $unit) { - $type = detectUnitTypeSpecifier($unit->getType()); + foreach ($this->units as &$unit) { $unit->setTempId(uniqueString()); } } @@ -184,13 +190,12 @@ public function save() } // ablogcms v3.1.23 からリファクタリングによりメソッドがなくなっている問題の解決 - if (method_exists(EntryHelper::class, 'saveColumn')) { - $entryHelper = new EntryHelper(); - $entryHelper->saveColumn($this->units, $this->id, $this->blog_id); + if (method_exists(\Acms\Services\Entry\Helper::class, 'saveColumn')) { + EntryHelper::saveColumn($this->units, $this->id, $this->blog_id); } else { $unitRepository = Application::make('unit-repository'); assert($unitRepository instanceof \Acms\Services\Unit\Repository); - $unitRepository->saveUnits($this->units, $this->id, $this->blog_id); + $unitRepository->saveAllUnits($this->units, $this->id, $this->blog_id); } Common::saveField('eid', $this->id, $this->fields); @@ -202,8 +207,8 @@ public function save() */ public function delete() { - Entry::entryDelete($this->id); - Entry::revisionDelete($this->id); + EntryHelper::entryDelete($this->id); + EntryHelper::revisionDelete($this->id); } /** @@ -212,34 +217,16 @@ public function delete() */ protected function getNextSort($type) { - $DB = DB::singleton(dsn()); - $SQL = SQL::newSelect('entry'); - - switch ($type) { - case self::SORT_ENTRY: - $SQL->setSelect('entry_sort'); - $SQL->addWhereOpr('entry_blog_id', $this->blog_id); - $SQL->setOrder('entry_sort', 'DESC'); - break; - case self::SORT_USER: - $SQL->setSelect('entry_user_sort'); - $SQL->addWhereOpr('entry_user_id', $this->user_id); - $SQL->addWhereOpr('entry_blog_id', $this->blog_id); - $SQL->setOrder('entry_user_sort', 'DESC'); - break; - case self::SORT_CATEGORY: - $SQL->setSelect('entry_category_sort'); - $SQL->addWhereOpr('entry_category_id', $this->category_id); - $SQL->addWhereOpr('entry_blog_id', $this->blog_id); - $SQL->setOrder('entry_category_sort', 'DESC'); - break; - default: - return 0; + $entryRepository = Application::make('entry.repository'); + assert($entryRepository instanceof \Acms\Services\Entry\EntryRepository); + + if ($type === self::SORT_ENTRY) { + return $entryRepository->nextSort($this->blog_id); + } elseif ($type === self::SORT_USER) { + return $entryRepository->nextUserSort($this->user_id, $this->blog_id); + } elseif ($type === self::SORT_CATEGORY) { + return $entryRepository->nextCategorySort($this->category_id, $this->blog_id); } - - $SQL->setLimit(1); - $next = intval($DB->query($SQL->get(dsn()), 'one')) + 1; - - return $next; + return 0; } } diff --git a/src/POST/GoogleTranslate/CreateEntry.php b/src/POST/GoogleTranslate/CreateEntry.php index 9f9eb53b..616ca026 100644 --- a/src/POST/GoogleTranslate/CreateEntry.php +++ b/src/POST/GoogleTranslate/CreateEntry.php @@ -9,6 +9,7 @@ use ACMS_RAM; use Acms\Services\Facades\Common; use Acms\Services\Facades\Logger; +use Acms\Services\Unit\Contracts\Model; class CreateEntry extends ACMS_POST_Entry_Duplicate { @@ -90,7 +91,7 @@ protected function googleTranslate($targetBid, $newEid) $entryInfo['title'] = $googleTranslate->getText('title'); $this->getTranslationUnits($entryInfo['units'], $googleTranslate); - foreach ($entryInfo['fields'] as $i => & $field) { + foreach ($entryInfo['fields'] as $i => &$field) { $temp = []; foreach ($field['value'] as $j => $value) { $temp[] = $googleTranslate->getText($field['key'] . '_' . $i); @@ -99,41 +100,51 @@ protected function googleTranslate($targetBid, $newEid) } $import = App::make('google_translate.import'); - $import->import($newEid, json_encode($entryInfo)); + $units = $entryInfo['units']; + unset($entryInfo['units']); + $import->import($newEid, json_encode($entryInfo), $units); } /** - * @param $units + * @param \Acms\Services\Unit\UnitCollection $units * @param $googleTranslate */ protected function addToTranslationUnits($units, $googleTranslate) { - foreach ($units as $i => $unit) { - if (is_array($unit)) { - $type = detectUnitTypeSpecifier($unit['type']); - switch ($type) { - case 'text': - $tagType = $this->getTextUnitFormat($unit['tag']); - if ($tagType === 'html') { - $googleTranslate->addHtml('unit_text_' . $i, $this->newLineEscape($unit['text'])); - } elseif ($tagType === 'text') { - $googleTranslate->addText('unit_text_' . $i, $unit['text']); - } - break; - case 'table': - $googleTranslate->addHtml('unit_table_' . $i, $unit['table']); - break; - case 'media': - case 'image': - $googleTranslate->addText('unit_caption_' . $i, $unit['caption']); - $googleTranslate->addText('unit_alt_' . $i, $unit['alt']); - break; - case 'file': - $googleTranslate->addText('unit_caption_' . $i, $unit['caption']); - break; - } + $units->walk(function (Model $unit, $i) use ($googleTranslate) { + $type = $unit->getUnitType(); + $attr = $unit->getAttributes(); + switch ($type) { + case 'block-editor': + $googleTranslate->addHtml('unit_block_editor_' . $i, $attr['html'] ?? ''); + break; + case 'text': + $text = $attr['text_text'] ?? ''; + $tagType = $this->getTextUnitFormat($attr['text_tag'] ?? ''); + if ($tagType === 'html') { + $googleTranslate->addHtml('unit_text_' . $i, $this->newLineEscape($text)); + } elseif ($tagType === 'text') { + $googleTranslate->addText('unit_text_' . $i, $text); + } + break; + case 'table': + $googleTranslate->addHtml('unit_table_' . $i, $attr['table_source'] ?? ''); + break; + case 'media': + $caption = $unit->getCaptions()[0] ?? ''; + $alt = $unit->getField3() ?? ''; + $googleTranslate->addText('unit_caption_' . $i, $caption); + $googleTranslate->addText('unit_alt_' . $i, $alt); + break; + case 'image': + $googleTranslate->addText('unit_caption_' . $i, $attr['image_caption'] ?? ''); + $googleTranslate->addText('unit_alt_' . $i, $attr['image_alt'] ?? ''); + break; + case 'file': + $googleTranslate->addText('unit_caption_' . $i, $attr['file_caption'] ?? ''); + break; } - } + }); } /** @@ -142,32 +153,38 @@ protected function addToTranslationUnits($units, $googleTranslate) */ protected function getTranslationUnits(&$units, $googleTranslate) { - foreach ($units as $i => & $unit) { - if (is_array($unit)) { - $type = detectUnitTypeSpecifier($unit['type']); - switch ($type) { - case 'text': - $tagType = $this->getTextUnitFormat($unit['tag']); - if ($tagType === 'html') { - $unit['text'] = $this->newLineUnEscape($googleTranslate->getHtml('unit_text_' . $i)); - } elseif ($tagType === 'text') { - $unit['text'] = $googleTranslate->getText('unit_text_' . $i); - } - break; - case 'table': - $unit['table'] = $googleTranslate->getHtml('unit_table_' . $i); - break; - case 'media': - case 'image': - $unit['caption'] = $googleTranslate->getText('unit_caption_' . $i); - $unit['alt'] = $googleTranslate->getText('unit_alt_' . $i); - break; - case 'file': - $unit['caption'] = $googleTranslate->getText('unit_caption_' . $i); - break; - } + $units->walk(function (Model $unit, $i) use ($googleTranslate) { + $type = $unit->getUnitType(); + $attr = $unit->getAttributes(); + + switch ($type) { + case 'block-editor': + $unit->setField1($googleTranslate->getHtml('unit_block_editor_' . $i)); + break; + case 'text': + $tagType = $this->getTextUnitFormat($attr['text_tag'] ?? ''); + if ($tagType === 'html') { + $unit->setField1($this->newLineUnEscape($googleTranslate->getHtml('unit_text_' . $i))); + } elseif ($tagType === 'text') { + $unit->setField1($googleTranslate->getText('unit_text_' . $i)); + } + break; + case 'table': + $unit->setField1($googleTranslate->getHtml('unit_table_' . $i)); + break; + case 'media': + $unit->setField2($googleTranslate->getText('unit_caption_' . $i)); + $unit->setField3($googleTranslate->getText('unit_alt_' . $i)); + break; + case 'image': + $unit->setCaption($googleTranslate->getText('unit_caption_' . $i)); + $unit->setAlt($googleTranslate->getText('unit_alt_' . $i)); + break; + case 'file': + $unit->setCaption($googleTranslate->getText('unit_caption_' . $i)); + break; } - } + }); } /** diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index aa66b4ee..c2621f8a 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -2,13 +2,13 @@ namespace Acms\Plugins\GoogleTranslate; -use App; use ACMS_App; -use Google\Cloud\Translate\V2\TranslateClient; +use Acms\Services\Facades\Application; use Acms\Services\Facades\Storage; use Acms\Services\Facades\Config; use Acms\Services\Common\HookFactory; use Acms\Services\Common\InjectTemplate; +use Google\Cloud\Translate\V3\Client\TranslationServiceClient; class ServiceProvider extends ACMS_App { @@ -60,18 +60,21 @@ public function init() if ($code = $baseBlogConfig->get('google_translate_base_lang')) { $engine->setBaseLangCode($code); } - App::singleton('google_translate.engine', function () use ($engine) { + Application::singleton('google_translate.engine', function () use ($engine) { return $engine; }); - App::singleton('google_translate.duplicate', '\Acms\Plugins\GoogleTranslate\DuplicateEntry'); - App::singleton('google_translate.import', function () { + Application::singleton('google_translate.duplicate', '\Acms\Plugins\GoogleTranslate\DuplicateEntry'); + Application::singleton('google_translate.import', function () { return new Import(dirname(__FILE__) . '/schema/schema.json'); }); - App::bind('google_translate.google.translate', function () use ($baseBlogConfig) { - $client = new TranslateClient([ - 'key' => $baseBlogConfig->get('google_translate_google_translate_api_key'), + Application::bind('google_translate.google.translate', function () use ($baseBlogConfig) { + $projectId = $baseBlogConfig->get('google_translate_project_id'); + $jsonPath = $baseBlogConfig->get('google_translate_service_account_json_path'); + $client = new TranslationServiceClient([ + 'credentials' => $jsonPath ]); - return new GoogleTranslate($client); + $parent = $client->locationName($projectId, 'global'); + return new GoogleTranslate($client, $parent); }); $hook = HookFactory::singleton(); @@ -85,13 +88,6 @@ public function init() $inject->add('admin-main', PLUGIN_DIR . 'GoogleTranslate/template/admin/main.html'); $inject->add('admin-topicpath', PLUGIN_DIR . 'GoogleTranslate/template/admin/topicpath.html'); } - /** - * ToDo: Spoke連携 - * https://www.alleyoop.co.jp/spoke/ - */ -// if (preg_match('/^\/api\/spoke/', REQUEST_PATH)) { -// require_once dirname(__FILE__) . '/bootstrap.php'; -// } } /** diff --git a/src/SpokeController.php b/src/SpokeController.php deleted file mode 100644 index 6a96eb75..00000000 --- a/src/SpokeController.php +++ /dev/null @@ -1,205 +0,0 @@ -engine = App::make('google_translate.engine'); - $this->import = App::make('google_translate.import'); - } - - /** - * 翻訳対象エントリ一覧 - * - * @param \Slim\Http\Request $request - * @param \Slim\Http\Response $response - * @return \Slim\Http\Response - */ - public function index(Request $request, Response $response) - { - $json = [ - 'total_count' => 0, - 'entries' => [], - ]; - $limit = 100; - $offset = 0; - $params = $request->getQueryParams(); - - if (isset($params['limit']) && intval($params['limit']) > 0) { - $limit = intval($params['limit']); - } - if (isset($params['offset']) && intval($params['offset']) > 0) { - $offset = intval($params['offset']); - } - - $db = DB::singleton(dsn()); - $sql = SQL::newSelect('google_translate_entry', 'multi_lang_entry'); - $sql->addLeftJoin('entry', 'entry_id', 'relation_eid', 'entry', 'multi_lang_entry'); - $sql->addLeftJoin( - 'google_translate_blog', - 'relation_bid', - 'relation_bid', - 'multi_lang_blog', - 'multi_lang_entry' - ); - $sql->addWhereOpr('status', 'original'); - $sql->addWhereOpr('entry_title', null, '<>'); - - $amount = new SQL_Select($sql); - $amount->addSelect('DISTINCT(entry_id)', 'amount', null, 'COUNT'); - $json['total_count'] = intval($db->query($amount->get(dsn()), 'one')); - - $sql->addOrder('entry_id', 'asc'); - $sql->setLimit($limit, $offset); - $q = $sql->get(dsn()); - $db->query($q, 'fetch'); - - $items = []; - $ids = []; - while ($entry = $db->fetch($q)) { - $items[] = $entry; - $ids[] = $entry['entry_id']; - } - $translationsList = $this->getTranslationsList($ids); - foreach ($items as $entry) { - $jaId = intval($entry['entry_id']); - $item = $this->engine->buildEntryData($entry, [], false); - $item['translations'] = null; - if (isset($translationsList[$jaId])) { - $item['translations'] = $translationsList[$jaId]; - } - $json['entries'][] = $item; - } - return $response->withJson($json, 200); - } - - /** - * 翻訳対象エントリー詳細 - * - * @param \Slim\Http\Request $request - * @param \Slim\Http\Response $response - * @return \Slim\Http\Response - */ - public function show(Request $request, Response $response) - { - $eid = $request->getAttribute('eid'); - if (!is_numeric($eid)) { - return $this->errorResponse($response, 'Invalid entry id.', 400); - } - try { - $entry = $this->engine->getEntryData($eid); - $targetField = $this->engine->getTranslationFieldFromEid($eid); - return $response->withJson($this->engine->buildEntryData($entry, $targetField), 200); - } catch (\Exception $e) { - return $this->errorResponse($response, $e->getMessage(), 404); - } - } - - /** - * 翻訳対象エントリー更新 - * - * @param \Slim\Http\Request $request - * @param \Slim\Http\Response $response - * @return \Slim\Http\Response - */ - public function update(Request $request, Response $response) - { - try { - $eid = $request->getAttribute('eid'); - $json = $request->getBody(); - - $this->import->import($eid, $json); - } catch (NotFoundException $e) { - return $this->errorResponse($response, $e->getMessage(), 404); - } catch (\Exception $e) { - return $this->errorResponse($response, $e->getMessage(), 400); - } - return $response->withStatus(204); - } - - /** - * エラーレスポンス - * - * @param \Slim\Http\Response $response - * @param string $message - * @param int $code - * @return \Slim\Http\Response - */ - protected function errorResponse($response, $message, $code) - { - return $response->withJson([ - 'message' => $message, - 'code' => $code, - ], $code); - } - - /** - * @param array $ids - * @return array - */ - protected function getTranslationsList($ids) - { - $translationsList = []; - - $db = DB::singleton(dsn()); - $sql = SQL::newSelect('google_translate_entry', 'multi_lang_entry'); - $sql->addSelect('base_entry_id'); - $sql->addSelect('relation_eid'); - $sql->addSelect('lang_code'); - $sql->addLeftJoin( - 'google_translate_blog', - 'relation_bid', - 'relation_bid', - 'multi_lang_blog', - 'multi_lang_entry' - ); - $sql->addWhereIn('base_entry_id', $ids); - $translations = $db->query($sql->get(dsn()), 'all'); - - foreach ($translations as $translation) { - $jaId = intval($translation['base_entry_id']); - $relationId = intval($translation['relation_eid']); - if ($jaId === $relationId) { - continue; - } - if (!isset($translationsList[$jaId])) { - $translation[$jaId] = []; - } - $translationsList[$jaId][$translation['lang_code']] = $this->getDetailEndpoint($relationId); - } - return $translationsList; - } - - - protected function getDetailEndpoint($id) - { - return BASE_URL . 'api/spoke/entries/' . $id . '/'; - } -} diff --git a/src/bootstrap.php b/src/bootstrap.php deleted file mode 100644 index 6990a951..00000000 --- a/src/bootstrap.php +++ /dev/null @@ -1,62 +0,0 @@ - [ - 'displayErrorDetails' => true - ] -]); - -/** - * Error handler - */ -$c = $app->getContainer(); -$c['errorHandler'] = function ($c) { - return function ($request, $response, $exception) use ($c) { - return $response->withJson([ - 'message' => $exception->getMessage(), - 'code' => 500, - ], 500); - }; -}; -$c['notFoundHandler'] = function ($c) { - return function ($request, $response) use ($c) { - return $response->withJson([ - 'message' => 'Resource not found.', - 'code' => 404, - ], 404); - }; -}; -$c['notAllowedHandler'] = function ($c) { - return function ($request, $response, $methods) use ($c) { - return $response->withJson([ - 'message' => 'Method must be one of: ' . implode(', ', $methods), - 'code' => 405, - ], 405); - }; -}; - -/** - * 翻訳対象エントリー覧 - * - * get: /api/spoke/entries?limit=100&offset=0 - */ -$app->get('/api/spoke/entries/', SpokeController::class . ':index'); - -/** - * 翻訳対象エントリー詳細 - * - * get: /api/spoke/entries/{eid}/ - */ -$app->get('/api/spoke/entries/{eid}/', SpokeController::class . ':show'); - -/** - * 翻訳対象エントリーアップデート - * - * post: /api/spoke/entries/{eid}/ - */ -$app->map(['POST', 'PUT'], '/api/spoke/entries/{eid}/', SpokeController::class . ':update'); - -$app->run(); -die(); diff --git a/src/composer.json b/src/composer.json index aaec6149..fc17910d 100644 --- a/src/composer.json +++ b/src/composer.json @@ -2,14 +2,13 @@ "name": "com.appleple/google-translate", "description": "Google Translate API を使ってエントリーを多言語化する拡張アプリです。", "require": { - "php": ">=7.2.5", - "slim/slim": "^3.12.3", - "google/cloud": "^0.201.0" + "php": ">=8.1", + "google/cloud-translate": "^2.1" }, "config": { "vendor-dir": "vendor", "platform": { - "php": "7.2.5" + "php": "8.1" } } } diff --git a/src/composer.lock b/src/composer.lock index b1a3b55b..1e86c725 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,30 +4,29 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fd7ab0408f6ee9b0bee37a3c10a69711", + "content-hash": "c4c0a0cab109ae7e5d764618fbf59cc9", "packages": [ { "name": "brick/math", - "version": "0.9.3", + "version": "0.13.1", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae" + "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae", - "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae", + "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04", + "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04", "shasum": "" }, "require": { - "ext-json": "*", - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0", - "vimeo/psalm": "4.9.2" + "phpunit/phpunit": "^10.1", + "vimeo/psalm": "6.8.8" }, "type": "library", "autoload": { @@ -47,47 +46,48 @@ "arithmetic", "bigdecimal", "bignum", + "bignumber", "brick", - "math" + "decimal", + "integer", + "math", + "mathematics", + "rational" ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.9.3" + "source": "https://github.com/brick/math/tree/0.13.1" }, "funding": [ { "url": "https://github.com/BenMorel", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/brick/math", - "type": "tidelift" } ], - "time": "2021-08-15T20:50:18+00:00" + "time": "2025-03-29T13:50:30+00:00" }, { "name": "firebase/php-jwt", - "version": "v6.4.0", + "version": "v6.11.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224" + "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224", - "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", + "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", "shasum": "" }, "require": { - "php": "^7.1||^8.0" + "php": "^8.0" }, "require-dev": { - "guzzlehttp/guzzle": "^6.5||^7.4", - "phpspec/prophecy-phpunit": "^1.1", - "phpunit/phpunit": "^7.5||^9.5", - "psr/cache": "^1.0||^2.0", + "guzzlehttp/guzzle": "^7.4", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "psr/cache": "^2.0||^3.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0" }, @@ -125,40 +125,44 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.4.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.11.1" }, - "time": "2023-02-09T21:01:23+00:00" + "time": "2025-04-09T20:32:01+00:00" }, { "name": "google/auth", - "version": "v1.26.0", + "version": "v1.49.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "f1f0d0319e2e7750ebfaa523c78819792a9ed9f7" + "reference": "68e3d88cb59a49f713e3db25d4f6bb3cc0b70764" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/f1f0d0319e2e7750ebfaa523c78819792a9ed9f7", - "reference": "f1f0d0319e2e7750ebfaa523c78819792a9ed9f7", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/68e3d88cb59a49f713e3db25d4f6bb3cc0b70764", + "reference": "68e3d88cb59a49f713e3db25d4f6bb3cc0b70764", "shasum": "" }, "require": { - "firebase/php-jwt": "^5.5||^6.0", - "guzzlehttp/guzzle": "^6.2.1|^7.0", - "guzzlehttp/psr7": "^1.7|^2.0", - "php": "^7.1||^8.0", - "psr/cache": "^1.0|^2.0|^3.0", - "psr/http-message": "^1.0" + "firebase/php-jwt": "^6.0", + "guzzlehttp/guzzle": "^7.4.5", + "guzzlehttp/psr7": "^2.4.5", + "php": "^8.1", + "psr/cache": "^2.0||^3.0", + "psr/http-message": "^1.1||^2.0", + "psr/log": "^3.0" }, "require-dev": { - "guzzlehttp/promises": "0.1.1|^1.3", - "kelvinmo/simplejwt": "0.7.0", - "phpseclib/phpseclib": "^2.0.31||^3.0", - "phpspec/prophecy-phpunit": "^1.1||^2.0", - "phpunit/phpunit": "^7.5||^9.0.0", + "guzzlehttp/promises": "^2.0", + "kelvinmo/simplejwt": "0.7.1", + "phpseclib/phpseclib": "^3.0.35", + "phpspec/prophecy-phpunit": "^2.1", + "phpunit/phpunit": "^9.6", "sebastian/comparator": ">=1.2.3", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^4.0", + "symfony/filesystem": "^6.3||^7.3", + "symfony/process": "^6.0||^7.0", + "webmozart/assert": "^1.11" }, "suggest": { "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." @@ -174,719 +178,234 @@ "Apache-2.0" ], "description": "Google Auth Library for PHP", - "homepage": "http://github.com/google/google-auth-library-php", + "homepage": "https://github.com/google/google-auth-library-php", "keywords": [ "Authentication", "google", "oauth2" ], "support": { - "docs": "https://googleapis.github.io/google-auth-library-php/main/", + "docs": "https://cloud.google.com/php/docs/reference/auth/latest", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.26.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.49.0" }, - "time": "2023-04-05T15:11:57+00:00" + "time": "2025-11-06T21:27:55+00:00" }, { - "name": "google/cloud", - "version": "v0.201.0", + "name": "google/cloud-core", + "version": "v1.68.2", "source": { "type": "git", - "url": "https://github.com/googleapis/google-cloud-php.git", - "reference": "8877e16a5cee4f9f08ea00266b1dee3cf269a505" + "url": "https://github.com/googleapis/google-cloud-php-core.git", + "reference": "f33d7c3e912d83ea731d08975e79de1c3b8c19d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php/zipball/8877e16a5cee4f9f08ea00266b1dee3cf269a505", - "reference": "8877e16a5cee4f9f08ea00266b1dee3cf269a505", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/f33d7c3e912d83ea731d08975e79de1c3b8c19d1", + "reference": "f33d7c3e912d83ea731d08975e79de1c3b8c19d1", "shasum": "" }, "require": { - "google/auth": "^1.18", - "google/common-protos": "^1.3.1||^2.0||^3.0", - "google/crc32": "^0.1.0", - "google/gax": "^1.12", - "guzzlehttp/guzzle": "^5.3|^6.5.7|^7.4.4", - "guzzlehttp/psr7": "^1.7|^2.0", - "monolog/monolog": "^1.1||^2.0||^3.0", - "php": ">=5.6", - "psr/http-message": "^1.0", - "ramsey/uuid": "^3.0|^4.0", - "rize/uri-template": "~0.3" - }, - "conflict": { - "psr/log": ">=3" - }, - "replace": { - "google/access-context-manager": "0.3.4", - "google/analytics-admin": "0.11.0", - "google/analytics-data": "0.9.4", - "google/cloud-access-approval": "1.0.3", - "google/cloud-advisorynotifications": "0.2.0", - "google/cloud-ai-platform": "0.14.0", - "google/cloud-alloydb": "0.1.2", - "google/cloud-api-gateway": "1.0.3", - "google/cloud-api-keys": "0.1.5", - "google/cloud-apigee-connect": "1.0.3", - "google/cloud-apigee-registry": "0.2.5", - "google/cloud-appengine-admin": "1.0.5", - "google/cloud-artifact-registry": "0.3.10", - "google/cloud-asset": "1.11.0", - "google/cloud-assured-workloads": "0.8.0", - "google/cloud-automl": "1.4.15", - "google/cloud-bare-metal-solution": "0.2.6", - "google/cloud-batch": "0.5.0", - "google/cloud-beyondcorp-appconnections": "0.1.4", - "google/cloud-beyondcorp-appconnectors": "0.1.4", - "google/cloud-beyondcorp-appgateways": "0.1.4", - "google/cloud-beyondcorp-clientconnectorservices": "0.1.4", - "google/cloud-beyondcorp-clientgateways": "0.1.4", - "google/cloud-bigquery": "1.24.0", - "google/cloud-bigquery-analyticshub": "0.1.4", - "google/cloud-bigquery-connection": "1.2.0", - "google/cloud-bigquery-data-exchange": "0.2.4", - "google/cloud-bigquery-datapolicies": "0.2.2", - "google/cloud-bigquery-migration": "0.2.0", - "google/cloud-bigquery-reservation": "1.1.1", - "google/cloud-bigquery-storage": "1.2.11", - "google/cloud-bigquerydatatransfer": "1.4.3", - "google/cloud-bigtable": "1.22.0", - "google/cloud-billing": "1.5.4", - "google/cloud-billing-budgets": "1.0.3", - "google/cloud-binary-authorization": "0.5.7", - "google/cloud-build": "0.5.2", - "google/cloud-certificate-manager": "0.3.5", - "google/cloud-channel": "1.2.0", - "google/cloud-common-protos": "0.4.0", - "google/cloud-compute": "1.8.1", - "google/cloud-contact-center-insights": "1.2.0", - "google/cloud-container": "1.11.0", - "google/cloud-container-analysis": "0.2.12", - "google/cloud-core": "1.49.4", - "google/cloud-data-catalog": "1.4.0", - "google/cloud-data-fusion": "0.2.9", - "google/cloud-datacatalog-lineage": "0.1.1", - "google/cloud-dataflow": "0.3.9", - "google/cloud-dataform": "0.1.4", - "google/cloud-datalabeling": "0.1.12", - "google/cloud-dataplex": "0.2.2", - "google/cloud-dataproc": "3.5.1", - "google/cloud-dataproc-metastore": "0.5.1", - "google/cloud-datastore": "1.20.0", - "google/cloud-datastore-admin": "0.5.7", - "google/cloud-datastream": "1.0.3", - "google/cloud-debugger": "1.4.14", - "google/cloud-deploy": "0.4.0", - "google/cloud-dialogflow": "1.3.0", - "google/cloud-dlp": "1.8.4", - "google/cloud-dms": "1.0.3", - "google/cloud-document-ai": "1.2.0", - "google/cloud-domains": "0.2.8", - "google/cloud-error-reporting": "0.19.10", - "google/cloud-essential-contacts": "0.2.11", - "google/cloud-eventarc": "1.0.3", - "google/cloud-eventarc-publishing": "0.3.3", - "google/cloud-filestore": "1.1.0", - "google/cloud-firestore": "1.29.0", - "google/cloud-functions": "1.1.0", - "google/cloud-game-servers": "1.0.3", - "google/cloud-gke-backup": "0.1.5", - "google/cloud-gke-connect-gateway": "0.1.11", - "google/cloud-gke-hub": "0.5.6", - "google/cloud-gke-multi-cloud": "0.2.1", - "google/cloud-gsuite-addons": "0.1.4", - "google/cloud-iam": "0.1.5", - "google/cloud-iam-credentials": "1.0.4", - "google/cloud-iap": "1.2.1", - "google/cloud-ids": "0.1.10", - "google/cloud-iot": "1.5.10", - "google/cloud-kms": "1.16.2", - "google/cloud-kms-inventory": "0.1.0", - "google/cloud-language": "0.28.3", - "google/cloud-life-sciences": "0.3.3", - "google/cloud-logging": "1.25.3", - "google/cloud-managed-identities": "1.0.3", - "google/cloud-media-translation": "0.2.10", - "google/cloud-memcache": "1.0.3", - "google/cloud-monitoring": "1.3.1", - "google/cloud-network-connectivity": "1.0.3", - "google/cloud-network-management": "1.0.3", - "google/cloud-network-security": "0.3.4", - "google/cloud-notebooks": "0.3.3", - "google/cloud-optimization": "0.1.7", - "google/cloud-orchestration-airflow": "1.0.3", - "google/cloud-org-policy": "0.4.0", - "google/cloud-osconfig": "1.0.3", - "google/cloud-oslogin": "1.4.4", - "google/cloud-policy-troubleshooter": "1.0.3", - "google/cloud-private-catalog": "0.2.12", - "google/cloud-profiler": "1.1.0", - "google/cloud-pubsub": "1.41.1", - "google/cloud-recaptcha-enterprise": "1.3.0", - "google/cloud-recommendations-ai": "0.4.10", - "google/cloud-recommender": "1.7.6", - "google/cloud-redis": "1.6.10", - "google/cloud-resource-manager": "0.3.9", - "google/cloud-resource-settings": "1.0.3", - "google/cloud-retail": "1.1.1", - "google/cloud-run": "0.3.3", - "google/cloud-scheduler": "1.8.1", - "google/cloud-secret-manager": "1.10.3", - "google/cloud-security-center": "1.14.2", - "google/cloud-security-private-ca": "1.2.0", - "google/cloud-security-public-ca": "0.1.4", - "google/cloud-service-control": "1.0.4", - "google/cloud-service-directory": "1.0.3", - "google/cloud-service-management": "1.0.4", - "google/cloud-service-usage": "1.0.4", - "google/cloud-shell": "1.0.3", - "google/cloud-spanner": "1.58.2", - "google/cloud-speech": "1.11.0", - "google/cloud-sql-admin": "0.2.10", - "google/cloud-storage": "1.30.2", - "google/cloud-storage-transfer": "1.0.4", - "google/cloud-talent": "1.0.3", - "google/cloud-tasks": "1.11.9", - "google/cloud-text-to-speech": "1.5.3", - "google/cloud-tpu": "1.0.3", - "google/cloud-trace": "1.5.1", - "google/cloud-translate": "1.13.1", - "google/cloud-video-live-stream": "0.3.0", - "google/cloud-video-stitcher": "0.4.0", - "google/cloud-video-transcoder": "0.6.0", - "google/cloud-videointelligence": "1.12.14", - "google/cloud-vision": "1.6.5", - "google/cloud-vm-migration": "0.3.0", - "google/cloud-vmware-engine": "0.1.2", - "google/cloud-vpc-access": "1.0.3", - "google/cloud-web-risk": "1.2.5", - "google/cloud-web-security-scanner": "0.7.11", - "google/cloud-workflows": "0.2.12", - "google/grafeas": "0.6.0", - "google/longrunning": "0.2.5" + "google/auth": "^1.34", + "google/gax": "^1.38.0", + "guzzlehttp/guzzle": "^6.5.8||^7.4.4", + "guzzlehttp/promises": "^1.4||^2.0", + "guzzlehttp/psr7": "^2.6", + "monolog/monolog": "^2.9||^3.0", + "php": "^8.1", + "psr/http-message": "^1.0||^2.0", + "rize/uri-template": "~0.3||~0.4" }, "require-dev": { "erusev/parsedown": "^1.6", - "google/cloud-tools": "^0.13.0", - "opis/closure": "^3.0", - "phpdocumentor/reflection": "^3.0||^4.0||^5.0", - "phpseclib/phpseclib": "^2.0||^3.0", - "phpspec/prophecy": "^1.10.3", - "phpunit/phpunit": "^4.8|^5.0|^8.0", - "rg/avro-php": "^1.8.0||^2.0.1||^3.0.0", - "yoast/phpunit-polyfills": "^1.0" + "google/cloud-common-protos": "~0.5", + "opis/closure": "^3.7|^4.0", + "phpdocumentor/reflection": "^5.3.3||^6.0", + "phpdocumentor/reflection-docblock": "^5.3", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.0", + "squizlabs/php_codesniffer": "2.*" }, "suggest": { "opis/closure": "May be used to serialize closures to process jobs in the batch daemon. Please require version ^3.", - "phpseclib/phpseclib": "May be used in place of OpenSSL for creating signed Cloud Storage URLs. Please require version ^2." + "symfony/lock": "Required for the Spanner cached based session pool. Please require the following commit: 3.3.x-dev#1ba6ac9" }, "bin": [ - "Core/bin/google-cloud-batch", - "Debugger/bin/google-cloud-debugger" + "bin/google-cloud-batch" ], "type": "library", "extra": { "component": { - "id": "google-cloud", - "target": "googleapis/google-cloud-php.git", - "path": "src", - "entry": [ - "Version.php", - "ServiceBuilder.php" - ] + "id": "cloud-core", + "path": "Core", + "entry": "src/ServiceBuilder.php", + "target": "googleapis/google-cloud-php-core.git" } }, "autoload": { "psr-4": { - "Grafeas\\": "Grafeas/src", - "Google\\Cloud\\": [ - "CommonProtos/src", - "src" - ], - "Google\\Cloud\\Dlp\\": "Dlp/src", - "Google\\Cloud\\Iam\\": "Iam/src", - "Google\\Cloud\\Iap\\": "Iap/src", - "Google\\Cloud\\Ids\\": "Ids/src", - "Google\\Cloud\\Iot\\": "Iot/src", - "Google\\Cloud\\Kms\\": "Kms/src", - "Google\\Cloud\\Run\\": "Run/src", - "Google\\Cloud\\Sql\\": "SqlAdmin/src", - "Google\\Cloud\\Tpu\\": "Tpu/src", - "Google\\Cloud\\Core\\": "Core/src", - "Google\\Cloud\\Asset\\": "Asset/src", - "Google\\Cloud\\Batch\\": "Batch/src", - "Google\\Cloud\\Build\\": "Build/src", - "Google\\Cloud\\Redis\\": "Redis/src", - "Google\\Cloud\\Shell\\": "Shell/src", - "Google\\Cloud\\Tasks\\": "Tasks/src", - "Google\\Cloud\\Trace\\": "Trace/src", - "Google\\LongRunning\\": "LongRunning/src/LongRunning", - "GPBMetadata\\Grafeas\\": "Grafeas/metadata", - "Google\\Cloud\\AutoMl\\": "AutoMl/src", - "Google\\Cloud\\Deploy\\": "Deploy/src", - "Google\\Cloud\\Gaming\\": "Gaming/src", - "Google\\Cloud\\GkeHub\\": "GkeHub/src", - "Google\\Cloud\\PubSub\\": "PubSub/src", - "Google\\Cloud\\Retail\\": "Retail/src", - "Google\\Cloud\\Speech\\": "Speech/src", - "Google\\Cloud\\Talent\\": "Talent/src", - "Google\\Cloud\\Vision\\": "Vision/src", - "Google\\Cloud\\AlloyDb\\": "AlloyDb/src", - "Google\\Cloud\\ApiKeys\\": "ApiKeys/src", - "Google\\Cloud\\Billing\\": "Billing/src", - "Google\\Cloud\\Channel\\": "Channel/src", - "Google\\Cloud\\Compute\\": "Compute/src", - "Google\\Cloud\\Domains\\": "Domains/src", - "Google\\Cloud\\Logging\\": "Logging/src", - "Google\\Cloud\\OsLogin\\": "OsLogin/src", - "Google\\Cloud\\Spanner\\": "Spanner/src", - "Google\\Cloud\\Storage\\": "Storage/src", - "Google\\Cloud\\WebRisk\\": "WebRisk/src", - "Google\\Analytics\\Data\\": "AnalyticsData/src", - "Google\\Cloud\\BigQuery\\": "BigQuery/src", - "Google\\Cloud\\Bigtable\\": "Bigtable/src", - "Google\\Cloud\\CloudDms\\": "Dms/src", - "Google\\Cloud\\Dataflow\\": "Dataflow/src", - "Google\\Cloud\\Dataform\\": "Dataform/src", - "Google\\Cloud\\Dataplex\\": "Dataplex/src", - "Google\\Cloud\\Dataproc\\": "Dataproc/src", - "Google\\Cloud\\Debugger\\": "Debugger/src", - "Google\\Cloud\\Eventarc\\": "Eventarc/src", - "Google\\Cloud\\Language\\": "Language/src", - "Google\\Cloud\\Memcache\\": "Memcache/src", - "Google\\Cloud\\OsConfig\\": "OsConfig/src", - "Google\\Cloud\\Profiler\\": "Profiler/src", - "GPBMetadata\\Google\\Iam\\": "Iam/metadata", - "GPBMetadata\\Google\\Rpc\\": "CommonProtos/metadata/Rpc", - "Google\\Analytics\\Admin\\": "AnalyticsAdmin/src", - "Google\\Cloud\\AppEngine\\": "AppEngineAdmin/src", - "Google\\Cloud\\Container\\": "Container/src", - "Google\\Cloud\\Datastore\\": "Datastore/src", - "Google\\Cloud\\Filestore\\": "Filestore/src", - "Google\\Cloud\\Firestore\\": "Firestore/src", - "Google\\Cloud\\Functions\\": "Functions/src", - "Google\\Cloud\\GkeBackup\\": "GkeBackup/src", - "Google\\Cloud\\Metastore\\": "DataprocMetastore/src", - "Google\\Cloud\\Notebooks\\": "Notebooks/src", - "Google\\Cloud\\OrgPolicy\\": [ - "OrgPolicy/src", - "Asset/external/protos/Cloud/OrgPolicy" - ], - "Google\\Cloud\\Scheduler\\": "Scheduler/src", - "Google\\Cloud\\Translate\\": "Translate/src", - "Google\\Cloud\\VpcAccess\\": "VpcAccess/src", - "Google\\Cloud\\Workflows\\": "Workflows/src", - "Google\\Apps\\Script\\Type\\": "GSuiteAddOns/external/protos", - "Google\\Cloud\\AIPlatform\\": "AiPlatform/src", - "Google\\Cloud\\ApiGateway\\": "ApiGateway/src", - "Google\\Cloud\\DataFusion\\": "DataFusion/src", - "Google\\Cloud\\Datastream\\": "Datastream/src", - "Google\\Cloud\\Dialogflow\\": "Dialogflow/src", - "Google\\Cloud\\DocumentAI\\": "DocumentAi/src", - "Google\\Cloud\\Monitoring\\": "Monitoring/src", - "Google\\Cloud\\DataCatalog\\": "DataCatalog/src", - "Google\\Cloud\\Recommender\\": "Recommender/src", - "Google\\Cloud\\VMMigration\\": "VmMigration/src", - "GPBMetadata\\Google\\Pubsub\\": "PubSub/metadata", - "Google\\Cloud\\DataLabeling\\": "DataLabeling/src", - "Google\\Cloud\\GSuiteAddOns\\": "GSuiteAddOns/src", - "Google\\Cloud\\LifeSciences\\": "LifeSciences/src", - "Google\\Cloud\\Optimization\\": "Optimization/src", - "Google\\Cloud\\ServiceUsage\\": "ServiceUsage/src", - "Google\\Cloud\\TextToSpeech\\": "TextToSpeech/src", - "Google\\Cloud\\VmwareEngine\\": "VmwareEngine/src", - "GPBMetadata\\Google\\Logging\\": "Logging/metadata", - "GPBMetadata\\Google\\Spanner\\": "Spanner/metadata", - "Google\\ApiCore\\LongRunning\\": "LongRunning/src/ApiCore/LongRunning", - "Google\\Cloud\\ApigeeConnect\\": "ApigeeConnect/src", - "Google\\Cloud\\GkeMultiCloud\\": "GkeMultiCloud/src", - "Google\\Cloud\\Kms\\Inventory\\": "KmsInventory/src", - "Google\\Cloud\\SecretManager\\": "SecretManager/src", - "GPBMetadata\\Google\\Bigtable\\": "Bigtable/metadata", - "GPBMetadata\\Google\\Dataflow\\": "Dataflow/metadata", - "GPBMetadata\\Google\\Devtools\\": "CommonProtos/metadata/Devtools", - "Google\\Cloud\\AccessApproval\\": "AccessApproval/src", - "Google\\Cloud\\ApigeeRegistry\\": "ApigeeRegistry/src", - "Google\\Cloud\\ErrorReporting\\": "ErrorReporting/src", - "Google\\Cloud\\PrivateCatalog\\": "PrivateCatalog/src", - "Google\\Cloud\\SecurityCenter\\": "SecurityCenter/src", - "Google\\Cloud\\ServiceControl\\": "ServiceControl/src", - "Google\\Cloud\\Video\\Stitcher\\": "VideoStitcher/src", - "GPBMetadata\\Google\\Appengine\\": "AppEngineAdmin/metadata", - "GPBMetadata\\Google\\Cloud\\Iap\\": "Iap/metadata", - "GPBMetadata\\Google\\Cloud\\Ids\\": "Ids/metadata", - "GPBMetadata\\Google\\Cloud\\Iot\\": "Iot/metadata", - "GPBMetadata\\Google\\Cloud\\Kms\\": "Kms/metadata", - "GPBMetadata\\Google\\Cloud\\Run\\": "Run/metadata", - "GPBMetadata\\Google\\Cloud\\Sql\\": "SqlAdmin/metadata", - "GPBMetadata\\Google\\Cloud\\Tpu\\": "Tpu/metadata", - "GPBMetadata\\Google\\Container\\": "Container/metadata", - "GPBMetadata\\Google\\Datastore\\": "Datastore/metadata", - "GPBMetadata\\Google\\Firestore\\": "Firestore/metadata", - "Google\\Cloud\\Billing\\Budgets\\": "BillingBudgets/src", - "Google\\Cloud\\Datastore\\Admin\\": "DatastoreAdmin/src", - "Google\\Cloud\\Iam\\Credentials\\": "IamCredentials/src", - "Google\\Cloud\\NetworkSecurity\\": "NetworkSecurity/src", - "Google\\Cloud\\ResourceManager\\": "ResourceManager/src", - "Google\\Cloud\\StorageTransfer\\": "StorageTransfer/src", - "GPBMetadata\\Google\\Monitoring\\": "Monitoring/metadata", - "Google\\Cloud\\ArtifactRegistry\\": "ArtifactRegistry/src", - "Google\\Cloud\\AssuredWorkloads\\": "AssuredWorkloads/src", - "Google\\Cloud\\BigQuery\\Storage\\": "BigQueryStorage/src", - "Google\\Cloud\\MediaTranslation\\": "MediaTranslation/src", - "Google\\Cloud\\ResourceSettings\\": "ResourceSettings/src", - "Google\\Cloud\\ServiceDirectory\\": "ServiceDirectory/src", - "Google\\Cloud\\Video\\LiveStream\\": "VideoLiveStream/src", - "Google\\Cloud\\Video\\Transcoder\\": "VideoTranscoder/src", - "GPBMetadata\\Google\\Api\\Apikeys\\": "ApiKeys/metadata", - "GPBMetadata\\Google\\Cloud\\Asset\\": "Asset/metadata", - "GPBMetadata\\Google\\Cloud\\Audit\\": "CommonProtos/metadata/Audit", - "GPBMetadata\\Google\\Cloud\\Batch\\": "Batch/metadata", - "GPBMetadata\\Google\\Cloud\\Redis\\": "Redis/metadata", - "GPBMetadata\\Google\\Cloud\\Shell\\": "Shell/metadata", - "GPBMetadata\\Google\\Cloud\\Tasks\\": "Tasks/metadata", - "GPBMetadata\\Google\\Longrunning\\": "LongRunning/metadata/Longrunning", - "GPBMetadata\\Google\\Privacy\\Dlp\\": "Dlp/metadata", - "Google\\Cloud\\BareMetalSolution\\": "BareMetalSolution/src", - "Google\\Cloud\\ContainerAnalysis\\": "ContainerAnalysis/src", - "Google\\Cloud\\EssentialContacts\\": "EssentialContacts/src", - "Google\\Cloud\\ManagedIdentities\\": "ManagedIdentities/src", - "Google\\Cloud\\NetworkManagement\\": "NetworkManagement/src", - "Google\\Cloud\\Security\\PublicCA\\": "SecurityPublicCA/src", - "Google\\Cloud\\ServiceManagement\\": "ServiceManagement/src", - "Google\\Cloud\\VideoIntelligence\\": "VideoIntelligence/src", - "GPBMetadata\\Google\\Cloud\\Automl\\": "AutoMl/metadata", - "GPBMetadata\\Google\\Cloud\\Common\\": "CommonProtos/metadata/Common", - "GPBMetadata\\Google\\Cloud\\Deploy\\": "Deploy/metadata", - "GPBMetadata\\Google\\Cloud\\Gaming\\": "Gaming/metadata", - "GPBMetadata\\Google\\Cloud\\Gkehub\\": "GkeHub/metadata", - "GPBMetadata\\Google\\Cloud\\Retail\\": "Retail/metadata", - "GPBMetadata\\Google\\Cloud\\Speech\\": "Speech/metadata", - "GPBMetadata\\Google\\Cloud\\Talent\\": "Talent/metadata", - "GPBMetadata\\Google\\Cloud\\Vision\\": "Vision/metadata", - "Google\\Cloud\\BigQuery\\Migration\\": "BigQueryMigration/src", - "Google\\Cloud\\CertificateManager\\": "CertificateManager/src", - "Google\\Cloud\\GkeConnect\\Gateway\\": "GkeConnectGateway/src", - "Google\\Cloud\\Security\\PrivateCA\\": "SecurityPrivateCa/src", - "Google\\Cloud\\WebSecurityScanner\\": "WebSecurityScanner/src", - "GPBMetadata\\Google\\Cloud\\Alloydb\\": "AlloyDb/metadata", - "GPBMetadata\\Google\\Cloud\\Billing\\": "Billing/metadata", - "GPBMetadata\\Google\\Cloud\\Channel\\": "Channel/metadata", - "GPBMetadata\\Google\\Cloud\\Compute\\": "Compute/metadata", - "GPBMetadata\\Google\\Cloud\\Domains\\": "Domains/metadata", - "GPBMetadata\\Google\\Cloud\\Oslogin\\": "OsLogin/metadata", - "GPBMetadata\\Google\\Cloud\\Secrets\\": "SecretManager/metadata", - "GPBMetadata\\Google\\Cloud\\Webrisk\\": "WebRisk/metadata", - "Google\\Cloud\\BigQuery\\Connection\\": "BigQueryConnection/src", - "Google\\Cloud\\BinaryAuthorization\\": "BinaryAuthorization/src", - "Google\\Cloud\\DataCatalog\\Lineage\\": "DataCatalogLineage/src", - "Google\\Cloud\\Eventarc\\Publishing\\": "EventarcPublishing/src", - "Google\\Cloud\\NetworkConnectivity\\": "NetworkConnectivity/src", - "Google\\Cloud\\RecaptchaEnterprise\\": "RecaptchaEnterprise/src", - "GPBMetadata\\Google\\Analytics\\Data\\": "AnalyticsData/metadata", - "GPBMetadata\\Google\\Cloud\\Clouddms\\": "Dms/metadata", - "GPBMetadata\\Google\\Cloud\\Dataform\\": "Dataform/metadata", - "GPBMetadata\\Google\\Cloud\\Dataplex\\": "Dataplex/metadata", - "GPBMetadata\\Google\\Cloud\\Dataproc\\": "Dataproc/metadata", - "GPBMetadata\\Google\\Cloud\\Eventarc\\": "Eventarc/metadata", - "GPBMetadata\\Google\\Cloud\\Language\\": "Language/metadata", - "GPBMetadata\\Google\\Cloud\\Memcache\\": "Memcache/metadata", - "GPBMetadata\\Google\\Cloud\\Osconfig\\": "OsConfig/metadata", - "GPBMetadata\\Google\\Devtools\\Build\\": "Build/metadata", - "Google\\Cloud\\BigQuery\\Reservation\\": "BigQueryReservation/src", - "Google\\Cloud\\PolicyTroubleshooter\\": "PolicyTroubleshooter/src", - "Google\\Cloud\\RecommendationEngine\\": "RecommendationEngine/src", - "GPBMetadata\\Google\\Analytics\\Admin\\": "AnalyticsAdmin/metadata", - "GPBMetadata\\Google\\Cloud\\Filestore\\": "Filestore/metadata", - "GPBMetadata\\Google\\Cloud\\Functions\\": "Functions/metadata", - "GPBMetadata\\Google\\Cloud\\Gkebackup\\": "GkeBackup/metadata", - "GPBMetadata\\Google\\Cloud\\Metastore\\": "DataprocMetastore/metadata", - "GPBMetadata\\Google\\Cloud\\Notebooks\\": "Notebooks/metadata", - "GPBMetadata\\Google\\Cloud\\Orgpolicy\\": [ - "OrgPolicy/metadata", - "Asset/external/metadata/Cloud/Orgpolicy" - ], - "GPBMetadata\\Google\\Cloud\\Scheduler\\": "Scheduler/metadata", - "GPBMetadata\\Google\\Cloud\\Translate\\": "Translate/metadata", - "GPBMetadata\\Google\\Cloud\\Vpcaccess\\": "VpcAccess/metadata", - "GPBMetadata\\Google\\Cloud\\Workflows\\": "Workflows/metadata", - "GPBMetadata\\Google\\Datastore\\Admin\\": "DatastoreAdmin/metadata", - "GPBMetadata\\Google\\Iam\\Credentials\\": "IamCredentials/metadata", - "GPBMetadata\\Google\\Storagetransfer\\": "StorageTransfer/metadata", - "Google\\Cloud\\AdvisoryNotifications\\": "AdvisoryNotifications/src", - "Google\\Cloud\\BigQuery\\AnalyticsHub\\": "BigQueryAnalyticsHub/src", - "Google\\Cloud\\BigQuery\\DataExchange\\": "BigQueryDataExchange/src", - "Google\\Cloud\\BigQuery\\DataPolicies\\": "BigQueryDataPolicies/src", - "Google\\Cloud\\BigQuery\\DataTransfer\\": "BigQueryDataTransfer/src", - "Google\\Cloud\\ContactCenterInsights\\": "ContactCenterInsights/src", - "GPBMetadata\\Google\\Api\\Serviceusage\\": "ServiceUsage/metadata", - "GPBMetadata\\Google\\Apps\\Script\\Type\\": "GSuiteAddOns/external/metadata", - "GPBMetadata\\Google\\Cloud\\Aiplatform\\": "AiPlatform/metadata", - "GPBMetadata\\Google\\Cloud\\Apigateway\\": "ApiGateway/metadata", - "GPBMetadata\\Google\\Cloud\\Datafusion\\": "DataFusion/metadata", - "GPBMetadata\\Google\\Cloud\\Datastream\\": "Datastream/metadata", - "GPBMetadata\\Google\\Cloud\\Dialogflow\\": "Dialogflow/metadata", - "GPBMetadata\\Google\\Cloud\\Documentai\\": "DocumentAi/metadata", - "Google\\Cloud\\BeyondCorp\\AppGateways\\": "BeyondCorpAppGateways/src", - "GPBMetadata\\Google\\Cloud\\Datacatalog\\": "DataCatalog/metadata", - "GPBMetadata\\Google\\Cloud\\Recommender\\": "Recommender/metadata", - "GPBMetadata\\Google\\Cloud\\Vmmigration\\": "VmMigration/metadata", - "Google\\Identity\\AccessContextManager\\": "AccessContextManager/src", - "GPBMetadata\\Google\\Api\\Servicecontrol\\": "ServiceControl/metadata", - "GPBMetadata\\Google\\Cloud\\Datalabeling\\": "DataLabeling/metadata", - "GPBMetadata\\Google\\Cloud\\Gsuiteaddons\\": "GSuiteAddOns/metadata", - "GPBMetadata\\Google\\Cloud\\Lifesciences\\": "LifeSciences/metadata", - "GPBMetadata\\Google\\Cloud\\Optimization\\": "Optimization/metadata", - "GPBMetadata\\Google\\Cloud\\Texttospeech\\": "TextToSpeech/metadata", - "GPBMetadata\\Google\\Cloud\\Vmwareengine\\": "VmwareEngine/metadata", - "Google\\Cloud\\BeyondCorp\\AppConnectors\\": "BeyondCorpAppConnectors/src", - "GPBMetadata\\Google\\Cloud\\Apigeeconnect\\": "ApigeeConnect/metadata", - "GPBMetadata\\Google\\Cloud\\Gkemulticloud\\": "GkeMultiCloud/metadata", - "GPBMetadata\\Google\\Cloud\\Kms\\Inventory\\": "KmsInventory/metadata", - "GPBMetadata\\Google\\Cloud\\Secretmanager\\": "SecretManager/metadata", - "GPBMetadata\\Google\\Devtools\\Cloudbuild\\": "Build/metadata", - "GPBMetadata\\Google\\Devtools\\Cloudtrace\\": "Trace/metadata", - "Google\\Cloud\\BeyondCorp\\AppConnections\\": "BeyondCorpAppConnections/src", - "Google\\Cloud\\BeyondCorp\\ClientGateways\\": "BeyondCorpClientGateways/src", - "GPBMetadata\\Google\\Cloud\\Accessapproval\\": "AccessApproval/metadata", - "GPBMetadata\\Google\\Cloud\\Apigeeregistry\\": "ApigeeRegistry/metadata", - "GPBMetadata\\Google\\Cloud\\Privatecatalog\\": "PrivateCatalog/metadata", - "GPBMetadata\\Google\\Cloud\\Securitycenter\\": "SecurityCenter/metadata", - "GPBMetadata\\Google\\Cloud\\Video\\Stitcher\\": "VideoStitcher/metadata", - "GPBMetadata\\Google\\Api\\Servicemanagement\\": "ServiceManagement/metadata", - "GPBMetadata\\Google\\Cloud\\Billing\\Budgets\\": "BillingBudgets/metadata", - "GPBMetadata\\Google\\Cloud\\Networksecurity\\": "NetworkSecurity/metadata", - "GPBMetadata\\Google\\Cloud\\Resourcemanager\\": "ResourceManager/metadata", - "GPBMetadata\\Google\\Cloud\\Assuredworkloads\\": "AssuredWorkloads/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Storage\\": "BigQueryStorage/metadata", - "GPBMetadata\\Google\\Cloud\\Mediatranslation\\": "MediaTranslation/metadata", - "GPBMetadata\\Google\\Cloud\\Resourcesettings\\": "ResourceSettings/metadata", - "GPBMetadata\\Google\\Cloud\\Servicedirectory\\": "ServiceDirectory/metadata", - "GPBMetadata\\Google\\Cloud\\Video\\Livestream\\": "VideoLiveStream/metadata", - "GPBMetadata\\Google\\Cloud\\Video\\Transcoder\\": "VideoTranscoder/metadata", - "GPBMetadata\\Google\\Devtools\\Clouddebugger\\": "Debugger/metadata", - "GPBMetadata\\Google\\Devtools\\Cloudprofiler\\": "Profiler/metadata", - "GPBMetadata\\Google\\Cloud\\Baremetalsolution\\": "BareMetalSolution/metadata", - "GPBMetadata\\Google\\Cloud\\Essentialcontacts\\": "EssentialContacts/metadata", - "GPBMetadata\\Google\\Cloud\\Managedidentities\\": "ManagedIdentities/metadata", - "GPBMetadata\\Google\\Cloud\\Networkmanagement\\": "NetworkManagement/metadata", - "GPBMetadata\\Google\\Cloud\\Security\\Publicca\\": "SecurityPublicCA/metadata", - "GPBMetadata\\Google\\Cloud\\Videointelligence\\": "VideoIntelligence/metadata", - "Google\\Cloud\\Orchestration\\Airflow\\Service\\": "OrchestrationAirflow/src", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Migration\\": "BigQueryMigration/metadata", - "GPBMetadata\\Google\\Cloud\\Certificatemanager\\": "CertificateManager/metadata", - "GPBMetadata\\Google\\Cloud\\Gkeconnect\\Gateway\\": "GkeConnectGateway/metadata", - "GPBMetadata\\Google\\Cloud\\Security\\Privateca\\": "SecurityPrivateCa/metadata", - "GPBMetadata\\Google\\Cloud\\Websecurityscanner\\": "WebSecurityScanner/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Connection\\": "BigQueryConnection/metadata", - "GPBMetadata\\Google\\Cloud\\Binaryauthorization\\": "BinaryAuthorization/metadata", - "GPBMetadata\\Google\\Cloud\\Datacatalog\\Lineage\\": "DataCatalogLineage/metadata", - "GPBMetadata\\Google\\Cloud\\Eventarc\\Publishing\\": "EventarcPublishing/metadata", - "GPBMetadata\\Google\\Cloud\\Networkconnectivity\\": "NetworkConnectivity/metadata", - "GPBMetadata\\Google\\Cloud\\Recaptchaenterprise\\": "RecaptchaEnterprise/metadata", - "GPBMetadata\\Google\\Devtools\\Artifactregistry\\": "ArtifactRegistry/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Reservation\\": "BigQueryReservation/metadata", - "GPBMetadata\\Google\\Cloud\\Policytroubleshooter\\": "PolicyTroubleshooter/metadata", - "GPBMetadata\\Google\\Cloud\\Recommendationengine\\": "RecommendationEngine/metadata", - "GPBMetadata\\Google\\Devtools\\Containeranalysis\\": "ContainerAnalysis/metadata", - "GPBMetadata\\Google\\Cloud\\Advisorynotifications\\": "AdvisoryNotifications/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Analyticshub\\": "BigQueryAnalyticsHub/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Dataexchange\\": "BigQueryDataExchange/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Datapolicies\\": "BigQueryDataPolicies/metadata", - "GPBMetadata\\Google\\Cloud\\Bigquery\\Datatransfer\\": "BigQueryDataTransfer/metadata", - "GPBMetadata\\Google\\Cloud\\Contactcenterinsights\\": "ContactCenterInsights/metadata", - "GPBMetadata\\Google\\Cloud\\Beyondcorp\\Appgateways\\": "BeyondCorpAppGateways/metadata", - "GPBMetadata\\Google\\Devtools\\Clouderrorreporting\\": "ErrorReporting/metadata", - "Google\\Cloud\\BeyondCorp\\ClientConnectorServices\\": "BeyondCorpClientConnectorServices/src", - "GPBMetadata\\Google\\Identity\\Accesscontextmanager\\": "AccessContextManager/metadata", - "GPBMetadata\\Google\\Cloud\\Beyondcorp\\Appconnectors\\": "BeyondCorpAppConnectors/metadata", - "GPBMetadata\\Google\\Cloud\\Beyondcorp\\Appconnections\\": "BeyondCorpAppConnections/metadata", - "GPBMetadata\\Google\\Cloud\\Beyondcorp\\Clientgateways\\": "BeyondCorpClientGateways/metadata", - "GPBMetadata\\Google\\Cloud\\Orchestration\\Airflow\\Service\\": "OrchestrationAirflow/metadata", - "GPBMetadata\\Google\\Cloud\\Beyondcorp\\Clientconnectorservices\\": "BeyondCorpClientConnectorServices/metadata" + "Google\\Cloud\\Core\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], - "authors": [ - { - "name": "Dave Supplee", - "email": "dwsupplee@gmail.com" - }, - { - "name": "John Pedrie", - "email": "john@pedrie.com" - } - ], - "description": "Google Cloud Client Library", - "homepage": "http://github.com/googleapis/google-cloud-php", - "keywords": [ - "Tasks", - "big query", - "bigquery", - "bigtable", - "cloud", - "datastore", - "gcs", - "google", - "google api", - "google api client", - "google apis", - "google apis client", - "google cloud", - "google cloud platform", - "kms", - "language", - "natural language", - "pub sub", - "pubsub", - "spanner", - "speech", - "stackdriver logging", - "storage", - "translate", - "translation", - "vision" - ], + "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "issues": "https://github.com/googleapis/google-cloud-php/issues", - "source": "https://github.com/googleapis/google-cloud-php/tree/v0.201.0" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.68.2" }, - "time": "2023-04-07T21:48:59+00:00" + "time": "2025-10-25T01:16:28+00:00" }, { - "name": "google/common-protos", - "version": "v3.2.0", + "name": "google/cloud-translate", + "version": "v2.1.1", "source": { "type": "git", - "url": "https://github.com/googleapis/common-protos-php.git", - "reference": "57d4ad36cc48cc0369123042908013ef2a86bb98" + "url": "https://github.com/googleapis/google-cloud-php-translate.git", + "reference": "c45371e614d42b522a3382cdeff15e5b4bbb64a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/57d4ad36cc48cc0369123042908013ef2a86bb98", - "reference": "57d4ad36cc48cc0369123042908013ef2a86bb98", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-translate/zipball/c45371e614d42b522a3382cdeff15e5b4bbb64a5", + "reference": "c45371e614d42b522a3382cdeff15e5b4bbb64a5", "shasum": "" }, "require": { - "google/protobuf": "^3.6.1" + "google/cloud-core": "^1.57", + "google/gax": "^1.38.0", + "php": "^8.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.36||^8.5", - "sami/sami": "*" + "erusev/parsedown": "^1.6", + "phpdocumentor/reflection": "^5.3.3||^6.0", + "phpdocumentor/reflection-docblock": "^5.3", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.0", + "squizlabs/php_codesniffer": "2.*" + }, + "suggest": { + "ext-grpc": "The gRPC extension enables use of the performant gRPC transport", + "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions." }, "type": "library", + "extra": { + "component": { + "id": "cloud-translate", + "path": "Translate", + "entry": "src/TranslateClient.php", + "target": "googleapis/google-cloud-php-translate.git" + } + }, "autoload": { "psr-4": { - "Google\\Api\\": "src/Api", - "Google\\Iam\\": "src/Iam", - "Google\\Rpc\\": "src/Rpc", - "Google\\Type\\": "src/Type", - "Google\\Cloud\\": "src/Cloud", - "GPBMetadata\\Google\\Api\\": "metadata/Api", - "GPBMetadata\\Google\\Iam\\": "metadata/Iam", - "GPBMetadata\\Google\\Rpc\\": "metadata/Rpc", - "GPBMetadata\\Google\\Type\\": "metadata/Type", - "GPBMetadata\\Google\\Cloud\\": "metadata/Cloud", - "GPBMetadata\\Google\\Logging\\": "metadata/Logging" + "Google\\Cloud\\Translate\\": "src", + "GPBMetadata\\Google\\Cloud\\Translate\\": "metadata" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], - "description": "Google API Common Protos for PHP", - "homepage": "https://github.com/googleapis/common-protos-php", - "keywords": [ - "google" - ], + "description": "Cloud Translation Client for PHP", "support": { - "issues": "https://github.com/googleapis/common-protos-php/issues", - "source": "https://github.com/googleapis/common-protos-php/tree/v3.2.0" + "source": "https://github.com/googleapis/google-cloud-php-translate/tree/v2.1.1" }, - "time": "2023-01-12T16:51:46+00:00" + "time": "2025-10-07T18:41:09+00:00" }, { - "name": "google/crc32", - "version": "v0.1.0", + "name": "google/common-protos", + "version": "4.12.4", "source": { "type": "git", - "url": "https://github.com/google/php-crc32.git", - "reference": "a8525f0dea6fca1893e1bae2f6e804c5f7d007fb" + "url": "https://github.com/googleapis/common-protos-php.git", + "reference": "0127156899af0df2681bd42024c60bd5360d64e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/php-crc32/zipball/a8525f0dea6fca1893e1bae2f6e804c5f7d007fb", - "reference": "a8525f0dea6fca1893e1bae2f6e804c5f7d007fb", + "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/0127156899af0df2681bd42024c60bd5360d64e3", + "reference": "0127156899af0df2681bd42024c60bd5360d64e3", "shasum": "" }, "require": { - "php": ">=5.4" + "google/protobuf": "^4.31", + "php": "^8.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^1.13 || v2.14.2", - "paragonie/random_compat": ">=2", - "phpunit/phpunit": "^4" + "phpunit/phpunit": "^9.6" }, "type": "library", + "extra": { + "component": { + "id": "common-protos", + "path": "CommonProtos", + "entry": "README.md", + "target": "googleapis/common-protos-php.git" + } + }, "autoload": { "psr-4": { - "Google\\CRC32\\": "src" + "Google\\Api\\": "src/Api", + "Google\\Iam\\": "src/Iam", + "Google\\Rpc\\": "src/Rpc", + "Google\\Type\\": "src/Type", + "Google\\Cloud\\": "src/Cloud", + "GPBMetadata\\Google\\Api\\": "metadata/Api", + "GPBMetadata\\Google\\Iam\\": "metadata/Iam", + "GPBMetadata\\Google\\Rpc\\": "metadata/Rpc", + "GPBMetadata\\Google\\Type\\": "metadata/Type", + "GPBMetadata\\Google\\Cloud\\": "metadata/Cloud", + "GPBMetadata\\Google\\Logging\\": "metadata/Logging" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], - "authors": [ - { - "name": "Andrew Brampton", - "email": "bramp@google.com" - } + "description": "Google API Common Protos for PHP", + "homepage": "https://github.com/googleapis/common-protos-php", + "keywords": [ + "google" ], - "description": "Various CRC32 implementations", - "homepage": "https://github.com/google/php-crc32", "support": { - "issues": "https://github.com/google/php-crc32/issues", - "source": "https://github.com/google/php-crc32/tree/v0.1.0" + "source": "https://github.com/googleapis/common-protos-php/tree/v4.12.4" }, - "time": "2019-05-09T06:24:58+00:00" + "time": "2025-09-20T01:29:44+00:00" }, { "name": "google/gax", - "version": "v1.19.1", + "version": "v1.38.1", "source": { "type": "git", "url": "https://github.com/googleapis/gax-php.git", - "reference": "30f6b307faa9858bf58d967664467098dbbc354f" + "reference": "04ba0821b551f8788e23ea0335186d224a7278d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/gax-php/zipball/30f6b307faa9858bf58d967664467098dbbc354f", - "reference": "30f6b307faa9858bf58d967664467098dbbc354f", + "url": "https://api.github.com/repos/googleapis/gax-php/zipball/04ba0821b551f8788e23ea0335186d224a7278d1", + "reference": "04ba0821b551f8788e23ea0335186d224a7278d1", "shasum": "" }, "require": { - "google/auth": "1.19.1||^1.25.0", - "google/common-protos": "^1.3.1||^2.0||^3.0", - "google/grpc-gcp": "^0.2", - "google/longrunning": "^0.2", - "google/protobuf": "^3.21.4", + "google/auth": "^1.49", + "google/common-protos": "^4.4", + "google/grpc-gcp": "^0.4", + "google/longrunning": "~0.4", + "google/protobuf": "^4.31", "grpc/grpc": "^1.13", - "guzzlehttp/promises": "^1.3", - "guzzlehttp/psr7": "^1.7.0||^2", - "php": ">=7.0" + "guzzlehttp/promises": "^2.0", + "guzzlehttp/psr7": "^2.0", + "php": "^8.1", + "ramsey/uuid": "^4.0" }, "conflict": { - "ext-protobuf": "<3.7.0" + "ext-protobuf": "<4.31.0" }, "require-dev": { - "phpspec/prophecy": "^1.10", - "phpunit/phpunit": "^5.5||^8.5", - "squizlabs/php_codesniffer": "3.*", - "yoast/phpunit-polyfills": "^1.0" + "phpspec/prophecy-phpunit": "^2.1", + "phpstan/phpstan": "^2.0", + "phpunit/phpunit": "^9.6", + "squizlabs/php_codesniffer": "4.*" }, "type": "library", "autoload": { @@ -906,34 +425,34 @@ ], "support": { "issues": "https://github.com/googleapis/gax-php/issues", - "source": "https://github.com/googleapis/gax-php/tree/v1.19.1" + "source": "https://github.com/googleapis/gax-php/tree/v1.38.1" }, - "time": "2023-03-16T19:58:19+00:00" + "time": "2025-11-06T22:48:43+00:00" }, { "name": "google/grpc-gcp", - "version": "v0.2.1", + "version": "v0.4.1", "source": { "type": "git", "url": "https://github.com/GoogleCloudPlatform/grpc-gcp-php.git", - "reference": "899d0112812a812df7692617a59f4076f0d01719" + "reference": "e585b7721bbe806ef45b5c52ae43dfc2bff89968" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GoogleCloudPlatform/grpc-gcp-php/zipball/899d0112812a812df7692617a59f4076f0d01719", - "reference": "899d0112812a812df7692617a59f4076f0d01719", + "url": "https://api.github.com/repos/GoogleCloudPlatform/grpc-gcp-php/zipball/e585b7721bbe806ef45b5c52ae43dfc2bff89968", + "reference": "e585b7721bbe806ef45b5c52ae43dfc2bff89968", "shasum": "" }, "require": { "google/auth": "^1.3", - "google/protobuf": "^v3.3.0", + "google/protobuf": "^v3.25.3||^4.26.1", "grpc/grpc": "^v1.13.0", - "php": ">=5.5.0", + "php": "^8.0", "psr/cache": "^1.0.1||^2.0.0||^3.0.0" }, "require-dev": { "google/cloud-spanner": "^1.7", - "phpunit/phpunit": "4.8.36" + "phpunit/phpunit": "^9.0" }, "type": "library", "autoload": { @@ -951,29 +470,73 @@ "description": "gRPC GCP library for channel management", "support": { "issues": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/issues", - "source": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/tree/v0.2.1" + "source": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/tree/v0.4.1" + }, + "time": "2025-02-19T21:53:22+00:00" + }, + { + "name": "google/longrunning", + "version": "0.6.0", + "source": { + "type": "git", + "url": "https://github.com/googleapis/php-longrunning.git", + "reference": "226d3b5166eaa13754cc5e452b37872478e23375" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/php-longrunning/zipball/226d3b5166eaa13754cc5e452b37872478e23375", + "reference": "226d3b5166eaa13754cc5e452b37872478e23375", + "shasum": "" }, - "time": "2022-10-11T15:54:47+00:00" + "require-dev": { + "google/gax": "^1.38.0", + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "component": { + "id": "longrunning", + "path": "LongRunning", + "entry": null, + "target": "googleapis/php-longrunning" + } + }, + "autoload": { + "psr-4": { + "Google\\LongRunning\\": "src/LongRunning", + "Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning", + "GPBMetadata\\Google\\Longrunning\\": "metadata/Longrunning" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Google LongRunning Client for PHP", + "support": { + "source": "https://github.com/googleapis/php-longrunning/tree/v0.6.0" + }, + "time": "2025-10-07T18:41:09+00:00" }, { "name": "google/protobuf", - "version": "v3.24.3", + "version": "v4.33.1", "source": { "type": "git", "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "2fc191fc5e137829081b8700086ac6ed7003b925" + "reference": "0cd73ccf0cd26c3e72299cce1ea6144091a57e12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/2fc191fc5e137829081b8700086ac6ed7003b925", - "reference": "2fc191fc5e137829081b8700086ac6ed7003b925", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/0cd73ccf0cd26c3e72299cce1ea6144091a57e12", + "reference": "0cd73ccf0cd26c3e72299cce1ea6144091a57e12", "shasum": "" }, "require": { - "php": ">=7.0.0" + "php": ">=8.1.0" }, "require-dev": { - "phpunit/phpunit": ">=5.0.0" + "phpunit/phpunit": ">=5.0.0 <8.5.27" }, "suggest": { "ext-bcmath": "Need to support JSON deserialization" @@ -995,22 +558,22 @@ "proto" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.24.3" + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.1" }, - "time": "2023-09-07T15:39:13+00:00" + "time": "2025-11-12T21:58:05+00:00" }, { "name": "grpc/grpc", - "version": "1.57.0", + "version": "1.74.0", "source": { "type": "git", "url": "https://github.com/grpc/grpc-php.git", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" + "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", + "url": "https://api.github.com/repos/grpc/grpc-php/zipball/32bf4dba256d60d395582fb6e4e8d3936bcdb713", + "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713", "shasum": "" }, "require": { @@ -1039,28 +602,28 @@ "rpc" ], "support": { - "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" + "source": "https://github.com/grpc/grpc-php/tree/v1.74.0" }, - "time": "2023-08-14T23:57:54+00:00" + "time": "2025-07-24T20:02:16+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.8.0", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "guzzlehttp/promises": "^2.3", + "guzzlehttp/psr7": "^2.8", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1069,11 +632,11 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "guzzle/client-integration-tests": "3.0.2", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1151,7 +714,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.0" + "source": "https://github.com/guzzle/guzzle/tree/7.10.0" }, "funding": [ { @@ -1167,33 +730,37 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:20:53+00:00" + "time": "2025-08-23T22:36:01+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "481557b130ef3790cf82b713667b43030dc9c957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", + "reference": "481557b130ef3790cf82b713667b43030dc9c957", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -1230,7 +797,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.3.0" }, "funding": [ { @@ -1246,42 +813,48 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2025-08-22T14:34:08+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", - "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "ralouphie/getallheaders": "^3.0" }, "provide": { + "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + "bamarni/composer-bin-plugin": "^1.8.2", + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Psr7\\": "src/" } @@ -1320,6 +893,11 @@ "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -1335,7 +913,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.1" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -1351,46 +929,47 @@ "type": "tidelift" } ], - "time": "2023-04-17T16:00:37+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "monolog/monolog", - "version": "2.9.1", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" + "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6", + "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6", "shasum": "" }, "require": { - "php": ">=7.2", - "psr/log": "^1.0.1 || ^2.0 || ^3.0" + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" + "psr/log-implementation": "3.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "aws/aws-sdk-php": "^3.0", "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2 || ^2@dev", - "guzzlehttp/guzzle": "^7.4", + "graylog2/gelf-php": "^1.4.2 || ^2.0", + "guzzlehttp/guzzle": "^7.4.5", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1 || ^2.0", - "rollbar/rollbar": "^1.3 || ^2 || ^3", - "ruflin/elastica": "^7", - "swiftmailer/swiftmailer": "^5.3|^6.0", + "php-console/php-console": "^3.1.8", + "phpstan/phpstan": "^2", + "phpstan/phpstan-deprecation-rules": "^2", + "phpstan/phpstan-strict-rules": "^2", + "phpunit/phpunit": "^10.5.17 || ^11.0.7", + "predis/predis": "^1.1 || ^2", + "rollbar/rollbar": "^4.0", + "ruflin/elastica": "^7 || ^8", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -1413,7 +992,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -1441,7 +1020,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.1" + "source": "https://github.com/Seldaek/monolog/tree/3.9.0" }, "funding": [ { @@ -1453,128 +1032,24 @@ "type": "tidelift" } ], - "time": "2023-02-06T13:44:46+00:00" - }, - { - "name": "nikic/fast-route", - "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/FastRoute.git", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35|~5.7" - }, - "type": "library", - "autoload": { - "psr-4": { - "FastRoute\\": "src/" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov", - "email": "nikic@php.net" - } - ], - "description": "Fast request router for PHP", - "keywords": [ - "router", - "routing" - ], - "support": { - "issues": "https://github.com/nikic/FastRoute/issues", - "source": "https://github.com/nikic/FastRoute/tree/master" - }, - "time": "2018-02-13T20:26:39+00:00" - }, - { - "name": "pimple/pimple", - "version": "v3.2.3", - "source": { - "type": "git", - "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/container": "^1.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "psr-0": { - "Pimple": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", - "keywords": [ - "container", - "dependency injection" - ], - "support": { - "issues": "https://github.com/silexphp/Pimple/issues", - "source": "https://github.com/silexphp/Pimple/tree/master" - }, - "time": "2018-01-21T07:42:36+00:00" + "time": "2025-03-24T10:02:05+00:00" }, { "name": "psr/cache", - "version": "1.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { @@ -1594,7 +1069,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for caching libraries", @@ -1604,26 +1079,27 @@ "psr-6" ], "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "source": "https://github.com/php-fig/cache/tree/3.0.0" }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2021-02-03T23:26:27+00:00" }, { - "name": "psr/container", - "version": "1.0.0", + "name": "psr/http-client", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1633,7 +1109,7 @@ }, "autoload": { "psr-4": { - "Psr\\Container\\": "src/" + "Psr\\Http\\Client\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1643,40 +1119,38 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" + "http", + "http-client", + "psr", + "psr-18" ], "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/http-client" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { - "name": "psr/http-client", - "version": "1.0.2", + "name": "psr/http-factory", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", + "php": ">=7.1", "psr/http-message": "^1.0 || ^2.0" }, "type": "library", @@ -1687,7 +1161,7 @@ }, "autoload": { "psr-4": { - "Psr\\Http\\Client\\": "src/" + "Psr\\Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1700,40 +1174,43 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ + "factory", "http", - "http-client", + "message", "psr", - "psr-18" + "psr-17", + "psr-7", + "request", + "response" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1748,7 +1225,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -1762,36 +1239,36 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", - "version": "1.1.4", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1812,9 +1289,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "ralouphie/getallheaders", @@ -1862,40 +1339,49 @@ }, { "name": "ramsey/collection", - "version": "1.1.4", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "ab2237657ad99667a5143e32ba2683c8029563d4" + "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/ab2237657ad99667a5143e32ba2683c8029563d4", - "reference": "ab2237657ad99667a5143e32ba2683c8029563d4", + "url": "https://api.github.com/repos/ramsey/collection/zipball/344572933ad0181accbf4ba763e85a0306a8c5e2", + "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2", "shasum": "" }, "require": { - "php": "^7.2 || ^8" + "php": "^8.1" }, "require-dev": { - "captainhook/captainhook": "^5.3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "ergebnis/composer-normalize": "^2.6", - "fakerphp/faker": "^1.5", - "hamcrest/hamcrest-php": "^2", - "jangregor/phpstan-prophecy": "^0.8", - "mockery/mockery": "^1.3", - "phpstan/extension-installer": "^1", - "phpstan/phpstan": "^0.12.32", - "phpstan/phpstan-mockery": "^0.12.5", - "phpstan/phpstan-phpunit": "^0.12.11", - "phpunit/phpunit": "^8.5 || ^9", - "psy/psysh": "^0.10.4", - "slevomat/coding-standard": "^6.3", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.4" + "captainhook/plugin-composer": "^5.3", + "ergebnis/composer-normalize": "^2.45", + "fakerphp/faker": "^1.24", + "hamcrest/hamcrest-php": "^2.0", + "jangregor/phpstan-prophecy": "^2.1", + "mockery/mockery": "^1.6", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.4", + "phpspec/prophecy-phpunit": "^2.3", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-mockery": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^10.5", + "ramsey/coding-standard": "^2.3", + "ramsey/conventional-commits": "^1.6", + "roave/security-advisories": "dev-latest" }, "type": "library", + "extra": { + "captainhook": { + "force-install": true + }, + "ramsey/conventional-commits": { + "configFile": "conventional-commits.json" + } + }, "autoload": { "psr-4": { "Ramsey\\Collection\\": "src/" @@ -1912,7 +1398,7 @@ "homepage": "https://benramsey.com" } ], - "description": "A PHP 7.2+ library for representing and manipulating collections.", + "description": "A PHP library for representing and manipulating collections.", "keywords": [ "array", "collection", @@ -1923,70 +1409,53 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.1.4" + "source": "https://github.com/ramsey/collection/tree/2.1.1" }, - "funding": [ - { - "url": "https://github.com/ramsey", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ramsey/collection", - "type": "tidelift" - } - ], - "time": "2021-07-30T00:58:27+00:00" + "time": "2025-03-22T05:38:12+00:00" }, { "name": "ramsey/uuid", - "version": "4.2.3", + "version": "4.9.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df" + "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", - "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440", + "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440", "shasum": "" }, "require": { - "brick/math": "^0.8 || ^0.9", - "ext-json": "*", - "php": "^7.2 || ^8.0", - "ramsey/collection": "^1.0", - "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-php80": "^1.14" + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14", + "php": "^8.0", + "ramsey/collection": "^1.2 || ^2.0" }, "replace": { "rhumsaa/uuid": "self.version" }, "require-dev": { - "captainhook/captainhook": "^5.10", + "captainhook/captainhook": "^5.25", "captainhook/plugin-composer": "^5.3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "doctrine/annotations": "^1.8", - "ergebnis/composer-normalize": "^2.15", - "mockery/mockery": "^1.3", - "moontoast/math": "^1.1", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", + "ergebnis/composer-normalize": "^2.47", + "mockery/mockery": "^1.6", "paragonie/random-lib": "^2", - "php-mock/php-mock": "^2.2", - "php-mock/php-mock-mockery": "^1.3", - "php-parallel-lint/php-parallel-lint": "^1.1", - "phpbench/phpbench": "^1.0", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-mockery": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^8.5 || ^9", - "slevomat/coding-standard": "^7.0", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.9" + "php-mock/php-mock": "^2.6", + "php-mock/php-mock-mockery": "^1.5", + "php-parallel-lint/php-parallel-lint": "^1.4.0", + "phpbench/phpbench": "^1.2.14", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-mockery": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^9.6", + "slevomat/coding-standard": "^8.18", + "squizlabs/php_codesniffer": "^3.13" }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", - "ext-ctype": "Enables faster processing of character classification using ctype functions.", "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", @@ -1994,9 +1463,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "4.x-dev" - }, "captainhook": { "force-install": true } @@ -2021,39 +1487,31 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.2.3" + "source": "https://github.com/ramsey/uuid/tree/4.9.1" }, - "funding": [ - { - "url": "https://github.com/ramsey", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid", - "type": "tidelift" - } - ], - "time": "2021-09-25T23:10:38+00:00" + "time": "2025-09-04T20:59:21+00:00" }, { "name": "rize/uri-template", - "version": "0.3.5", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/rize/UriTemplate.git", - "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168" + "reference": "56f374a9a42c7c3998f8b55b6b21b224de90c58b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rize/UriTemplate/zipball/5ed4ba8ea34af84485dea815d4b6b620794d1168", - "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168", + "url": "https://api.github.com/repos/rize/UriTemplate/zipball/56f374a9a42c7c3998f8b55b6b21b224de90c58b", + "reference": "56f374a9a42c7c3998f8b55b6b21b224de90c58b", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "~4.8.36" + "friendsofphp/php-cs-fixer": "^3.63", + "phpstan/phpstan": "^1.12", + "phpunit/phpunit": "~10.0" }, "type": "library", "autoload": { @@ -2079,7 +1537,7 @@ ], "support": { "issues": "https://github.com/rize/UriTemplate/issues", - "source": "https://github.com/rize/UriTemplate/tree/0.3.5" + "source": "https://github.com/rize/UriTemplate/tree/0.4.0" }, "funding": [ { @@ -2095,270 +1553,38 @@ "type": "open_collective" } ], - "time": "2022-10-12T17:22:51+00:00" - }, - { - "name": "slim/slim", - "version": "3.12.3", - "source": { - "type": "git", - "url": "https://github.com/slimphp/Slim.git", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-libxml": "*", - "ext-simplexml": "*", - "nikic/fast-route": "^1.0", - "php": ">=5.5.0", - "pimple/pimple": "^3.0", - "psr/container": "^1.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0", - "squizlabs/php_codesniffer": "^2.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Slim\\": "Slim" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Josh Lockhart", - "email": "hello@joshlockhart.com", - "homepage": "https://joshlockhart.com" - }, - { - "name": "Andrew Smith", - "email": "a.smith@silentworks.co.uk", - "homepage": "http://silentworks.co.uk" - }, - { - "name": "Rob Allen", - "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" - }, - { - "name": "Gabriel Manricks", - "email": "gmanricks@me.com", - "homepage": "http://gabrielmanricks.com" - } - ], - "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", - "homepage": "https://slimframework.com", - "keywords": [ - "api", - "framework", - "micro", - "router" - ], - "support": { - "issues": "https://github.com/slimphp/Slim/issues", - "source": "https://github.com/slimphp/Slim/tree/3.x" - }, - "time": "2019-11-28T17:40:33+00:00" + "time": "2024-11-27T12:13:42+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" - }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "dev-main": "3.6-dev" } }, "autoload": { "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2366,10 +1592,6 @@ "MIT" ], "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -2379,16 +1601,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" }, "funding": [ { @@ -2404,7 +1620,7 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-25T14:21:43+00:00" } ], "packages-dev": [], @@ -2414,11 +1630,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.2.5" + "php": ">=8.1" }, "platform-dev": [], "platform-overrides": { - "php": "7.2.5" + "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/src/template/admin/entry/editor/top.html b/src/template/admin/entry/editor/top.html index 1c4a8b9b..5c6c52b4 100644 --- a/src/template/admin/entry/editor/top.html +++ b/src/template/admin/entry/editor/top.html @@ -1,7 +1,7 @@

- \{error\} + {error}

@@ -20,35 +20,35 @@

多言語設定

編集 - + - \{label\} - + {label} + 表示中 - 非公開 - 公開 - 下書き - ゴミ箱 + 非公開 + 公開 + 下書き + ゴミ箱 未作成 - \{status\} + {status} - \{category_label\} + {category_label} - - \{title\} - \{code\} + + {title} - {code} - 編集 - - + 編集 + +
- +
@@ -56,14 +56,14 @@

多言語設定

- +
- +
- + @@ -74,7 +74,7 @@

多言語設定

- + diff --git a/src/template/admin/main.html b/src/template/admin/main.html index 94390d16..a94aa834 100644 --- a/src/template/admin/main.html +++ b/src/template/admin/main.html @@ -77,10 +77,17 @@

基本設定

- Google Translate API Key + プロジェクトID - - + + + + + + サービスアカウントJSONパス + + + diff --git a/src/template/convert.json.twig b/src/template/convert.json.twig deleted file mode 100644 index 25df99b2..00000000 --- a/src/template/convert.json.twig +++ /dev/null @@ -1,329 +0,0 @@ -{ - "entries": [ - {% for entry in json.body %} - { - "method": "{% if entry.method == "insert" %}insupd{% else %}{{ entry.method }}{% endif %}", - "title": "{{ entry.title.view|raw }}", - "code": "{{ entry.itemCode }}.html", - "status": "{% if entry.availFlg and entry.pubFlg %}open{% else %}close{% endif %}", - "link": "", - "datetime": "{{ entry.sailDate|date("Y-m-d H:i:s") }}", - "start_datetime": "{% if entry.infoRelDate is empty %}1000-01-01 00:00:00{% else %}{{ entry.infoRelDate|date("Y-m-d H:i:s") }}{% endif %}", - "end_datetime": "9999-12-31 23:59:59", - "posted_datetime": "{{ entry.regDate|date("Y-m-d H:i:s") }}", - "updated_datetime": "{{ entry.updDate|date("Y-m-d H:i:s") }}", - "indexing": "on", - "fields": [ - { - "key": "entry_title", - "value": "{{ entry.title.view|raw }}", - "search": "on" - }, - { - "key": "title_kana", - "value": "{{ entry.title.mainKana|raw }}", - "search": "on" - }, - { - "key": "search_word", - "value": "{% for auth in entry.auth %}{{- auth.name|replace({' ':'', '　':''}) -}}{{- auth.nameKana -}}{% endfor %}{{- entry.brand.name -}}{{ entry.desc.srchKeyWord }}", - "search": "on" - }, - { - "key": "genre", - "value": "{{ entry.genreOhp.l.name|raw }}", - "search": "off" - }, - { - "key": "genre_m", - "value": "{{ entry.genreOhp.m.name|raw }}", - "search": "off" - }, - { - "key": "bookCover_url", - "value": "{{ entry.bookCover.l|raw }}", - "search": "off" - }, - { - "key": "bookCover_url_m", - "value": "{{ entry.bookCover.m|raw }}", - "search": "off" - }, - { - "key": "bookCover_url_s", - "value": "{{ entry.bookCover.s|raw }}", - "search": "off" - }, - { - "key": "bookCover_url_ss", - "value": "{{ entry.bookCover.ss|raw }}", - "search": "off" - }, - { - "key": "isbn", - "value": "{{ entry.bookInfo.isbn|raw }}", - "search": "on" - }, - { - "key": "pageNum", - "value": "{{ entry.bookInfo.pageNum|raw }}", - "search": "off" - }, - { - "key": "book_format", - "value": "{{ entry.bookInfo.fmt|raw }}", - "search": "off" - }, - { - "key": "description_catchCopy", - "value": "{{ entry.desc.catchCopy|raw }}", - "search": "on" - }, - { - "key": "series_name", - "value": "{{ entry.seriesOhp.lv1.name|raw }}", - "search": "on" - }, - { - "key": "series_seriesNum", - "value": "{{ entry.series.no }}", - "search": "off" - }, - { - "key": "price_fix", - "value": "{{ entry.price.priceFix }}", - "search": "off" - }, - { - "key": "price_srp", - "value": "{{ entry.price.priceRtl }}", - "search": "off" - }, - { - "key": "description_script100", - "value": "{% if entry.desc.contIntro is empty %}{{ entry.desc.script100|raw }}{% else %}{{entry.desc.contIntro|raw }}{% endif %}", - "search": "on" - }, - { - "key": "bookInfo_award", - "value": "{{ entry.bookInfo.award|raw }}", - "search": "on" - }, - { - "key": "bookInfo_memo", - "value": "{{ entry.bookInfo.memo|raw }}", - "search": "off" - }, - { - "key": "desc_toc", - "value": "{{ entry.desc.toc|raw }}", - "search": "off" - }, - { - "key": "kadokawaStore", - "value": "{{ entry.purch.kadokawaStore|raw }}", - "search": "off" - }, - { - "key": "rakuten", - "value": "{{ entry.purch.rakuten|raw }}", - "search": "off" - }, - { - "key": "amazon", - "value": "{{ entry.purch.amazon|raw }}", - "search": "off" - }, - { - "key": "animate", - "value": "{{ entry.purch.animate|raw }}", - "search": "off" - }, - { - "key": "bw_url", - "value": "{{ entry.purch.bw.url|raw }}", - "search": "off" - }, - { - "key": "bw_expDate", - "value": "{{ entry.purch.bw.expDate }}", - "search": "off" - }, - { - "key": "bw_licDate", - "value": "{{ entry.purch.bw.licDate }}", - "search": "off" - }, - { - "key": "bw_toDate", - "value": "{{ entry.purch.bw.toDate }}", - "search": "off" - }, - { - "key": "purchase_7net", - "value": "{{ entry.purch["7net"]|raw }}", - "search": "off" - }, - { - "key": "purchase_eHon", - "value": "{{ entry.purch.eHon|raw }}", - "search": "off" - }, - { - "key": "purchase_honto", - "value": "{{ entry.purch.honto|raw }}", - "search": "off" - }, - { - "key": "purchase_honyaClub", - "value": "{{ entry.purch.honyaClub|raw }}", - "search": "off" - }, - { - "key": "purchase_kinokuniya", - "value": "{{ entry.purch.kinokuniya|raw }}", - "search": "off" - } - ], - "fieldGroups": [ - { - "group": "authors", - "items": [ - {% for auth in entry.auth %} - { - "fields": [ - { - "key": "author_title", - "value": "{{ auth.title|raw }}", - "search": "off" - }, - { - "key": "author_name", - "value": "{{ auth.name|raw }}", - "search": "on" - }, - { - "key": "author_furigana", - "value": "{{ auth.nameKana|raw }}", - "search": "on" - } - ] - } - {% if not loop.last %}, - {% endif %}{% endfor %} - ] - }, - { - "group": "characters", - "items": [ - {% for char in entry.charInfo.char %} - { - "fields": [ - { - "key": "char_cont", - "value": "{{ char.cont|raw }}", - "search": "on" - }, - { - "key": "char_imgUrl", - "value": "{{ char.imgUrl|raw }}", - "search": "off" - }, - { - "key": "char_name", - "value": "{{ char.name|raw }}", - "search": "on" - } - ] - } - {% if not loop.last %}, - {% endif %}{% endfor %} - ] - }, - { - "group": "book_comments", - "items": [ - {% for comment in entry.cmnt %} - { - "fields": [ - { - "key": "comment_cont", - "value": "{{ comment.cont|raw }}", - "search": "on" - } - ] - } - {% if not loop.last %}, - {% endif %}{% endfor %} - ] - }, - { - "group": "movies", - "items": [ - {% for video in entry.movie %} - { - "fields": [ - { - "key": "video_movUrl", - "value": "{{ video.movUrl|raw }}", - "search": "off" - }, - { - "key": "video_title", - "value": "{{ video.title|raw }}", - "search": "off" - }, - { - "key": "video_fromDate", - "value": "{{ video.fromDate|raw }}", - "search": "off" - }, - { - "key": "video_toDate", - "value": "{{ video.toDate|raw }}", - "search": "off" - } - ] - } - {% if not loop.last %}, - {% endif %}{% endfor %} - ] - }, - { - "group": "book_banners", - "items": [ - {% for banner in entry.banner %} - { - "fields": [ - { - "key": "banner_imgUrl", - "value": "{{ banner.imgUrl|raw }}", - "search": "off" - }, - { - "key": "banner_linkUrl", - "value": "{{ banner.linkUrl|raw }}", - "search": "off" - }, - { - "key": "banner_fromDate", - "value": "{{ banner.fromDate|raw }}", - "search": "off" - }, - { - "key": "banner_toDate", - "value": "{{ banner.toDate|raw }}", - "search": "off" - } - ] - } - {% if not loop.last %}, - {% endif %}{% endfor %} - ] - } - ] - } - {% if not loop.last %}, - {% endif %}{% endfor %} - ] -}