Raise min PHP version to PHP 7.3, check compatibility PHP 8.3.

.editorconfig

@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.github/CONTRIBUTING.md

@@ -3,5 +3,5 @@ Contributing to Yii2
 
 - [Report an issue](https://github.com/yiisoft/yii2/blob/master/docs/internals/report-an-issue.md)
 - [Translate documentation or messages](https://github.com/yiisoft/yii2/blob/master/docs/internals/translation-workflow.md)
-- [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
+- [Give us feedback or start a design discussion](https://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
 - [Contribute to the core code or fix bugs](https://github.com/yiisoft/yii2/blob/master/docs/internals/git-workflow.md)

.github/FUNDING.yml

@@ -2,4 +2,4 @@
 
 open_collective: yiisoft
 github: [yiisoft]
-tidelift: "packagist/yiisoft/yii2-smarty"
+tidelift: "packagist/yiisoft/yii2-bootstrap5"

.github/ISSUE_TEMPLATE.md

@@ -5,16 +5,15 @@ Yii communities listed at https://github.com/yiisoft/yii2/wiki/communities
 
 ### What steps will reproduce the problem?
 
-### What's expected?
+### What is the expected result?
 
 ### What do you get instead?
 
+
 ### Additional info
 
-| Q                  | A
-| ------------------ | ---
-| Yii version        |
-| Yii Smarty version |
-| Smarty version     |
-| PHP version        |
-| Operating system   |
+| Q                | A
+| ---------------- | ---
+| Yii vesion       |
+| PHP version      |
+| Operating system |

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
-| Q            | A                                                                  |
-|--------------|--------------------------------------------------------------------|
-| Is bugfix?   | ✔️/❌                                                               |
-| New feature? | ✔️/❌                                                               |  
-| Breaks BC?   | ✔️/❌                                                               | 
-| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any --> |
+| Q             | A
+| ------------- | ---
+| Is bugfix?    | ✔️/❌
+| New feature?  | ✔️/❌
+| Breaks BC?    | ✔️/❌
+| Fixed issues  | <!-- comma-separated list of tickets # fixed by the PR, if any -->

.github/workflows/build.yml

@@ -1,47 +1,31 @@
-name: build
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'psalm.xml'
 
-on: [push, pull_request]
+  push:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'psalm.xml'
 
-env:
-    DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi"
+name: build
 
 jobs:
-    phpunit:
-        name: PHP ${{ matrix.php }} on ${{ matrix.os }}
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: false
-            matrix:
-                os: [ubuntu-latest]
-                php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-            - name: Install PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-            - name: Get composer cache directory
-              id: composer-cache
-              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-            - name: Cache composer dependencies
-              uses: actions/cache@v1
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-                  restore-keys: ${{ runner.os }}-composer-
-            - name: Install dependencies
-              run: composer update $DEFAULT_COMPOSER_FLAGS
-            - name: Run unit tests with coverage
-              run: vendor/bin/phpunit --verbose --coverage-clover=coverage.clover --colors=always
-              if: matrix.php == '7.1'
-            - name: Run unit tests without coverage
-              run: vendor/bin/phpunit --verbose --colors=always
-              if: matrix.php != '7.1'
-            - name: Upload code coverage
-              run: |
-                  wget https://scrutinizer-ci.com/ocular.phar
-                  php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-              if: matrix.php == '7.1'
-              continue-on-error: true # if is fork
+  phpunit:
+    uses: yiisoft/actions/.github/workflows/phpunit.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']

README.md

@@ -16,7 +16,12 @@ Documentation is at [docs/guide/README.md](docs/guide/README.md).
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2-smarty/v/stable.png)](https://packagist.org/packages/yiisoft/yii2-smarty)
 [![Total Downloads](https://poser.pugx.org/yiisoft/yii2-smarty/downloads.png)](https://packagist.org/packages/yiisoft/yii2-smarty)
 [![Build Status](https://github.com/yiisoft/yii2-smarty/workflows/build/badge.svg)](https://github.com/yiisoft/yii2-smarty/actions)
+[![codecov](https://codecov.io/gh/yiisoft/yii2-smarty/graph/badge.svg?token=6dBHWO0kMO)](https://codecov.io/gh/yiisoft/yii2-smarty)
 
+Requirements
+------------
+
+- PHP 7.3 or higher.
 
 Installation
 ------------

composer.json

@@ -22,13 +22,13 @@
         }
     ],
     "require": {
+        "php": ">=7.3",
         "yiisoft/yii2": "~2.0.0",
         "smarty/smarty": "^3.1.0 | ^4.2.0"
     },
     "require-dev": {
         "yiisoft/yii2-coding-standards": "~2.0",
-        "cweagans/composer-patches": "^1.7",
-        "phpunit/phpunit": "4.8.34"
+        "phpunit/phpunit": "^9.6"
     },
     "repositories": [
         {
@@ -49,23 +49,12 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.0.x-dev"
-        },
-        "composer-exit-on-patch-failure": true,
-        "patches": {
-            "phpunit/phpunit-mock-objects": {
-                "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
-            },
-            "phpunit/phpunit": {
-                "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
-                "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch"
-            }
         }
     },
     "config": {
         "secure-http": false,
         "allow-plugins": {
-            "yiisoft/yii2-composer": true,
-            "cweagans/composer-patches": true
+            "yiisoft/yii2-composer": true
         }
     }
 }

phpunit.xml.dist

@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-		colors="true"
-		verbose="true"
-		convertErrorsToExceptions="true"
-		convertNoticesToExceptions="true"
-		convertWarningsToExceptions="true"
-		stopOnFailure="false">
-		<testsuites>
-			<testsuite name="Test Suite">
-				<directory>./tests</directory>
-			</testsuite>
-		</testsuites>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  bootstrap="./tests/bootstrap.php"
+  colors="true" convertErrorsToExceptions="true"
+  convertNoticesToExceptions="true"
+  convertWarningsToExceptions="true"
+  stopOnFailure="false"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
+
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+
+  <testsuites>
+    <testsuite name="Yii2-Smarty">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <coverage>
+    <include>
+        <directory>./src</directory>
+    </include>
+  </coverage>
 </phpunit>

tests/ExtensionTest.php

@@ -17,14 +17,14 @@
 class ExtensionTest extends TestCase
 {
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->mockWebApplication();
         FileHelper::createDirectory(Yii::getAlias('@runtime/Smarty'));
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         FileHelper::removeDirectory(Yii::getAlias('@runtime/Smarty'));

tests/TestCase.php

@@ -21,7 +21,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
      * Clean up after test.
      * By default the application created with [[mockApplication]] will be destroyed.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         $this->destroyApplication();

tests/ViewRendererTest.php

@@ -19,13 +19,13 @@
  */
 class ViewRendererTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->mockWebApplication();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         FileHelper::removeDirectory(Yii::getAlias('@runtime/assets'));
@@ -105,8 +105,8 @@ public function testUse()
     {
         $view = $this->mockView();
         $content = $view->renderFile('@yiiunit/smarty/views/use.tpl');
-        $this->assertContains('<form id="', $content);
-        $this->assertContains('<ul class="', $content);
+        $this->assertStringContainsString('<form id="', $content);
+        $this->assertStringContainsString('<ul class="', $content);
     }
 
     /**
@@ -117,8 +117,8 @@ public function testInheritedUse()
         $view = $this->mockView();
         $content = $view->renderFile('@yiiunit/smarty/views/use.tpl');
         $view->renderFile('@yiiunit/smarty/views/extended-layout.tpl', ['content' => $content]);
-        $this->assertContains('<form id="', $content);
-        $this->assertContains('<ul class="', $content);
+        $this->assertStringContainsString('<form id="', $content);
+        $this->assertStringContainsString('<ul class="', $content);
     }
 
     /**
@@ -150,14 +150,14 @@ public function testWidgetDefault()
     {
         $view = $this->mockView();
         $content = $view->renderFile('@yiiunit/smarty/views/widget-default.tpl');
-        $this->assertContains('<div class="widget">test</div>', $content);
+        $this->assertStringContainsString('<div class="widget">test</div>', $content);
     }
 
     public function testWidgetHidden()
     {
         $view = $this->mockView();
         $content = $view->renderFile('@yiiunit/smarty/views/widget-invalid.tpl');
-        $this->assertNotContains('<div class="widget">test</div>', $content);
+        $this->assertStringNotContainsString('<div class="widget">test</div>', $content);
     }
 
     public function testRegisterBlocks()
@@ -169,11 +169,11 @@ public function testRegisterBlocks()
         ];
         $content = $view->render('@yiiunit/smarty/views/register-blocks.tpl');
         $content = $view->renderFile('@yiiunit/smarty/views/layout-block.tpl', ['content' => $content]);
-        $this->assertContains('<script>jQuery(function ($) {
+        $this->assertStringContainsString('<script>jQuery(function ($) {
     console.log(\'test\');
 
 });</script>', $content);
-        $this->assertContains('<style>    body {
+        $this->assertStringContainsString('<style>    body {
         background-color: white;
     }
 </style>', $content);

tests/bootstrap.php

@@ -13,5 +13,3 @@
 
 Yii::setAlias('@yiiunit/smarty', __DIR__);
 Yii::setAlias('@yii/smarty', dirname(__DIR__) . '/src');
-
-require_once(__DIR__ . '/compatibility.php');