drop support for PHP < 7.4

mhujer · Dec 31, 2020 · 7a5182f · 7a5182f
1 parent 06afda8
commit 7a5182f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /build
 /composer.lock
 /vendor
+/.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,11 @@
 language: php
 
 php:
-  - 7.2
-  - 7.3
+  - 7.4
 
 env:
+  global:
+    - XDEBUG_MODE=coverage
   matrix:
     - PREFER_LOWEST="--prefer-lowest --prefer-stable"
     - PREFER_LOWEST=""

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ class User
 
 Requirements
 ------------
-Works with PHP 7.2 or higher.
+Works with PHP 7.4 or higher.
 
 Submitting bugs and feature requests
 ------------------------------------

diff --git a/composer.json b/composer.json
@@ -12,21 +12,20 @@
 	"authors": [
 		{
 			"name": "Martin Hujer",
-			"email": "[email protected]",
+			"email": "[email protected]",
 			"homepage": "https://www.martinhujer.cz"
 		}
 	],
 	"require": {
-		"php": "~7.2",
+		"php": "~7.4",
 		"jms/serializer": "~2.0|~3.0",
 		"ramsey/uuid": "~3.0|~4.0"
 	},
 	"require-dev": {
-		"consistence/coding-standard": "3.5",
-		"jakub-onderka/php-parallel-lint": "1.0.0",
-		"php-coveralls/php-coveralls": "2.1.0",
-		"phpunit/phpunit": "7.4.4",
-		"squizlabs/php_codesniffer": "3.3.2"
+		"consistence/coding-standard": "3.10.1",
+		"php-parallel-lint/php-parallel-lint": "1.2.0",
+		"php-coveralls/php-coveralls": "2.4.1",
+		"phpunit/phpunit": "9.5.0"
 	},
 	"autoload": {
 		"psr-4": { "Mhujer\\JmsSerializer\\": [ "src" ] },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -17,13 +17,12 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">src/Uuid/</directory>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+        </include>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/src/Uuid/exceptions/DeserializationInvalidValueException.php b/src/Uuid/exceptions/DeserializationInvalidValueException.php
@@ -9,8 +9,7 @@ class DeserializationInvalidValueException
 	implements \Mhujer\JmsSerializer\Uuid\Exception
 {
 
-	/** @var string */
-	private $fieldPath;
+	private string $fieldPath;
 
 	public function __construct(string $fieldPath, \Throwable $exception)
 	{

diff --git a/src/Uuid/exceptions/InvalidUuidException.php b/src/Uuid/exceptions/InvalidUuidException.php
@@ -9,8 +9,7 @@ class InvalidUuidException
 	implements \Mhujer\JmsSerializer\Uuid\Exception
 {
 
-	/** @var string */
-	private $invalidUuid;
+	private string $invalidUuid;
 
 	public function __construct(string $invalidUuid, ?\Throwable $exception = null)
 	{

diff --git a/tests/Uuid/data/User.php b/tests/Uuid/data/User.php
@@ -5,14 +5,12 @@
 namespace Mhujer\JmsSerializer\Uuid;
 
 use JMS\Serializer\Annotation as JMS;
+use Ramsey\Uuid\UuidInterface;
 
 class User
 {
 
-	/**
-	 * @JMS\Type("uuid")
-	 * @var \Ramsey\Uuid\UuidInterface
-	 */
-	public $id;
+	/** @JMS\Type("uuid") */
+	public UuidInterface $id;
 
 }