From f8b390cbe20e9ef03a06a876d38d73cc4667f765 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sun, 7 Jan 2018 15:11:03 +0100 Subject: [PATCH] Developer improvements, PhpCs, PhpUnit #42 (#43) * improved dev fixtures with more diversity, more data, better testcases, user avatars #42 * added customer stats to dashboard, fixed column length for 3 widgets #42 * fixed empty alias - display empty message for new user #42 * unified-ui for "new" toolbar icon #42 * use kimai2_ as database prefix #42 * added customer stats to dashboard, fixed column length for 3 widgets #42 * fix long project/customer names in "currently active" navbar flyout" #42 * added services config for dev environment #42 * added command to run unit tests #42 * added command to run integration tests #42 * added command to run code sniffer #42 * added phpcs and phpunit to composer #42 * created tests directory #42 * fixed code sniffer warnings #42 * added function to switch result type from Pagerfanta to QueryBuilder #42 * dramatically reduced database calls by using custom joined query #42 * added command to install kimai dependencies #42 * added dev:reset command #42 --- app/Resources/translations/messages.de.xliff | 12 +- app/Resources/views/dashboard/index.html.twig | 15 +- app/Resources/views/macros/widgets.html.twig | 9 +- app/Resources/views/user/profile.html.twig | 17 +- app/config/config_dev.yml | 1 + app/config/parameters.yml.dist | 2 +- app/config/security.yml | 9 +- app/config/services.yml | 91 +- app/config/services_dev.yml | 32 + composer.json | 4 +- composer.lock | 1494 ++++++++++++++++- src/AppBundle/AppBundle.php | 2 +- src/AppBundle/Command/CreateUserCommand.php | 14 +- src/AppBundle/Command/DevResetCommand.php | 131 ++ src/AppBundle/Command/InstallCommand.php | 92 + .../Command/RunCodeSnifferCommand.php | 84 + .../Command/RunIntegrationTestsCommand.php | 46 + src/AppBundle/Command/RunUnitTestsCommand.php | 94 ++ .../Controller/AbstractController.php | 6 +- .../Controller/Admin/UserController.php | 5 +- .../Controller/DashboardController.php | 41 +- .../Controller/ProfileController.php | 21 +- .../DataFixtures/ORM/LoadFixtures.php | 25 +- .../DependencyInjection/AppExtension.php | 2 +- .../DependencyInjection/CompilerPass.php | 4 +- .../Doctrine/TablePrefixSubscriber.php | 5 +- src/AppBundle/Entity/User.php | 10 +- .../Event/ConfigureMainMenuEvent.php | 4 - src/AppBundle/Event/ConfigureMenuEvent.php | 6 +- src/AppBundle/EventListener/MenuBuilder.php | 17 +- .../EventListener/NavbarShowUserListener.php | 3 +- .../RedirectToPreferredLocaleListener.php | 4 +- src/AppBundle/Form/UserRolesType.php | 2 + .../Repository/AbstractRepository.php | 19 +- src/AppBundle/Repository/Query/BaseQuery.php | 27 + src/AppBundle/Twig/Extensions.php | 14 +- .../Validator/Constraints/RoleValidator.php | 2 +- src/AppBundle/Voter/UserVoter.php | 7 +- .../Controller/ActivityController.php | 3 +- .../Controller/Admin/ActivityController.php | 8 +- .../Controller/Admin/CustomerController.php | 4 +- .../Controller/Admin/ProjectController.php | 4 +- .../Controller/Admin/TimesheetController.php | 9 +- .../Controller/TimesheetController.php | 20 +- .../Controller/TimesheetControllerTrait.php | 2 +- .../DataFixtures/ORM/LoadFixtures.php | 115 +- src/TimesheetBundle/Entity/Project.php | 6 +- src/TimesheetBundle/Entity/Timesheet.php | 8 +- src/TimesheetBundle/EventListener/Menu.php | 2 +- .../Form/Type/ActivityType.php | 22 +- src/TimesheetBundle/Form/Type/ProjectType.php | 9 +- .../Repository/ActivityRepository.php | 7 +- .../Repository/CustomerRepository.php | 4 +- .../Repository/ProjectRepository.php | 7 +- .../Repository/Query/TimesheetQuery.php | 1 - .../Repository/TimesheetRepository.php | 33 +- .../Resources/views/admin/customer.html.twig | 2 +- src/TimesheetBundle/Voter/ActivityVoter.php | 2 + src/TimesheetBundle/Voter/CustomerVoter.php | 2 + src/TimesheetBundle/Voter/ProjectVoter.php | 2 + .../Controller/DefaultControllerTest.php | 3 +- .../Repository/Query/TimesheetQueryTest.php | 72 + web/css/kimai.css | 6 + 63 files changed, 2424 insertions(+), 302 deletions(-) create mode 100644 app/config/services_dev.yml create mode 100644 src/AppBundle/Command/DevResetCommand.php create mode 100644 src/AppBundle/Command/InstallCommand.php create mode 100644 src/AppBundle/Command/RunCodeSnifferCommand.php create mode 100644 src/AppBundle/Command/RunIntegrationTestsCommand.php create mode 100644 src/AppBundle/Command/RunUnitTestsCommand.php rename {src/AppBundle/Tests => tests/AppBundle}/Controller/DefaultControllerTest.php (97%) create mode 100644 tests/TimesheetBundle/Repository/Query/TimesheetQueryTest.php diff --git a/app/Resources/translations/messages.de.xliff b/app/Resources/translations/messages.de.xliff index 712b0b4a..737607d4 100644 --- a/app/Resources/translations/messages.de.xliff +++ b/app/Resources/translations/messages.de.xliff @@ -464,7 +464,7 @@ admin_user.subtitle - Alle registrierten Nutzer + Alle registrierten Benutzer der Zeitverwaltung label.alias @@ -546,9 +546,9 @@ stats.userActiveEver Aktive Benutzer jemals - - stats.userActiveNow - Momentan aktiv + + stats.activeRecordings + Momentan aktive Zeitmessungen stats.activitiesTotal @@ -558,6 +558,10 @@ stats.projectsTotal Anzahl Projekte + + stats.customerTotal + Anzahl Kunden + -

{{ user.alias }} ({{ user.username }})

+

{{ user.alias|default(user.username) }}

{{ user.title }}
@@ -207,7 +212,7 @@
-

{{ user.alias }} ({{ user.username }})

+

{{ user.alias|default(user.username) }}

