Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

バージョン更新 #1180

Merged
merged 3 commits into from
Feb 19, 2025
Merged

バージョン更新 #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1574c50
バージョン更新
saori-kakiuchi Feb 17, 2025
08f5826
Merge branch 'master' into fix/version
nanasess Feb 19, 2025
c80e8ff
Merge branch 'master' into fix/version
nanasess Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
tag: ${{ env.TAG_NAME }}
name: ${{ env.TAG_NAME }}
body: |
EC-CUBE 2.17系の Weekly build🚀 です。毎週の改善内容を反映しております。
EC-CUBE 2.25系の Weekly build🚀 です。毎週の改善内容を反映しております。
常に安定して動作するよう努めていますが、思わぬ不具合を取り込んでしまっている場合もあります。十分に検証の上ご利用ください。

<table>
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EC-CUBE 2.17系
# EC-CUBE 2.25系

[![CI/CD for EC-CUBE](https://github.com/EC-CUBE/ec-cube2/actions/workflows/main.yml/badge.svg)](https://github.com/EC-CUBE/ec-cube2/actions/workflows/main.yml)
[![codecov](https://codecov.io/gh/EC-CUBE/ec-cube2/branch/master/graph/badge.svg?token=4oNLGhIQwy)](https://codecov.io/gh/EC-CUBE/ec-cube2)
Expand All @@ -24,7 +24,7 @@ Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに

本リポジトリでは、以下方針で開発を行っています。

### 2.17系
### 2.25系

* EC-CUBE 2.13 系の PHP7 及び PHP8 対応バージョンです。
* `master` ブランチで開発を行っています。
Expand Down
2 changes: 1 addition & 1 deletion data/class/SC_Initial.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
public function __construct()
{
/* EC-CUBEのバージョン */
defined('ECCUBE_VERSION') || define('ECCUBE_VERSION', '2.17.2-p2');
defined('ECCUBE_VERSION') || define('ECCUBE_VERSION', '2.25.0');

Check warning on line 39 in data/class/SC_Initial.php

View check run for this annotation

Codecov / codecov/patch

data/class/SC_Initial.php#L39 

Added line #L39 was not covered by tests
}

/**
Expand Down
4 changes: 2 additions & 2 deletions docs/.tbls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dsn: postgres://eccube_db_user:password@host.docker.internal:15432/eccube_db?sslmode=disable
docPath: /work/docs/database-schema
name: EC-CUBE 2.17.x table definition
desc: EC-CUBE 2.17.x テーブル定義書
name: EC-CUBE 2.25.x table definition
desc: EC-CUBE 2.25.x テーブル定義書
er:
comment: true
relations:
Expand Down
4 changes: 2 additions & 2 deletions docs/database-schema/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# EC-CUBE 2.17.x table definition
# EC-CUBE 2.25.x table definition

## Description

EC-CUBE 2.17.x テーブル定義書
EC-CUBE 2.25.x テーブル定義書

## Tables

Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/test/admin/home.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test.describe('管理画面Homeの確認をします', () => {

test('システム情報を確認します', async ({ adminLoginPage, page }) => {
await page.goto(url);
await expect(page.locator('.shop-info >> nth=0 >> tr >> nth=0 >> td')).toContainText('2.17');
await expect(page.locator('.shop-info >> nth=0 >> tr >> nth=0 >> td')).toContainText('2.25');
});

test('LC_Page_Admin_Home_Ex クラスのテストをします @extends', async ({ adminLoginPage, page }) => {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ec-cube2",
"version": "2.17.2",
"version": "2.25.0",
"main": "index.js",
"repository": "git@github.com:EC-CUBE/ec-cube2.git",
"author": "https://www.ec-cube.net",
Expand Down
2 changes: 1 addition & 1 deletion tests/class/fixtures/plugin/PrefilterTransformPlugin/plugin_info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class plugin_info
public static $PLUGIN_NAME = 'PrefilterTransformPlugin';
public static $CLASS_NAME = 'PrefilterTransformPlugin';
public static $PLUGIN_VERSION = '0.0.0';
public static $COMPLIANT_VERSION = '2.17';
public static $COMPLIANT_VERSION = '2.25';
public static $AUTHOR = 'dummy';
public static $DESCRIPTION = 'dummy';
public static $HOOK_POINTS = [
Expand Down
2 changes: 1 addition & 1 deletion tests/class/plugin/LoadClassFileChangeCustomDirTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protected function setUp(): void
'plugin_code' => 'FixturePlugin',
'class_name' => 'FixturePlugin',
'plugin_version' => '0.0.0',
'compliant_version' => '2.17',
'compliant_version' => '2.25',
'enable' => 1,
'create_date' => 'CURRENT_TIMESTAMP',
'update_date' => 'CURRENT_TIMESTAMP',
Expand Down
4 changes: 2 additions & 2 deletions tests/class/plugin/LoadClassFileChangeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class plugin_info {
static \$PLUGIN_NAME = 'AutoloadingPlugin';
static \$CLASS_NAME = 'AutoloadingPlugin';
static \$PLUGIN_VERSION = '0.0.0';
static \$COMPLIANT_VERSION = '2.17';
static \$COMPLIANT_VERSION = '2.25';
static \$AUTHOR = 'dummy';
static \$DESCRIPTION = 'dummy';
static \$HOOK_POINTS = 'loadClassFileChange';
Expand Down Expand Up @@ -121,7 +121,7 @@ public function isExtended() {
'plugin_code' => 'AutoloadingPlugin',
'class_name' => 'AutoloadingPlugin',
'plugin_version' => '0.0.0',
'compliant_version' => '2.17',
'compliant_version' => '2.25',
'enable' => 1,
'create_date' => 'CURRENT_TIMESTAMP',
'update_date' => 'CURRENT_TIMESTAMP',
Expand Down
Loading