jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

switch to kimai specific user-bundle fork (#1568)

Browse Source
This commit is contained in:
Kevin Papst
2020-03-17 21:24:51 +01:00
committed by GitHub
parent 4b1cfa5840
commit 7b13ea860a
4 changed files with 81 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -24,13 +24,13 @@
"doctrine/orm": "^2.7",
"erusev/parsedown": "^1.6",
"friendsofsymfony/rest-bundle": "^2.5",
"friendsofsymfony/user-bundle": "dev-master",
"gedmo/doctrine-extensions": "^2.4",
"hslavich/oneloginsaml-bundle": "^1.4",
"jms/metadata": "^2.0",
"jms/serializer-bundle": "^3.2",
"kevinpapst/adminlte-bundle": "^3.0",
"kimai/kimai2-composer": "^0.1",
"kimai/user-bundle": "^1.1",
"laravolt/avatar": "^3.0",
"league/csv": "^9.4",
"league/html-to-markdown": "^4.9",
@@ -152,6 +152,7 @@
"@kimai:tests-integration"
],
"kimai:code-lint": [
"composer validate --strict",
"bin/console lint:yaml config --parse-tags",
"bin/console lint:twig templates --show-deprecations",
"bin/console lint:xliff translations",

222
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ecd74f1434a86c60e96a95518b581aaa",
"content-hash": "0d02096214d52a2a623854b2f486e197",
"packages": [
{
"name": "beberlei/doctrineextensions",
@@ -1494,83 +1494,6 @@
],
"time": "2020-03-04T21:18:53+00:00"
},
{
"name": "friendsofsymfony/user-bundle",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
"reference": "a9e71b6e7b61e7f39ba77436ba3e9af954450c4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/a9e71b6e7b61e7f39ba77436ba3e9af954450c4b",
"reference": "a9e71b6e7b61e7f39ba77436ba3e9af954450c4b",
"shasum": ""
},
"require": {
"paragonie/random_compat": "^1 || ^2 || ^9",
"php": "^5.5.9 || ^7.0",
"symfony/form": "^2.8 || ^3.0 || ^4.0",
"symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0",
"symfony/security-bundle": "^2.8 || ^3.0 || ^4.0",
"symfony/templating": "^2.8 || ^3.0 || ^4.0",
"symfony/translation": "^2.8 || ^3.0 || ^4.0",
"symfony/twig-bundle": "^2.8 || ^3.0 || ^4.0",
"symfony/validator": "^2.8 || ^3.0 || ^4.0",
"twig/twig": "^1.28 || ^2.0"
},
"conflict": {
"doctrine/doctrine-bundle": "<1.3",
"symfony/doctrine-bridge": "<2.7"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.3",
"friendsofphp/php-cs-fixer": "^2.2",
"phpunit/phpunit": "^4.8.35 || ^5.7.11 || ^6.5",
"swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
"symfony/console": "^2.8 || ^3.0 || ^4.0",
"symfony/phpunit-bridge": "^2.8 || ^3.0 || ^4.0",
"symfony/yaml": "^2.8 || ^3.0 || ^4.0"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev"
}
},
"autoload": {
"psr-4": {
"FOS\\UserBundle\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Christophe Coevoet",
"email": "stof@notk.org"
},
{
"name": "Thibault Duplessis"
},
{
"name": "FriendsOfSymfony Community",
"homepage": "https://github.com/friendsofsymfony/FOSUserBundle/contributors"
}
],
"description": "Symfony FOSUserBundle",
"homepage": "http://friendsofsymfony.github.com",
"keywords": [
"User management"
],
"time": "2020-01-08T18:06:24+00:00"
},
{
"name": "gedmo/doctrine-extensions",
"version": "v2.4.39",
@@ -3168,6 +3091,72 @@
],
"time": "2019-03-10T19:34:31+00:00"
},
{
"name": "kimai/user-bundle",
"version": "1.1",
"source": {
"type": "git",
"url": "https://github.com/kimai/user-bundle.git",
"reference": "a52680e843f2a2408df967029c4ea471c41622ee"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kimai/user-bundle/zipball/a52680e843f2a2408df967029c4ea471c41622ee",
"reference": "a52680e843f2a2408df967029c4ea471c41622ee",
"shasum": ""
},
"require": {
"paragonie/random_compat": "^1 || ^2 || ^9",
"php": "^7.2",
"symfony/form": "^4.4",
"symfony/framework-bundle": "^4.4",
"symfony/security-bundle": "^4.4",
"symfony/translation": "^4.4",
"symfony/twig-bundle": "^4.4",
"symfony/validator": "^4.4"
},
"require-dev": {
"doctrine/doctrine-bundle": "^2.0",
"phpunit/phpunit": "^4.8.35 || ^5.7.11 || ^6.5",
"swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
"symfony/console": "^4.0",
"symfony/phpunit-bridge": "^4.0",
"symfony/yaml": "^4.0"
},
"type": "symfony-bundle",
"autoload": {
"psr-4": {
"FOS\\UserBundle\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Christophe Coevoet",
"email": "stof@notk.org"
},
{
"name": "Thibault Duplessis"
},
{
"name": "FriendsOfSymfony Community",
"homepage": "https://github.com/friendsofsymfony/FOSUserBundle/contributors"
},
{
"name": "Kevin Papst",
"homepage": "https://www.kevinpapst.de"
}
],
"description": "Kimai UserBundle",
"homepage": "https://www.kimai.org",
"time": "2020-03-17T18:39:24+00:00"
},
{
"name": "laravolt/avatar",
"version": "3.2.0",
@@ -8758,62 +8747,6 @@
],
"time": "2020-02-26T22:30:10+00:00"
},
{
"name": "symfony/templating",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/templating.git",
"reference": "9995a4f65149d5ab7f0d9cca6d88136ae8bfaa72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/templating/zipball/9995a4f65149d5ab7f0d9cca6d88136ae8bfaa72",
"reference": "9995a4f65149d5ab7f0d9cca6d88136ae8bfaa72",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8"
},
"require-dev": {
"psr/log": "~1.0"
},
"suggest": {
"psr/log-implementation": "For using debug logging in loaders"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Templating\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Templating Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T13:00:46+00:00"
},
{
"name": "symfony/translation",
"version": "v4.4.5",
@@ -9793,20 +9726,20 @@
},
{
"name": "twig/twig",
"version": "v2.12.5",
"version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "18772e0190734944277ee97a02a9a6c6555fcd94"
"reference": "3b88ccd180a6b61ebb517aea3b1a8906762a1dc2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/18772e0190734944277ee97a02a9a6c6555fcd94",
"reference": "18772e0190734944277ee97a02a9a6c6555fcd94",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3b88ccd180a6b61ebb517aea3b1a8906762a1dc2",
"reference": "3b88ccd180a6b61ebb517aea3b1a8906762a1dc2",
"shasum": ""
},
"require": {
"php": "^7.0",
"php": "^7.2.5",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3"
},
@@ -9817,13 +9750,10 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.12-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
},
"psr-4": {
"Twig\\": "src/"
}
@@ -9854,7 +9784,7 @@
"keywords": [
"templating"
],
"time": "2020-02-11T15:31:23+00:00"
"time": "2020-02-11T15:33:47+00:00"
},
{
"name": "voku/portable-ascii",
@@ -12652,9 +12582,7 @@
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"friendsofsymfony/user-bundle": 20
},
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {

2
config/packages/jms_serializer.yaml
View File

@@ -18,7 +18,7 @@ jms_serializer:
included:
- "%kernel.root_dir%/Entity/"
- "%kernel.root_dir%/API/Model/"
- "%kernel.root_dir%/../vendor/friendsofsymfony/user-bundle/Model"
- "%kernel.root_dir%/../vendor/kimai/user-bundle/Model"
excluded: []
property_naming:
id: 'jms_serializer.identical_property_naming_strategy'

9
symfony.lock
View File

@@ -126,9 +126,6 @@
"ref": "258300d52be6ad59b32a888d5ddafbf9638540ff"
}
},
"friendsofsymfony/user-bundle": {
"version": "v2.1.2"
},
"fzaninotto/faker": {
"version": "v1.8.0"
},
@@ -216,6 +213,9 @@
"kimai/kimai2-composer": {
"version": "0.1"
},
"kimai/user-bundle": {
"version": "dev-master"
},
"laravolt/avatar": {
"version": "3.0.0"
},
@@ -714,9 +714,6 @@
"symfony/string": {
"version": "v5.0.4"
},
"symfony/templating": {
"version": "v4.1.1"
},
"symfony/translation": {
"version": "3.3",
"recipe": {