diff --git a/.php_cs.dist b/.php_cs.dist index 41e343f..863b00b 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -9,9 +9,9 @@ return PhpCsFixer\Config::create() 'array_syntax' => ['syntax' => 'short'], 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, - // 'compact_nullable_typehint' => true, + 'compact_nullable_typehint' => true, 'linebreak_after_opening_tag' => true, - // 'list_syntax' => ['syntax' => 'short'], + 'list_syntax' => ['syntax' => 'short'], // 'mb_str_functions' => true, 'native_function_invocation' => true, 'no_null_property_initialization' => true, diff --git a/.travis.yml b/.travis.yml index 659e554..13445f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ language: php php: - - 5.6 - - 7.0 - 7.1 - 7.2 - 7.3 + - 7.4 - nightly matrix: diff --git a/README.md b/README.md index d456c87..7cfd5b9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ echo $xbbcode->getHtml(); ``` ### Requirements: - - PHP >= 5.6 + - PHP >= 7.1.3 ### Installation: diff --git a/composer.json b/composer.json index ee60361..32348be 100644 --- a/composer.json +++ b/composer.json @@ -5,12 +5,12 @@ "keywords": ["xbbcode","bbcode"], "license": "GPL-2.0-or-later", "require": { - "php": ">=5.6", + "php": "^7.1.3", "geshi/geshi": "^1.0.9" }, "require-dev": { - "phpunit/phpunit": "^5.7", - "friendsofphp/php-cs-fixer": "^2.15" + "phpunit/phpunit": "^7.5", + "friendsofphp/php-cs-fixer": "^2.16" }, "homepage": "http://xbb.uz", "support": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 186a8f0..ef0ab44 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,8 +1,7 @@ diff --git a/tests/Tag/ATest.php b/tests/Tag/ATest.php index 805a1c1..31a5eaf 100644 --- a/tests/Tag/ATest.php +++ b/tests/Tag/ATest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class ATest extends \PHPUnit_Framework_TestCase +class ATest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/AbbrTest.php b/tests/Tag/AbbrTest.php index 17d38e0..8c24973 100644 --- a/tests/Tag/AbbrTest.php +++ b/tests/Tag/AbbrTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class AbbrTest extends \PHPUnit_Framework_TestCase +class AbbrTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/AcronymTest.php b/tests/Tag/AcronymTest.php index 0f9eb7e..3741413 100644 --- a/tests/Tag/AcronymTest.php +++ b/tests/Tag/AcronymTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class AcronymTest extends \PHPUnit_Framework_TestCase +class AcronymTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/AddressTest.php b/tests/Tag/AddressTest.php index 6d7ac17..d5a712d 100644 --- a/tests/Tag/AddressTest.php +++ b/tests/Tag/AddressTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class AddressTest extends \PHPUnit_Framework_TestCase +class AddressTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/AlignTest.php b/tests/Tag/AlignTest.php index b40d9c0..4159436 100644 --- a/tests/Tag/AlignTest.php +++ b/tests/Tag/AlignTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class AlignTest extends \PHPUnit_Framework_TestCase +class AlignTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/AltfontTest.php b/tests/Tag/AltfontTest.php index eb7a8b8..2d7b38d 100644 --- a/tests/Tag/AltfontTest.php +++ b/tests/Tag/AltfontTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class AltfontTest extends \PHPUnit_Framework_TestCase +class AltfontTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/BbcodeTest.php b/tests/Tag/BbcodeTest.php index 19a6d6a..988330c 100644 --- a/tests/Tag/BbcodeTest.php +++ b/tests/Tag/BbcodeTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class BbcodeTest extends \PHPUnit_Framework_TestCase +class BbcodeTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/BdoTest.php b/tests/Tag/BdoTest.php index 840c8ef..4624fe1 100644 --- a/tests/Tag/BdoTest.php +++ b/tests/Tag/BdoTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class BdoTest extends \PHPUnit_Framework_TestCase +class BdoTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/BrTest.php b/tests/Tag/BrTest.php index eca2059..dce007a 100644 --- a/tests/Tag/BrTest.php +++ b/tests/Tag/BrTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class BrTest extends \PHPUnit_Framework_TestCase +class BrTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/CaptionTest.php b/tests/Tag/CaptionTest.php index 8eb62eb..256efc4 100644 --- a/tests/Tag/CaptionTest.php +++ b/tests/Tag/CaptionTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class CaptionTest extends \PHPUnit_Framework_TestCase +class CaptionTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/CodeTest.php b/tests/Tag/CodeTest.php index c0c761d..c5ba4f7 100644 --- a/tests/Tag/CodeTest.php +++ b/tests/Tag/CodeTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class CodeTest extends \PHPUnit_Framework_TestCase +class CodeTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/ColorTest.php b/tests/Tag/ColorTest.php index d4bd620..3f511ab 100644 --- a/tests/Tag/ColorTest.php +++ b/tests/Tag/ColorTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class ColorTest extends \PHPUnit_Framework_TestCase +class ColorTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/EmailTest.php b/tests/Tag/EmailTest.php index c361dfa..5fc1275 100644 --- a/tests/Tag/EmailTest.php +++ b/tests/Tag/EmailTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class EmailTest extends \PHPUnit_Framework_TestCase +class EmailTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/FontTest.php b/tests/Tag/FontTest.php index 355bd2a..d394117 100644 --- a/tests/Tag/FontTest.php +++ b/tests/Tag/FontTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class FontTest extends \PHPUnit_Framework_TestCase +class FontTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/GoogleTest.php b/tests/Tag/GoogleTest.php index e384bf4..f191be7 100644 --- a/tests/Tag/GoogleTest.php +++ b/tests/Tag/GoogleTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class GoogleTest extends \PHPUnit_Framework_TestCase +class GoogleTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/HrTest.php b/tests/Tag/HrTest.php index d94d2ea..32d9de2 100644 --- a/tests/Tag/HrTest.php +++ b/tests/Tag/HrTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class HrTest extends \PHPUnit_Framework_TestCase +class HrTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/ImgTest.php b/tests/Tag/ImgTest.php index c93077a..50e11e6 100644 --- a/tests/Tag/ImgTest.php +++ b/tests/Tag/ImgTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class ImgTest extends \PHPUnit_Framework_TestCase +class ImgTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/LiTest.php b/tests/Tag/LiTest.php index c1e2dbd..4ae0155 100644 --- a/tests/Tag/LiTest.php +++ b/tests/Tag/LiTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class LiTest extends \PHPUnit_Framework_TestCase +class LiTest extends \PHPUnit\Framework\TestCase { public function testTagWithUl() { diff --git a/tests/Tag/NobbTest.php b/tests/Tag/NobbTest.php index 5c3fc8a..8a89d57 100644 --- a/tests/Tag/NobbTest.php +++ b/tests/Tag/NobbTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class NobbTest extends \PHPUnit_Framework_TestCase +class NobbTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/OlTest.php b/tests/Tag/OlTest.php index c7d4f8d..446138c 100644 --- a/tests/Tag/OlTest.php +++ b/tests/Tag/OlTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class OlTest extends \PHPUnit_Framework_TestCase +class OlTest extends \PHPUnit\Framework\TestCase { public function testTagWithoutLi() { diff --git a/tests/Tag/PTest.php b/tests/Tag/PTest.php index 2870725..18dbf46 100644 --- a/tests/Tag/PTest.php +++ b/tests/Tag/PTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class PTest extends \PHPUnit_Framework_TestCase +class PTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/QuoteTest.php b/tests/Tag/QuoteTest.php index bc8a8c2..a72dc35 100644 --- a/tests/Tag/QuoteTest.php +++ b/tests/Tag/QuoteTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class QuoteTest extends \PHPUnit_Framework_TestCase +class QuoteTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/SimpleTest.php b/tests/Tag/SimpleTest.php index 4adeb7a..9690c09 100644 --- a/tests/Tag/SimpleTest.php +++ b/tests/Tag/SimpleTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class SimpleTest extends \PHPUnit_Framework_TestCase +class SimpleTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/TableTest.php b/tests/Tag/TableTest.php index 9484f21..187b5c4 100644 --- a/tests/Tag/TableTest.php +++ b/tests/Tag/TableTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class TableTest extends \PHPUnit_Framework_TestCase +class TableTest extends \PHPUnit\Framework\TestCase { public function testTagWithoutTableCells() { diff --git a/tests/Tag/TdTest.php b/tests/Tag/TdTest.php index 29add58..ab7cb09 100644 --- a/tests/Tag/TdTest.php +++ b/tests/Tag/TdTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class TdTest extends \PHPUnit_Framework_TestCase +class TdTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/ThTest.php b/tests/Tag/ThTest.php index ec46598..b6c049c 100644 --- a/tests/Tag/ThTest.php +++ b/tests/Tag/ThTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class ThTest extends \PHPUnit_Framework_TestCase +class ThTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/TrTest.php b/tests/Tag/TrTest.php index d6d2fd0..7aa8db2 100644 --- a/tests/Tag/TrTest.php +++ b/tests/Tag/TrTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class TrTest extends \PHPUnit_Framework_TestCase +class TrTest extends \PHPUnit\Framework\TestCase { public function testTagWithoutTdCell() { diff --git a/tests/Tag/UlTest.php b/tests/Tag/UlTest.php index 29c34b1..f4c3739 100644 --- a/tests/Tag/UlTest.php +++ b/tests/Tag/UlTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class UlTest extends \PHPUnit_Framework_TestCase +class UlTest extends \PHPUnit\Framework\TestCase { public function testTagWithoutLi() { diff --git a/tests/Tag/YandexTest.php b/tests/Tag/YandexTest.php index d81a2c2..d2ea241 100644 --- a/tests/Tag/YandexTest.php +++ b/tests/Tag/YandexTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class YandexTest extends \PHPUnit_Framework_TestCase +class YandexTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/Tag/YoutubeTest.php b/tests/Tag/YoutubeTest.php index 487f065..d11e4e4 100644 --- a/tests/Tag/YoutubeTest.php +++ b/tests/Tag/YoutubeTest.php @@ -3,7 +3,7 @@ use Xbbcode\Xbbcode; -class YoutubeTest extends \PHPUnit_Framework_TestCase +class YoutubeTest extends \PHPUnit\Framework\TestCase { public function testTag() { diff --git a/tests/XbbcodeTest.php b/tests/XbbcodeTest.php index fbec464..9692d09 100644 --- a/tests/XbbcodeTest.php +++ b/tests/XbbcodeTest.php @@ -1,9 +1,10 @@