Skip to content

Commit

Permalink
Merge pull request #5 from SPLCompanyOy/master
Browse files Browse the repository at this point in the history
Add Laravel 10 support and update dependencies
  • Loading branch information
jnbn committed Jul 24, 2023
2 parents 73f7079 + 4db4625 commit 443ceea
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -3,3 +3,4 @@
composer.phar
composer.lock
.phpunit.result.cache
.phpunit.cache
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -21,10 +21,10 @@
],
"require": {
"php": ">=8.0",
"illuminate/events": "^8.0|^9.0",
"illuminate/support": "^8.0|^9.0",
"illuminate/events": "^8.0|^9.0|^10.0",
"illuminate/support": "^8.0|^9.0|^10.0",
"nesbot/carbon": "^2.0",
"commerceguys/intl": "^1.0.4",
"commerceguys/intl": "^2.0.4",
"umpirsky/country-list": "^2.0",
"umpirsky/locale-list": "^1.0",
"punic/punic": "^3.1"
Expand Down
47 changes: 28 additions & 19 deletions phpunit.xml.dist
@@ -1,21 +1,30 @@
<?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">
<testsuites>
<testsuite name="Package Test Suite">
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
bootstrap="vendor/autoload.php"
colors="true"
processIsolation="false"
stopOnFailure="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false">
<coverage
includeUncoveredFiles="true"/>
<testsuites>
<testsuite
name="Package Test Suite">
<directory
suffix=".php">
./tests/
</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory
suffix=".php">
./src
</directory>
</include>
</source>
</phpunit>
8 changes: 4 additions & 4 deletions tests/TestDate.php
Expand Up @@ -43,7 +43,7 @@ public function testToMediumDateString()
$this->app->setLocale('nl');
$date = Date::create(2018, 1, 31)->toMediumDateString();

$this->assertEquals('31 jan. 2018', $date);
$this->assertEquals('31 jan 2018', $date);
}

public function testToLongDateString()
Expand Down Expand Up @@ -107,22 +107,22 @@ public function testToMediumDatetimeString()
$this->app->setLocale('nl');
$date = Date::create(2018, 1, 31, 1, 2, 3)->toMediumDatetimeString();

$this->assertEquals('31 jan. 2018 01:02:03', $date);
$this->assertEquals('31 jan 2018 01:02:03', $date);
}

public function testToLongDatetimeString()
{
$this->app->setLocale('nl');
$date = Date::create(2018, 1, 31, 1, 2, 3)->toLongDatetimeString();

$this->assertEquals('31 januari 2018 om 01:02:03 UTC', $date);
$this->assertEquals('31 januari 2018 01:02:03 UTC', $date);
}

public function testToFullDatetimeString()
{
$this->app->setLocale('nl');
$date = Date::create(2018, 1, 31, 1, 2, 3)->toFullDatetimeString();

$this->assertEquals('woensdag 31 januari 2018 om 01:02:03 geco枚rdineerde wereldtijd', $date);
$this->assertEquals('woensdag 31 januari 2018 01:02:03 geco枚rdineerde wereldtijd', $date);
}
}

0 comments on commit 443ceea

Please sign in to comment.