Merge pull request #1 from jesseschutt/main

Updates to php 8.1
HollyIT · Mar 2, 2023 · 884f65a · 884f65a
2 parents deacd66 + 637e890
commit 884f65a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .php_cs
 .php_cs.cache
+.phpunit.cache
 .phpunit.result.cache
 build
 composer.lock

diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "phpunit/phpunit": "^9.5"
+        "php": "^8.1",
+        "phpunit/phpunit": "^10.0"
     },
     "require-dev": {
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="HollyIT Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="HollyIT Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
 </phpunit>
diff --git a/src/TokenReplacer.php b/src/TokenReplacer.php
@@ -307,7 +307,7 @@ protected function doTransformations($open, $close, callable $callback)
                 if (str_contains($matches[1][$key], ':')) {
                     list($token, $args) = explode(':', $matches[1][$key], 2);
                 }
-                $results = $this->doTransformation(trim($token), trim($args));
+                $results = $this->doTransformation(trim($token), trim($args ?? ''));
 
                 // Let our callback to any alterations if set.
                 if (is_callable($this->replaceCallback)) {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -4,7 +4,7 @@
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-    public function test()
+    protected function setUp(): void
     {
         \HollyIT\TokenReplace\TokenReplacer::$defaultTransformers = [
             'date' => \HollyIT\TokenReplace\Transformers\DateTransformer::class,

diff --git a/tests/Transformers/ArrayTransformerTest.php b/tests/Transformers/ArrayTransformerTest.php
@@ -8,7 +8,7 @@
 
 class ArrayTransformerTest extends TestCase
 {
-    /** @test * */
+    /** @test **/
     public function it_extracts_items_from_an_array()
     {
         $str = 'The quick brown {{animal:jumper}} jumped over the lazy {{animal:target}}';
@@ -21,7 +21,7 @@ public function it_extracts_items_from_an_array()
         $this->assertEquals('The quick brown fox jumped over the lazy dog', $transformer->transform());
     }
 
-    /** @test * */
+    /** @test **/
     public function it_removes_missing_array_values()
     {
         $str = 'The quick brown {{animal:jumper}} jumped over the lazy {{animal:target}}';

diff --git a/tests/Transformers/ClosureTransformerTest.php b/tests/Transformers/ClosureTransformerTest.php
@@ -6,7 +6,7 @@
 
 class ClosureTransformerTest extends TestCase
 {
-    /** @test * */
+    /** @test **/
     public function it_transforms_via_closures()
     {
         $transformer = new \HollyIT\TokenReplace\TokenReplacer('with {{ test1:options }} and without {{ test2 }}');

diff --git a/tests/Transformers/DateTransformerTest.php b/tests/Transformers/DateTransformerTest.php
@@ -8,7 +8,7 @@
 
 class DateTransformerTest extends TestCase
 {
-    /** @test */
+    /** @test **/
     public function it_transforms_a_date()
     {
         $transformer = new \HollyIT\TokenReplace\TokenReplacer('replace a {{ date:m }}/{{ date:d }}/{{ date:y }} date token');
@@ -20,7 +20,7 @@ public function it_transforms_a_date()
             ]) . ' date token', (string) $transformer);
     }
 
-    /** @test * */
+    /** @test **/
     public function it_requires_a_format_option()
     {
         $transformer = new \HollyIT\TokenReplace\TokenReplacer('{{ date }}');

diff --git a/tests/Transformers/FileTransformerTest.php b/tests/Transformers/FileTransformerTest.php
@@ -8,7 +8,7 @@
 
 class FileTransformerTest extends TestCase
 {
-    /** @test * */
+    /** @test **/
     public function is_extract_from_a_file_path()
     {
         $path = '/home/me/test.txt';

diff --git a/tests/Transformers/ObjectTransformerTest.php b/tests/Transformers/ObjectTransformerTest.php
@@ -8,7 +8,7 @@
 
 class ObjectTransformerTest extends TestCase
 {
-    /** @test * */
+    /** @test **/
     public function it_extracts_items_from_an_array()
     {
         $str = 'The quick brown {{animal:jumper}} jumped over the lazy {{animal:target}}';

diff --git a/tests/Transformers/UrlTransformerTest.php b/tests/Transformers/UrlTransformerTest.php
@@ -8,7 +8,7 @@
 
 class UrlTransformerTest extends TestCase
 {
-    /** @test * */
+    /** @test **/
     public function is_extract_from_a_file_path()
     {
         $url = 'https://example.com/index.html';