From 95ecbfd7a6ff7beea0e6a0209cde7170126625af Mon Sep 17 00:00:00 2001 From: jake johns Date: Sun, 17 Sep 2023 15:27:13 -0400 Subject: [PATCH 1/3] Support psr/log 1|2|3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a4debd9..ea7c51b 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "php": ">=7.1.0", "atlas/info": "~1.0", "atlas/mapper": "~1.0", - "psr/log": "~1.0" + "psr/log": "^1.0 || ^2.0 || ^3.0" }, "autoload": { "psr-4": { From 75d39ea7a71a69c12c602e60a4dd4d66ace0cfef Mon Sep 17 00:00:00 2001 From: jake johns Date: Sun, 17 Sep 2023 15:30:41 -0400 Subject: [PATCH 2/3] Support phpunit 10,11,12 & php8 --- .gitignore | 1 + composer.json | 4 ++-- phpunit.xml.dist | 23 ++++++++++++----------- tests/FsioTest.php | 2 +- tests/SkeletonTest.php | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 448000e..7d33546 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /composer.lock /vendor +.phpunit.cache diff --git a/composer.json b/composer.json index ea7c51b..5d9168f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": ">=7.1.0", + "php": ">=8.1.0", "atlas/info": "~1.0", "atlas/mapper": "~1.0", "psr/log": "^1.0 || ^2.0 || ^3.0" @@ -23,7 +23,7 @@ } }, "require-dev": { - "phpunit/phpunit": "~7.0", + "phpunit/phpunit": "~10.0 || ~11.0 || ~12.0", "pds/skeleton": "~1.0" }, "autoload-dev": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 33cc89b..a4b7f42 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,12 +1,13 @@ - - - - tests/ - - - - - ./src - - + + + + + tests/ + + + + + ./src + + diff --git a/tests/FsioTest.php b/tests/FsioTest.php index 07bc925..830150a 100644 --- a/tests/FsioTest.php +++ b/tests/FsioTest.php @@ -6,7 +6,7 @@ class FsioTest extends \PHPUnit\Framework\TestCase protected $fsio; protected $base; - protected function setUp() + protected function setUp() : void { $this->fsio = new Fsio(); $this->base = __DIR__ . DIRECTORY_SEPARATOR . 'tmp'; diff --git a/tests/SkeletonTest.php b/tests/SkeletonTest.php index deea47b..bf9f1e2 100644 --- a/tests/SkeletonTest.php +++ b/tests/SkeletonTest.php @@ -12,7 +12,7 @@ class SkeletonTest extends \PHPUnit\Framework\TestCase protected $stdout; protected $factory; - protected function setUp() + protected function setUp() : void { $this->fsio = $this->newFsio(); $this->stdout = fopen('php://memory', 'w+'); From b24153ae36c73e899e429f57c10a2fca35794853 Mon Sep 17 00:00:00 2001 From: jake johns Date: Sun, 17 Sep 2023 15:31:38 -0400 Subject: [PATCH 3/3] Don't dynamically create property --- src/Skeleton.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Skeleton.php b/src/Skeleton.php index e1d86bc..1ed44a5 100644 --- a/src/Skeleton.php +++ b/src/Skeleton.php @@ -30,6 +30,7 @@ class Skeleton protected $templates = []; protected $namespace; protected $types = []; + protected $transform; public function __construct(Config $config, Fsio $fsio, Logger $logger) {