From 856e7ccaeb15cf0d3a5027690e4706067c222c87 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Mon, 18 Jun 2018 23:13:29 +0200 Subject: [PATCH] Composer updates (#165) * updated composer dependencies * updated README about composer install --- README.md | 14 +++- composer.json | 2 +- composer.lock | 216 +++++++++++++++++++++++++------------------------- 3 files changed, 117 insertions(+), 115 deletions(-) diff --git a/README.md b/README.md index 63b8bbc8..b1c01edd 100644 --- a/README.md +++ b/README.md @@ -34,16 +34,16 @@ git clone https://github.com/kevinpapst/kimai2.git cd kimai2/ ``` +The next steps depend in which environment you want to use Kimai, you can choose between development or production mode. + +### Installation (development) + Lets prepare the environment by installing all dependencies: ```bash composer install ``` -The next steps depend in which environment you want to use Kimai, you can choose between development or production mode. - -### Installation (development) - The default installation uses a SQLite database, so there is no need to create a database for your first tests. Our default settings will work out-of-the-box, but you might want to adjust the `.env` values to your needs. You can configure your database through your environment (e.g. Webserver, Cloud-Provider) or in your `.env` file: @@ -106,6 +106,12 @@ npm run prod ### Installation (production) +Lets prepare the environment by installing all dependencies: + +```bash +composer install --no-dev +``` + Make sure the [directories are read and writable by your webserver](https://symfony.com/doc/current/setup/file_permissions.html): ```bash chown -R www-data var/ diff --git a/composer.json b/composer.json index 7a000637..ed90aa88 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ "sensio/framework-extra-bundle": "^5.1", "symfony/asset": "^4.0", "symfony/console": "^4.0", + "symfony/dotenv": "^4.0", "symfony/expression-language": "^4.0", "symfony/flex": "^1.0", "symfony/form": "^4.0", @@ -42,7 +43,6 @@ "symfony/browser-kit": "^4.0", "symfony/css-selector": "^4.0", "symfony/debug-pack": "^1.0", - "symfony/dotenv": "^4.0", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^4.0", "symfony/web-server-bundle": "^4.0" diff --git a/composer.lock b/composer.lock index 89e6cc98..db77085e 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "a346b30d3fbb9e6bafa068e5d56186a2", + "content-hash": "3ae4c225619897f7feb4f4e99da7bf01", "packages": [ { "name": "almasaeed2010/adminlte", @@ -943,16 +943,16 @@ }, { "name": "doctrine/migrations", - "version": "v1.7.2", + "version": "v1.8.1", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "3e7656c5adfd9b7d0d8757aa1e9e8daf43a6f200" + "reference": "215438c0eef3e5f9b7da7d09c6b90756071b43e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/3e7656c5adfd9b7d0d8757aa1e9e8daf43a6f200", - "reference": "3e7656c5adfd9b7d0d8757aa1e9e8daf43a6f200", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/215438c0eef3e5f9b7da7d09c6b90756071b43e6", + "reference": "215438c0eef3e5f9b7da7d09c6b90756071b43e6", "shasum": "" }, "require": { @@ -980,17 +980,18 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "v1.7.x-dev" + "dev-master": "v1.8.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations" + "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations", + "Doctrine\\Migrations\\": "lib/Doctrine/Migrations" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "MIT" ], "authors": [ { @@ -1007,12 +1008,12 @@ } ], "description": "Database Schema migrations using Doctrine DBAL", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org/projects/migrations.html", "keywords": [ "database", "migrations" ], - "time": "2018-05-09T21:04:56+00:00" + "time": "2018-06-06T21:00:30+00:00" }, { "name": "doctrine/orm", @@ -2291,6 +2292,63 @@ "homepage": "https://symfony.com", "time": "2018-05-16T14:41:07+00:00" }, + { + "name": "symfony/dotenv", + "version": "v4.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/dotenv.git", + "reference": "f98b6b65e04dd51f40d2cfc81c2c833ff3773b1e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/f98b6b65e04dd51f40d2cfc81c2c833ff3773b1e", + "reference": "f98b6b65e04dd51f40d2cfc81c2c833ff3773b1e", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "symfony/process": "~3.4|~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Dotenv\\": "" + }, + "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": "Registers environment variables from a .env file", + "homepage": "https://symfony.com", + "keywords": [ + "dotenv", + "env", + "environment" + ], + "time": "2018-05-30T07:26:09+00:00" + }, { "name": "symfony/event-dispatcher", "version": "v4.1.0", @@ -5207,16 +5265,16 @@ }, { "name": "easycorp/easy-log-handler", - "version": "v1.0.4", + "version": "v1.0.5", "source": { "type": "git", "url": "https://github.com/EasyCorp/easy-log-handler.git", - "reference": "1a617a37ab9389eac4e2e1d14cb70ee0087d724d" + "reference": "21c442f5d08b6761a6fa7653e08a5525fb4ccd2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyCorp/easy-log-handler/zipball/1a617a37ab9389eac4e2e1d14cb70ee0087d724d", - "reference": "1a617a37ab9389eac4e2e1d14cb70ee0087d724d", + "url": "https://api.github.com/repos/EasyCorp/easy-log-handler/zipball/21c442f5d08b6761a6fa7653e08a5525fb4ccd2b", + "reference": "21c442f5d08b6761a6fa7653e08a5525fb4ccd2b", "shasum": "" }, "require": { @@ -5253,20 +5311,20 @@ "monolog", "productivity" ], - "time": "2018-01-10T08:34:20+00:00" + "time": "2018-06-12T06:27:09+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.12.0", + "version": "v2.12.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "a53f39a72cf0baa03909fae779a4de6d3772c74f" + "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/a53f39a72cf0baa03909fae779a4de6d3772c74f", - "reference": "a53f39a72cf0baa03909fae779a4de6d3772c74f", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/beef6cbe6dec7205edcd143842a49f9a691859a6", + "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6", "shasum": "" }, "require": { @@ -5297,10 +5355,10 @@ "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.1", "php-cs-fixer/accessible-object": "^1.0", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", - "phpunitgoodpractices/traits": "^1.4", + "phpunitgoodpractices/traits": "^1.5", "symfony/phpunit-bridge": "^4.0" }, "suggest": { @@ -5313,11 +5371,6 @@ "php-cs-fixer" ], "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.12-dev" - } - }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -5349,20 +5402,20 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-06-02T17:33:35+00:00" + "time": "2018-06-10T08:26:56+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "478465659fd987669df0bd8a9bf22a8710e5f1b6" + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/478465659fd987669df0bd8a9bf22a8710e5f1b6", - "reference": "478465659fd987669df0bd8a9bf22a8710e5f1b6", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", "shasum": "" }, "require": { @@ -5397,7 +5450,7 @@ "object", "object graph" ], - "time": "2018-05-29T17:25:09+00:00" + "time": "2018-06-11T23:09:50+00:00" }, { "name": "nikic/php-parser", @@ -5883,16 +5936,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "e20525b0c2945c7c317fff95660698cb3d2a53bc" + "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/e20525b0c2945c7c317fff95660698cb3d2a53bc", - "reference": "e20525b0c2945c7c317fff95660698cb3d2a53bc", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c", + "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c", "shasum": "" }, "require": { @@ -5926,7 +5979,7 @@ "filesystem", "iterator" ], - "time": "2018-05-28T12:13:49+00:00" + "time": "2018-06-11T11:44:00+00:00" }, { "name": "phpunit/php-text-template", @@ -6198,16 +6251,16 @@ }, { "name": "sebastian/comparator", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5" + "reference": "591a30922f54656695e59b1f39501aec513403da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5", - "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da", + "reference": "591a30922f54656695e59b1f39501aec513403da", "shasum": "" }, "require": { @@ -6258,20 +6311,20 @@ "compare", "equality" ], - "time": "2018-04-18T13:33:00+00:00" + "time": "2018-06-14T15:05:28+00:00" }, { "name": "sebastian/diff", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8" + "reference": "366541b989927187c4ca70490a35615d3fef2dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/e09160918c66281713f1c324c1f4c4c3037ba1e8", - "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce", + "reference": "366541b989927187c4ca70490a35615d3fef2dce", "shasum": "" }, "require": { @@ -6314,7 +6367,7 @@ "unidiff", "unified diff" ], - "time": "2018-02-01T13:45:15+00:00" + "time": "2018-06-10T07:54:39+00:00" }, { "name": "sebastian/environment", @@ -6716,16 +6769,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.2.3", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "4842476c434e375f9d3182ff7b89059583aa8b27" + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27", - "reference": "4842476c434e375f9d3182ff7b89059583aa8b27", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "shasum": "" }, "require": { @@ -6763,7 +6816,7 @@ "phpcs", "standards" ], - "time": "2018-02-20T21:35:23+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "symfony/browser-kit", @@ -7027,63 +7080,6 @@ "homepage": "https://symfony.com", "time": "2018-05-01T23:02:13+00:00" }, - { - "name": "symfony/dotenv", - "version": "v4.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/dotenv.git", - "reference": "f98b6b65e04dd51f40d2cfc81c2c833ff3773b1e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/f98b6b65e04dd51f40d2cfc81c2c833ff3773b1e", - "reference": "f98b6b65e04dd51f40d2cfc81c2c833ff3773b1e", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "require-dev": { - "symfony/process": "~3.4|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Dotenv\\": "" - }, - "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": "Registers environment variables from a .env file", - "homepage": "https://symfony.com", - "keywords": [ - "dotenv", - "env", - "environment" - ], - "time": "2018-05-30T07:26:09+00:00" - }, { "name": "symfony/maker-bundle", "version": "v1.5.0",