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/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: ['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', '8.4']

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-twig/v/stable.png)](https://packagist.org/packages/yiisoft/yii2-twig)
 [![Total Downloads](https://poser.pugx.org/yiisoft/yii2-twig/downloads.png)](https://packagist.org/packages/yiisoft/yii2-twig)
 [![Build Status](https://github.com/yiisoft/yii2-twig/workflows/build/badge.svg)](https://github.com/yiisoft/yii2-twig/actions)
+[![codecov](https://codecov.io/gh/yiisoft/yii2-twig/graph/badge.svg?token=9NTxihROa6)](https://codecov.io/gh/yiisoft/yii2-twig)
 
+Requirements
+------------
+
+- PHP 7.3 or higher.
 
 Installation
 ------------

composer.json

@@ -18,13 +18,12 @@
  }
  ],
  "require": {
- "php": "^7.2.5|^8.0|^8.1",
+ "php": ">=7.3",
  "yiisoft/yii2": "~2.0.4",
  "twig/twig": "~3.9"
  },
  "require-dev": {
- "cweagans/composer-patches": "^1.7",
- "phpunit/phpunit": "4.8.34"
+ "phpunit/phpunit": "^9.6"
  },
  "repositories": [
  {
@@ -45,25 +44,10 @@
  "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/php-file-iterator": {
- "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_path_file_iterator.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",
- "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php81.patch"
- }
  }
  },
  "config": {
  "allow-plugins": {
- "cweagans/composer-patches": true,
  "yiisoft/yii2-composer": true
  }
  }

phpunit.xml.dist

@@ -1,19 +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>
- <filter>
- <whitelist processUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">src/</directory>
- </whitelist>
- </filter>
+<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-Twig">
+ <directory>./tests</directory>
+ </testsuite>
+ </testsuites>
+
+ <coverage>
+ <include>
+ <directory>./src</directory>
+ </include>
+ </coverage>
 </phpunit>

tests/TestCase.php

@@ -20,7 +20,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

@@ -22,19 +22,19 @@
  */
 class ViewRendererTest extends TestCase
 {
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
  {
  parent::setUpBeforeClass();
  Order::setUp();
  }
 
- 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'));
@@ -84,23 +84,23 @@ public function testCalls()
  $view = $this->mockView();
  $model = new Singer();
  $content = $view->renderFile('@yiiunit/twig/views/calls.twig', ['model' => $model]);
- $this->assertNotContains('silence', $content, 'silence should not be echoed when void() used');
- $this->assertContains('echo', $content);
- $this->assertContains('variable', $content);
+ $this->assertStringNotContainsString('silence', $content, 'silence should not be echoed when void() used');
+ $this->assertStringContainsString('echo', $content);
+ $this->assertStringContainsString('variable', $content);
  }
 
  public function testInheritance()
  {
  $view = $this->mockView();
  $content = $view->renderFile('@yiiunit/twig/views/extends2.twig');
- $this->assertContains('Hello, I\'m inheritance test!', $content);
- $this->assertContains('extends2 block', $content);
- $this->assertNotContains('extends1 block', $content);
+ $this->assertStringContainsString('Hello, I\'m inheritance test!', $content);
+ $this->assertStringContainsString('extends2 block', $content);
+ $this->assertStringNotContainsString('extends1 block', $content);
 
  $content = $view->renderFile('@yiiunit/twig/views/extends3.twig');
- $this->assertContains('Hello, I\'m inheritance test!', $content);
- $this->assertContains('extends3 block', $content);
- $this->assertNotContains('extends1 block', $content);
+ $this->assertStringContainsString('Hello, I\'m inheritance test!', $content);
+ $this->assertStringContainsString('extends3 block', $content);
+ $this->assertStringNotContainsString('extends1 block', $content);
  }
 
  public function testChangeTitle()
@@ -109,8 +109,8 @@ public function testChangeTitle()
  $view->title = 'Original title';
 
  $content = $view->renderFile('@yiiunit/twig/views/changeTitle.twig');
- $this->assertContains('New title', $content);
- $this->assertNotContains('Original title', $content);
+ $this->assertStringContainsString('New title', $content);
+ $this->assertStringNotContainsString('Original title', $content);
  }
 
  public function testNullsInAr()
@@ -127,7 +127,7 @@ public function testPropertyAccess()
  $order = new Order();
  $order->total = 42;
  $content = $view->renderFile('@yiiunit/twig/views/property.twig', ['order' => $order]);
- $this->assertContains('42', $content);
+ $this->assertStringContainsString('42', $content);
  }
 
  public function testSimpleFilters()
@@ -164,7 +164,7 @@ public function testTranslation()
  {
  $view = $this->mockView();
  $content = $view->renderFile('@yiiunit/twig/views/t.twig');
- $this->assertContains('test<br>', $content);
+ $this->assertStringContainsString('test<br>', $content);
  }
 
  public function testHtmlExtension()
@@ -260,9 +260,9 @@ public function testStaticAndConsts()
  $view = $this->mockView();
  $view->renderers['twig']['globals']['staticClass'] = ['class' => \yiiunit\twig\data\StaticAndConsts::class];
  $content = $view->renderFile('@yiiunit/twig/views/staticAndConsts.twig');
- $this->assertContains('I am a const!', $content);
- $this->assertContains('I am a static var!', $content);
- $this->assertContains('I am a static function with param pam-param!', $content);
+ $this->assertStringContainsString('I am a const!', $content);
+ $this->assertStringContainsString('I am a static var!', $content);
+ $this->assertStringContainsString('I am a static function with param pam-param!', $content);
  }
 
  public function testDate()

tests/bootstrap.php

@@ -12,5 +12,3 @@
 require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
 Yii::setAlias('@yiiunit/twig', __DIR__);
-
-require_once(__DIR__ . '/compatibility.php');