LEVEL 6の修正。

sai-gillingham · Nov 2, 2023 · 7436c1d · 7436c1d
1 parent 096e807
commit 7436c1d
Show file tree

Hide file tree

Showing 9 changed files with 206 additions and 61 deletions.
diff --git a/src/Eccube/Entity/BaseInfo.php b/src/Eccube/Entity/BaseInfo.php
@@ -1088,7 +1088,7 @@ public function setPointConversionRate($pointConversionRate)
         /**
          * Get pointConversionRate
          *
-         * @return string
+         * @return string|int|float
          */
         public function getPointConversionRate()
         {

diff --git a/src/Eccube/Entity/Customer.php b/src/Eccube/Entity/Customer.php
@@ -1169,7 +1169,7 @@ public function setPoint($point)
         /**
          * Get point
          *
-         * @return string
+         * @return string|int
          */
         public function getPoint()
         {

diff --git a/src/Eccube/Entity/Plugin.php b/src/Eccube/Entity/Plugin.php
@@ -200,7 +200,7 @@ public function getVersion()
         /**
          * Set source.
          *
-         * @param string $source
+         * @param string|int $source
          *
          * @return Plugin
          */

diff --git a/src/Eccube/Service/Payment/PaymentResult.php b/src/Eccube/Service/Payment/PaymentResult.php
@@ -21,7 +21,7 @@
 class PaymentResult
 {
     /**
-     * @var array
+     * @var array<int, string>
      */
     private $errors = [];
 
@@ -66,7 +66,7 @@ public function isSuccess()
     /**
      * 決済が失敗した場合のエラーの配列を返します.
      *
-     * @return array
+     * @return array<int, string>
      */
     public function getErrors()
     {
@@ -76,7 +76,7 @@ public function getErrors()
     /**
      * 決済が失敗した場合のエラーの配列を設定します.
      *
-     * @param array $errors
+     * @param array<int, string> $errors
      *
      * @return PaymentResult
      */

diff --git a/src/Eccube/Service/PluginApiService.php b/src/Eccube/Service/PluginApiService.php
@@ -83,6 +83,7 @@ public function getApiUrl()
 
     /**
      * @param mixed $apiUrl
+     * @return void
      */
     public function setApiUrl($apiUrl)
     {
@@ -91,8 +92,7 @@ public function setApiUrl($apiUrl)
 
     /**
      * Get master data: category
-     *
-     * @return array
+     * @return string|bool|array<string, string|int|array<int, string>>
      */
     public function getCategory()
     {
@@ -108,9 +108,8 @@ public function getCategory()
     /**
      * Get plugins list
      *
-     * @param $data
-     *
-     * @return array
+     * @param array<string, string|int> $data
+     * @return array<string, string|int>
      *
      * @throws PluginApiException
      */
@@ -137,8 +136,7 @@ public function getPlugins($data)
     /**
      * Get purchased plugins list
      *
-     * @return array
-     *
+     * @return array<int, array<string, string|int>>
      * @throws PluginApiException
      */
     public function getPurchased()
@@ -154,8 +152,7 @@ public function getPurchased()
     /**
      * Get recommended plugins list
      *
-     * @return array($result, $info)
-     *
+     * @return array<int, array<string, string|int>>
      * @throws PluginApiException
      */
     public function getRecommended()
@@ -168,6 +165,10 @@ public function getRecommended()
         return $this->buildPlugins($plugins);
     }
 
+    /**
+     * @param array<int, array<string, string|int>> $plugins
+     * @return array<int, array<string, string|int>>
+     */
     private function buildPlugins(&$plugins)
     {
         /** @var Plugin[] $pluginInstalled */
@@ -215,7 +216,7 @@ private function isUpdate($pluginVersion, $remoteVersion)
      *
      * @param int|string $id Id or plugin code
      *
-     * @return array
+     * @return array<string, string|int|array<int, string>>
      *
      * @throws PluginApiException
      */
@@ -229,26 +230,47 @@ public function getPlugin($id)
         return $this->buildInfo($json);
     }
 
+    /**
+     * @param Plugin $Plugin
+     * @return void
+     */
     public function pluginInstalled(Plugin $Plugin)
     {
         $this->updatePluginStatus('/status/installed', $Plugin);
     }
 
+    /**
+     * @param Plugin $Plugin
+     * @return void
+     */
     public function pluginEnabled(Plugin $Plugin)
     {
         $this->updatePluginStatus('/status/enabled', $Plugin);
     }
 
+    /**
+     * @param Plugin $Plugin
+     * @return void
+     */
     public function pluginDisabled(Plugin $Plugin)
     {
         $this->updatePluginStatus('/status/disabled', $Plugin);
     }
 
+    /**
+     * @param Plugin $Plugin
+     * @return void
+     */
     public function pluginUninstalled(Plugin $Plugin)
     {
         $this->updatePluginStatus('/status/uninstalled', $Plugin);
     }
 
+    /**
+     * @param string $url
+     * @param Plugin $Plugin
+     * @return void
+     */
     private function updatePluginStatus($url, Plugin $Plugin)
     {
         if ($Plugin->getSource()) {
@@ -263,9 +285,10 @@ private function updatePluginStatus($url, Plugin $Plugin)
      * API request processing
      *
      * @param string $url
-     * @param array $data
+     * @param array<string, mixed> $data
+     * @param bool $post
      *
-     * @return array
+     * @return string|bool
      *
      * @throws PluginApiException
      */
@@ -328,9 +351,8 @@ public function requestApi($url, $data = [], $post = false)
     /**
      * Get plugin information
      *
-     * @param array $plugin
-     *
-     * @return array
+     * @param array<string, string|int|array<int, string>>  $plugin
+     * @return array<string, string|int|array<int, string>>
      */
     public function buildInfo(&$plugin)
     {
@@ -341,8 +363,8 @@ public function buildInfo(&$plugin)
 
     /**
      * Check support version
-     *
-     * @param $plugin
+     * @param array<string, string|int|array<int, string|float>> $plugin
+     * @return void
      */
     public function supportedVersion(&$plugin)
     {

diff --git a/src/Eccube/Service/PluginContext.php b/src/Eccube/Service/PluginContext.php
@@ -21,47 +21,79 @@ class PluginContext
     private const MODE_INSTALL = 'install';
     private const MODE_UNINSTALL = 'uninstall';
 
+    /**
+     * @var string
+     */
     private $mode;
 
+    /**
+     * @var string|int
+     */
     private $code;
 
+    /**
+     * @var array<string, mixed>
+     */
     private $composerJson;
 
     /**
      * @var EccubeConfig
      */
     private $eccubeConfig;
 
+    /**
+     * @param EccubeConfig $eccubeConfig
+     */
     public function __construct(EccubeConfig $eccubeConfig)
     {
         $this->eccubeConfig = $eccubeConfig;
     }
 
+    /**
+     * @return bool
+     */
     public function isInstall()
     {
         return $this->mode === self::MODE_INSTALL;
     }
 
+    /**
+     * @return bool
+     */
     public function isUninstall()
     {
         return $this->mode === self::MODE_UNINSTALL;
     }
 
+    /**
+     * @return string
+     */
     public function setInstall()
     {
         return $this->mode = self::MODE_INSTALL;
     }
 
+    /**
+     * @return string
+     */
     public function setUninstall()
     {
         return $this->mode = self::MODE_UNINSTALL;
     }
 
+    /**
+     * @param string $code
+     * @return void
+     */
     public function setCode(string $code)
     {
         $this->code = $code;
     }
 
+    /**
+     * @return array<string, mixed>
+     * @throws PluginException
+     */
     public function getComposerJson(): array
     {
         if ($this->composerJson) {
@@ -81,6 +113,10 @@ public function getComposerJson(): array
         return $this->composerJson;
     }
 
+    /**
+     * @return array<string, string>
+     * @throws PluginException
+     */
     public function getExtraEntityNamespaces(): array
     {
         $json = $this->getComposerJson();