Skip to content

Commit

Permalink
upgraded to symfony 4 #74 (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpapst committed Jan 12, 2018
1 parent c011b83 commit a873556
Show file tree
Hide file tree
Showing 232 changed files with 5,304 additions and 4,275 deletions.
29 changes: 29 additions & 0 deletions .env.dist
@@ -0,0 +1,29 @@
# This file is a "template" of which env vars need to be defined for your application
# Copy this file to .env file for development, create environment variables when deploying to production
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration

# KIMAI DEFAULT ENV VARS
DATABASE_PREFIX=kimai2_
DATABASE_ENGINE=sqlite
DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=c88c14fa70a424e7a12d459b9dd9df7f
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
#TRUSTED_HOSTS=localhost,example.com
###< symfony/framework-bundle ###

###> doctrine/doctrine-bundle ###
# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite"
# Configure your db driver and server_version in config/packages/doctrine.yaml
#DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
###< doctrine/doctrine-bundle ###

###> symfony/swiftmailer-bundle ###
# For Gmail as a transport, use: "gmail://username:password@localhost"
# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
# Delivery is disabled by default via "null://localhost"
MAILER_URL=null://localhost
###< symfony/swiftmailer-bundle ###
68 changes: 25 additions & 43 deletions .gitignore
@@ -1,57 +1,39 @@
# Cache and logs (Symfony2)
/app/cache/*
/app/logs/*
!app/cache/.gitkeep
!app/logs/.gitkeep

# Email spool folder
/app/spool/*

# Cache, session files and logs (Symfony3)
/var/cache/*
/var/logs/*
/var/sessions/*
!var/cache/.gitkeep
!var/logs/.gitkeep
!var/sessions/.gitkeep
###> symfony/framework-bundle ###
.env
/public/bundles/
/vendor/
###< symfony/framework-bundle ###

# Parameters
/app/config/parameters.yml
/app/config/parameters.ini
###> symfony/web-server-bundle ###
.web-server-pid
###< symfony/web-server-bundle ###

# Managed by Composer
/app/bootstrap.php.cache
/var/bootstrap.php.cache
# ========== KIMAI ==========
/bin/*
!bin/console
!bin/symfony_requirements
/vendor/

# Assets and user uploads
/web/bundles/
/web/uploads/
/public/theme/

# Assets managed by Bower
/web/assets/vendor/
/var/data/*.sqlite

# PHPUnit
/app/phpunit.xml
/phpunit.xml

# Build data
/build/
/var/cache/*
!var/cache/.gitkeep

# Composer PHAR
/composer.phar
/var/log/*
!var/log/.gitkeep

# Backup entities generated with doctrine:generate:entities command
*/Entity/*~
/var/sessions/*
!var/sessions/.gitkeep
# ========== KIMAI ==========

# IDE
.idea/

# SQLite files
/app/data/timesheet.sqlite
###> phpunit/phpunit ###
/phpunit.xml
###< phpunit/phpunit ###

# generated install and setup files
/web/theme/
###> friendsofphp/php-cs-fixer ###
.php_cs
.php_cs.cache
###< friendsofphp/php-cs-fixer ###
8 changes: 8 additions & 0 deletions .php_cs.dist
@@ -0,0 +1,8 @@
<?php

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
])
;
11 changes: 5 additions & 6 deletions README.md
Expand Up @@ -9,14 +9,13 @@ Kimai v2 - the reloaded open source Time-Tracking application.
This is (or will be in the future, currently a lot of features are still missing) the reloaded version of the open source time-tracking application [Kimai](http://www.kimai.org).

It is based on the following PHP components:
- [Symfony Framework 3.4](https://github.com/symfony/symfony)
- [Symfony Framework 4](https://github.com/symfony/symfony)
- [AdminThemeBundle](https://github.com/avanzu/AdminThemeBundle/) (based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE/))
- [Doctrine](https://github.com/doctrine/)
- Bower

## Requirements

- PHP 7 or higher
- PHP 7.1 or higher
- One PHP extension of PDO-SQLite and/or PDO-MySQL enabled
- and the [usual Symfony application requirements](http://symfony.com/doc/current/reference/requirements.html)

Expand Down Expand Up @@ -53,13 +52,13 @@ All thats left to do is to create your first user:
$ bin/console kimai:create-user admin admin@example.com password en ROLE_SUPER_ADMIN
```

For available roles, please refer to [the user documentation](app/Resources/docs/users.md).
For available roles, please refer to [the user documentation](var/docs/users.md).

### Installation (development / demo)

Lets boostrap your environment by executing this commands (which is only available in dev environment):
```bash
$ bin/console kimai:dev:reset
$ bin/console kimai:reset-dev
```

You just imported demo data, to test the application in its full beauty and with several different user accounts and permission sets.
Expand All @@ -83,7 +82,7 @@ $ bin/console doctrine:schema:drop --force
$ bin/console doctrine:schema:create
```

The `kimai:dev:reset` command can always be executed later on to reset your dev database and cache. I use it very frequently.
The `kimai:reset-dev` command can always be executed later on to reset your dev database and cache. I use it very frequently.


## Usage
Expand Down
26 changes: 0 additions & 26 deletions app.json

This file was deleted.

7 changes: 0 additions & 7 deletions app/.htaccess

This file was deleted.

71 changes: 0 additions & 71 deletions app/AppKernel.php

This file was deleted.

13 changes: 0 additions & 13 deletions app/autoload.php

This file was deleted.

105 changes: 0 additions & 105 deletions app/config/config.yml

This file was deleted.

0 comments on commit a873556

Please sign in to comment.