Merge pull request #4 from trickeyone/php81

mrdan · web-flow · commit 80b04a89c122 · 2023-06-06T10:16:37.000+01:00
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     ],
     "type": "library",
     "require": {
-        "php": ">=7.4"
+        "php": "~8.1"
     },
     "require-dev": {
         "mockery/mockery": "^1.3",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    bootstrap="vendor/autoload.php"
->
-    <testsuites>
-        <testsuite name="Delimiters">
-            <directory suffix=".php">tests/Delimiters</directory>
-        </testsuite>
-        <testsuite name="Diff">
-            <directory suffix=".php">tests/Diff</directory>
-        </testsuite>
-        <testsuite name="Granularity">
-            <directory suffix=".php">tests/Granularity</directory>
-        </testsuite>
-        <testsuite name="Parser">
-            <directory suffix=".php">tests/Parser</directory>
-        </testsuite>
-        <testsuite name="Render">
-            <directory suffix=".php">tests/Render</directory>
-        </testsuite>
-        <testsuite name="Usage">
-            <directory suffix=".php">tests/Usage</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix=".php">PEAR_INSTALL_DIR</directory>
-                <directory suffix=".php">PHP_LIBDIR</directory>
-                <directory suffix=".php">vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">PEAR_INSTALL_DIR</directory>
+      <directory suffix=".php">PHP_LIBDIR</directory>
+      <directory suffix=".php">vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Delimiters">
+      <directory suffix=".php">tests/Delimiters</directory>
+    </testsuite>
+    <testsuite name="Diff">
+      <directory suffix=".php">tests/Diff</directory>
+    </testsuite>
+    <testsuite name="Granularity">
+      <directory suffix=".php">tests/Granularity</directory>
+    </testsuite>
+    <testsuite name="Parser">
+      <directory suffix=".php">tests/Parser</directory>
+    </testsuite>
+    <testsuite name="Render">
+      <directory suffix=".php">tests/Render</directory>
+    </testsuite>
+    <testsuite name="Usage">
+      <directory suffix=".php">tests/Usage</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Granularity/Granularity.php b/src/Granularity/Granularity.php
@@ -7,23 +7,23 @@ trait Granularity
     /**
      * @inheritdoc
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->delimiters[$offset]);
     }
 
     /**
      * @inheritdoc
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
-        return isset($this->delimiters[$offset]) ? $this->delimiters[$offset] : null;
+        return $this->delimiters[$offset] ?? null;
     }
 
     /**
      * @inheritdoc
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if ($offset === null) {
             $this->delimiters[] = $value;
@@ -35,7 +35,7 @@ public function offsetSet($offset, $value)
     /**
      * @inheritdoc
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->delimiters[$offset]);
     }
@@ -45,7 +45,7 @@ public function offsetUnset($offset)
      *
      * @return int
      */
-    public function count()
+    public function count(): int
     {
         return count($this->delimiters);
     }

Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,23 @@ trait Granularity`
`7`	`7`	`/**`
`8`	`8`	`* @inheritdoc`
`9`	`9`	`*/`
`10`		`- public function offsetExists($offset)`
	`10`	`+ public function offsetExists(mixed $offset): bool`
`11`	`11`	`{`
`12`	`12`	`return isset($this->delimiters[$offset]);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* @inheritdoc`
`17`	`17`	`*/`
`18`		`- public function offsetGet($offset)`
	`18`	`+ public function offsetGet(mixed $offset): mixed`
`19`	`19`	`{`
`20`		`- return isset($this->delimiters[$offset]) ? $this->delimiters[$offset] : null;`
	`20`	`+ return $this->delimiters[$offset] ?? null;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* @inheritdoc`
`25`	`25`	`*/`
`26`		`- public function offsetSet($offset, $value)`
	`26`	`+ public function offsetSet(mixed $offset, mixed $value): void`
`27`	`27`	`{`
`28`	`28`	`if ($offset === null) {`
`29`	`29`	`$this->delimiters[] = $value;`
`@@ -35,7 +35,7 @@ public function offsetSet($offset, $value)`
`35`	`35`	`/**`
`36`	`36`	`* @inheritdoc`
`37`	`37`	`*/`
`38`		`- public function offsetUnset($offset)`
	`38`	`+ public function offsetUnset(mixed $offset): void`
`39`	`39`	`{`
`40`	`40`	`unset($this->delimiters[$offset]);`
`41`	`41`	`}`
`@@ -45,7 +45,7 @@ public function offsetUnset($offset)`
`45`	`45`	`*`
`46`	`46`	`* @return int`
`47`	`47`	`*/`
`48`		`- public function count()`
	`48`	`+ public function count(): int`
`49`	`49`	`{`
`50`	`50`	`return count($this->delimiters);`
`51`	`51`	`}`