Compare commits

..

2 Commits

Author SHA1 Message Date
Constantin Graf
819dfd5037 Allow Clockify import without Billable column 2026-06-24 12:11:46 +02:00
Constantin Graf
c94aa8038d Add base path to the vite config to be able to tunnel all vite assets through a CDN 2026-06-20 21:55:29 +02:00
6 changed files with 200 additions and 175 deletions

View File

@@ -116,10 +116,12 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
throw new ImportException('Time entry description is too long');
}
$timeEntry->description = $record['Description'];
if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
throw new ImportException('Invalid billable value');
if (isset($record['Billable'])) {
if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
throw new ImportException('Invalid billable value');
}
$timeEntry->billable = $record['Billable'] === 'Yes';
}
$timeEntry->billable = $record['Billable'] === 'Yes';
$timeEntry->tags = $this->getTags($record['Tags']);
$timeEntry->is_imported = true;
@@ -219,7 +221,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
'Group',
'Email',
'Tags',
'Billable',
'Start Date',
'Start Time',
'End Date',

328
composer.lock generated
View File

@@ -3020,26 +3020,25 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.12.1",
"version": "7.10.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "d34627490fbc03bf5c5d7cfed81f2faa19519425"
"reference": "47ba23c7a55247e2e1b7407aca90e9bbed0d9d86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d34627490fbc03bf5c5d7cfed81f2faa19519425",
"reference": "d34627490fbc03bf5c5d7cfed81f2faa19519425",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/47ba23c7a55247e2e1b7407aca90e9bbed0d9d86",
"reference": "47ba23c7a55247e2e1b7407aca90e9bbed0d9d86",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^2.5",
"guzzlehttp/psr7": "^2.12.1",
"guzzlehttp/promises": "^2.3",
"guzzlehttp/psr7": "^2.8",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.5 || ^3.0",
"symfony/polyfill-php80": "^1.24"
"symfony/deprecation-contracts": "^2.2 || ^3.0"
},
"provide": {
"psr/http-client-implementation": "1.0"
@@ -3048,7 +3047,7 @@
"bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
"guzzle/client-integration-tests": "3.0.2",
"guzzlehttp/test-server": "^0.5.1",
"guzzlehttp/test-server": "^0.3.2",
"php-http/message-factory": "^1.1",
"phpunit/phpunit": "^8.5.52 || ^9.6.34",
"psr/log": "^1.1 || ^2.0 || ^3.0"
@@ -3128,7 +3127,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.12.1"
"source": "https://github.com/guzzle/guzzle/tree/7.10.3"
},
"funding": [
{
@@ -3144,25 +3143,24 @@
"type": "tidelift"
}
],
"time": "2026-06-18T14:12:49+00:00"
"time": "2026-05-20T22:59:19+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "2.5.0",
"version": "2.4.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "4360e982f87f5f258bf872d094647791db2f4c8e"
"reference": "09e8a212562fb1fb6a512c4156ed71525969d6c2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/4360e982f87f5f258bf872d094647791db2f4c8e",
"reference": "4360e982f87f5f258bf872d094647791db2f4c8e",
"url": "https://api.github.com/repos/guzzle/promises/zipball/09e8a212562fb1fb6a512c4156ed71525969d6c2",
"reference": "09e8a212562fb1fb6a512c4156ed71525969d6c2",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"symfony/deprecation-contracts": "^2.5 || ^3.0"
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
@@ -3212,7 +3210,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/2.5.0"
"source": "https://github.com/guzzle/promises/tree/2.4.1"
},
"funding": [
{
@@ -3228,29 +3226,27 @@
"type": "tidelift"
}
],
"time": "2026-06-02T12:23:43+00:00"
"time": "2026-05-20T22:57:30+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "2.12.1",
"version": "2.10.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "172ef2f4e9824c1e058b7f30be8ae25a02c0f2b7"
"reference": "73ab136360b5dfd858006eae9795e8fe43c80361"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/172ef2f4e9824c1e058b7f30be8ae25a02c0f2b7",
"reference": "172ef2f4e9824c1e058b7f30be8ae25a02c0f2b7",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/73ab136360b5dfd858006eae9795e8fe43c80361",
"reference": "73ab136360b5dfd858006eae9795e8fe43c80361",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.1 || ^2.0",
"ralouphie/getallheaders": "^3.0",
"symfony/deprecation-contracts": "^2.5 || ^3.0",
"symfony/polyfill-php80": "^1.24"
"ralouphie/getallheaders": "^3.0"
},
"provide": {
"psr/http-factory-implementation": "1.0",
@@ -3331,7 +3327,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.12.1"
"source": "https://github.com/guzzle/psr7/tree/2.10.1"
},
"funding": [
{
@@ -3347,20 +3343,20 @@
"type": "tidelift"
}
],
"time": "2026-06-18T09:49:37+00:00"
"time": "2026-05-20T09:27:36+00:00"
},
{
"name": "guzzlehttp/uri-template",
"version": "v1.0.7",
"version": "v1.0.5",
"source": {
"type": "git",
"url": "https://github.com/guzzle/uri-template.git",
"reference": "7fe811c23a9e3cd712b4389eaeb50b5456d8c529"
"reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/uri-template/zipball/7fe811c23a9e3cd712b4389eaeb50b5456d8c529",
"reference": "7fe811c23a9e3cd712b4389eaeb50b5456d8c529",
"url": "https://api.github.com/repos/guzzle/uri-template/zipball/4f4bbd4e7172148801e76e3decc1e559bdee34e1",
"reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1",
"shasum": ""
},
"require": {
@@ -3369,7 +3365,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"phpunit/phpunit": "^8.5.52 || ^9.6.34",
"phpunit/phpunit": "^8.5.44 || ^9.6.25",
"uri-template/tests": "1.0.0"
},
"type": "library",
@@ -3417,7 +3413,7 @@
],
"support": {
"issues": "https://github.com/guzzle/uri-template/issues",
"source": "https://github.com/guzzle/uri-template/tree/v1.0.7"
"source": "https://github.com/guzzle/uri-template/tree/v1.0.5"
},
"funding": [
{
@@ -3433,7 +3429,7 @@
"type": "tidelift"
}
],
"time": "2026-06-12T21:33:43+00:00"
"time": "2025-08-22T14:27:06+00:00"
},
{
"name": "inertiajs/inertia-laravel",
@@ -4197,16 +4193,16 @@
},
{
"name": "laravel/framework",
"version": "v12.61.1",
"version": "v12.60.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "e8472ca9774452fe50841d9bdced060679f4d58d"
"reference": "b8b55ce32175cc00f834a56eeb6316f18ed6ea39"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/e8472ca9774452fe50841d9bdced060679f4d58d",
"reference": "e8472ca9774452fe50841d9bdced060679f4d58d",
"url": "https://api.github.com/repos/laravel/framework/zipball/b8b55ce32175cc00f834a56eeb6316f18ed6ea39",
"reference": "b8b55ce32175cc00f834a56eeb6316f18ed6ea39",
"shasum": ""
},
"require": {
@@ -4415,7 +4411,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-06-04T14:22:52+00:00"
"time": "2026-05-20T11:48:19+00:00"
},
{
"name": "laravel/octane",
@@ -6676,16 +6672,16 @@
},
{
"name": "nesbot/carbon",
"version": "3.13.0",
"version": "3.11.4",
"source": {
"type": "git",
"url": "https://github.com/CarbonPHP/carbon.git",
"reference": "40f6618f052df16b545f626fbf9a878e6497d16a"
"reference": "e890471a3494740f7d9326d72ce6a8c559ffee60"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/40f6618f052df16b545f626fbf9a878e6497d16a",
"reference": "40f6618f052df16b545f626fbf9a878e6497d16a",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/e890471a3494740f7d9326d72ce6a8c559ffee60",
"reference": "e890471a3494740f7d9326d72ce6a8c559ffee60",
"shasum": ""
},
"require": {
@@ -6777,7 +6773,7 @@
"type": "tidelift"
}
],
"time": "2026-06-18T13:49:15+00:00"
"time": "2026-04-07T09:57:54+00:00"
},
{
"name": "nette/schema",
@@ -7796,16 +7792,16 @@
},
{
"name": "phpoffice/phpspreadsheet",
"version": "1.30.5",
"version": "1.30.4",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "97bcabd32a64924688487dcd64aceaf158affb5c"
"reference": "02970383cc12e7bf0bc0707ea6e2e8ed23a7aec9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/97bcabd32a64924688487dcd64aceaf158affb5c",
"reference": "97bcabd32a64924688487dcd64aceaf158affb5c",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/02970383cc12e7bf0bc0707ea6e2e8ed23a7aec9",
"reference": "02970383cc12e7bf0bc0707ea6e2e8ed23a7aec9",
"shasum": ""
},
"require": {
@@ -7898,9 +7894,9 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.30.5"
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.30.4"
},
"time": "2026-05-31T05:13:11+00:00"
"time": "2026-04-19T06:00:39+00:00"
},
{
"name": "phpoption/phpoption",
@@ -7979,16 +7975,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.55",
"version": "3.0.52",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "db9744e6d47e742b1f974e965ad49bdd041105af"
"reference": "2adaefc83df2ec548558307690f376dd7d4f4fce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db9744e6d47e742b1f974e965ad49bdd041105af",
"reference": "db9744e6d47e742b1f974e965ad49bdd041105af",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/2adaefc83df2ec548558307690f376dd7d4f4fce",
"reference": "2adaefc83df2ec548558307690f376dd7d4f4fce",
"shasum": ""
},
"require": {
@@ -8069,7 +8065,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.55"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.52"
},
"funding": [
{
@@ -8085,7 +8081,7 @@
"type": "tidelift"
}
],
"time": "2026-06-14T23:24:10+00:00"
"time": "2026-04-27T07:02:15+00:00"
},
{
"name": "phpstan/phpdoc-parser",
@@ -9023,20 +9019,20 @@
},
{
"name": "ramsey/uuid",
"version": "4.9.3",
"version": "4.9.2",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "1df15849d00943a67d677dc9cfd80795f038c9f8"
"reference": "8429c78ca35a09f27565311b98101e2826affde0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/1df15849d00943a67d677dc9cfd80795f038c9f8",
"reference": "1df15849d00943a67d677dc9cfd80795f038c9f8",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0",
"reference": "8429c78ca35a09f27565311b98101e2826affde0",
"shasum": ""
},
"require": {
"brick/math": ">=0.8.16 <=0.18",
"brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
"php": "^8.0",
"ramsey/collection": "^1.2 || ^2.0"
},
@@ -9095,9 +9091,9 @@
],
"support": {
"issues": "https://github.com/ramsey/uuid/issues",
"source": "https://github.com/ramsey/uuid/tree/4.9.3"
"source": "https://github.com/ramsey/uuid/tree/4.9.2"
},
"time": "2026-06-18T03:57:49+00:00"
"time": "2025-12-14T04:43:48+00:00"
},
{
"name": "react/promise",
@@ -10134,16 +10130,16 @@
},
{
"name": "symfony/console",
"version": "v7.4.13",
"version": "v7.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "85095d2573eaefaf35e40b9513a9bf09f72cd217"
"reference": "ed0107e43ab452aa77ae99e005b95e56b556e075"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/85095d2573eaefaf35e40b9513a9bf09f72cd217",
"reference": "85095d2573eaefaf35e40b9513a9bf09f72cd217",
"url": "https://api.github.com/repos/symfony/console/zipball/ed0107e43ab452aa77ae99e005b95e56b556e075",
"reference": "ed0107e43ab452aa77ae99e005b95e56b556e075",
"shasum": ""
},
"require": {
@@ -10208,7 +10204,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v7.4.13"
"source": "https://github.com/symfony/console/tree/v7.4.11"
},
"funding": [
{
@@ -10228,7 +10224,7 @@
"type": "tidelift"
}
],
"time": "2026-05-24T08:56:14+00:00"
"time": "2026-05-13T12:04:42+00:00"
},
{
"name": "symfony/css-selector",
@@ -10757,16 +10753,16 @@
},
{
"name": "symfony/html-sanitizer",
"version": "v7.4.13",
"version": "v7.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/html-sanitizer.git",
"reference": "761f6c49dfd103ee08b3cd09ece588b069e18ec9"
"reference": "51cb4f68195883f7ac403abb58ecf7adc74e0f9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/761f6c49dfd103ee08b3cd09ece588b069e18ec9",
"reference": "761f6c49dfd103ee08b3cd09ece588b069e18ec9",
"url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/51cb4f68195883f7ac403abb58ecf7adc74e0f9e",
"reference": "51cb4f68195883f7ac403abb58ecf7adc74e0f9e",
"shasum": ""
},
"require": {
@@ -10807,7 +10803,7 @@
"sanitizer"
],
"support": {
"source": "https://github.com/symfony/html-sanitizer/tree/v7.4.13"
"source": "https://github.com/symfony/html-sanitizer/tree/v7.4.12"
},
"funding": [
{
@@ -10827,20 +10823,20 @@
"type": "tidelift"
}
],
"time": "2026-05-24T11:20:33+00:00"
"time": "2026-05-20T07:20:23+00:00"
},
{
"name": "symfony/http-foundation",
"version": "v7.4.13",
"version": "v7.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "bc354f47c62301e990b7874fa662326368508e2c"
"reference": "9381209597ec66c25be154cbf2289076e64d1eab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/bc354f47c62301e990b7874fa662326368508e2c",
"reference": "bc354f47c62301e990b7874fa662326368508e2c",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/9381209597ec66c25be154cbf2289076e64d1eab",
"reference": "9381209597ec66c25be154cbf2289076e64d1eab",
"shasum": ""
},
"require": {
@@ -10889,7 +10885,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v7.4.13"
"source": "https://github.com/symfony/http-foundation/tree/v7.4.8"
},
"funding": [
{
@@ -10909,20 +10905,20 @@
"type": "tidelift"
}
],
"time": "2026-05-24T11:20:33+00:00"
"time": "2026-03-24T13:12:05+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v7.4.13",
"version": "v7.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "9df847980c436451f4f51d1284491bb4356dd989"
"reference": "7922b53e70d2ba2027af8bb6a59d91eb3541ea4d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/9df847980c436451f4f51d1284491bb4356dd989",
"reference": "9df847980c436451f4f51d1284491bb4356dd989",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/7922b53e70d2ba2027af8bb6a59d91eb3541ea4d",
"reference": "7922b53e70d2ba2027af8bb6a59d91eb3541ea4d",
"shasum": ""
},
"require": {
@@ -11008,7 +11004,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v7.4.13"
"source": "https://github.com/symfony/http-kernel/tree/v7.4.12"
},
"funding": [
{
@@ -11028,7 +11024,7 @@
"type": "tidelift"
}
],
"time": "2026-05-27T08:31:43+00:00"
"time": "2026-05-20T09:27:11+00:00"
},
{
"name": "symfony/mailer",
@@ -11116,16 +11112,16 @@
},
{
"name": "symfony/mime",
"version": "v7.4.13",
"version": "v7.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "a845722765c4f6b2ce88beaf4f4479975b186770"
"reference": "b198dd66c211c97119bcaaff7c13431dbbb5e470"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/a845722765c4f6b2ce88beaf4f4479975b186770",
"reference": "a845722765c4f6b2ce88beaf4f4479975b186770",
"url": "https://api.github.com/repos/symfony/mime/zipball/b198dd66c211c97119bcaaff7c13431dbbb5e470",
"reference": "b198dd66c211c97119bcaaff7c13431dbbb5e470",
"shasum": ""
},
"require": {
@@ -11181,7 +11177,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v7.4.13"
"source": "https://github.com/symfony/mime/tree/v7.4.12"
},
"funding": [
{
@@ -11201,7 +11197,7 @@
"type": "tidelift"
}
],
"time": "2026-05-23T16:22:37+00:00"
"time": "2026-05-20T07:20:23+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -11288,16 +11284,16 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
"version": "v1.38.1",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "e9247d281d694a5120554d9afaf54e070e88a603"
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e9247d281d694a5120554d9afaf54e070e88a603",
"reference": "e9247d281d694a5120554d9afaf54e070e88a603",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e",
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e",
"shasum": ""
},
"require": {
@@ -11346,7 +11342,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.38.1"
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0"
},
"funding": [
{
@@ -11366,20 +11362,20 @@
"type": "tidelift"
}
],
"time": "2026-05-26T05:58:03+00:00"
"time": "2026-04-26T13:13:48+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.38.1",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "dc21118016c039a66235cf93d96b435ffb282412"
"reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/dc21118016c039a66235cf93d96b435ffb282412",
"reference": "dc21118016c039a66235cf93d96b435ffb282412",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
"reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
"shasum": ""
},
"require": {
@@ -11433,7 +11429,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.38.1"
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.37.0"
},
"funding": [
{
@@ -11453,20 +11449,20 @@
"type": "tidelift"
}
],
"time": "2026-05-25T15:22:23+00:00"
"time": "2024-09-10T14:38:51+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.38.0",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
"reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
"reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
"reference": "3833d7255cc303546435cb650316bff708a1c75c",
"shasum": ""
},
"require": {
@@ -11518,7 +11514,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0"
},
"funding": [
{
@@ -11538,20 +11534,20 @@
"type": "tidelift"
}
],
"time": "2026-05-25T13:48:31+00:00"
"time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.38.2",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6"
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
"reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
"shasum": ""
},
"require": {
@@ -11603,7 +11599,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.2"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
},
"funding": [
{
@@ -11623,7 +11619,7 @@
"type": "tidelift"
}
],
"time": "2026-05-27T06:59:30+00:00"
"time": "2026-04-10T17:25:58+00:00"
},
{
"name": "symfony/polyfill-php73",
@@ -11791,16 +11787,16 @@
},
{
"name": "symfony/polyfill-php81",
"version": "v1.38.1",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
"reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7"
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
"reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"shasum": ""
},
"require": {
@@ -11847,7 +11843,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php81/tree/v1.38.1"
"source": "https://github.com/symfony/polyfill-php81/tree/v1.37.0"
},
"funding": [
{
@@ -11867,20 +11863,20 @@
"type": "tidelift"
}
],
"time": "2026-05-26T12:45:58+00:00"
"time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php83",
"version": "v1.38.2",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php83.git",
"reference": "796a26abb75ce49f3a84433cd81bf1009d73d5f8"
"reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/796a26abb75ce49f3a84433cd81bf1009d73d5f8",
"reference": "796a26abb75ce49f3a84433cd81bf1009d73d5f8",
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/3600c2cb22399e25bb226e4a135ce91eeb2a6149",
"reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149",
"shasum": ""
},
"require": {
@@ -11927,7 +11923,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php83/tree/v1.38.2"
"source": "https://github.com/symfony/polyfill-php83/tree/v1.37.0"
},
"funding": [
{
@@ -11947,20 +11943,20 @@
"type": "tidelift"
}
],
"time": "2026-05-27T06:51:48+00:00"
"time": "2026-04-10T17:25:58+00:00"
},
{
"name": "symfony/polyfill-php84",
"version": "v1.38.1",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php84.git",
"reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa"
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
"reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
"shasum": ""
},
"require": {
@@ -12007,7 +12003,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php84/tree/v1.38.1"
"source": "https://github.com/symfony/polyfill-php84/tree/v1.37.0"
},
"funding": [
{
@@ -12027,20 +12023,20 @@
"type": "tidelift"
}
],
"time": "2026-05-26T12:51:13+00:00"
"time": "2026-04-10T18:47:49+00:00"
},
{
"name": "symfony/polyfill-php85",
"version": "v1.38.1",
"version": "v1.37.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php85.git",
"reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1"
"reference": "fcfa4973a9917cef23f2e38774da74a2b7d115ee"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1",
"reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1",
"url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/fcfa4973a9917cef23f2e38774da74a2b7d115ee",
"reference": "fcfa4973a9917cef23f2e38774da74a2b7d115ee",
"shasum": ""
},
"require": {
@@ -12087,7 +12083,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php85/tree/v1.38.1"
"source": "https://github.com/symfony/polyfill-php85/tree/v1.37.0"
},
"funding": [
{
@@ -12107,7 +12103,7 @@
"type": "tidelift"
}
],
"time": "2026-05-26T02:25:22+00:00"
"time": "2026-04-26T13:10:57+00:00"
},
{
"name": "symfony/polyfill-uuid",
@@ -12194,16 +12190,16 @@
},
{
"name": "symfony/process",
"version": "v7.4.13",
"version": "v7.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "f5804be144caceb570f6747519999636b664f24c"
"reference": "d9593c9efa40499eb078b81144de42cbc28a31f0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/f5804be144caceb570f6747519999636b664f24c",
"reference": "f5804be144caceb570f6747519999636b664f24c",
"url": "https://api.github.com/repos/symfony/process/zipball/d9593c9efa40499eb078b81144de42cbc28a31f0",
"reference": "d9593c9efa40499eb078b81144de42cbc28a31f0",
"shasum": ""
},
"require": {
@@ -12235,7 +12231,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v7.4.13"
"source": "https://github.com/symfony/process/tree/v7.4.11"
},
"funding": [
{
@@ -12255,7 +12251,7 @@
"type": "tidelift"
}
],
"time": "2026-05-23T16:05:06+00:00"
"time": "2026-05-11T16:55:21+00:00"
},
{
"name": "symfony/property-access",
@@ -12518,16 +12514,16 @@
},
{
"name": "symfony/routing",
"version": "v7.4.13",
"version": "v7.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "3a162171bb008e5e0f15dce6581373a4c0e8390d"
"reference": "3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/3a162171bb008e5e0f15dce6581373a4c0e8390d",
"reference": "3a162171bb008e5e0f15dce6581373a4c0e8390d",
"url": "https://api.github.com/repos/symfony/routing/zipball/3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204",
"reference": "3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204",
"shasum": ""
},
"require": {
@@ -12579,7 +12575,7 @@
"url"
],
"support": {
"source": "https://github.com/symfony/routing/tree/v7.4.13"
"source": "https://github.com/symfony/routing/tree/v7.4.12"
},
"funding": [
{
@@ -12599,7 +12595,7 @@
"type": "tidelift"
}
],
"time": "2026-05-24T11:20:33+00:00"
"time": "2026-05-20T07:20:23+00:00"
},
{
"name": "symfony/serializer",
@@ -12794,16 +12790,16 @@
},
{
"name": "symfony/string",
"version": "v7.4.13",
"version": "v7.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde"
"reference": "965f7306a43383d02c6aca1e3f3bd2f0ea5dee15"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
"reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
"url": "https://api.github.com/repos/symfony/string/zipball/965f7306a43383d02c6aca1e3f3bd2f0ea5dee15",
"reference": "965f7306a43383d02c6aca1e3f3bd2f0ea5dee15",
"shasum": ""
},
"require": {
@@ -12861,7 +12857,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v7.4.13"
"source": "https://github.com/symfony/string/tree/v7.4.11"
},
"funding": [
{
@@ -12881,7 +12877,7 @@
"type": "tidelift"
}
],
"time": "2026-05-23T15:23:29+00:00"
"time": "2026-05-13T12:04:42+00:00"
},
{
"name": "symfony/translation",
@@ -13827,16 +13823,16 @@
},
{
"name": "webmozart/assert",
"version": "2.4.1",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
"reference": "2ccb7c2e821038c03a3e6e1700c570c158c55f70"
"reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozarts/assert/zipball/2ccb7c2e821038c03a3e6e1700c570c158c55f70",
"reference": "2ccb7c2e821038c03a3e6e1700c570c158c55f70",
"url": "https://api.github.com/repos/webmozarts/assert/zipball/9007ea6f45ecf352a9422b36644e4bfc039b9155",
"reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155",
"shasum": ""
},
"require": {
@@ -13887,9 +13883,9 @@
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
"source": "https://github.com/webmozarts/assert/tree/2.4.1"
"source": "https://github.com/webmozarts/assert/tree/2.4.0"
},
"time": "2026-06-15T15:31:57+00:00"
"time": "2026-05-20T13:07:01+00:00"
},
{
"name": "wikimedia/composer-merge-plugin",

View File

@@ -0,0 +1,3 @@
"Project","Client","Description","Task","User","Group","Email","Tags","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"
1 Project Client Description Task User Group Email Tags Start Date Start Time End Date End Time Duration (h) Duration (decimal) Billable Rate (USD) Billable Amount (USD)
2 Project without Client Peter Tester peter.test@email.test Development, Backend 03/04/2024 10:23:52 AM 03/04/2024 10:23:52 AM 00:00:00 0.00 0.00 0.00
3 Project for Big Company Big Company Working hard Task 1 Peter Tester peter.test@email.test 03/04/2024 10:23 AM 03/04/2024 11:23:01 AM 01:00:01 0.00 0.00 0.00

View File

@@ -41,6 +41,30 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
$this->assertSame(1, $report->clientsCreated);
}
public function test_import_of_test_file_without_billable_works_and_defaults_to_non_billable(): void
{
// Arrange
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new ClockifyTimeEntriesImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_4.csv');
// Act
$importer->importData($data, $timezone);
$report = $importer->getReport();
// Assert
$testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries(false, true);
$this->checkTimeEntries($testScenario, false, true);
$this->assertSame(2, $report->timeEntriesCreated);
$this->assertSame(2, $report->tagsCreated);
$this->assertSame(1, $report->tasksCreated);
$this->assertSame(1, $report->usersCreated);
$this->assertSame(2, $report->projectsCreated);
$this->assertSame(1, $report->clientsCreated);
}
public function test_import_of_test_with_special_characters_description_succeeds(): void
{
// Arrange

View File

@@ -26,7 +26,7 @@ class ImporterTestAbstract extends TestCase
/**
* @return object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}
*/
protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false): object
protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false, bool $billableDefault = false): object
{
$users = User::all();
$this->assertCount(2, $users);
@@ -80,12 +80,12 @@ class ImporterTestAbstract extends TestCase
$this->assertSame('#ef5350', $project1->color);
$this->assertSame(null, $project1->billable_rate);
// Project for Big Company
$this->assertSame(true, $project2->is_billable);
$this->assertSame(! $billableDefault, $project2->is_billable);
$this->assertSame(false, $project2->is_public);
$this->assertSame('#ec407a', $project2->color);
$this->assertSame(10001, $project2->billable_rate);
// Project (Archived)
$this->assertSame(true, $project3->is_billable);
$this->assertSame(! $billableDefault, $project3->is_billable);
$this->assertSame(true, $project3->is_public);
$this->assertSame('#6a407f', $project3->color);
$this->assertSame(null, $project3->billable_rate);
@@ -176,7 +176,7 @@ class ImporterTestAbstract extends TestCase
/**
* @param object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag} $testScenario
*/
protected function checkTimeEntries(object $testScenario, bool $secondRun = false): void
protected function checkTimeEntries(object $testScenario, bool $secondRun = false, bool $billableDefault = false): void
{
$timeEntries = TimeEntry::all();
if ($secondRun) {
@@ -197,7 +197,7 @@ class ImporterTestAbstract extends TestCase
$this->assertSame('Working hard', $timeEntry2->description);
$this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
$this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
$this->assertTrue($timeEntry2->billable);
$this->assertSame(! $billableDefault, $timeEntry2->billable);
$this->assertTrue($timeEntry2->is_imported);
$this->assertSame([], $timeEntry2->tags);
}

View File

@@ -14,6 +14,7 @@ async function getConfig() {
const additionalPlugins = await collectModulePlugins('extensions');
return defineConfig({
base: './',
build: {
sourcemap: true, // Source map generation must be turned on
},