Merge pull request #615 from nanasess/use-smarty42

Smarty4.3 を使用する

.github/workflows/e2e-tests.yml

@@ -172,6 +172,9 @@ jobs:
         docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache
         TAG=${PHP_VERSION_TAG}-apache docker-compose up -d
 
+    - run: docker-compose exec -T ec-cube composer require smarty/smarty "^3.1"
+      if: matrix.php < 7.1
+
     - run: sleep 1
     - run: |
         yarn install

.github/workflows/main.yml

@@ -77,6 +77,9 @@ jobs:
     - name: composer install
       run: composer install --no-interaction -o
 
+    - run: composer require smarty/smarty "^3.1"
+      if: matrix.php < 7.1
+
     - name: Setup PHP
       uses: nanasess/setup-php@master
       with:
@@ -178,6 +181,10 @@ jobs:
     - name: composer install
       run: composer install --no-interaction -o
 
+    - run: composer require smarty/smarty "^3.1"
+      if: matrix.php < 7.1
+      shell: bash
+
     - name: Start PostgreSQL on Windows
       # see https://www.cybertec-postgresql.com/en/postgresql-github-actions-continuous-integration/
       run: |

composer.json

@@ -13,7 +13,7 @@
     "config": {
         "vendor-dir": "data/vendor",
         "platform": {
-            "php": "5.4.16"
+            "php": "7.4.0"
         },
         "optimize-autoloader": true,
         "sort-packages": true,
@@ -22,13 +22,16 @@
         }
     },
     "require-dev": {
+        "doctrine/instantiator": "~1.0.5",
         "fzaninotto/faker": "^1.8",
-        "nanasess/eccube2-fixture-generator": "^1.1",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
-        "php5friends/phpunit48": ">=4.8.41"
+        "nanasess/eccube2-fixture-generator": "^1.1",
+        "php5friends/phpunit48": ">=4.8.41",
+        "phpdocumentor/reflection-docblock": "~2.0.5",
+        "symfony/yaml": "^2.8 || ^3.4 || ^4.4"
     },
     "require": {
-        "php": ">=5.4.16",
+        "php": "^5.4 || ^7.0 || ^8.0",
         "ext-gd": "*",
         "ext-mbstring": "*",
         "mobiledetect/mobiledetectlib": "^2.8",
@@ -42,7 +45,7 @@
         "pear/xml_util": "*",
         "setasign/fpdf": "^1.8",
         "setasign/fpdi": "^1.6",
-        "smarty/smarty": "*"
+        "smarty/smarty": "^3.1 || ^4.3"
     },
     "autoload": {
         "classmap": [

data/class/SC_View.php

@@ -23,7 +23,7 @@
 
 class SC_View
 {
-    /** @var SmartyBC */
+    /** @var Smarty */
     public $_smarty;
 
     /** @var LC_Page */
@@ -41,9 +41,7 @@ public function __construct()
     public function init()
     {
         // include_phpの利用のためSmartyBCを呼び出す、ホントはinclude_phpをなくしたいそうすれば、blank.tplもなくせる
-        $this->_smarty = new SmartyBC;
-        // see https://github.com/smarty-php/smarty/issues/605#issuecomment-742832333
-        $this->_smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE);
+        $this->_smarty = new Smarty;
         $this->_smarty->left_delimiter = '<!--{';
         $this->_smarty->right_delimiter = '}-->';
         $this->_smarty->registerPlugin('modifier', 'sfDispDBDate', function ($dbdate, $time = true) { return SC_Utils_Ex::sfDispDBDate($dbdate, $time); });