Merge pull request #2 from adevade/add-support-for-php8

Add support for PHP 8.0

Author: adevade

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ["7.2", "7.3", "7.4"]
+        php-version: ["7.2", "7.3", "7.4", "8.0"]
 
     steps:
       - name: Checkout

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## 2.1.0 - 2021-04-16
+
+### Added
+
+- Support PHP 8.0.
+
+### Changed
+
+- Exception messages use correct variable names.
+
 ## 2.0.0 - 2020-04-17
 
 :boom: Breaking changes! New namespace. Run `composer dump-autoload` after update.

README.md

@@ -1,61 +1,61 @@
-# Seconds
-
-[![Tests](https://github.com/adevade/seconds/workflows/Tests/badge.svg)](https://github.com/adevade/seconds)
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/adevade/seconds.svg)](https://packagist.org/packages/adevade/seconds)
-[![Total Downloads](https://img.shields.io/packagist/dt/adevade/seconds.svg)](https://packagist.org/packages/adevade/seconds)
-
-Helpers for converting time to seconds.
-
-## Installation
-
-You can install the package via composer:
-
-```bash
-composer require adevade/seconds
-```
-
-## Usage
-
-```php
-use Adevade\Seconds;
-
-Seconds::fromMinutes(2); // returns => (int) 120
-```
-
-### Available methods
-
-```php
-Seconds::fromMinutes($minutes = 5);
-Seconds::fromHours($hours = 12);
-Seconds::fromDays($days = 4);
-Seconds::fromWeeks($weeks = 2);
-Seconds::fromMonths($months = 6);
-Seconds::fromYears($years = 2);
-
-Seconds::fromMinute();
-Seconds::fromHour();
-Seconds::fromDay();
-Seconds::fromWeek();
-Seconds::fromMonth();
-Seconds::fromYear();
-```
-
-### Available constants
-
-```php
-Seconds::MINUTE;
-Seconds::HOUR;
-Seconds::DAY;
-Seconds::WEEK;
-Seconds::MONTH;
-Seconds::YEAR;
-```
-
-> Months have an average length of 30.42 days.\
-> Years have an average length of 365.24 days.
-
-## Credits
-
-- [Andréas Lundgren](https://github.com/adevade)
-
-Idea came from [this tweet by @LasseRafn](https://twitter.com/LasseRafn/status/1225017098373685255). Thanks!
+# Seconds
+
+[![Tests](https://github.com/adevade/seconds/workflows/Tests/badge.svg)](https://github.com/adevade/seconds)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/adevade/seconds.svg)](https://packagist.org/packages/adevade/seconds)
+[![Total Downloads](https://img.shields.io/packagist/dt/adevade/seconds.svg)](https://packagist.org/packages/adevade/seconds)
+
+Helpers for converting time to seconds.
+
+## Installation
+
+You can install the package via composer:
+
+```bash
+composer require adevade/seconds
+```
+
+## Usage
+
+```php
+use Adevade\Seconds;
+
+Seconds::fromMinutes(2); // returns => (int) 120
+```
+
+### Available methods
+
+```php
+Seconds::fromMinutes($minutes = 5);
+Seconds::fromHours($hours = 12);
+Seconds::fromDays($days = 4);
+Seconds::fromWeeks($weeks = 2);
+Seconds::fromMonths($months = 6);
+Seconds::fromYears($years = 2);
+
+Seconds::fromMinute();
+Seconds::fromHour();
+Seconds::fromDay();
+Seconds::fromWeek();
+Seconds::fromMonth();
+Seconds::fromYear();
+```
+
+### Available constants
+
+```php
+Seconds::MINUTE;
+Seconds::HOUR;
+Seconds::DAY;
+Seconds::WEEK;
+Seconds::MONTH;
+Seconds::YEAR;
+```
+
+> Months have an average length of 30.42 days.\
+> Years have an average length of 365.24 days.
+
+## Credits
+
+- [Andréas Lundgren](https://github.com/adevade)
+
+Idea came from [this tweet by @LasseRafn](https://twitter.com/LasseRafn/status/1225017098373685255). Thanks!

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.2"
+        "php": "^7.2|^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0|^9.0"

src/Seconds.php

@@ -46,9 +46,10 @@ public static function __callStatic($method, $parameters)
         if (!isset($parameters[0]) || !is_int($parameters[0])) {
             throw new InvalidArgumentException(
                 sprintf(
-                    '%s::%s(int $seconds) expects an integer.',
+                    '%s::%s(int $%s) expects an integer.',
                     static::class,
-                    $method
+                    $method,
+                    str_replace('from', '', strtolower($method))
                 )
             );
         }

tests/SecondsTest.php

@@ -80,7 +80,7 @@ function it_throws_an_exception_if_no_parameter_is_given()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'Adevade\Seconds::fromMinutes(int $seconds) expects an integer.'
+            'Adevade\Seconds::fromMinutes(int $minutes) expects an integer.'
         );
 
         Seconds::fromMinutes();
@@ -91,7 +91,7 @@ function it_throws_an_exception_if_parameter_is_not_an_integer()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'Adevade\Seconds::fromDays(int $seconds) expects an integer.'
+            'Adevade\Seconds::fromDays(int $days) expects an integer.'
         );
 
         Seconds::fromDays('4');