Bumping PHP min. requirement to 8.2

ericsizemore · Jan 12, 2024 · c71b894 · c71b894
1 parent 9ebd203
commit c71b894
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.1', '8.2', '8.3' ]
+        php: [ '8.2', '8.3' ]
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.2', '8.3', '8.4' ]
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/composer.json b/composer.json
@@ -17,15 +17,15 @@
         "security": "https://github.com/ericsizemore/simple_tpl/security/policy"
     },
     "require": {
-        "php": "^8.1 <8.5"
+        "php": "^8.2 <8.5"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.45",
-        "phpstan/phpstan": "^1.11",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-strict-rules": "^1.6",
-        "phpunit/phpunit": "^10.5",
-        "rector/rector": "^0.19"
+        "friendsofphp/php-cs-fixer": ">=3.45",
+        "phpstan/phpstan": ">=1.11",
+        "phpstan/phpstan-phpunit": ">=1.4",
+        "phpstan/phpstan-strict-rules": ">=1.6",
+        "phpunit/phpunit": ">=10.5",
+        "rector/rector": "dev-main"
     },
     "minimum-stability": "dev",
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -16,7 +16,6 @@
         __DIR__ . '/tests/src',
     ]);
 
-    $rectorConfig->phpVersion(PhpVersion::PHP_81);
     $rectorConfig->phpVersion(PhpVersion::PHP_82);
     $rectorConfig->phpVersion(PhpVersion::PHP_83);
     //$rectorConfig->importNames();
@@ -29,7 +28,7 @@
         SetList::NAMING,
         SetList::PRIVATIZATION,
         SetList::EARLY_RETURN,
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_82,
         PHPUnitSetList::PHPUNIT_100,
     ]);
     $rectorConfig->skip([LocallyCalledStaticMethodToNonStaticRector::class]);

diff --git a/tests/src/TemplateTest.php b/tests/src/TemplateTest.php
@@ -37,11 +37,13 @@
 #[CoversClass(Template::class)]
 final class TemplateTest extends TestCase
 {
-    protected static string $testDir;
+    private static string $testDir;
+
     /**
      * @var array<string>
      */
-    protected static array $testFiles;
+    private static array $testFiles;
+
     public static function setUpBeforeClass(): void
     {
         self::$testDir = __DIR__ . \DIRECTORY_SEPARATOR . 'dir1';
@@ -62,16 +64,18 @@ public static function setUpBeforeClass(): void
             \touch(self::$testFiles['file2']);
         }
     }
+
     public static function tearDownAfterClass(): void
     {
         \unlink(self::$testFiles['file1']);
         \unlink(self::$testFiles['file2']);
-        \usleep(90000);
+        \usleep(100000);
         \rmdir(self::$testDir);
 
         self::$testDir = '';
         self::$testFiles = [];
     }
+
     /**
      * Test setLeftDelimiter()
      */
@@ -85,6 +89,7 @@ public function testSetLeftDelimiter(): void
         $template->setLeftDelimiter('{');
         self::assertEquals('{', $template->getLeftDelimiter());
     }
+
     /**
      * Test setRightDelimiter()
      */
@@ -98,6 +103,7 @@ public function testSetRightDelimiter(): void
         $template->setRightDelimiter('}');
         self::assertEquals('}', $template->getRightDelimiter());
     }
+
     /**
      * Test assign() and toArray()
      */
@@ -115,6 +121,7 @@ public function testAssign(): void
             'content' => 'This is a test of the Simple Template Engine class by Eric Sizemore.'
         ], $template->toArray());
     }
+
     /**
      * Test display()
      */
@@ -168,6 +175,7 @@ public function testDisplay(): void
 html_WRAP
             , $data);
     }
+
     /**
      * Test parse() with non-existent file
      */
@@ -180,6 +188,7 @@ public function testParseInvalidFile(): void
 
         $template->parse('/this/should/not/exist.tpl');
     }
+
     /**
      * Test parse() with empty file
      */
@@ -194,6 +203,7 @@ public function testParseEmptyFile(): void
 
         $template->parse(self::$testFiles['file2']);
     }
+
     /**
      * Test parse()
      */