museum-digital/MDNodaHelpers
33
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Compare commits

base: museum-digital:54a30e683e7fb880244ac79f65e4cbd6c8326aa6
Branches Tags
museum-digital:master
..
compare: museum-digital:4582f6a697e8a036286a50f61cd29392ae80c38d
Branches Tags
museum-digital:master

2 Commits
54a30e683e ... 4582f6a697

Author SHA1 Message Date
Joshua Ramon Enslin
4582f6a697
Fix another edge case in time splitter 2023-11-14 03:32:17 +01:00
Joshua Ramon Enslin
7ef05a55c5
Migrate PHPunit config to PHPUnit 10's requirements 2023-11-14 03:28:24 +01:00
3 changed files with 30 additions and 31 deletions
Show Stats Expand all files Collapse all files

37
phpunit.xml
View File

@ -1,27 +1,14 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" backupGlobals="false" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" bootstrap="tests/bootstrap.php" cacheResult="false" colors="true" enforceTimeLimit="true" failOnWarning="true" processIsolation="true" stopOnError="true" stopOnFailure="true" stopOnIncomplete="true" stopOnSkipped="true" stopOnRisky="true" testdox="false" timeoutForSmallTests="1" timeoutForMediumTests="10" timeoutForLargeTests="60" cacheDirectory=".phpunit.cache" backupStaticProperties="false" requireCoverageMetadata="false" beStrictAboutCoverageMetadata="false">
backupGlobals="false" backupStaticAttributes="false" <testsuites>
beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutResourceUsageDuringSmallTests="true" beStrictAboutTodoAnnotatedTests="true" beStrictAboutCoversAnnotation="false" <testsuite name="tests">
bootstrap="tests/bootstrap.php" <directory>tests/</directory>
cacheResult="false" </testsuite>
colors="true" </testsuites>
convertErrorsToExceptions="true" convertDeprecationsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" <coverage/>
enforceTimeLimit="true" <source>
failOnWarning="true" <include>
forceCoversAnnotation="false" <directory suffix=".php">src</directory>
processIsolation="true" </include>
stopOnError="true" stopOnFailure="true" stopOnIncomplete="true" stopOnSkipped="true" stopOnRisky="true" </source>
testdox="true"
timeoutForSmallTests="1" timeoutForMediumTests="10" timeoutForLargeTests="60"
verbose="true">
<testsuites>
<testsuite name="tests">
<directory>tests/</directory>
</testsuite>
</testsuites>
<coverage>
<include>
<directory suffix=".php">src</directory>
</include>
</coverage>
</phpunit> </phpunit>

22
src/NodaTimeSplitter.php
View File

@ -507,7 +507,7 @@ final class NodaTimeSplitter {
if (strlen($datum) <= 9) return []; if (strlen($datum) <= 9) return [];
// The year is only parse-able if it is a four digit year at the start // The year is only parse-able if it is a four digit year at the start
if (self::is_numeric((string)\substr($datum, 0, 4))) { if (self::is_numeric((string)\substr($datum, 0, 4)) && substr($datum, 4, 1) === '.') {
$year = \substr($datum, 0, 4); $year = \substr($datum, 0, 4);
} }
@ -1114,11 +1114,21 @@ final class NodaTimeSplitter {
public static function attempt_splitting(string $datum):array { public static function attempt_splitting(string $datum):array {
$moda = NodaTimeSplitter::is_timespan($datum); $moda = NodaTimeSplitter::is_timespan($datum);
if (!$moda) $moda = NodaTimeSplitter::is_incomplete_date($datum); if (!$moda) {
if (!$moda) $moda = NodaTimeSplitter::is_valid_date($datum); $moda = NodaTimeSplitter::is_incomplete_date($datum);
if (!$moda) $moda = NodaTimeSplitter::is_valid_date_hungarian($datum); }
if (!$moda) $moda = NodaTimeSplitter::is_century($datum); if (!$moda) {
if (!$moda) $moda = NodaTimeSplitter::is_decade($datum); $moda = NodaTimeSplitter::is_valid_date($datum);
}
if (!$moda) {
$moda = NodaTimeSplitter::is_valid_date_hungarian($datum);
}
if (!$moda) {
$moda = NodaTimeSplitter::is_century($datum);
}
if (!$moda) {
$moda = NodaTimeSplitter::is_decade($datum);
}
if (!empty($moda)) { if (!empty($moda)) {
if ((int)$moda[2] > 12 || (int)$moda[3] > 31) { if ((int)$moda[2] > 12 || (int)$moda[3] > 31) {

2
tests/NodaTimeSplitterTest.php
View File

@ -699,6 +699,8 @@ final class NodaTimeSplitterTest extends TestCase {
$output = NodaTimeSplitter::attempt_splitting("65497028c51eb"); $output = NodaTimeSplitter::attempt_splitting("65497028c51eb");
self::assertEquals($output, []); self::assertEquals($output, []);
$output = NodaTimeSplitter::attempt_splitting("6552cf08b0196 test tag");
self::assertEquals($output, []);
# $output = NodaTimeSplitter::attempt_splitting("Nach 1944-1964"); # $output = NodaTimeSplitter::attempt_splitting("Nach 1944-1964");
# self::assertEquals($output, []); # self::assertEquals($output, []);