From fedab00dbe90f95c49dfd1aecdb8021a27bbb1db Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 2 Mar 2022 18:54:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=B8=80=E6=8B=AC=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=81=AE=E9=9A=9B=E3=80=81?= =?UTF-8?q?=E6=97=A2=E3=81=AB=E7=99=BB=E9=8C=B2=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B=E3=81=A8package=E3=81=AE?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E3=81=AF?= =?UTF-8?q?SQL=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8A?= =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Behavior/PluginBehavior.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Behavior/PluginBehavior.php b/Model/Behavior/PluginBehavior.php index eb28d6a..419877d 100644 --- a/Model/Behavior/PluginBehavior.php +++ b/Model/Behavior/PluginBehavior.php @@ -338,7 +338,7 @@ public function updateVersion(Model $model, $packages) { 'version' => '\'' . $package['version'] . '\'', 'commit_version' => '\'' . $package['commit_version'] . '\'', 'commited' => '\'' . $package['commited'] . '\'', - 'serialize_data' => '\'' . serialize($package) . '\'', + 'serialize_data' => $model->Plugin->getDataSource()->value(serialize($package), 'string'), ); if (! $model->Plugin->updateAll($update, $conditions)) { CakeLog::info(sprintf('[update version] Line(' . __LINE__ . ') Error')); From 4081be867b587e79e7b561ebe9284b45dc796651 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 2 Mar 2022 19:22:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=80=E6=8B=AC=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=81=AE=E9=9A=9B=E3=80=81?= =?UTF-8?q?=E6=97=A2=E3=81=AB=E7=99=BB=E9=8C=B2=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B=E3=81=A8package=E3=81=AE?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E3=81=AF?= =?UTF-8?q?SQL=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8A?= =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Behavior/PluginBehavior/UpdateVersionPhotoAlbumsTest.php | 2 +- Test/Case/Model/Behavior/PluginBehavior/UpdateVersionTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionPhotoAlbumsTest.php b/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionPhotoAlbumsTest.php index 36d8cad..878b645 100644 --- a/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionPhotoAlbumsTest.php +++ b/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionPhotoAlbumsTest.php @@ -66,7 +66,7 @@ public function testUpdateVersion() { 'version' => '\'' . $package['version'] . '\'', 'commit_version' => '\'' . $package['commit_version'] . '\'', 'commited' => '\'' . $package['commited'] . '\'', - 'serialize_data' => '\'' . serialize($package) . '\'', + 'serialize_data' => $this->TestModel->Plugin->getDataSource()->value(serialize($package), 'string'), ); $expectedConditions = array( 'namespace' => array('netcommons/photo-albums', 'netcommons/photo_albums') diff --git a/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionTest.php b/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionTest.php index 946e52a..984498e 100644 --- a/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionTest.php +++ b/Test/Case/Model/Behavior/PluginBehavior/UpdateVersionTest.php @@ -64,7 +64,7 @@ private function __prepareUpdateAll($namespace, $return) { 'version' => '\'' . $package['version'] . '\'', 'commit_version' => '\'' . $package['commit_version'] . '\'', 'commited' => '\'' . $package['commited'] . '\'', - 'serialize_data' => '\'' . serialize($package) . '\'', + 'serialize_data' => $this->TestModel->Plugin->getDataSource()->value(serialize($package), 'string'), ); $expectedConditions = array( 'namespace' => $namespace