Skip to content

Commit

Permalink
Add support for PHP 7.2
Browse files Browse the repository at this point in the history
Fixes #1
  • Loading branch information
ocubom committed Sep 4, 2018
1 parent 99dda9f commit 126c73a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
@@ -1,10 +1,8 @@
language: php

php:
- 5.5
- 5.4
- 5.3
- hhvm
- 7.2
- 7.1

branches:
except:
Expand All @@ -20,10 +18,10 @@ branches:

before_script:
- composer self-update
- composer require satooshi/php-coveralls:dev-master --no-update
- composer require php-coveralls/php-coveralls --no-update
- composer install

script: phpunit --coverage-text

after_script:
- php vendor/bin/coveralls -v
- php vendor/bin/php-coveralls -v
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -15,7 +15,7 @@
},

"require": {
"php": ">=5.3.6"
"php": ">=7.1.0"
},

"require-dev": {
Expand Down
12 changes: 7 additions & 5 deletions src/Xpl/DateTime/DateTime.php
Expand Up @@ -303,15 +303,16 @@ public function getOffset()
/**
* Resets the current time to a different one.
*
* @param mixed $hour Hour of the time
* @param mixed $minute Minute of the time
* @param mixed $second Second of the time
* @param mixed $hour Hour of the time
* @param mixed $minute Minute of the time
* @param mixed $second Second of the time
* @param mixed $microseconds Microsecond of the time
*
* @return DateTime
*
* @see \DateTime::setTime()
*/
public function setTime($hour = 0, $minute = 0, $second = 0)
public function setTime($hour = 0, $minute = 0, $second = 0, $microseconds = 0)
{
return $this->callParent(
// Name of the parent method
Expand All @@ -321,7 +322,8 @@ public function setTime($hour = 0, $minute = 0, $second = 0)
// Clean arguments for parent call
empty($hour) ? 0 : $hour,
empty($minute) ? 0 : $minute,
empty($second) ? 0 : $second
empty($second) ? 0 : $second,
empty($microseconds) ? 0 : $microseconds
);
}

Expand Down

0 comments on commit 126c73a

Please sign in to comment.