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

updated to Symfony 4.2 (#710)

Browse Source
This commit is contained in:
Kevin Papst
2019-04-21 01:41:08 +02:00
committed by GitHub
parent 32b36f42f0
commit f9c8028ea1
31 changed files with 1010 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/API/BaseApiController.php
View File

@@ -11,8 +11,8 @@ declare(strict_types=1);
namespace App\API;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
abstract class BaseApiController extends Controller
abstract class BaseApiController extends AbstractController
{
}

3
src/API/ConfigurationController.php
View File

@@ -18,9 +18,8 @@ use FOS\RestBundle\Controller\Annotations as Rest;
use FOS\RestBundle\View\View;
use FOS\RestBundle\View\ViewHandlerInterface;
use Swagger\Annotations as SWG;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
class ConfigurationController extends Controller
class ConfigurationController extends BaseApiController
{
/**
* @var ViewHandlerInterface

3
src/API/HealthcheckController.php
View File

@@ -16,9 +16,8 @@ use FOS\RestBundle\Controller\Annotations as Rest;
use FOS\RestBundle\View\View;
use FOS\RestBundle\View\ViewHandlerInterface;
use Swagger\Annotations as SWG;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
class HealthcheckController extends Controller
class HealthcheckController extends BaseApiController
{
/**
* @var ViewHandlerInterface

6
src/Command/RunCodeSnifferCommand.php → src/Command/RunCodestyleCommand.php
View File

@@ -18,7 +18,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
/**
* Command used to check and apply the projects coding styles.
*/
class RunCodeSnifferCommand extends Command
class RunCodestyleCommand extends Command
{
/**
* @var BashExecutor
@@ -46,8 +46,8 @@ class RunCodeSnifferCommand extends Command
protected function configure()
{
$this
->setName('kimai:phpcs')
->setDescription('Run PHP_CodeSniffer to check for the projects coding style')
->setName('kimai:codestyle')
->setDescription('Check and fix the projects coding style')
->addOption('fix', null, InputOption::VALUE_NONE, 'Fix all found problems')
->addOption('checkstyle', null, InputOption::VALUE_OPTIONAL, '')
;

2
src/Controller/InvoiceController.php
View File

@@ -254,7 +254,7 @@ class InvoiceController extends AbstractController
* @Security("is_granted('create_invoice_template')")
*
* @param Request $request
* @param InvoiceTemplate|null $template
* @param InvoiceTemplate|null $copyFrom
* @return \Symfony\Component\HttpFoundation\Response
* @throws \Exception
*/

44
src/DependencyInjection/Configuration.php
View File

@@ -27,8 +27,8 @@ class Configuration implements ConfigurationInterface
*/
public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('kimai');
$treeBuilder = new TreeBuilder('kimai');
$rootNode = $treeBuilder->getRootNode();
$rootNode
->children()
@@ -68,8 +68,8 @@ class Configuration implements ConfigurationInterface
protected function getTimesheetNode()
{
$builder = new TreeBuilder();
$node = $builder->root('timesheet');
$builder = new TreeBuilder('timesheet');
$node = $builder->getRootNode();
$node
->children()
@@ -185,8 +185,8 @@ class Configuration implements ConfigurationInterface
protected function getInvoiceNode()
{
$builder = new TreeBuilder();
$node = $builder->root('invoice');
$builder = new TreeBuilder('invoice');
$node = $builder->getRootNode();
$node
->addDefaultsIfNotSet()
@@ -208,8 +208,8 @@ class Configuration implements ConfigurationInterface
protected function getLanguagesNode()
{
$builder = new TreeBuilder();
$node = $builder->root('languages');
$builder = new TreeBuilder('languages');
$node = $builder->getRootNode();
$node
->useAttributeAsKey('name', false) // see https://github.com/symfony/symfony/issues/18988
@@ -233,8 +233,8 @@ class Configuration implements ConfigurationInterface
protected function getCalendarNode()
{
$builder = new TreeBuilder();
$node = $builder->root('calendar');
$builder = new TreeBuilder('calendar');
$node = $builder->getRootNode();
$node
->children()
@@ -276,8 +276,8 @@ class Configuration implements ConfigurationInterface
protected function getThemeNode()
{
$builder = new TreeBuilder();
$node = $builder->root('theme');
$builder = new TreeBuilder('theme');
$node = $builder->getRootNode();
$node
->addDefaultsIfNotSet()
@@ -300,8 +300,8 @@ class Configuration implements ConfigurationInterface
protected function getUserNode()
{
$builder = new TreeBuilder();
$node = $builder->root('user');
$builder = new TreeBuilder('user');
$node = $builder->getRootNode();
$node
->addDefaultsIfNotSet()
@@ -320,8 +320,8 @@ class Configuration implements ConfigurationInterface
protected function getWidgetsNode()
{
$builder = new TreeBuilder();
$node = $builder->root('widgets');
$builder = new TreeBuilder('widgets');
$node = $builder->getRootNode();
$node
->requiresAtLeastOneElement()
@@ -351,8 +351,8 @@ class Configuration implements ConfigurationInterface
protected function getDashboardNode()
{
$builder = new TreeBuilder();
$node = $builder->root('dashboard');
$builder = new TreeBuilder('dashboard');
$node = $builder->getRootNode();
$node
->requiresAtLeastOneElement()
@@ -384,8 +384,8 @@ class Configuration implements ConfigurationInterface
protected function getDefaultsNode()
{
$builder = new TreeBuilder();
$node = $builder->root('defaults');
$builder = new TreeBuilder('defaults');
$node = $builder->getRootNode();
$node
->addDefaultsIfNotSet()
@@ -406,8 +406,8 @@ class Configuration implements ConfigurationInterface
protected function getPermissionsNode()
{
$builder = new TreeBuilder();
$node = $builder->root('permissions');
$builder = new TreeBuilder('permissions');
$node = $builder->getRootNode();
$node
->addDefaultsIfNotSet()

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

@@ -20,12 +20,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*/
class DocumentationLinkExtension extends AbstractTypeExtension
{
/**
* @return string
*/
public function getExtendedType()
public static function getExtendedTypes(): iterable
{
return FormType::class;
return [FormType::class];
}
/**

7
src/Form/Extension/EnhancedChoiceTypeExtension.php
View File

@@ -34,12 +34,9 @@ class EnhancedChoiceTypeExtension extends AbstractTypeExtension
$this->type = $type;
}
/**
* @return string
*/
public function getExtendedType()
public static function getExtendedTypes(): iterable
{
return EntityType::class;
return [EntityType::class];
}
/**

7
src/Form/Extension/SelectWithApiDataExtension.php
View File

@@ -34,12 +34,9 @@ class SelectWithApiDataExtension extends AbstractTypeExtension
$this->router = $router;
}
/**
* @return string
*/
public function getExtendedType()
public static function getExtendedTypes(): iterable
{
return EntityType::class;
return [EntityType::class];
}
/**

1
src/Twig/EventExtensions.php
View File

@@ -29,6 +29,7 @@ class EventExtensions extends AbstractExtension
/**
* @param EventDispatcherInterface $dispatcher
* @param CurrentUser $user
*/
public function __construct(EventDispatcherInterface $dispatcher, CurrentUser $user)
{