Merge pull request #47 from fire015/php8-update

Update tests for PHP 8

.gitignore

@@ -1,5 +1,4 @@
 /vendor
-/docs
-/build
 composer.lock
-.idea
+.idea
+.phpunit.result.cache

.travis.yml

@@ -2,13 +2,11 @@ language: php
 sudo: false
 
 php:
-  - 7.0
-  - 7.1
-  - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 install:
-  - travis_retry composer install --no-interaction --prefer-dist --no-suggest
+  - travis_retry composer install --no-interaction --prefer-dist
 
 script: vendor/bin/phpunit

CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+### 19/01/2021 - 2.3
+* Bump minimum PHP version to 7.3
+* Update PHPUnit to version 9 (ensure Flintstone is compatible with PHP 8)
+
 ### 12/03/2019 - 2.2
 * Bump minimum PHP version to 7.0
 * Update PHPUnit to version 6

README.md

@@ -2,7 +2,7 @@ Flintstone
 ==========
 
 [![Total Downloads](https://img.shields.io/packagist/dm/fire015/flintstone.svg)](https://packagist.org/packages/fire015/flintstone)
-[![Build Status](https://travis-ci.org/fire015/flintstone.svg?branch=master)](https://travis-ci.org/fire015/flintstone)
+[![Build Status](https://travis-ci.com/fire015/flintstone.svg?branch=master)](https://travis-ci.com/github/fire015/flintstone)
 
 A key/value database store using flat files for PHP.
 
@@ -33,7 +33,7 @@ $users = new Flintstone('users', ['dir' => '/path/to/database/dir/']);
 
 ### Requirements
 
-- PHP 7.0+
+- PHP 7.3+
 
 ### Data types
 

composer.json

@@ -12,14 +12,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0"
+        "php": ">=7.3"
     },
     "autoload": {
         "psr-4": {
             "Flintstone\\": "src/"
         }
     },
     "require-dev" : {
-        "phpunit/phpunit": "^6"
+        "phpunit/phpunit": "^9"
     }
 }

phpunit.xml.dist

@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-		 backupStaticAttributes="false"
-		 bootstrap="vendor/autoload.php"
-		 colors="true"
-		 convertErrorsToExceptions="true"
-		 convertNoticesToExceptions="true"
-		 convertWarningsToExceptions="true"
-		 processIsolation="false"
-		 stopOnFailure="false"
-		 verbose="true"
-		 >
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./src</directory>
-		</whitelist>
-	</filter>
-
-	<testsuites>
-		<testsuite name="Flintstone Test Suite">
-			<directory>./tests</directory>
-		</testsuite>
-	 </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Flintstone Test Suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Flintstone.php

@@ -9,7 +9,7 @@ class Flintstone
      *
      * @var string
      */
-    const VERSION = '2.2';
+    const VERSION = '2.3';
 
     /**
      * Database class.

tests/Cache/ArrayCacheTest.php

@@ -9,7 +9,7 @@ class ArrayCacheTest extends \PHPUnit\Framework\TestCase
      */
     private $cache;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cache = new ArrayCache();
     }

tests/ConfigTest.php

@@ -55,30 +55,30 @@ public function setValidFormatter()
 
     /**
      * @test
-     * @expectedException Flintstone\Exception
      */
     public function setInvalidFormatter()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $config = new Config();
         $config->setFormatter(new self());
     }
 
     /**
      * @test
-     * @expectedException Flintstone\Exception
      */
     public function invalidDirSet()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $config = new Config();
         $config->setDir('/x/y/z/foo');
     }
 
     /**
      * @test
-     * @expectedException Flintstone\Exception
      */
     public function invalidCacheSet()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $config = new Config();
         $config->setCache(new self());
     }

tests/DatabaseTest.php

@@ -11,7 +11,7 @@ class DatabaseTest extends \PHPUnit\Framework\TestCase
      */
     private $db;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $config = new Config([
             'dir' => __DIR__,
@@ -20,7 +20,7 @@ protected function setUp()
         $this->db = new Database('test', $config);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (is_file($this->db->getPath())) {
             unlink($this->db->getPath());
@@ -29,11 +29,10 @@ protected function tearDown()
 
     /**
      * @test
-     * @expectedException Flintstone\Exception
-     * @expectedExceptionMessage Invalid characters in database name
      */
     public function databaseHasInvalidName()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $config = new Config();
         new Database('test!123', $config);
     }

tests/FlintstoneTest.php

@@ -20,11 +20,10 @@ public function testGetDatabaseAndConfig()
 
     /**
      * @test
-     * @expectedException \Flintstone\Exception
-     * @expectedExceptionMessage Invalid characters in key
      */
     public function keyHasInvalidName()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $db = new Flintstone('test', []);
         $db->get('test!123');
     }

tests/Formatter/JsonFormatterTest.php

@@ -9,7 +9,7 @@ class JsonFormatterTest extends \PHPUnit\Framework\TestCase
      */
     private $formatter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->formatter = new JsonFormatter();
     }
@@ -45,19 +45,19 @@ public function decodesAnObject()
 
     /**
      * @test
-     * @expectedException \Flintstone\Exception
      */
     public function encodingInvalidDataThrowsException()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $this->formatter->encode(chr(241));
     }
 
     /**
      * @test
-     * @expectedException \Flintstone\Exception
      */
     public function decodingInvalidDataThrowsException()
     {
+        $this->expectException(\Flintstone\Exception::class);
         $this->formatter->decode('{');
     }
 

tests/Formatter/SerializeFormatterTest.php

@@ -9,7 +9,7 @@ class SerializeFormatterTest extends \PHPUnit\Framework\TestCase
      */
     private $formatter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->formatter = new SerializeFormatter();
     }

tests/LineTest.php

@@ -9,7 +9,7 @@ class LineTest extends \PHPUnit\Framework\TestCase
      */
     private $line;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->line = new Line('foo=bar');
     }

tests/ValidationTest.php

@@ -6,21 +6,19 @@ class ValidationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @test
-     * @expectedException Flintstone\Exception
-     * @expectedExceptionMessage Invalid characters in key
      */
     public function validateKey()
     {
+        $this->expectException(\Flintstone\Exception::class);
         Validation::validateKey('test!123');
     }
 
     /**
      * @test
-     * @expectedException Flintstone\Exception
-     * @expectedExceptionMessage Invalid characters in database name
      */
     public function validateDatabaseName()
     {
+        $this->expectException(\Flintstone\Exception::class);
         Validation::validateDatabaseName('test!123');
     }
 }