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

improved code styles #158 (#172)

Browse Source 
* use php-cs-fixer instead of phpcodesniffer
* updated scrutinizer config
* adjusted code yules to all files
* updated CONTRIBUTING guidelines
This commit is contained in:
Kevin Papst
2018-06-22 21:09:10 +02:00
committed by GitHub
parent 773d27bb0e
commit cd7cbeae88
142 changed files with 775 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Form/ActivityEditForm.php
View File

@@ -24,7 +24,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class ActivityEditForm extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/CustomerEditForm.php
View File

@@ -28,7 +28,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class CustomerEditForm extends AbstractType
{
/**
* {@inheritdoc}
*/

2
src/Form/Extension/DocumentationLinkExtension.php
View File

@@ -43,7 +43,7 @@ class DocumentationLinkExtension extends AbstractTypeExtension
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefined(array('documentation'));
$resolver->setDefined(['documentation']);
$resolver->setDefaults(['documentation' => null]);
}
}

1
src/Form/InvoiceTemplateForm.php
View File

@@ -25,7 +25,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class InvoiceTemplateForm extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/ProjectEditForm.php
View File

@@ -26,7 +26,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class ProjectEditForm extends AbstractType
{
/**
* {@inheritdoc}
*/

3
src/Form/TimesheetEditForm.php
View File

@@ -25,7 +25,6 @@ use App\Repository\ActivityRepository;
*/
class TimesheetEditForm extends AbstractType
{
/**
* {@inheritdoc}
*/
@@ -39,7 +38,7 @@ class TimesheetEditForm extends AbstractType
$activity = $entry->getActivity();
}
if ($entry->getEnd() === null || !$options['duration_only']) {
if (null === $entry->getEnd() || !$options['duration_only']) {
$builder->add('begin', DateTimeType::class, [
'label' => 'label.begin',
'widget' => 'single_text',

4
src/Form/Toolbar/AbstractToolbarForm.php
View File

@@ -33,7 +33,6 @@ use Symfony\Component\Form\FormEvents;
*/
abstract class AbstractToolbarForm extends AbstractType
{
/**
* Dirty hack to enable easy handling of GET form in controller and javascript.
*Cleans up the name of all form elents (and unfortunately of the form itself).
@@ -67,6 +66,7 @@ abstract class AbstractToolbarForm extends AbstractType
$query = new CustomerQuery();
$query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
return $repo->findByQuery($query);
},
]);
@@ -147,6 +147,7 @@ abstract class AbstractToolbarForm extends AbstractType
'query_builder' => function (ProjectRepository $repo) use ($data) {
$qb = $repo->builderForEntityType();
$qb->where('p.customer = :customer')->setParameter('customer', $data['customer']);
return $qb;
},
]);
@@ -173,6 +174,7 @@ abstract class AbstractToolbarForm extends AbstractType
'query_builder' => function (ActivityRepository $repo) use ($data) {
$qb = $repo->builderForEntityType();
$qb->where('a.project = :project')->setParameter('project', $data['project']);
return $qb;
},
]);

1
src/Form/Toolbar/ActivityToolbarForm.php
View File

@@ -18,7 +18,6 @@ use App\Repository\Query\ActivityQuery;
*/
class ActivityToolbarForm extends AbstractToolbarForm
{
/**
* {@inheritdoc}
*/

1
src/Form/Toolbar/CustomerToolbarForm.php
View File

@@ -18,7 +18,6 @@ use App\Repository\Query\CustomerQuery;
*/
class CustomerToolbarForm extends AbstractToolbarForm
{
/**
* {@inheritdoc}
*/

3
src/Form/Toolbar/InvoiceToolbarForm.php
View File

@@ -19,9 +19,8 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class InvoiceToolbarForm extends AbstractToolbarForm
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{

1
src/Form/Toolbar/ProjectToolbarForm.php
View File

@@ -18,7 +18,6 @@ use App\Repository\Query\ProjectQuery;
*/
class ProjectToolbarForm extends AbstractToolbarForm
{
/**
* {@inheritdoc}
*/

3
src/Form/Toolbar/TimesheetAdminToolbarForm.php
View File

@@ -16,9 +16,8 @@ use Symfony\Component\Form\FormBuilderInterface;
*/
class TimesheetAdminToolbarForm extends TimesheetToolbarForm
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{

3
src/Form/Toolbar/TimesheetToolbarForm.php
View File

@@ -19,9 +19,8 @@ use App\Repository\Query\TimesheetQuery;
*/
class TimesheetToolbarForm extends AbstractToolbarForm
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{

1
src/Form/Toolbar/UserToolbarForm.php
View File

@@ -18,7 +18,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserToolbarForm extends AbstractToolbarForm
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/ActivityGroupedWithCustomerNameType.php
View File

@@ -16,7 +16,6 @@ use App\Entity\Activity;
*/
class ActivityGroupedWithCustomerNameType extends ActivityType
{
/**
* @param Activity $activity
* @param $key

1
src/Form/Type/ActivityType.php
View File

@@ -20,7 +20,6 @@ use App\Repository\ActivityRepository;
*/
class ActivityType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/CustomerType.php
View File

@@ -19,7 +19,6 @@ use App\Repository\CustomerRepository;
*/
class CustomerType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/DurationType.php
View File

@@ -50,7 +50,6 @@ class DurationType extends AbstractType
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'label' => 'label.duration',
'constraints' => [new Regex(['pattern' => $this->pattern])],

1
src/Form/Type/InvoiceTemplateType.php
View File

@@ -19,7 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class InvoiceTemplateType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/LanguageType.php
View File

@@ -19,7 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class LanguageType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/PageSizeType.php
View File

@@ -18,7 +18,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class PageSizeType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/ProjectType.php
View File

@@ -20,7 +20,6 @@ use App\Repository\ProjectRepository;
*/
class ProjectType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/SkinType.php
View File

@@ -18,7 +18,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class SkinType extends AbstractType
{
/**
* {@inheritdoc}
*/

3
src/Form/Type/UserPreferenceType.php
View File

@@ -23,7 +23,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserPreferenceType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
* @param array $options
@@ -43,7 +42,7 @@ class UserPreferenceType extends AbstractType
}
$required = true;
if ($preference->getType() == CheckboxType::class) {
if (CheckboxType::class == $preference->getType()) {
$required = false;
}

3
src/Form/Type/UserRoleType.php
View File

@@ -18,7 +18,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserRoleType extends AbstractType
{
/**
* @var string[]
*/
@@ -39,7 +38,7 @@ class UserRoleType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$roles = [];
/* @var string[] $value */
foreach ($this->roles as $key => $value) {
$roles[$key] = $key;
foreach ($value as $value2) {

2
src/Form/Type/UserType.php
View File

@@ -19,7 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserType extends AbstractType
{
/**
* {@inheritdoc}
*/
@@ -32,6 +31,7 @@ class UserType extends AbstractType
if (!empty($user->getAlias())) {
return $user->getAlias() . ' (' . $user->getUsername() . ')';
}
return $user->getUsername();
},
]);

1
src/Form/Type/VisibilityType.php
View File

@@ -19,7 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class VisibilityType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/Type/YesNoType.php
View File

@@ -18,7 +18,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class YesNoType extends AbstractType
{
/**
* {@inheritdoc}
*/

1
src/Form/UserCreateType.php
View File

@@ -19,7 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserCreateType extends UserEditType
{
/**
* {@inheritdoc}
*/

2
src/Form/UserEditType.php
View File

@@ -10,7 +10,6 @@
namespace App\Form;
use App\Entity\User;
use App\Form\Type\LanguageType;
use App\Form\Type\YesNoType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -22,7 +21,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserEditType extends AbstractType
{
/**
* {@inheritdoc}
*/

3
src/Form/UserPasswordType.php
View File

@@ -21,7 +21,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserPasswordType extends AbstractType
{
/**
* {@inheritdoc}
*/
@@ -30,7 +29,7 @@ class UserPasswordType extends AbstractType
$builder
->add('plainPassword', RepeatedType::class, [
'type' => PasswordType::class,
'first_options' => ['label' => 'label.password'],
'first_options' => ['label' => 'label.password'],
'second_options' => ['label' => 'label.password_repeat'],
])
;

1
src/Form/UserPreferencesForm.php
View File

@@ -21,7 +21,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class UserPreferencesForm extends AbstractType
{
/**
* {@inheritdoc}
*/