diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index 83c0774217c..7cc1a295fa8 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -113,7 +113,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Override PHP ini values for JIT compiler if: matrix.compiler == 'jit' run: echo "PHP_INI_VALUES::assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit=1255, opcache.jit_buffer_size=64M" >> $GITHUB_ENV @@ -131,7 +131,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php index 5be1837b888..07b7015b6e5 100644 --- a/tests/codeigniter/helpers/text_helper_test.php +++ b/tests/codeigniter/helpers/text_helper_test.php @@ -101,7 +101,15 @@ public function test_censored_words() public function test_highlight_code() { - $expect = "\n<?php var_dump(\$this); ?> \n\n"; + if (substr(PHP_VERSION, 0, 3) >= '8.3') + { + $expect = "
<?php var_dump($this); ?> ?>
"; + } + else + { + $expect = "\n<?php var_dump(\$this); ?> \n\n"; + } + $this->assertEquals($expect, highlight_code('')); }