Skip to content

Commit

Permalink
Merge e5fbfd1 into 3c0b7d7
Browse files Browse the repository at this point in the history
  • Loading branch information
moufmouf committed Jun 1, 2020
2 parents 3c0b7d7 + e5fbfd1 commit 4a63afe
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Resources/config/container/graphqlite.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<service id="TheCodingMachine\GraphQLite\AggregateControllerQueryProviderFactory">
<argument type="collection">
</argument>
<argument type="service" id="service_container">
</argument>
<tag name="graphql.queryprovider_factory" />
</service>

Expand Down Expand Up @@ -103,7 +105,7 @@
</argument>
<tag name="graphql.type_mapper_factory"/>
</service>

<service id="graphqlite.phpfilescache" class="Symfony\Component\Cache\Adapter\PhpFilesAdapter">
<argument>graphqlite</argument>
</service>
Expand Down
7 changes: 6 additions & 1 deletion Tests/GraphqliteTestingKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
use Symfony\Component\Routing\RouteCollectionBuilder;
use TheCodingMachine\Graphqlite\Bundle\GraphqliteBundle;
use Symfony\Component\Security\Core\User\User;
Expand Down Expand Up @@ -67,6 +68,10 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
'app' => 'cache.adapter.array',
];

$frameworkConf['router'] =[
'utf8' => true,
];

if ($this->enableSession) {
$frameworkConf['session'] =[
'enabled' => true,
Expand Down Expand Up @@ -136,7 +141,7 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
}

protected function configureRoutes(RouteCollectionBuilder $routes)
protected function configureRoutes(RoutingConfigurator $routes)
{
$routes->import(__DIR__.'/../Resources/config/routes.xml');
}
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"phpunit/phpunit": "^7.5.1",
"phpstan/phpstan": "^0.12.25",
"beberlei/porpaginas": "^1.2",
"php-coveralls/php-coveralls": "^2.1.0"
"php-coveralls/php-coveralls": "^2.1.0",
"symfony/phpunit-bridge": "^5.1"
},
"scripts": {
"phpstan": "phpstan analyse GraphqliteBundle.php DependencyInjection/ Controller/ Resources/ Security/ -c phpstan.neon --level=7 --no-progress"
Expand Down
4 changes: 4 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,8 @@
<log type="coverage-html" target="build/coverage"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>

<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
</phpunit>

0 comments on commit 4a63afe

Please sign in to comment.