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.

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

Silex ベースで簡易実装を行いました #38

Merged
merged 50 commits into from
Jan 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6a6656d
Framework化 仮
ttsuru Dec 29, 2014
68a55df
ProductReviewプラグイン追加
ttsuru Jan 9, 2015
3c9d2db
不要な MDB2_Driver_pgsql patch 削除
ttsuru Jan 11, 2015
4838558
デバッグメッセージ削除
ttsuru Jan 11, 2015
33fa48d
文法など修正
ttsuru Jan 11, 2015
c69aeeb
DI化
ttsuru Jan 12, 2015
bb99645
DI化
ttsuru Jan 12, 2015
8ffd275
CartSession SiteSession DI化
ttsuru Jan 12, 2015
174014f
Customer DI化
ttsuru Jan 12, 2015
f363873
CustomerList DI化
ttsuru Jan 12, 2015
9aef737
修正
ttsuru Jan 12, 2015
985d136
修正
ttsuru Jan 12, 2015
9f64849
AddressHelper DI化
ttsuru Jan 12, 2015
2614e2e
PurchaseHelper DI化
ttsuru Jan 12, 2015
3219a3f
DeliveryHelper DI化
ttsuru Jan 12, 2015
8c2cdd5
PaymentHelper DI化
ttsuru Jan 12, 2015
52c46bd
stdClass
ttsuru Jan 12, 2015
f85f975
DbHelper DI化
ttsuru Jan 12, 2015
fddbb7d
Smarty DI対応
ttsuru Jan 12, 2015
346e49a
NewsHelper DI化
ttsuru Jan 12, 2015
6ede9ef
BestProductsHelper DI化
ttsuru Jan 12, 2015
651af16
BlocHelper DI化
ttsuru Jan 12, 2015
000533b
FileManagerHelper DI化
ttsuru Jan 12, 2015
0d69a35
PageLayoutHelper DI化
ttsuru Jan 12, 2015
36d6a36
CheckError DI化
ttsuru Jan 12, 2015
6c1768c
Product DI化
ttsuru Jan 12, 2015
8c4e386
Query DI化抜け
ttsuru Jan 12, 2015
115d5ae
Display DI化
ttsuru Jan 12, 2015
49e02f0
PageNavi DI化
ttsuru Jan 12, 2015
98e19b9
Customer DI化追加
ttsuru Jan 12, 2015
065203c
Cookie DI化
ttsuru Jan 12, 2015
fcb0c97
Response DI化
ttsuru Jan 12, 2015
65c4e62
SiteSession DI化漏れ
ttsuru Jan 12, 2015
6efffee
Query DI化追加
ttsuru Jan 12, 2015
62c6278
SiteSession DI化追加
ttsuru Jan 12, 2015
ecdd05b
DBFactory DI化
ttsuru Jan 12, 2015
cea8ebc
Graph.* DI化
ttsuru Jan 12, 2015
45b8b5e
CategoryHelper DI化
ttsuru Jan 12, 2015
04cf987
CsvHelper DI化
ttsuru Jan 12, 2015
890d383
CustomerHelper DI化
ttsuru Jan 12, 2015
dbd98a5
FileManagerHelper DI化
ttsuru Jan 12, 2015
ffc05ba
Date HolidayHelper DI化
ttsuru Jan 12, 2015
363b2f5
KiyakuHelper DI化
ttsuru Jan 12, 2015
883ec6c
MailHelper DI化
ttsuru Jan 12, 2015
d117abd
SendMail DI化
ttsuru Jan 12, 2015
d96f462
MailtemplateHelper DI化
ttsuru Jan 12, 2015
94f92c0
MakerHelper DI化
ttsuru Jan 12, 2015
21f1b2d
MobileHelper DI化
ttsuru Jan 12, 2015
e2cf3bf
Merge remote-tracking branch 'upstream/master' into routing
ttsuru Jan 26, 2015
67eab2d
テストを退避
ttsuru Jan 26, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
composer.phar
!dummy
!.gitmodule
composer.phar
/vendor/
/data/Smarty/templates_c/*
/data/cache/*
/data/config/config.php
/data/logs/*
/data/upload/csv/*
/app/cache/*/*
/app/config/eccube/config.php
/app/logs/*
/app/upload/csv/*
/html/install/temp/*
/html/upload/graph_image/*
/html/upload/mobile_image/*
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ before_script:
- php composer.phar install --dev --no-interaction
- sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi"
- sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi"
- cat ./data/config/config.php
- cat ./app/config/eccube/config.php
- npm install -g grunt-cli
- npm install

script:
- mkdir -p reports/coverage
- vendor/bin/phpunit -c phpunit.xml.dist
# - vendor/bin/phpunit -c phpunit.xml.dist
- grunt

after_script:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
247,134 changes: 123,733 additions & 123,401 deletions data/downloads/KEN_ALL.CSV → app/downloads/KEN_ALL.CSV

Large diffs are not rendered by default.

123,733 changes: 123,733 additions & 0 deletions app/downloads/KEN_ALL_utf-8.CSV

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions app/downloads/tmp/dummy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file added app/downloads/tmp/ken_all.zip
Binary file not shown.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions data/mtb_constants_init.php → app/mtb_constants_init.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/** DBセッションの有効期限(秒) */
define('MAX_LIFETIME', 7200);
/** マスターデータキャッシュディレクトリ */
define('MASTER_DATA_REALDIR', DATA_REALDIR . "cache/");
define('MASTER_DATA_REALDIR', DATA_REALDIR . "cache/eccube/");
/** アップデート管理用ファイル格納場所 */
define('UPDATE_HTTP', "http://www.ec-cube.net/info/index.php");
/** 文字コード */
Expand Down Expand Up @@ -333,25 +333,25 @@
/** スマートフォンテンプレート名 */
define('SMARTPHONE_TEMPLATE_NAME', "sphone");
/** SMARTYテンプレート */
define('SMARTY_TEMPLATES_REALDIR', DATA_REALDIR . "Smarty/templates/");
define('SMARTY_TEMPLATES_REALDIR', DATA_REALDIR . "templates/");
/** SMARTYテンプレート(PC) */
define('TEMPLATE_REALDIR', SMARTY_TEMPLATES_REALDIR . TEMPLATE_NAME . "/");
/** SMARTYテンプレート(管理機能) */
define('TEMPLATE_ADMIN_REALDIR', SMARTY_TEMPLATES_REALDIR . "admin/");
/** SMARTYコンパイル */
define('COMPILE_REALDIR', DATA_REALDIR . "Smarty/templates_c/" . TEMPLATE_NAME . "/");
define('COMPILE_REALDIR', DATA_REALDIR . "cache/smarty/" . TEMPLATE_NAME . "/");
/** SMARTYコンパイル(管理機能) */
define('COMPILE_ADMIN_REALDIR', DATA_REALDIR . "Smarty/templates_c/admin/");
define('COMPILE_ADMIN_REALDIR', DATA_REALDIR . "cache/smarty/admin/");
/** ブロックファイル保存先 */
define('BLOC_DIR', "frontparts/bloc/");
/** SMARTYテンプレート(mobile) */
define('MOBILE_TEMPLATE_REALDIR', SMARTY_TEMPLATES_REALDIR . MOBILE_TEMPLATE_NAME . "/");
/** SMARTYコンパイル(mobile) */
define('MOBILE_COMPILE_REALDIR', DATA_REALDIR . "Smarty/templates_c/" . MOBILE_TEMPLATE_NAME . "/");
define('MOBILE_COMPILE_REALDIR', DATA_REALDIR . "cache/smarty/" . MOBILE_TEMPLATE_NAME . "/");
/** SMARTYテンプレート(smart phone) */
define('SMARTPHONE_TEMPLATE_REALDIR', SMARTY_TEMPLATES_REALDIR . SMARTPHONE_TEMPLATE_NAME . "/");
/** SMARTYコンパイル(smartphone) */
define('SMARTPHONE_COMPILE_REALDIR', DATA_REALDIR . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/");
define('SMARTPHONE_COMPILE_REALDIR', DATA_REALDIR . "cache/smarty/" . SMARTPHONE_TEMPLATE_NAME . "/");
/** EメールアドレスチェックをRFC準拠にするか(true:準拠する、false:準拠しない) */
define('RFC_COMPLIANT_EMAIL_CHECK', false);
/** モバイルサイトのセッションの存続時間 (秒) */
Expand Down Expand Up @@ -485,4 +485,4 @@
/** 決済処理中ステータスのロールバックをするか(true:する false:しない) */
define('PENDING_ORDER_CANCEL_FLAG', true);
/** API機能を有効にする(true:する false:しない) */
define('API_ENABLE_FLAG', false);
define('API_ENABLE_FLAG', false);
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading