build: min php version is 8.0.2

Gemorroj · Jul 3, 2023 · 0f75e38 · 0f75e38
1 parent 885a076
commit 0f75e38
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,15 +10,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - operating-system: 'ubuntu-latest'
-            php-version: '7.4'
-            job-description: 'Ubuntu; PHP 7.4; latest-deps'
-
-          - operating-system: 'ubuntu-latest'
-            php-version: '7.4'
-            composer-flags: '--prefer-lowest'
-            job-description: 'Ubuntu; PHP 7.4; lowest-deps'
-
           - operating-system: 'ubuntu-latest'
             php-version: '8.0'
             job-description: 'Ubuntu; PHP 8.0; latest-deps'

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -7,7 +7,7 @@
 return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
-        '@PHP74Migration' => true,
+        '@PHP80Migration' => true,
 
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 ### Requirements:
 
-- PHP >= 7.4
+- PHP >= 8.0.2
 
 
 ### Installation:

diff --git a/composer.json b/composer.json
@@ -10,10 +10,10 @@
         }
     ],
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/phpstan": "^1.0"
     },

diff --git a/src/M3uParser.php b/src/M3uParser.php
@@ -99,7 +99,7 @@ protected function parseLine(int &$lineNumber, array $linesStr): M3uEntry
 
     protected function removeBom(string &$str): void
     {
-        if (0 === \strpos($str, "\xEF\xBB\xBF")) {
+        if (\str_starts_with($str, "\xEF\xBB\xBF")) {
             $str = \substr($str, 3);
         }
     }

diff --git a/src/Tag/ExtInf.php b/src/Tag/ExtInf.php
@@ -14,7 +14,7 @@ class ExtInf implements ExtTagInterface
     /**
      * #EXTINF:-1 tvg-name=Первый_HD tvg-logo="Первый канал" deinterlace=4 group-title="Эфирные каналы",Первый канал HD.
      */
-    public function __construct(?string $lineStr = null)
+    public function __construct(string $lineStr = null)
     {
         if (null !== $lineStr) {
             $this->make($lineStr);

diff --git a/src/Tag/ExtLogo.php b/src/Tag/ExtLogo.php
@@ -12,7 +12,7 @@ class ExtLogo implements ExtTagInterface
     /**
      * #EXTLOGO:http://cdn1.siol.tv/logo/93x78/slo2.png.
      */
-    public function __construct(?string $lineStr = null)
+    public function __construct(string $lineStr = null)
     {
         if (null !== $lineStr) {
             $this->makeData($lineStr);

diff --git a/src/Tag/ExtTagInterface.php b/src/Tag/ExtTagInterface.php
@@ -2,11 +2,9 @@
 
 namespace M3uParser\Tag;
 
-interface ExtTagInterface
+interface ExtTagInterface extends \Stringable
 {
-    public function __construct(?string $lineStr = null);
-
-    public function __toString(): string;
+    public function __construct(string $lineStr = null);
 
     public static function isMatch(string $lineStr): bool;
 }
diff --git a/src/Tag/ExtTv.php b/src/Tag/ExtTv.php
@@ -18,7 +18,7 @@ class ExtTv implements ExtTagInterface
     /**
      * #EXTTV:nacionalni,hd;slovenski;SLO1;http://cdn1.siol.tv/logo/93x78/slo2.png.
      */
-    public function __construct(?string $lineStr = null)
+    public function __construct(string $lineStr = null)
     {
         if (null !== $lineStr) {
             $this->makeData($lineStr);

diff --git a/tests/ExtCustomTag.php b/tests/ExtCustomTag.php
@@ -16,7 +16,7 @@ class ExtCustomTag implements ExtTagInterface
     /**
      * #EXTCUSTOMTAG:data.
      */
-    public function __construct(?string $lineStr = null)
+    public function __construct(string $lineStr = null)
     {
         if (null !== $lineStr) {
             $this->makeData($lineStr);