Merge pull request #15 from ptthao-yrglmvn/migration-4.3

Migration 4.3

Author: chihiro-adachi

.github/workflows/main.yml

@@ -17,14 +17,13 @@ on:
 jobs:
   run-on-linux:
     name: Run on Linux
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
-        php: [ '7.4', '8.0', '8.1' ]
+        eccube_version: [ '4.2', '4.3' ]
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3']
         db: [ 'mysql', 'mysql8', 'pgsql' ]
-        eccube_version: [ '4.2' ]
         plugin_code: [ 'SiteKit42' ]
         include:
           - db: mysql
@@ -39,6 +38,15 @@ jobs:
             database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db
             database_server_version: 14
             database_charset: utf8
+        exclude:
+          -   eccube_version: 4.2
+              php: 8.2
+          -   eccube_version: 4.2
+              php: 8.3
+          -   eccube_version: 4.3
+              php: 7.4
+          -   eccube_version: 4.3
+              php: 8.0
     services:
       mysql:
         image: mysql:5.7
@@ -72,7 +80,6 @@ jobs:
           - 1080:1080
           - 1025:1025
     steps:
-      - run: sudo apt-get purge -y hhvm
       - name: Checkout
         uses: actions/checkout@v2
 
@@ -144,7 +151,7 @@ jobs:
         working-directory: 'ec-cube'
         run: |
           bin/console cache:clear --no-warmup
-          bin/phpunit -c app/Plugin/${PLUGIN_CODE}/phpunit.xml.dist app/Plugin/${PLUGIN_CODE}/Tests
+          ./vendor/bin/phpunit -c app/Plugin/${PLUGIN_CODE}/phpunit.xml.dist app/Plugin/${PLUGIN_CODE}/Tests
 
       - name: Disable Plugin
         working-directory: 'ec-cube'

PluginManager.php

@@ -15,16 +15,17 @@
 
 
 use Eccube\Plugin\AbstractPluginManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Yaml;
+use Eccube\Common\EccubeConfig;
 
 class PluginManager extends AbstractPluginManager
 {
     public function install(array $meta, ContainerInterface $container)
     {
         $fs = new Filesystem();
-        $routeYaml = $container->getParameter('plugin_data_realdir').'/SiteKit42/routes.yaml';
+        $routeYaml = $container->get(EccubeConfig::class)->get('plugin_data_realdir').'/SiteKit42/routes.yaml';
         if (!$fs->exists($routeYaml)) {
             $fs->dumpFile($routeYaml, '');
         }
@@ -33,7 +34,7 @@ public function install(array $meta, ContainerInterface $container)
     public function update(array $meta, ContainerInterface $container)
     {
         $fs = new Filesystem();
-        $routeYaml = $container->getParameter('plugin_data_realdir').'/SiteKit42/routes.yaml';
+        $routeYaml = $container->get(EccubeConfig::class)->get('plugin_data_realdir').'/SiteKit42/routes.yaml';
         if (!$fs->exists($routeYaml)) {
             $fs->dumpFile($routeYaml, '');
         }

Service/Google_Site_Kit_Client.php

@@ -136,6 +136,8 @@ public function authorize(ClientInterface $http = null)
      * Fetches an OAuth 2.0 access token by using a temporary code.
      *
      * @param string $code Temporary authorization code, or undelegated token code.
+     * 
+     * @param string $codeVerifier the code verifier used for PKCE (if applicable)
      *
      * @return array Access token.
      *
@@ -144,7 +146,7 @@ public function authorize(ClientInterface $http = null)
      *
      * @since 1.0.0
      */
-    public function fetchAccessTokenWithAuthCode($code)
+    public function fetchAccessTokenWithAuthCode($code, $codeVerifier = null)
     {
         if (strlen($code) === 0) {
             throw new InvalidArgumentException('Invalid code');

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-cube/sitekit42",
-  "version": "4.2.2",
+  "version": "4.3.0",
   "description": "Site Kit プラグイン",
   "type": "eccube-plugin",
   "require": {