From 863786e15d77813667fa0fa6244e873e360c2f12 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 13 Nov 2024 00:22:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Smarty=20=E3=81=AE=20warning=20=E3=82=92?= =?UTF-8?q?=E6=8A=91=E5=88=B6=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs https://github.com/EC-CUBE/ec-cube2/issues/1045 --- data/class/SC_View.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/class/SC_View.php b/data/class/SC_View.php index bab1244bc6..27cc188dd6 100644 --- a/data/class/SC_View.php +++ b/data/class/SC_View.php @@ -40,7 +40,6 @@ public function __construct() public function init() { - // include_phpの利用のためSmartyBCを呼び出す、ホントはinclude_phpをなくしたいそうすれば、blank.tplもなくせる $this->_smarty = new \Smarty\Smarty(); $this->_smarty->setLeftDelimiter(''); @@ -74,6 +73,7 @@ public function init() $this->_smarty->registerPlugin('function', 'sfIsHTTPS', ['SC_Utils_Ex', 'sfIsHTTPS']); $this->_smarty->registerPlugin('function', 'sfSetErrorStyle', ['SC_Utils_Ex', 'sfSetErrorStyle']); $this->_smarty->registerPlugin('function', 'printXMLDeclaration', ['GC_Utils_Ex', 'printXMLDeclaration']); + $this->_smarty->muteUndefinedOrNullWarnings(); $this->_smarty->default_modifiers = ['script_escape']; if (ADMIN_MODE == '1') { From ffc13ee03ef92ab95999a864fedb6eca89cc01eb Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 13 Nov 2024 00:25:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E6=99=82=E3=81=AB=E3=82=82=20data/logs=20=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E3=81=AE=E3=83=AD=E3=82=B0=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Warning の発生状況を確認するため --- .github/workflows/e2e-tests.yml | 5 +++++ .github/workflows/unit-tests.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 1a114efb30..333b95d8f7 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -108,6 +108,11 @@ jobs: FORCE_COLOR: 1 run: yarn ${PATTERN} e2e-tests/${GROUP} + - name: Print error log + if: always() + continue-on-error: true + run: docker compose exec ec-cube tail -n 100 data/logs/error.log + - name: Upload evidence if: failure() uses: actions/upload-artifact@v4 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 89b0a2a465..84f6d3d7e9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -80,6 +80,11 @@ jobs: - name: Run to PHPUnit SessionFactory run: docker compose exec -T ec-cube php data/vendor/bin/phpunit tests/class/SC_SessionFactoryTest.php + - name: Print error log + if: always() + continue-on-error: true + run: docker compose exec ec-cube tail -n 100 data/logs/error.log + - name: Upload logs if: failure() uses: actions/upload-artifact@v4