{{ user.title }}
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 29e874cd..cfe7903e 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -1,5 +1,6 @@ imports: - { resource: config.yml } + - { resource: services_dev.yml } framework: router: diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 3230c1c7..6fddbe6f 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -11,7 +11,7 @@ parameters: # database_url: 'mysql://root:pass@127.0.0.1:3306/timesheet' # You can prefix all your tables to pevent collision with other software - database_prefix: kimai_ + database_prefix: kimai2_ # You can create the database and load the sample data from the command line: # diff --git a/app/config/security.yml b/app/config/security.yml index 900713db..81d91347 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -6,20 +6,19 @@ security: providers: # in this example, users are stored via Doctrine in the database - # To see the users at src/AppBundle/DataFixtures/ORM/LoadFixtures.php - # To load users from somewhere else: http://symfony.com/doc/current/cookbook/security/custom_provider.html + # demo users can be found at src/AppBundle/DataFixtures/ORM/LoadFixtures.php database_users: entity: { class: AppBundle:User, property: username } # http://symfony.com/doc/current/book/security.html#firewalls-authentication firewalls: secured_area: - # this firewall applies to all URLs - pattern: ^/ - # does what it says logout_on_user_change: true + # this firewall applies to all URLs + pattern: ^/ + # but the firewall does not require login on every page # denying access is done in access_control or in your controllers anonymous: ~ diff --git a/app/config/services.yml b/app/config/services.yml index d35405f6..cdcdcf0b 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -1,12 +1,12 @@ services: + # ================================================================================ + # TWIG + # ================================================================================ + markdown: class: AppBundle\Utils\Markdown -# ================================================================================ -# TWIG -# ================================================================================ - app.twig.app_extension: public: false class: AppBundle\Twig\Extensions @@ -26,9 +26,9 @@ services: tags: - { name: twig.extension } -# ================================================================================ -# SECURITY -# ================================================================================ + # ================================================================================ + # SECURITY + # ================================================================================ # security voter to check user-profile access app.voter.user: @@ -58,9 +58,9 @@ services: tags: - { name: security.voter } -# ================================================================================ -# FORMS -# ================================================================================ + # ================================================================================ + # FORMS + # ================================================================================ # form to edit user roles app.admin.user_profile_roles: @@ -76,9 +76,9 @@ services: tags: - { name: kernel.event_listener, event: theme.sidebar_setup_menu, method: onSetupNavbar } -# ================================================================================ -# DATABASE -# ================================================================================ + # ================================================================================ + # DATABASE + # ================================================================================ # service that prefixes every database table app.tableprefix_subscriber: @@ -94,18 +94,18 @@ services: # app.post_repository: # class: Doctrine\ORM\EntityRepository # factory: ['@doctrine.orm.entity_manager', getRepository] - # arguments: [AppBundle\Entity\Post] + # arguments: [AppBundle\Entity\User] # # // traditional code inside a controller # $entityManager = $this->getDoctrine()->getManager(); - # $posts = $entityManager->getRepository('AppBundle:Post')->findAll(); + # $posts = $entityManager->getRepository('AppBundle:User')->findAll(); # # // same code using repository services - # $posts = $this->get('app.post_repository')->findAll(); + # $posts = $this->get('app.user_repository')->findAll(); -# ================================================================================ -# THEME -# ================================================================================ + # ================================================================================ + # THEME + # ================================================================================ avanzu_admin_theme.navbar_user_listener: class: AppBundle\EventListener\NavbarShowUserListener @@ -114,30 +114,30 @@ services: - { name: kernel.event_listener, event: theme.navbar_user, method: onShowUser } - { name: kernel.event_listener, event: theme.sidebar_user, method: onShowUser } -# avanzu_admin_theme.navbar_task_listener: -# class: "%avanzu_admin_theme.navbar_task_listener.class%" -# tags: -# - { name: kernel.event_listener, event: theme.tasks, method: onListTasks } -# -# avanzu_admin_theme.navbar_notify_listener: -# class: "%avanzu_admin_theme.navbar_notify_listener.class%" -# tags: -# - { name: kernel.event_listener, event: theme.notifications, method: onListNotifications } -# -# avanzu_admin_theme.navbar_msg_listener: -# class: "%avanzu_admin_theme.navbar_msg_listener.class%" -# tags: -# - { name: kernel.event_listener, event: theme.messages, method: onListMessages } -# -# avanzu_admin_theme.setup_menu_listener: -# class: "%avanzu_admin_theme.setup_menu_listener.class%" -# tags: -# - { name: kernel.event_listener, event: theme.sidebar_setup_menu, method: onSetupMenu } -# - { name: kernel.event_listener, event: theme.breadcrumb, method: onSetupMenu } + # avanzu_admin_theme.navbar_task_listener: + # class: "%avanzu_admin_theme.navbar_task_listener.class%" + # tags: + # - { name: kernel.event_listener, event: theme.tasks, method: onListTasks } + # + # avanzu_admin_theme.navbar_notify_listener: + # class: "%avanzu_admin_theme.navbar_notify_listener.class%" + # tags: + # - { name: kernel.event_listener, event: theme.notifications, method: onListNotifications } + # + # avanzu_admin_theme.navbar_msg_listener: + # class: "%avanzu_admin_theme.navbar_msg_listener.class%" + # tags: + # - { name: kernel.event_listener, event: theme.messages, method: onListMessages } + # + # avanzu_admin_theme.setup_menu_listener: + # class: "%avanzu_admin_theme.setup_menu_listener.class%" + # tags: + # - { name: kernel.event_listener, event: theme.sidebar_setup_menu, method: onSetupMenu } + # - { name: kernel.event_listener, event: theme.breadcrumb, method: onSetupMenu } -# ================================================================================ -# APPLICATION CORE -# ================================================================================ + # ================================================================================ + # APPLICATION CORE + # ================================================================================ # a route listener, that injects the locale through a URL directory app.redirect_to_preferred_locale_listener: @@ -153,9 +153,10 @@ services: - { name: kernel.event_listener, event: app.main_menu_configure, method: onMainMenuConfigure } - { name: kernel.event_listener, event: app.admin_menu_configure, method: onAdminMenuConfigure } -# ================================================================================ -# CONSOLE COMMANDS -# ================================================================================ + # ================================================================================ + # CONSOLE COMMANDS + # ================================================================================ + app.command.create_user: class: AppBundle\Command\CreateUserCommand arguments: ["@security.password_encoder", "@doctrine", "@validator"] diff --git a/app/config/services_dev.yml b/app/config/services_dev.yml new file mode 100644 index 00000000..6b1e809a --- /dev/null +++ b/app/config/services_dev.yml @@ -0,0 +1,32 @@ +imports: + - { resource: services.yml } + +services: + + # ================================================================================ + # CONSOLE COMMANDS + # ================================================================================ + + app.command.run_phpcs: + class: AppBundle\Command\RunCodeSnifferCommand + arguments: ["%kernel.root_dir%"] + tags: + - { name: console.command, command: kimai:dev:phpcs } + + app.command.run_unit_tests: + class: AppBundle\Command\RunUnitTestsCommand + arguments: ["%kernel.root_dir%"] + tags: + - { name: console.command, command: kimai:dev:test-unit } + + app.command.run_integration_tests: + class: AppBundle\Command\RunIntegrationTestsCommand + arguments: ["%kernel.root_dir%"] + tags: + - { name: console.command, command: kimai:dev:test-integration } + + app.command.dev_reset: + class: AppBundle\Command\DevResetCommand + arguments: ["%kernel.root_dir%"] + tags: + - { name: console.command, command: kimai:dev:reset } diff --git a/composer.json b/composer.json index 3b49f1e3..31c96b3a 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,9 @@ }, "require-dev": { "sensio/generator-bundle": "~3.0", - "symfony/phpunit-bridge": "^3.0" + "symfony/phpunit-bridge": "^3.0", + "squizlabs/php_codesniffer": "3.*", + "phpunit/phpunit": "^6" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index 910e0d14..36917cd5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "9be870d4b37b8cc29103dbe2cc2d02e6", + "content-hash": "1353056aae6cd3e256368e770737274f", "packages": [ { "name": "almasaeed2010/adminlte", @@ -2724,16 +2724,16 @@ }, { "name": "symfony/symfony", - "version": "v3.4.2", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "29961b693fa2157a3f349d1a801f9f8742be4e03" + "reference": "21abeae69baf64d689b04ca33663b4354be1a226" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/29961b693fa2157a3f349d1a801f9f8742be4e03", - "reference": "29961b693fa2157a3f349d1a801f9f8742be4e03", + "url": "https://api.github.com/repos/symfony/symfony/zipball/21abeae69baf64d689b04ca33663b4354be1a226", + "reference": "21abeae69baf64d689b04ca33663b4354be1a226", "shasum": "" }, "require": { @@ -2875,7 +2875,7 @@ "keywords": [ "framework" ], - "time": "2017-12-15T02:05:35+00:00" + "time": "2018-01-05T08:33:31+00:00" }, { "name": "symfony/web-server-bundle", @@ -3055,16 +3055,16 @@ }, { "name": "white-october/pagerfanta-bundle", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git", - "reference": "9b1f3d43eaeebaf1e2b8d9f8be394c0785184df3" + "reference": "b783a86877eaa5e9844449db1c86d68ace804ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/9b1f3d43eaeebaf1e2b8d9f8be394c0785184df3", - "reference": "9b1f3d43eaeebaf1e2b8d9f8be394c0785184df3", + "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/b783a86877eaa5e9844449db1c86d68ace804ae3", + "reference": "b783a86877eaa5e9844449db1c86d68ace804ae3", "shasum": "" }, "require": { @@ -3103,10 +3103,1323 @@ "page", "paging" ], - "time": "2017-11-30T12:07:11+00:00" + "time": "2018-01-03T08:27:40+00:00" } ], "packages-dev": [ + { + "name": "myclabs/deep-copy", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-10-19T19:58:43+00:00" + }, + { + "name": "phar-io/manifest", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^1.0.1", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2017-03-05T18:14:27+00:00" + }, + { + "name": "phar-io/version", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2017-03-05T17:38:23+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2017-09-11T18:02:19+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "4.2.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", + "shasum": "" + }, + "require": { + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2017-11-27T17:38:31+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.4.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2017-07-14T14:27:02+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8.35 || ^5.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2017-11-24T13:59:53+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "5.3.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^2.0.1", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-xdebug": "^2.5.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2017-12-06T09:29:45+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2017-11-27T13:52:08+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26T11:10:40+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "791198a2c6254db10131eecfe8c06670700904db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2017-11-27T05:48:46+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "6.5.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "83d27937a310f2984fd575686138597147bdc7df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d27937a310f2984fd575686138597147bdc7df", + "reference": "83d27937a310f2984fd575686138597147bdc7df", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "^1.6.1", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.3", + "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^5.0.5", + "sebastian/comparator": "^2.1", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0.1" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-xdebug": "*", + "phpunit/php-invoker": "^1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.5.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2017-12-17T06:31:19+00:00" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "5.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.1" + }, + "conflict": { + "phpunit/phpunit": "<6.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.5" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2018-01-06T05:45:45+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" + }, + { + "name": "sebastian/comparator", + "version": "2.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b11c729f95109b56a0fe9650c6a63a0fcd8c439f", + "reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/diff": "^2.0", + "sebastian/exporter": "^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2017-12-22T14:50:35+00:00" + }, + { + "name": "sebastian/diff", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2017-08-03T08:09:46+00:00" + }, + { + "name": "sebastian/environment", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2017-07-01T08:51:00+00:00" + }, + { + "name": "sebastian/exporter", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2017-04-03T13:19:02+00:00" + }, + { + "name": "sebastian/global-state", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2017-04-27T15:39:26+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2017-03-03T06:23:57+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28T20:34:47+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, { "name": "sensio/generator-bundle", "version": "v3.1.7", @@ -3162,17 +4475,68 @@ "time": "2017-12-07T15:36:41+00:00" }, { - "name": "symfony/phpunit-bridge", - "version": "v3.4.2", + "name": "squizlabs/php_codesniffer", + "version": "3.2.2", "source": { "type": "git", - "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "074c2e205c849a5fb37b1c24ade03cc975ac8079" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/074c2e205c849a5fb37b1c24ade03cc975ac8079", - "reference": "074c2e205c849a5fb37b1c24ade03cc975ac8079", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", + "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2017-12-19T21:44:46+00:00" + }, + { + "name": "symfony/phpunit-bridge", + "version": "v3.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "24ffb71a115c25f5ee56cbfd38e56ed2cdbeb0a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/24ffb71a115c25f5ee56cbfd38e56ed2cdbeb0a9", + "reference": "24ffb71a115c25f5ee56cbfd38e56ed2cdbeb0a9", "shasum": "" }, "require": { @@ -3192,6 +4556,10 @@ "extra": { "branch-alias": { "dev-master": "3.4-dev" + }, + "thanks": { + "name": "phpunit/phpunit", + "url": "https://github.com/sebastianbergmann/phpunit" } }, "autoload": { @@ -3221,7 +4589,97 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2018-01-04T17:19:23+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07T12:08:54+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [], diff --git a/src/AppBundle/AppBundle.php b/src/AppBundle/AppBundle.php index 241e8527..e96b5589 100644 --- a/src/AppBundle/AppBundle.php +++ b/src/AppBundle/AppBundle.php @@ -32,4 +32,4 @@ class AppBundle extends Bundle $container->addCompilerPass(new CompilerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -1000); } -} \ No newline at end of file +} diff --git a/src/AppBundle/Command/CreateUserCommand.php b/src/AppBundle/Command/CreateUserCommand.php index d64fd9d3..07700767 100644 --- a/src/AppBundle/Command/CreateUserCommand.php +++ b/src/AppBundle/Command/CreateUserCommand.php @@ -48,8 +48,11 @@ class CreateUserCommand extends Command * @param RegistryInterface $registry * @param ValidatorInterface $validator */ - public function __construct(UserPasswordEncoderInterface $encoder, RegistryInterface $registry, ValidatorInterface $validator) - { + public function __construct( + UserPasswordEncoderInterface $encoder, + RegistryInterface $registry, + ValidatorInterface $validator + ) { $this->encoder = $encoder; $this->doctrine = $registry; $this->validator = $validator; @@ -70,7 +73,7 @@ class CreateUserCommand extends Command ->addArgument('email', InputArgument::REQUIRED, 'Users email address (must be unique)') ->addArgument('password', InputArgument::REQUIRED, 'Users password') ->addArgument('language', InputArgument::OPTIONAL, 'Users language', User::DEFAULT_LANGUAGE) - ->addArgument('role', InputArgument::OPTIONAL, 'Users role (can be a comma separated list)', User::DEFAULT_ROLE) + ->addArgument('role', InputArgument::OPTIONAL, 'Users role (comma separated list)', User::DEFAULT_ROLE) ; } @@ -104,10 +107,11 @@ class CreateUserCommand extends Command $errors = $this->validator->validate($user); if ($errors->count() > 0) { /** @var \Symfony\Component\Validator\ConstraintViolation $error */ - foreach($errors as $error) { + foreach ($errors as $error) { + $value = $error->getInvalidValue(); $io->error( $error->getPropertyPath() - . " (" . (is_array($error->getInvalidValue()) ? implode(',', $error->getInvalidValue()) : $error->getInvalidValue()).")" + . " (" . (is_array($value) ? implode(',', $value) : $value) .")" . "\n " . $error->getMessage() ); diff --git a/src/AppBundle/Command/DevResetCommand.php b/src/AppBundle/Command/DevResetCommand.php new file mode 100644 index 00000000..a84e8e68 --- /dev/null +++ b/src/AppBundle/Command/DevResetCommand.php @@ -0,0 +1,131 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace AppBundle\Command; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Question\ConfirmationQuestion; +use Symfony\Component\Console\Style\SymfonyStyle; + +/** + * Command used to execute all the basic application bootstrapping AFTER "composer install" was executed. + * + * @author Kevin Papst + */ +class DevResetCommand extends Command +{ + + /** + * @inheritdoc + */ + protected function configure() + { + $this + ->setName('kimai:dev:reset') + ->setDescription('Resets the dev environment') + ->setHelp(<<-n switch to skip the question. +EOT + ) + ->addOption('no-cache', null, InputOption::VALUE_NONE, 'Skip cache flushing') + ; + } + + /** + * @param InputInterface $input + * @param OutputInterface $output + * @return int|null + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $io = new SymfonyStyle($input, $output); + + if ($input->isInteractive()) { + if (!$this->askConfirmation( + $input, + $output, + 'Careful, database will be purged. Do you want to continue y/N ?', + false + )) { + return; + } + } + + $command = $this->getApplication()->find('doctrine:database:create'); + try { + $command->run(new ArrayInput([]), $output); + } catch (\Exception $ex) { + $io->error('Failed to create database: ' . $ex->getMessage()); + return 1; + } + + $command = $this->getApplication()->find('doctrine:schema:drop'); + try { + $command->run(new ArrayInput(['--force' => true]), $output); + } catch (\Exception $ex) { + $io->error('Failed to drop database schema: ' . $ex->getMessage()); + return 2; + } + + $command = $this->getApplication()->find('doctrine:schema:create'); + try { + $command->run(new ArrayInput([]), $output); + } catch (\Exception $ex) { + $io->error('Failed to create database schema: ' . $ex->getMessage()); + return 3; + } + + $command = $this->getApplication()->find('doctrine:fixtures:load'); + try { + $cmdInput = new ArrayInput([]); + $cmdInput->setInteractive(false); + $command->run($cmdInput, $output); + } catch (\Exception $ex) { + $io->error('Failed to import fixtures: ' . $ex->getMessage()); + return 4; + } + + if ($input->getOption('no-cache')) { + return 0; + } + + $command = $this->getApplication()->find('cache:clear'); + try { + $command->run(new ArrayInput([]), $output); + } catch (\Exception $ex) { + $io->error('Failed to clear cache: ' . $ex->getMessage()); + return 5; + } + + return 0; + } + + + /** + * @param InputInterface $input + * @param OutputInterface $output + * @param string $question + * @param bool $default + * @return bool + */ + private function askConfirmation(InputInterface $input, OutputInterface $output, $question, $default) + { + $questionHelper = $this->getHelperSet()->get('question'); + $question = new ConfirmationQuestion($question, $default); + + return $questionHelper->ask($input, $output, $question); + } +} diff --git a/src/AppBundle/Command/InstallCommand.php b/src/AppBundle/Command/InstallCommand.php new file mode 100644 index 00000000..355fc97b --- /dev/null +++ b/src/AppBundle/Command/InstallCommand.php @@ -0,0 +1,92 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace AppBundle\Command; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Style\SymfonyStyle; + +/** + * Command used to execute all the basic application bootstrapping AFTER "composer install" was executed. + * + * @author Kevin Papst + */ +class InstallCommand extends Command +{ + + /** + * @inheritdoc + */ + protected function configure() + { + $this + ->setName('kimai:install') + ->setDescription('Execute all the basic installation tasks') + ->setHelp('This command will bootstrap Kimai, copies asset installation by default') + ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it') + ->addOption('relative', null, InputOption::VALUE_NONE, 'Make relative symlinks') + ; + } + + /** + * @inheritdoc + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $io = new SymfonyStyle($input, $output); + + $arguments = []; + + if ($input->getOption('relative')) { + $arguments = [ + '--relative' => true, + ]; + } elseif ($input->getOption('symlink')) { + $arguments = [ + '--symlink' => true, + ]; + } + + if ($this->installAssets($output, $io, 'assets:install', $arguments)) { + $this->installAssets($output, $io, 'avanzu:admin:initialize', $arguments); + } + } + + /** + * @param OutputInterface $output + * @param SymfonyStyle $io + * @param string $cmdName + * @param array $args + * @return bool + */ + protected function installAssets(OutputInterface $output, SymfonyStyle $io, $cmdName, $args = []) + { + $command = $this->getApplication()->find($cmdName); + + try { + $returnCode = $command->run(new ArrayInput($args), $output); + } catch (\Exception $ex) { + $io->error('Failed to install assets via "'.$cmdName.'": ' . $ex->getMessage()); + return false; + } + + if ($returnCode != 0) { + $io->error('Failed to install assets via "'.$cmdName.'"'); + return false; + } + + return true; + } +} diff --git a/src/AppBundle/Command/RunCodeSnifferCommand.php b/src/AppBundle/Command/RunCodeSnifferCommand.php new file mode 100644 index 00000000..59fefb13 --- /dev/null +++ b/src/AppBundle/Command/RunCodeSnifferCommand.php @@ -0,0 +1,84 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace AppBundle\Command; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Style\SymfonyStyle; + +/** + * Command used to check the project coding styles. + * + * @author Kevin Papst + */ +class RunCodeSnifferCommand extends Command +{ + /** + * @var string + */ + protected $rootDir; + + /** + * RunCodeSnifferCommand constructor. + * @param $rootDir + */ + public function __construct($rootDir) + { + $this->rootDir = realpath($rootDir . '/../'); + parent::__construct(); + } + + /** + * @inheritdoc + */ + protected function configure() + { + $this + ->setName('kimai:dev:phpcs') + ->setDescription('Run PHP_CodeSniffer to check for the projects coding style') + ; + } + + /** + * @inheritdoc + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $io = new SymfonyStyle($input, $output); + + $this->executeCodeSniffer($io, '/src'); + $this->executeCodeSniffer($io, '/tests'); + $this->executeCodeSniffer($io, '/app/Resources/views'); + } + + /** + * @param string $directory + */ + protected function executeCodeSniffer(SymfonyStyle $io, $directory) + { + $directory = $this->rootDir . $directory; + + $exitCode = 0; + ob_start(); + passthru($this->rootDir . '/bin/phpcs --standard=PSR2 ' . $directory, $exitCode); + $result = ob_get_clean(); + + $io->write($result); + + if ($exitCode > 0) { + $io->error('Found problems while checking sources at: ' . $directory); + } else { + $io->success('All sources look good at: ' . $directory); + } + } +} diff --git a/src/AppBundle/Command/RunIntegrationTestsCommand.php b/src/AppBundle/Command/RunIntegrationTestsCommand.php new file mode 100644 index 00000000..37fe83dc --- /dev/null +++ b/src/AppBundle/Command/RunIntegrationTestsCommand.php @@ -0,0 +1,46 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace AppBundle\Command; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Style\SymfonyStyle; + +/** + * Command used to run all integration tests. + * + * @author Kevin Papst + */ +class RunIntegrationTestsCommand extends RunUnitTestsCommand +{ + /** + * @inheritdoc + */ + protected function configure() + { + $this + ->setName('kimai:dev:test-integration') + ->setDescription('Run all integration tests') + ->setHelp('This command will execute all integration tests with the annotation "@group integration".') + ; + } + + /** + * @param $directory + * @return string + */ + protected function createPhpunitCmdLine($directory) + { + return $this->rootDir . '/bin/phpunit --group integration ' . $directory; + } +} diff --git a/src/AppBundle/Command/RunUnitTestsCommand.php b/src/AppBundle/Command/RunUnitTestsCommand.php new file mode 100644 index 00000000..383d0031 --- /dev/null +++ b/src/AppBundle/Command/RunUnitTestsCommand.php @@ -0,0 +1,94 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace AppBundle\Command; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Style\SymfonyStyle; + +/** + * Command used to run all unit tests. + * + * @author Kevin Papst + */ +class RunUnitTestsCommand extends Command +{ + + /** + * @var string + */ + protected $rootDir; + + /** + * RunCodeSnifferCommand constructor. + * @param $rootDir + */ + public function __construct($rootDir) + { + $this->rootDir = realpath($rootDir . '/../'); + parent::__construct(); + } + + /** + * @inheritdoc + */ + protected function configure() + { + $this + ->setName('kimai:dev:test-unit') + ->setDescription('Run all unit tests') + ->setHelp('This command will execute all unit tests. Skips all tests with "@group integration" annotation.') + ; + } + + /** + * @inheritdoc + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $io = new SymfonyStyle($input, $output); + + $this->executeTests($io, '/tests/AppBundle'); + $this->executeTests($io, '/tests/TimesheetBundle'); + } + + /** + * @param $directory + * @return string + */ + protected function createPhpunitCmdLine($directory) + { + return $this->rootDir . '/bin/phpunit --exclude-group integration ' . $directory; + } + + /** + * @param string $directory + */ + protected function executeTests(SymfonyStyle $io, $directory) + { + $directory = $this->rootDir . $directory; + + $exitCode = 0; + ob_start(); + passthru($this->createPhpunitCmdLine($directory), $exitCode); + $result = ob_get_clean(); + + $io->write($result); + + if ($exitCode > 0) { + $io->error('Found problems while running tests at: ' . $directory); + } else { + $io->success('All tests performed good at: ' . $directory); + } + } +} diff --git a/src/AppBundle/Controller/AbstractController.php b/src/AppBundle/Controller/AbstractController.php index 9c608cf2..2c90fbfb 100644 --- a/src/AppBundle/Controller/AbstractController.php +++ b/src/AppBundle/Controller/AbstractController.php @@ -43,13 +43,13 @@ abstract class AbstractController extends Controller * * @param $attributes * @param null $subject - * @param string $translationKey + * @param string $translation * @param array $parameter * @throws AccessDeniedException */ - protected function denyUnlessGranted($attributes, $subject = null, $translationKey = 'access.denied', $parameter = []) + protected function denyUnlessGranted($attributes, $subject = null, $translation = 'access.denied', $parameter = []) { - $error = $this->getTranslator()->trans($translationKey, $parameter, self::DOMAIN_ERROR); + $error = $this->getTranslator()->trans($translation, $parameter, self::DOMAIN_ERROR); // TODO try & catch and add to audit log? $this->denyAccessUnlessGranted($attributes, $subject, $error); } diff --git a/src/AppBundle/Controller/Admin/UserController.php b/src/AppBundle/Controller/Admin/UserController.php index 8a32a410..02328af7 100644 --- a/src/AppBundle/Controller/Admin/UserController.php +++ b/src/AppBundle/Controller/Admin/UserController.php @@ -75,9 +75,7 @@ class UserController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'user_profile_edit', ['username' => $user->getUsername()] - ); + return $this->redirectToRoute('user_profile_edit', ['username' => $user->getUsername()]); } return $this->render( @@ -87,7 +85,6 @@ class UserController extends AbstractController 'form' => $editForm->createView() ] ); - } /** diff --git a/src/AppBundle/Controller/DashboardController.php b/src/AppBundle/Controller/DashboardController.php index 0f478f27..12248f2a 100644 --- a/src/AppBundle/Controller/DashboardController.php +++ b/src/AppBundle/Controller/DashboardController.php @@ -12,18 +12,14 @@ namespace AppBundle\Controller; use AppBundle\Entity\User; -use AppBundle\Model\UserStatistic; use TimesheetBundle\Entity\Activity; +use TimesheetBundle\Entity\Customer; use TimesheetBundle\Entity\Project; use TimesheetBundle\Entity\Timesheet; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use TimesheetBundle\Model\ActivityStatistic; -use TimesheetBundle\Model\ProjectStatistic; -use TimesheetBundle\Model\TimesheetGlobalStatistic; -use TimesheetBundle\Model\TimesheetStatistic; /** * Dashboard controller for the admin area. @@ -49,25 +45,29 @@ class DashboardController extends Controller $activityStats = $this->getDoctrine()->getRepository(Activity::class)->getGlobalStatistics(); $projectStats = $this->getDoctrine()->getRepository(Project::class)->getGlobalStatistics(); + $customerStats = $this->getDoctrine()->getRepository(Customer::class)->getGlobalStatistics(); $userStats = $this->getDoctrine()->getRepository(User::class)->getGlobalStatistics(); return $this->render('dashboard/index.html.twig', [ - 'dashboard_widgets' => $this->getWidgets($timesheetUserStats, $timesheetGlobalStats, $activityStats, $projectStats, $userStats), + 'dashboard_widgets' => $this->getWidgets(), 'timesheetGlobal' => $timesheetGlobalStats, 'timesheetUser' => $timesheetUserStats, 'activity' => $activityStats, 'project' => $projectStats, + 'customer' => $customerStats, 'user' => $userStats, ]); } - protected function getWidgets( - TimesheetStatistic $timesheetUserStats, - TimesheetGlobalStatistic $timesheetGlobalStats, - ActivityStatistic $activityStats, - ProjectStatistic $projectStats, - UserStatistic $userStats - ) { + /** + * colors: blue / yellow / purple / green / black + * icons: bar-chart / line-chart / calendar / clock-o + * + * @return array + */ + protected function getWidgets() + { + // @codingStandardsIgnoreStart $widgets = [ /* [ @@ -104,6 +104,7 @@ class DashboardController extends Controller //"{{ widgets.info_box_counter('stats.amountThisMonth', timesheetGlobal.amountThisMonth|money, 'money', 'green') }}", "{{ widgets.info_box_counter('stats.durationTotal', timesheetGlobal.durationTotal|duration(true), 'hourglass-o', 'yellow') }}", //"{{ widgets.info_box_counter('stats.amountTotal', timesheetGlobal.amountTotal|money, 'money', 'red') }}", + "{{ widgets.info_box_counter('stats.activeRecordings', timesheetGlobal.activeCurrently, 'hourglass-o', 'red', path('admin_timesheet', {'state': 1})) }}", ], ]; @@ -111,10 +112,9 @@ class DashboardController extends Controller 'id' => 'user.stats', 'header' => '', 'widgets' => [ - "{{ widgets.info_box_counter('stats.userTotal', user.totalAmount, 'users', 'red') }}", - "{{ widgets.info_box_counter('stats.userActiveThisMoth', timesheetGlobal.activeThisMonth, 'users', 'yellow') }}", - "{{ widgets.info_box_counter('stats.userActiveEver', timesheetGlobal.activeTotal, 'users', 'blue') }}", - "{{ widgets.info_box_counter('stats.userActiveNow', timesheetGlobal.activeCurrently, 'users', 'green') }}", + "{{ widgets.info_box_counter('stats.userTotal', user.totalAmount, 'user', 'red') }}", + "{{ widgets.info_box_counter('stats.userActiveThisMoth', timesheetGlobal.activeThisMonth, 'user', 'yellow') }}", + "{{ widgets.info_box_counter('stats.userActiveEver', timesheetGlobal.activeTotal, 'user', 'blue') }}", ], ]; @@ -126,12 +126,13 @@ class DashboardController extends Controller 'id' => 'admin.stats', 'header' => 'dashboard.admin', 'widgets' => [ - "{{ widgets.info_box_more('stats.activitiesTotal', activity.totalAmount, '', path('admin_activity'), 'tasks', 'purple') }}", + "{{ widgets.info_box_more('stats.userTotal', user.totalAmount, ' ', path('admin_user'), 'user') }}", + "{{ widgets.info_box_more('stats.customerTotal', customer.totalAmount, '', path('admin_customer'), 'users', 'blue') }}", "{{ widgets.info_box_more('stats.projectsTotal', project.totalAmount, '', path('admin_project'), 'book', 'yellow') }}", - "{{ widgets.info_box_more('stats.userTotal', user.totalAmount, ' ', path('admin_user'), 'users') }}", - "{{ widgets.info_box_more('stats.userActiveNow', timesheetGlobal.activeCurrently, '', path('admin_timesheet', {'state': 1}), 'hourglass-o', 'red') }}", // FIXME ??? + "{{ widgets.info_box_more('stats.activitiesTotal', activity.totalAmount, '', path('admin_activity'), 'tasks', 'purple') }}", ], ]; + // @codingStandardsIgnoreEnd return $widgets; } diff --git a/src/AppBundle/Controller/ProfileController.php b/src/AppBundle/Controller/ProfileController.php index 5869461a..47d80fa0 100644 --- a/src/AppBundle/Controller/ProfileController.php +++ b/src/AppBundle/Controller/ProfileController.php @@ -60,9 +60,7 @@ class ProfileController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'user_profile', ['username' => $profile->getUsername()] - ); + return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]); } return $this->getProfileView($profile, $editForm, null, null, 'profile'); @@ -89,9 +87,7 @@ class ProfileController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'user_profile', ['username' => $profile->getUsername()] - ); + return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]); } return $this->getProfileView($profile, null, $pwdForm, null, 'password'); @@ -114,9 +110,7 @@ class ProfileController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'user_profile', ['username' => $profile->getUsername()] - ); + return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]); } return $this->getProfileView($profile, null, null, $rolesForm, 'roles'); @@ -145,8 +139,13 @@ class ProfileController extends AbstractController * @return \Symfony\Component\HttpFoundation\Response * @throws \Doctrine\ORM\NonUniqueResultException */ - protected function getProfileView(User $user, Form $editForm = null, Form $pwdForm = null, Form $rolesForm = null, $tab = 'charts') - { + protected function getProfileView( + User $user, + Form $editForm = null, + Form $pwdForm = null, + Form $rolesForm = null, + $tab = 'charts' + ) { /* @var $timesheetRepo TimesheetRepository */ $timesheetRepo = $this->getDoctrine()->getRepository(Timesheet::class); $userStats = $timesheetRepo->getUserStatistics($user); diff --git a/src/AppBundle/DataFixtures/ORM/LoadFixtures.php b/src/AppBundle/DataFixtures/ORM/LoadFixtures.php index 5eb79e50..89384a8b 100644 --- a/src/AppBundle/DataFixtures/ORM/LoadFixtures.php +++ b/src/AppBundle/DataFixtures/ORM/LoadFixtures.php @@ -24,6 +24,9 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class LoadFixtures implements FixtureInterface, ContainerAwareInterface { + + const DEFAULT_PASSWORD = 'kitten'; + /** @var ContainerInterface */ private $container; @@ -45,18 +48,18 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface $claraCustomer->setUsername('clara_customer'); $claraCustomer->setEmail('clara_customer@example.com'); $claraCustomer->setRoles(['ROLE_CUSTOMER']); - $encodedPassword = $passwordEncoder->encodePassword($claraCustomer, 'kitten'); - $claraCustomer->setPassword($encodedPassword); + $claraCustomer->setAvatar('https://www.gravatar.com/avatar/00000000000000000000000000000000?d=monsterid&f=y'); + $claraCustomer->setPassword($passwordEncoder->encodePassword($claraCustomer, self::DEFAULT_PASSWORD)); $manager->persist($claraCustomer); $johnUser = new User(); $johnUser->setAlias('John Doe'); - $johnUser->setTitle('Lead Developer'); + $johnUser->setTitle('Developer'); $johnUser->setUsername('john_user'); $johnUser->setEmail('john_user@example.com'); $johnUser->setRoles(['ROLE_USER']); - $encodedPassword = $passwordEncoder->encodePassword($johnUser, 'kitten'); - $johnUser->setPassword($encodedPassword); + $johnUser->setAvatar('https://www.gravatar.com/avatar/00000000000000000000000000000000?d=retro&f=y'); + $johnUser->setPassword($passwordEncoder->encodePassword($claraCustomer, self::DEFAULT_PASSWORD)); $manager->persist($johnUser); $tonyTeamlead = new User(); @@ -65,8 +68,8 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface $tonyTeamlead->setUsername('tony_teamlead'); $tonyTeamlead->setEmail('tony_teamlead@example.com'); $tonyTeamlead->setRoles(['ROLE_TEAMLEAD']); - $encodedPassword = $passwordEncoder->encodePassword($tonyTeamlead, 'kitten'); - $tonyTeamlead->setPassword($encodedPassword); + $tonyTeamlead->setAvatar('https://en.gravatar.com/userimage/3533186/bf2163b1dd23f3107a028af0195624e9.jpeg'); + $tonyTeamlead->setPassword($passwordEncoder->encodePassword($claraCustomer, self::DEFAULT_PASSWORD)); $manager->persist($tonyTeamlead); $annaAdmin = new User(); @@ -75,8 +78,8 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface $annaAdmin->setUsername('anna_admin'); $annaAdmin->setEmail('anna_admin@example.com'); $annaAdmin->setRoles(['ROLE_ADMIN']); - $encodedPassword = $passwordEncoder->encodePassword($annaAdmin, 'kitten'); - $annaAdmin->setPassword($encodedPassword); + // no avatar to test default image! + $annaAdmin->setPassword($passwordEncoder->encodePassword($claraCustomer, self::DEFAULT_PASSWORD)); $manager->persist($annaAdmin); $susanSuper = new User(); @@ -85,8 +88,8 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface $susanSuper->setUsername('susan_super'); $susanSuper->setEmail('susan_super@example.com'); $susanSuper->setRoles(['ROLE_SUPER_ADMIN']); - $encodedPassword = $passwordEncoder->encodePassword($susanSuper, 'kitten'); - $susanSuper->setPassword($encodedPassword); + $susanSuper->setAvatar('https://www.gravatar.com/avatar/00000000000000000000000000000000?d=wavatar&f=y'); + $susanSuper->setPassword($passwordEncoder->encodePassword($claraCustomer, self::DEFAULT_PASSWORD)); $manager->persist($susanSuper); $manager->flush(); diff --git a/src/AppBundle/DependencyInjection/AppExtension.php b/src/AppBundle/DependencyInjection/AppExtension.php index a5785b83..bb47bcaf 100644 --- a/src/AppBundle/DependencyInjection/AppExtension.php +++ b/src/AppBundle/DependencyInjection/AppExtension.php @@ -31,4 +31,4 @@ class AppExtension extends Extension $classLoader = new ClassLoader('DoctrineExtensions', $extensionsDir); $classLoader->register(); } -} \ No newline at end of file +} diff --git a/src/AppBundle/DependencyInjection/CompilerPass.php b/src/AppBundle/DependencyInjection/CompilerPass.php index ab0cb6fb..1ad74861 100644 --- a/src/AppBundle/DependencyInjection/CompilerPass.php +++ b/src/AppBundle/DependencyInjection/CompilerPass.php @@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException; use Symfony\Component\Yaml\Yaml; /** - * Class Configuration + * Class CompilerPass, dynamically loads additional doctrine functions for the configured database engine. * * @author Kevin Papst */ @@ -57,4 +57,4 @@ class CompilerPass implements CompilerPassInterface } } } -} \ No newline at end of file +} diff --git a/src/AppBundle/Doctrine/TablePrefixSubscriber.php b/src/AppBundle/Doctrine/TablePrefixSubscriber.php index d78bf9fd..d3fb30c1 100644 --- a/src/AppBundle/Doctrine/TablePrefixSubscriber.php +++ b/src/AppBundle/Doctrine/TablePrefixSubscriber.php @@ -40,11 +40,12 @@ class TablePrefixSubscriber implements \Doctrine\Common\EventSubscriber return; } - $classMetadata->setTableName($this->prefix . $classMetadata->getTableName()); + $classMetadata->setPrimaryTable(['name' => $this->prefix . $classMetadata->getTableName()]); foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) { if ($mapping['type'] == \Doctrine\ORM\Mapping\ClassMetadataInfo::MANY_TO_MANY - // Check if "joinTable" exists, it can be null if this field is the reverse side of a ManyToMany relationship + // Check if "joinTable" exists: + // it can be null if this field is the reverse side of a ManyToMany relationship && array_key_exists('name', $classMetadata->associationMappings[$fieldName]['joinTable']) ) { $mappedTableName = $classMetadata->associationMappings[$fieldName]['joinTable']['name']; $classMetadata->associationMappings[$fieldName]['joinTable']['name'] = $this->prefix . $mappedTableName; diff --git a/src/AppBundle/Entity/User.php b/src/AppBundle/Entity/User.php index 028441cf..46a45ac6 100644 --- a/src/AppBundle/Entity/User.php +++ b/src/AppBundle/Entity/User.php @@ -12,7 +12,13 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; * User * * @ORM\Entity(repositoryClass="AppBundle\Repository\UserRepository") - * @ORM\Table(name="users", uniqueConstraints={@ORM\UniqueConstraint(name="name", columns={"name"}), @ORM\UniqueConstraint(name="mail", columns={"mail"})}) + * @ORM\Table( + * name="users", + * uniqueConstraints={ + * @ORM\UniqueConstraint(name="name", columns={"name"}), + * @ORM\UniqueConstraint(name="mail", columns={"mail"}) + * } + * ) * @UniqueEntity("username") * @UniqueEntity("email") * @@ -381,4 +387,4 @@ class User implements UserInterface { return $this->getAlias() ?: $this->getUsername(); } -} \ No newline at end of file +} diff --git a/src/AppBundle/Event/ConfigureMainMenuEvent.php b/src/AppBundle/Event/ConfigureMainMenuEvent.php index 592f8fbe..49baeb20 100644 --- a/src/AppBundle/Event/ConfigureMainMenuEvent.php +++ b/src/AppBundle/Event/ConfigureMainMenuEvent.php @@ -11,10 +11,6 @@ namespace AppBundle\Event; -use Knp\Menu\FactoryInterface; -use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\Event; - /** * The ConfigureMainMenuEvent is used for populating the main navigation. * diff --git a/src/AppBundle/Event/ConfigureMenuEvent.php b/src/AppBundle/Event/ConfigureMenuEvent.php index fc87a553..04669687 100644 --- a/src/AppBundle/Event/ConfigureMenuEvent.php +++ b/src/AppBundle/Event/ConfigureMenuEvent.php @@ -11,7 +11,6 @@ namespace AppBundle\Event; -use Avanzu\AdminThemeBundle\Model\MenuItemModel; use Avanzu\AdminThemeBundle\Event\SidebarMenuEvent; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\EventDispatcher\Event; @@ -41,14 +40,13 @@ abstract class ConfigureMenuEvent extends Event * ConfigureMenuEvent constructor. * @param AuthorizationChecker $auth * @param Request $request - * @param MenuItemModel $menuModel + * @param SidebarMenuEvent $event */ public function __construct( AuthorizationChecker $auth, Request $request, SidebarMenuEvent $event - ) - { + ) { $this->auth = $auth; $this->request = $request; $this->event = $event; diff --git a/src/AppBundle/EventListener/MenuBuilder.php b/src/AppBundle/EventListener/MenuBuilder.php index a794569f..d7fba85a 100644 --- a/src/AppBundle/EventListener/MenuBuilder.php +++ b/src/AppBundle/EventListener/MenuBuilder.php @@ -13,7 +13,6 @@ namespace AppBundle\EventListener; use AppBundle\Event\ConfigureMainMenuEvent; use AppBundle\Event\ConfigureAdminMenuEvent; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Security\Core\Authorization\AuthorizationChecker; use Avanzu\AdminThemeBundle\Model\MenuItemModel; @@ -40,10 +39,7 @@ class MenuBuilder * @param EventDispatcherInterface $dispatcher * @param AuthorizationChecker $security */ - public function __construct( - EventDispatcherInterface $dispatcher, - AuthorizationChecker $security - ) + public function __construct(EventDispatcherInterface $dispatcher, AuthorizationChecker $security) { $this->eventDispatcher = $dispatcher; $this->security = $security; @@ -102,7 +98,6 @@ class MenuBuilder $event->getRequest()->get('_route'), $event->getItems() ); - } /** @@ -111,16 +106,14 @@ class MenuBuilder */ protected function activateByRoute($route, $items) { - foreach($items as $item) { - if($item->hasChildren()) { + foreach ($items as $item) { + if ($item->hasChildren()) { $this->activateByRoute($route, $item->getChildren()); - } - else { - if($item->getRoute() == $route) { + } else { + if ($item->getRoute() == $route) { $item->setIsActive(true); } } } - } } diff --git a/src/AppBundle/EventListener/NavbarShowUserListener.php b/src/AppBundle/EventListener/NavbarShowUserListener.php index 89b5e4e6..07ede9cc 100644 --- a/src/AppBundle/EventListener/NavbarShowUserListener.php +++ b/src/AppBundle/EventListener/NavbarShowUserListener.php @@ -15,7 +15,6 @@ use AppBundle\Entity\User; use Avanzu\AdminThemeBundle\Event\ShowUserEvent; use Avanzu\AdminThemeBundle\Model\UserModel; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; -use Symfony\Component\Security\Core\User\UserInterface; /** * Class NavbarShowUserListener @@ -62,4 +61,4 @@ class NavbarShowUserListener $event->setUser($user); } -} \ No newline at end of file +} diff --git a/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php b/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php index d9f648fd..df09ca43 100644 --- a/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php +++ b/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php @@ -60,7 +60,9 @@ class RedirectToPreferredLocaleListener $this->defaultLocale = $defaultLocale ?: $this->locales[0]; if (!in_array($this->defaultLocale, $this->locales)) { - throw new \UnexpectedValueException(sprintf('The default locale ("%s") must be one of "%s".', $this->defaultLocale, $locales)); + throw new \UnexpectedValueException( + sprintf('The default locale ("%s") must be one of "%s".', $this->defaultLocale, $locales) + ); } // Add the default locale at the first position of the array, diff --git a/src/AppBundle/Form/UserRolesType.php b/src/AppBundle/Form/UserRolesType.php index ee076506..a3946313 100644 --- a/src/AppBundle/Form/UserRolesType.php +++ b/src/AppBundle/Form/UserRolesType.php @@ -43,6 +43,8 @@ class UserRolesType extends AbstractType */ public function buildForm(FormBuilderInterface $builder, array $options) { + $roles = []; + foreach ($this->roles as $key => $value) { $roles[$key] = $key; foreach ($value as $value2) { diff --git a/src/AppBundle/Repository/AbstractRepository.php b/src/AppBundle/Repository/AbstractRepository.php index 1d7f3e3f..0057fbee 100644 --- a/src/AppBundle/Repository/AbstractRepository.php +++ b/src/AppBundle/Repository/AbstractRepository.php @@ -11,14 +11,12 @@ namespace AppBundle\Repository; -use AppBundle\Entity\User; -use TimesheetBundle\Entity\Activity; -use TimesheetBundle\Entity\Timesheet; +use AppBundle\Repository\Query\BaseQuery; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; use Pagerfanta\Adapter\DoctrineORMAdapter; use Pagerfanta\Pagerfanta; -use TimesheetBundle\Model\ActivityStatistic; /** * Class AbstractRepository @@ -27,6 +25,19 @@ use TimesheetBundle\Model\ActivityStatistic; */ abstract class AbstractRepository extends EntityRepository { + /** + * @param QueryBuilder $qb + * @param BaseQuery $query + * @return QueryBuilder|Pagerfanta + */ + protected function getBaseQueryResult(QueryBuilder $qb, BaseQuery $query) + { + if ($query->getResultType() == BaseQuery::RESULT_TYPE_PAGER) { + return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize()); + } + + return $qb; + } /** * @param Query $query diff --git a/src/AppBundle/Repository/Query/BaseQuery.php b/src/AppBundle/Repository/Query/BaseQuery.php index 4581b8ca..f2699170 100644 --- a/src/AppBundle/Repository/Query/BaseQuery.php +++ b/src/AppBundle/Repository/Query/BaseQuery.php @@ -22,6 +22,9 @@ class BaseQuery const DEFAULT_PAGESIZE = 25; const DEFAULT_PAGE = 1; + const RESULT_TYPE_PAGER = 'PagerFanta'; + const RESULT_TYPE_QUERYBUILDER = 'QueryBuilder'; + /** * @var int */ @@ -38,6 +41,10 @@ class BaseQuery * @var string */ protected $order = 'ASC'; + /** + * @var string + */ + protected $resultType = self::RESULT_TYPE_PAGER; /** * @return int @@ -116,4 +123,24 @@ class BaseQuery } return $this; } + + /** + * @return string + */ + public function getResultType() + { + return $this->resultType; + } + + /** + * @param string $resultType + * @return BaseQuery + */ + public function setResultType($resultType) + { + if (in_array($resultType, [self::RESULT_TYPE_PAGER, self::RESULT_TYPE_QUERYBUILDER])) { + $this->resultType = $resultType; + } + return $this; + } } diff --git a/src/AppBundle/Twig/Extensions.php b/src/AppBundle/Twig/Extensions.php index e9fa19ab..83e358cc 100644 --- a/src/AppBundle/Twig/Extensions.php +++ b/src/AppBundle/Twig/Extensions.php @@ -13,8 +13,6 @@ namespace AppBundle\Twig; use AppBundle\Utils\Markdown; use Symfony\Component\Intl\Intl; -use DateTime; -use DateInterval; use TimesheetBundle\Entity\Customer; use TimesheetBundle\Entity\Timesheet; @@ -31,19 +29,19 @@ class Extensions extends \Twig_Extension private $parser; /** - * @var array + * @var string[] */ private $locales; /** * Extensions constructor. * @param Markdown $parser - * @param $locales + * @param string $locales */ public function __construct(Markdown $parser, $locales) { $this->parser = $parser; - $this->locales = $locales; + $this->locales = explode('|', $locales); } /** @@ -158,11 +156,9 @@ class Extensions extends \Twig_Extension */ public function getLocales() { - $localeCodes = explode('|', $this->locales); - $locales = []; - foreach ($localeCodes as $localeCode) { - $locales[] = ['code' => $localeCode, 'name' => Intl::getLocaleBundle()->getLocaleName($localeCode, $localeCode)]; + foreach ($this->locales as $locale) { + $locales[] = ['code' => $locale, 'name' => Intl::getLocaleBundle()->getLocaleName($locale, $locale)]; } return $locales; diff --git a/src/AppBundle/Validator/Constraints/RoleValidator.php b/src/AppBundle/Validator/Constraints/RoleValidator.php index 1ad369a8..356a728e 100644 --- a/src/AppBundle/Validator/Constraints/RoleValidator.php +++ b/src/AppBundle/Validator/Constraints/RoleValidator.php @@ -38,7 +38,7 @@ class RoleValidator extends ConstraintValidator $roles = [$roles]; } - foreach($roles as $role) { + foreach ($roles as $role) { if (!is_string($role) || !in_array($role, $this->allowedRoles)) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($role)) diff --git a/src/AppBundle/Voter/UserVoter.php b/src/AppBundle/Voter/UserVoter.php index e5f845a3..4b4c3d85 100644 --- a/src/AppBundle/Voter/UserVoter.php +++ b/src/AppBundle/Voter/UserVoter.php @@ -36,7 +36,10 @@ class UserVoter extends AbstractVoter */ protected function supports($attribute, $subject) { - if (!in_array($attribute, [self::VIEW, self::VIEW_ALL, self::EDIT, self::CREATE, self::ROLES, self::PASSWORD, self::DELETE])) { + if (!in_array( + $attribute, + [self::VIEW, self::VIEW_ALL, self::EDIT, self::CREATE, self::ROLES, self::PASSWORD, self::DELETE] + )) { return false; } @@ -71,7 +74,7 @@ class UserVoter extends AbstractVoter case self::CREATE: // create actually passes in the current user as $subject, not the new one case self::DELETE: - // if we ever allow to delete user for ADMIN we have to check if the user to be deleted is not in a higher level + // if we allow to delete user for ADMIN: make sure the user to be deleted is not in a higher level case self::ROLES: return $this->canAdminUsers($token); } diff --git a/src/TimesheetBundle/Controller/ActivityController.php b/src/TimesheetBundle/Controller/ActivityController.php index 17d703ec..43ac383d 100644 --- a/src/TimesheetBundle/Controller/ActivityController.php +++ b/src/TimesheetBundle/Controller/ActivityController.php @@ -44,7 +44,8 @@ class ActivityController extends Controller public function recentActivitiesAction() { $user = $this->getUser(); - $activeEntries = $this->getRepository()->getRecentActivities($user, new \DateTime('-30 days')); // TODO make days configurable + // TODO make days configurable + $activeEntries = $this->getRepository()->getRecentActivities($user, new \DateTime('-30 days')); return $this->render( 'TimesheetBundle:Navbar:recent-activities.html.twig', diff --git a/src/TimesheetBundle/Controller/Admin/ActivityController.php b/src/TimesheetBundle/Controller/Admin/ActivityController.php index 1dacb54d..9cee9ee4 100644 --- a/src/TimesheetBundle/Controller/Admin/ActivityController.php +++ b/src/TimesheetBundle/Controller/Admin/ActivityController.php @@ -14,14 +14,12 @@ namespace TimesheetBundle\Controller\Admin; use AppBundle\Controller\AbstractController; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use TimesheetBundle\Entity\Activity; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; use TimesheetBundle\Form\ActivityEditForm; -use TimesheetBundle\Repository\ActivityRepository; use TimesheetBundle\Repository\Query\ActivityQuery; /** @@ -89,9 +87,7 @@ class ActivityController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'admin_activity', ['id' => $activity->getId()] - ); + return $this->redirectToRoute('admin_activity', ['id' => $activity->getId()]); } return $this->render( @@ -105,7 +101,7 @@ class ActivityController extends AbstractController /** * @param Activity $activity - * @return \Symfony\Component\Form\Form + * @return \Symfony\Component\Form\FormInterface */ private function createEditForm(Activity $activity) { diff --git a/src/TimesheetBundle/Controller/Admin/CustomerController.php b/src/TimesheetBundle/Controller/Admin/CustomerController.php index b421cf28..80096ab9 100644 --- a/src/TimesheetBundle/Controller/Admin/CustomerController.php +++ b/src/TimesheetBundle/Controller/Admin/CustomerController.php @@ -87,9 +87,7 @@ class CustomerController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'admin_customer', ['id' => $customer->getId()] - ); + return $this->redirectToRoute('admin_customer', ['id' => $customer->getId()]); } return $this->render( diff --git a/src/TimesheetBundle/Controller/Admin/ProjectController.php b/src/TimesheetBundle/Controller/Admin/ProjectController.php index a8ac3215..4c5a2892 100644 --- a/src/TimesheetBundle/Controller/Admin/ProjectController.php +++ b/src/TimesheetBundle/Controller/Admin/ProjectController.php @@ -88,9 +88,7 @@ class ProjectController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'admin_project', ['id' => $project->getId()] - ); + return $this->redirectToRoute('admin_project', ['id' => $project->getId()]); } return $this->render( diff --git a/src/TimesheetBundle/Controller/Admin/TimesheetController.php b/src/TimesheetBundle/Controller/Admin/TimesheetController.php index 36454fb5..80b99689 100644 --- a/src/TimesheetBundle/Controller/Admin/TimesheetController.php +++ b/src/TimesheetBundle/Controller/Admin/TimesheetController.php @@ -34,10 +34,16 @@ class TimesheetController extends AbstractController use TimesheetControllerTrait; /** + * This route shows all users timesheet entries. + * * @Route("/", defaults={"page": 1}, name="admin_timesheet") * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_timesheet_paginated") * @Method("GET") * @Cache(smaxage="10") + * + * @param $page + * @param Request $request + * @return \Symfony\Component\HttpFoundation\Response */ public function indexAction($page, Request $request) { @@ -62,10 +68,9 @@ class TimesheetController extends AbstractController * @Method({"GET"}) * * @param Timesheet $entry - * @param Request $request * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response */ - public function stopAction(Timesheet $entry, Request $request) + public function stopAction(Timesheet $entry) { try { $this->getRepository()->stopRecording($entry); diff --git a/src/TimesheetBundle/Controller/TimesheetController.php b/src/TimesheetBundle/Controller/TimesheetController.php index 32e125de..4c0e7bd2 100644 --- a/src/TimesheetBundle/Controller/TimesheetController.php +++ b/src/TimesheetBundle/Controller/TimesheetController.php @@ -89,7 +89,13 @@ class TimesheetController extends AbstractController // make sure only ADMIN can stop other users entries if ($user->getId() !== $entry->getUser()->getId()) { - $this->denyUnlessGranted('ROLE_ADMIN', null, 'timesheet.access.denied', ['%user%' => $user->getId(), '%entry%' => $entry->getId()]); + // TODO move me to a voter + $this->denyUnlessGranted( + 'ROLE_ADMIN', + null, + 'timesheet.access.denied', + ['%user%' => $user->getId(), '%entry%' => $entry->getId()] + ); } try { @@ -141,7 +147,13 @@ class TimesheetController extends AbstractController // make sure only ADMIN can edit other users entries if ($user->getId() !== $entry->getUser()->getId()) { - $this->denyUnlessGranted('ROLE_ADMIN', null, 'timesheet.access.denied', ['%user%' => $user->getId(), '%entry%' => $entry->getId()]); + // TODO move me to a voter + $this->denyUnlessGranted( + 'ROLE_ADMIN', + null, + 'timesheet.access.denied', + ['%user%' => $user->getId(), '%entry%' => $entry->getId()] + ); } $editForm = $this->createEditForm($entry, $request->get('page')); @@ -155,9 +167,7 @@ class TimesheetController extends AbstractController $this->flashSuccess('action.updated_successfully'); - return $this->redirectToRoute( - 'timesheet_paginated', ['page' => $request->get('page')] - ); + return $this->redirectToRoute('timesheet_paginated', ['page' => $request->get('page')]); } return $this->render( diff --git a/src/TimesheetBundle/Controller/TimesheetControllerTrait.php b/src/TimesheetBundle/Controller/TimesheetControllerTrait.php index 276c1773..e0005299 100644 --- a/src/TimesheetBundle/Controller/TimesheetControllerTrait.php +++ b/src/TimesheetBundle/Controller/TimesheetControllerTrait.php @@ -71,7 +71,7 @@ trait TimesheetControllerTrait } else { $customer = null; } - } else if ($customer !== null) { + } elseif ($customer !== null) { $repo = $this->getDoctrine()->getRepository(Customer::class); $customer = $repo->getById($customer); } diff --git a/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php b/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php index 011f2395..70ab139f 100644 --- a/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php +++ b/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php @@ -12,7 +12,6 @@ namespace TimesheetBundle\DataFixtures\ORM; use AppBundle\Entity\User; -use Symfony\Component\Intl\Intl; use TimesheetBundle\Entity\Activity; use TimesheetBundle\Entity\Customer; use TimesheetBundle\Entity\Project; @@ -30,8 +29,7 @@ use AppBundle\DataFixtures\ORM\LoadFixtures as AppBundleLoadFixtures; */ class LoadFixtures extends AppBundleLoadFixtures { - const AMOUNT_ACTIVITIES = 10; // maximum activites per project - const AMOUNT_TIMESHEET = 1000; // timesheet entries total + const AMOUNT_TIMESHEET = 5000; // timesheet entries total const RATE_MIN = 10; // minimum rate for one hour const RATE_MAX = 80; // maximum rate for one hour @@ -109,9 +107,11 @@ class LoadFixtures extends AppBundleLoadFixtures { $allUser = $this->getAllUsers($manager); $amountUser = count($allUser); - $allActivity = $this->getAllActivities($manager); + // by using array_pop we make sure that at least one activity has NO entry! + array_pop($allActivity); + for ($i = 0; $i <= self::AMOUNT_TIMESHEET; $i++) { $entry = $this->createTimesheetEntry( $allUser[rand(1, $amountUser)], @@ -123,14 +123,18 @@ class LoadFixtures extends AppBundleLoadFixtures $manager->persist($entry); } - // leave one running time entry for each user - for ($i = 1; $i <= $amountUser; $i++) { - $entry = $this->createTimesheetEntry( - $allUser[$i], - $allActivity[array_rand($allActivity)] - ); + // by using array_pop we make sure that at least one user has NO running entry! + array_pop($allUser); - $manager->persist($entry); + // create active recodinge for test user + foreach ($allUser as $id => $user) { + for ($i = 0; $i < rand(1, 4); $i++) { + $entry = $this->createTimesheetEntry( + $user, + $allActivity[array_rand($allActivity)] + ); + $manager->persist($entry); + } } $manager->flush(); @@ -174,17 +178,18 @@ class LoadFixtures extends AppBundleLoadFixtures $amountTimezone = count($allTimezones); $allCustomer = $this->getCustomers(); - $amountCustomer = count($allCustomer); + shuffle($allCustomer); + $i = 0; - for ($i = 0; $i < $amountCustomer; $i++) { + foreach ($allCustomer as $customerName) { $entry = new Customer(); $entry ->setCurrency($this->getRandomCurrency()) ->setVat(rand(0, 30)) - ->setName($allCustomer[$i]) + ->setName($customerName) ->setAddress($this->getRandomLocation()) ->setComment($this->getRandomPhrase()) - ->setVisible($i % 3 != 0) + ->setVisible($i++ % 3 != 0) ->setTimezone($allTimezones[rand(1, $amountTimezone)]); $manager->persist($entry); @@ -195,19 +200,21 @@ class LoadFixtures extends AppBundleLoadFixtures private function loadProjects(ObjectManager $manager) { $allCustomer = $this->getAllCustomers($manager); - $amountCustomer = count($allCustomer); - for ($i = 0; $i < $amountCustomer * 2; $i++) { + foreach ($allCustomer as $id => $customer) { + $projectForCustomer = rand(0, 7); + for ($i = 0; $i < $projectForCustomer; $i++) { + $entry = new Project(); - $entry = new Project(); - $entry - ->setName($this->getRandomProject()) - ->setBudget(rand(1000, 100000)) - ->setComment($this->getRandomPhrase()) - ->setCustomer($allCustomer[($i % $amountCustomer) + 1]) - ->setVisible($i % 3 != 0); + $entry + ->setName($this->getRandomProject()) + ->setBudget(rand(500, 100000)) + ->setComment($this->getRandomPhrase()) + ->setCustomer($customer) + ->setVisible($i % 3 != 0); - $manager->persist($entry); + $manager->persist($entry); + } } $manager->flush(); } @@ -217,7 +224,7 @@ class LoadFixtures extends AppBundleLoadFixtures $allProject = $this->getAllProjects($manager); foreach ($allProject as $projectId => $project) { - $activityCount = rand(1, self::AMOUNT_ACTIVITIES); + $activityCount = rand(0, 10); for ($i = 0; $i < $activityCount; $i++) { $entry = new Activity(); $entry @@ -238,12 +245,11 @@ class LoadFixtures extends AppBundleLoadFixtures private function getActivities() { return [ - 'Design', + 'Designing', 'Programming', 'Testing', 'Documentation', 'Pause', - 'Internal', 'Research', 'Meeting', 'Hosting', @@ -256,6 +262,11 @@ class LoadFixtures extends AppBundleLoadFixtures 'Management', 'Setup', 'Planning', + 'Skiing', + 'Eating', + 'Watching TV', + 'Talking', + 'Cooking' ]; } @@ -282,8 +293,10 @@ class LoadFixtures extends AppBundleLoadFixtures 'Hosting & Server', 'Customer Relations', 'Infrastructure', + 'Princess Cat', 'Software Upgrade', 'Office Management', + 'Project X', ]; } @@ -310,10 +323,20 @@ class LoadFixtures extends AppBundleLoadFixtures 'Amsterdam', 'London', 'San Francisco', - 'Tokio', + 'Tokyo', 'Berlin', 'Sao Paulo', 'Mexico City', + 'Moscow', + 'Sankt Petersburg', + 'Taiwan', + 'Perth', + 'Sydney', + 'Mumbai', + 'Lagos', + 'Karachi', + 'Shanghai', + 'Delhi', ]; } @@ -342,18 +365,34 @@ class LoadFixtures extends AppBundleLoadFixtures 'Twitter', 'Zend', 'SensioLabs', + 'Samsung', + 'Huawai', + 'Yandex', + 'Baidu', + 'Alphabet', + 'Amazon.com', + 'Berkshire Hathaway', + 'Facebook', + 'ExxonMobil', + 'Nestle', + 'Johnson & Johnson', + 'Alibaba', + 'General Electric', + 'Procter & Gamble', + 'Wal-Mart Stores', + 'Novartis', + 'Coca-Cola', + 'Wikipedia', + 'Walt Disney', + 'Merck', + 'Pfizer', + "L'Oréal Group", + "McDonald's", + 'China Petroleum & Chemical', + 'GlaxoSmithKline' ]; } - /** - * @return string - */ - private function getRandomCustomer() - { - $all = $this->getCustomers(); - return $all[array_rand($all)]; - } - /** * @return string[] */ diff --git a/src/TimesheetBundle/Entity/Project.php b/src/TimesheetBundle/Entity/Project.php index 8deba1ab..de1da20f 100644 --- a/src/TimesheetBundle/Entity/Project.php +++ b/src/TimesheetBundle/Entity/Project.php @@ -71,7 +71,11 @@ class Project /** * @var Activity[] * - * @ORM\OneToMany(targetEntity="TimesheetBundle\Entity\Activity", mappedBy="project", cascade={"persist", "merge", "remove"}) + * @ORM\OneToMany( + * targetEntity="TimesheetBundle\Entity\Activity", + * mappedBy="project", + * cascade={"persist", "merge", "remove"} + * ) */ private $activities; diff --git a/src/TimesheetBundle/Entity/Timesheet.php b/src/TimesheetBundle/Entity/Timesheet.php index 0541ad75..fd9db0e3 100644 --- a/src/TimesheetBundle/Entity/Timesheet.php +++ b/src/TimesheetBundle/Entity/Timesheet.php @@ -18,7 +18,13 @@ use Doctrine\ORM\Mapping as ORM; * Timesheet entity. * * @ORM\Entity(repositoryClass="TimesheetBundle\Repository\TimesheetRepository") - * @ORM\Table(name="timesheet", indexes={@ORM\Index(columns={"user"}), @ORM\Index(name="activity", columns={"activity"})}) + * @ORM\Table( + * name="timesheet", + * indexes={ + * @ORM\Index(columns={"user"}), + * @ORM\Index(name="activity", columns={"activity"}) + * } + * ) * * @author Kevin Papst */ diff --git a/src/TimesheetBundle/EventListener/Menu.php b/src/TimesheetBundle/EventListener/Menu.php index 8c784e16..ab187ac0 100644 --- a/src/TimesheetBundle/EventListener/Menu.php +++ b/src/TimesheetBundle/EventListener/Menu.php @@ -77,4 +77,4 @@ class Menu ) ; } -} \ No newline at end of file +} diff --git a/src/TimesheetBundle/Form/Type/ActivityType.php b/src/TimesheetBundle/Form/Type/ActivityType.php index 45996bf3..6ffd0a0d 100644 --- a/src/TimesheetBundle/Form/Type/ActivityType.php +++ b/src/TimesheetBundle/Form/Type/ActivityType.php @@ -15,6 +15,8 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; use TimesheetBundle\Entity\Activity; +use TimesheetBundle\Repository\ActivityRepository; +use TimesheetBundle\Repository\Query\ActivityQuery; /** * Custom form field type to select an activity. @@ -24,17 +26,6 @@ use TimesheetBundle\Entity\Activity; class ActivityType extends AbstractType { - /** - * @param Activity $activity - * @param $key - * @param $index - * @return string - */ - public function groupBy(Activity $activity, $key, $index) - { - return $activity->getProject()->getName(); - } - /** * {@inheritdoc} */ @@ -44,7 +35,14 @@ class ActivityType extends AbstractType 'class' => 'TimesheetBundle:Activity', 'choice_label' => 'name', 'choice_value' => 'id', - 'group_by' => array($this, 'groupBy'), + 'group_by' => function (Activity $activity, $key, $index) { + return $activity->getProject()->getName(); + }, + 'query_builder' => function (ActivityRepository $repo) { + $query = new ActivityQuery(); + $query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER); + return $repo->findByQuery($query); + }, ]); } diff --git a/src/TimesheetBundle/Form/Type/ProjectType.php b/src/TimesheetBundle/Form/Type/ProjectType.php index f0ad55c4..a758c8bc 100644 --- a/src/TimesheetBundle/Form/Type/ProjectType.php +++ b/src/TimesheetBundle/Form/Type/ProjectType.php @@ -15,6 +15,8 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; use TimesheetBundle\Entity\Project; +use TimesheetBundle\Repository\ProjectRepository; +use TimesheetBundle\Repository\Query\ProjectQuery; /** * Custom form field type to select a project. @@ -33,9 +35,14 @@ class ProjectType extends AbstractType 'class' => 'TimesheetBundle:Project', 'choice_label' => 'name', 'choice_value' => 'id', - 'group_by' => function(Project $project, $key, $index) { + 'group_by' => function (Project $project, $key, $index) { return $project->getCustomer()->getName(); }, + 'query_builder' => function (ProjectRepository $repo) { + $query = new ProjectQuery(); + $query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER); + return $repo->findByQuery($query); + }, ]); } diff --git a/src/TimesheetBundle/Repository/ActivityRepository.php b/src/TimesheetBundle/Repository/ActivityRepository.php index e6c0f934..d749de5a 100644 --- a/src/TimesheetBundle/Repository/ActivityRepository.php +++ b/src/TimesheetBundle/Repository/ActivityRepository.php @@ -69,7 +69,7 @@ class ActivityRepository extends AbstractRepository $activities = []; /* @var Timesheet $entry */ - foreach($results as $entry) { + foreach ($results as $entry) { $activities[] = $entry->getActivity(); } @@ -93,10 +93,9 @@ class ActivityRepository extends AbstractRepository return $stats; } - /** * @param ActivityQuery $query - * @return \Pagerfanta\Pagerfanta + * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta */ public function findByQuery(ActivityQuery $query) { @@ -116,6 +115,6 @@ class ActivityRepository extends AbstractRepository // TODO check for visibility of customer and project } - return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize()); + return $this->getBaseQueryResult($qb, $query); } } diff --git a/src/TimesheetBundle/Repository/CustomerRepository.php b/src/TimesheetBundle/Repository/CustomerRepository.php index 6848263a..f717009c 100644 --- a/src/TimesheetBundle/Repository/CustomerRepository.php +++ b/src/TimesheetBundle/Repository/CustomerRepository.php @@ -52,7 +52,7 @@ class CustomerRepository extends AbstractRepository /** * @param CustomerQuery $query - * @return \Pagerfanta\Pagerfanta + * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta */ public function findByQuery(CustomerQuery $query) { @@ -68,6 +68,6 @@ class CustomerRepository extends AbstractRepository $qb->andWhere('c.visible = 0'); } - return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize()); + return $this->getBaseQueryResult($qb, $query); } } diff --git a/src/TimesheetBundle/Repository/ProjectRepository.php b/src/TimesheetBundle/Repository/ProjectRepository.php index 4dc2c318..2a576eca 100644 --- a/src/TimesheetBundle/Repository/ProjectRepository.php +++ b/src/TimesheetBundle/Repository/ProjectRepository.php @@ -52,13 +52,14 @@ class ProjectRepository extends AbstractRepository /** * @param ProjectQuery $query - * @return \Pagerfanta\Pagerfanta + * @return \Doctrine\ORM\QueryBuilder|\Pagerfanta\Pagerfanta */ public function findByQuery(ProjectQuery $query) { $qb = $this->getEntityManager()->createQueryBuilder(); - // if we join activities, the maxperpage limit will limit the list due to the raised amount of rows by projects * activities + // if we join activities, the maxperpage limit will limit the list + // due to the raised amount of rows by projects * activities $qb->select('p', 'c') ->from('TimesheetBundle:Project', 'p') ->join('p.customer', 'c') @@ -72,6 +73,6 @@ class ProjectRepository extends AbstractRepository // TODO check for visibility of customer } - return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize()); + return $this->getBaseQueryResult($qb, $query); } } diff --git a/src/TimesheetBundle/Repository/Query/TimesheetQuery.php b/src/TimesheetBundle/Repository/Query/TimesheetQuery.php index ef1edc39..a2909848 100644 --- a/src/TimesheetBundle/Repository/Query/TimesheetQuery.php +++ b/src/TimesheetBundle/Repository/Query/TimesheetQuery.php @@ -158,5 +158,4 @@ class TimesheetQuery extends BaseQuery } return $this; } - } diff --git a/src/TimesheetBundle/Repository/TimesheetRepository.php b/src/TimesheetBundle/Repository/TimesheetRepository.php index 1be33355..560b20f5 100644 --- a/src/TimesheetBundle/Repository/TimesheetRepository.php +++ b/src/TimesheetBundle/Repository/TimesheetRepository.php @@ -12,12 +12,10 @@ namespace TimesheetBundle\Repository; use AppBundle\Entity\User; +use AppBundle\Repository\AbstractRepository; use TimesheetBundle\Entity\Activity; use TimesheetBundle\Entity\Timesheet; -use Doctrine\ORM\EntityRepository; -use Doctrine\ORM\Query; use Doctrine\DBAL\Types\Type; -use Pagerfanta\Adapter\DoctrineORMAdapter; use Pagerfanta\Pagerfanta; use TimesheetBundle\Model\Statistic\Month; use TimesheetBundle\Model\Statistic\Year; @@ -31,7 +29,7 @@ use TimesheetBundle\Repository\Query\TimesheetQuery; * * @author Kevin Papst */ -class TimesheetRepository extends EntityRepository +class TimesheetRepository extends AbstractRepository { /** @@ -89,7 +87,7 @@ class TimesheetRepository extends EntityRepository $end = new DateTime('last day of this month'); $end->setTime(23, 59, 59); $begin = new DateTime('first day of this month'); - $begin->setTime(0,0,0); + $begin->setTime(0, 0, 0); return $this->queryTimeRange($select, $begin, $end, $user); } @@ -168,7 +166,7 @@ class TimesheetRepository extends EntityRepository { $qb = $this->getEntityManager()->createQueryBuilder(); - $qb->select('SUM(t.rate) as totalRate, SUM(t.duration) as totalDuration, MONTH(t.begin) as month, YEAR(t.begin) as year') + $qb->select('SUM(t.rate) as rate, SUM(t.duration) as duration, MONTH(t.begin) as month, YEAR(t.begin) as year') ->from('TimesheetBundle:Timesheet', 't') ->where($qb->expr()->gt('t.begin', '0')) ->andWhere($qb->expr()->isNotNull('t.end')) @@ -183,7 +181,7 @@ class TimesheetRepository extends EntityRepository } $years = []; - foreach($qb->getQuery()->execute() as $statRow) { + foreach ($qb->getQuery()->execute() as $statRow) { $curYear = $statRow['year']; if (!isset($years[$curYear])) { @@ -196,8 +194,8 @@ class TimesheetRepository extends EntityRepository } $month = new Month($statRow['month']); - $month->setTotalDuration($statRow['totalDuration']) - ->setTotalRate($statRow['totalRate']); + $month->setTotalDuration($statRow['duration']) + ->setTotalRate($statRow['rate']); $years[$curYear]->setMonth($month); } @@ -310,21 +308,6 @@ class TimesheetRepository extends EntityRepository ->setParameter('customer', $query->getCustomer()); } - return $this->getPager($qb->getQuery(), $query->getPage(), $query->getPageSize()); - } - - /** - * @param Query $query - * @param int $page - * @param int $maxPerPage - * @return Pagerfanta - */ - protected function getPager(Query $query, $page = 1, $maxPerPage = 25) - { - $paginator = new Pagerfanta(new DoctrineORMAdapter($query, false)); - $paginator->setMaxPerPage($maxPerPage); - $paginator->setCurrentPage($page); - - return $paginator; + return $this->getBaseQueryResult($qb, $query); } } diff --git a/src/TimesheetBundle/Resources/views/admin/customer.html.twig b/src/TimesheetBundle/Resources/views/admin/customer.html.twig index 461d8a47..c43113d7 100644 --- a/src/TimesheetBundle/Resources/views/admin/customer.html.twig +++ b/src/TimesheetBundle/Resources/views/admin/customer.html.twig @@ -21,7 +21,7 @@ 'label.currency': 'hidden-xs', 'label.visible': '', 'label.actions': '', - }, null, {'user-plus': path('admin_customer_create')}) }} + }, null, {'plus-square': path('admin_customer_create')}) }} {% for entry in entries %} diff --git a/src/TimesheetBundle/Voter/ActivityVoter.php b/src/TimesheetBundle/Voter/ActivityVoter.php index 7371e31b..923b1ed6 100644 --- a/src/TimesheetBundle/Voter/ActivityVoter.php +++ b/src/TimesheetBundle/Voter/ActivityVoter.php @@ -74,6 +74,7 @@ class ActivityVoter extends AbstractVoter /** * @param Activity $activity * @param User $user + * @param TokenInterface $token * @return bool */ protected function canView(Activity $activity, User $user, TokenInterface $token) @@ -88,6 +89,7 @@ class ActivityVoter extends AbstractVoter /** * @param Activity $activity * @param User $user + * @param TokenInterface $token * @return bool */ protected function canEdit(Activity $activity, User $user, TokenInterface $token) diff --git a/src/TimesheetBundle/Voter/CustomerVoter.php b/src/TimesheetBundle/Voter/CustomerVoter.php index cdec3cde..7acea9fc 100644 --- a/src/TimesheetBundle/Voter/CustomerVoter.php +++ b/src/TimesheetBundle/Voter/CustomerVoter.php @@ -74,6 +74,7 @@ class CustomerVoter extends AbstractVoter /** * @param Customer $customer * @param User $user + * @param TokenInterface $token * @return bool */ protected function canView(Customer $customer, User $user, TokenInterface $token) @@ -88,6 +89,7 @@ class CustomerVoter extends AbstractVoter /** * @param Customer $customer * @param User $user + * @param TokenInterface $token * @return bool */ protected function canEdit(Customer $customer, User $user, TokenInterface $token) diff --git a/src/TimesheetBundle/Voter/ProjectVoter.php b/src/TimesheetBundle/Voter/ProjectVoter.php index 33464d79..43f3563b 100644 --- a/src/TimesheetBundle/Voter/ProjectVoter.php +++ b/src/TimesheetBundle/Voter/ProjectVoter.php @@ -74,6 +74,7 @@ class ProjectVoter extends AbstractVoter /** * @param Project $project * @param User $user + * @param TokenInterface $token * @return bool */ protected function canView(Project $project, User $user, TokenInterface $token) @@ -88,6 +89,7 @@ class ProjectVoter extends AbstractVoter /** * @param Project $project * @param User $user + * @param TokenInterface $token * @return bool */ protected function canEdit(Project $project, User $user, TokenInterface $token) diff --git a/src/AppBundle/Tests/Controller/DefaultControllerTest.php b/tests/AppBundle/Controller/DefaultControllerTest.php similarity index 97% rename from src/AppBundle/Tests/Controller/DefaultControllerTest.php rename to tests/AppBundle/Controller/DefaultControllerTest.php index 240f73b1..0aa85749 100644 --- a/src/AppBundle/Tests/Controller/DefaultControllerTest.php +++ b/tests/AppBundle/Controller/DefaultControllerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace AppBundle\Tests\Controller; +namespace KimaiTest\AppBundle\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -25,6 +25,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; * $ cd your-symfony-project/ * $ phpunit -c app * + * @group integration */ class DefaultControllerTest extends WebTestCase { diff --git a/tests/TimesheetBundle/Repository/Query/TimesheetQueryTest.php b/tests/TimesheetBundle/Repository/Query/TimesheetQueryTest.php new file mode 100644 index 00000000..6a23bdcb --- /dev/null +++ b/tests/TimesheetBundle/Repository/Query/TimesheetQueryTest.php @@ -0,0 +1,72 @@ +assertTrue($class->hasProperty('order')); + $this->assertTrue($class->hasProperty('orderBy')); + } + + public function testGetUser() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testSetUser() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testGetActivity() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testSetActivity() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testGetProject() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testSetProject() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testGetCustomer() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testSetCustomer() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testGetState() + { + $this->markTestIncomplete(__METHOD__); + } + + public function testSetState() + { + $this->markTestIncomplete(__METHOD__); + } +} diff --git a/web/css/kimai.css b/web/css/kimai.css index a4d7b747..dde2850a 100644 --- a/web/css/kimai.css +++ b/web/css/kimai.css @@ -9,6 +9,12 @@ li.messages-menu ul.menu li:hover .pull-left i { color: #dd4b39; } + +.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>p { + overflow: hidden; + text-overflow: ellipsis; +} + /* .ticktac:hover i.running{ color: #4ff131;