Skip to content

Commit

Permalink
Make build passing
Browse files Browse the repository at this point in the history
  • Loading branch information
pamil committed Jun 7, 2019
1 parent 0e67461 commit c88ab75
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 3 deletions.
2 changes: 2 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ parameters:
- '/Class Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder does not have a constructor and must be instantiated without any parameters/'
- '/Class Symfony\\Component\\ExpressionLanguage\\ParserCache\\ParserCacheInterface not found/'
- '/Instantiated class Symfony\\Component\\ExpressionLanguage\\ParserCache\\ParserCacheAdapter not found/'
- '/Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required\./'
- '/Parameter \#1 \$event of method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) expects object, string given\./'

- '/Class Doctrine\\Bundle\\MongoDBBundle/'
- '/Class Doctrine\\Bundle\\PHPCRBundle/'
Expand Down
2 changes: 1 addition & 1 deletion src/Bundle/Controller/RequestConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ public function getSorting(array $sorting = [])
*/
public function getRequestParameter($parameter, $defaults = [])
{
return array_replace_recursive(
return (array) array_replace_recursive(
$defaults,
$this->request->get($parameter, [])
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Sylius\Bundle\ResourceBundle\Form\Builder\DefaultFormBuilderInterface;
use Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType;
use Sylius\Component\Resource\Metadata\MetadataInterface;
use Symfony\Component\Form\FormBuilderInterface;

Expand Down
9 changes: 9 additions & 0 deletions src/Bundle/Doctrine/ResourceMappingDriver.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Sylius\Bundle\ResourceBundle\Doctrine;
Expand Down
2 changes: 1 addition & 1 deletion src/Bundle/Form/Type/FixedCollectionType.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
$entryName = $options['entry_name']($entry);
$entryOptions = $options['entry_options']($entry);

$builder->add($entryName, $entryType, array_replace([
$builder->add($entryName, $entryType, (array) array_replace([
'property_path' => '[' . $entryName . ']',
'block_name' => 'entry',
], $entryOptions));
Expand Down
9 changes: 9 additions & 0 deletions src/Bundle/test/src/AppBundle/Entity/Author.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace AppBundle\Entity;
Expand Down

0 comments on commit c88ab75

Please sign in to comment.