Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved config into a ConfigProvider #5

Merged
merged 3 commits into from
Jun 20, 2018
Merged

Moved config into a ConfigProvider #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db7bb34
Moved config into a ConfigProvider
TomHAnderson Jun 20, 2018
9b26c54
Correct unused criteria filter classes; tidy config provider
TomHAnderson Jun 20, 2018
a64c02e
config provider code coverage
TomHAnderson Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct unused criteria filter classes; tidy config provider
  • Loading branch information
@TomHAnderson
TomHAnderson committed Jun 20, 2018
commit 9b26c547bc61036d87bbd4994be7bff286297a45
1 change: 0 additions & 1 deletion phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<rule ref="Generic.Formatting.SpaceAfterNot"/>
<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
<rule ref="Generic.NamingConventions.ConstructorName"/>
<rule ref="Generic.NamingConventions.CamelCapsFunctionName"/>
<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
<rule ref="Generic.PHP.DisallowShortOpenTag"/>
<rule ref="Generic.PHP.DisallowAlternativePHPTags"/>
Expand Down
26 changes: 4 additions & 22 deletions src/ConfigProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ public function __invoke()
{
return [
'dependencies' => $this->getDependencyConfig(),
'zf-doctrine-criteria-filter' => $this->getDoctrineCriteriaFilterConfig(),
'hydrators' => $this->getHydratorConfig(),
'zf-doctrine-graphql-type' => $this->getDoctrineGraphQLTypeConfig(),
'zf-doctrine-graphql-filter' => $this->getDoctrineGraphQLFilterConfig(),
'zf-doctrine-graphql-criteria' => $this->getDoctrineGraphQLCriteriaConfig(),
'zf-doctrine-graphql-resolve' => $this->getDoctrineGraphQLResolveConfig(),
'controllers' => $this->getControllerConfig(),
'console' => [
'router' => $this->getConsoleRouterConfig(),
],
'zf-doctrine-graphql-type' => $this->getDoctrineGraphQLTypeConfig(),
'zf-doctrine-graphql-filter' => $this->getDoctrineGraphQLFilterConfig(),
'zf-doctrine-graphql-criteria' => $this->getDoctrineGraphQLCriteriaConfig(),
'zf-doctrine-graphql-resolve' => $this->getDoctrineGraphQLResolveConfig(),
];
}

Expand All @@ -37,7 +36,6 @@ public function getDependencyConfig()
Hydrator\Strategy\AssociationDefault::class => InvokableFactory::class,
Hydrator\Strategy\FieldDefault::class => InvokableFactory::class,

Criteria\Loader::class => Criteria\LoaderFactory::class,
Criteria\FilterManager::class => Criteria\FilterManagerFactory::class,
Field\FieldResolver::class => Field\FieldResolverFactory::class,
Filter\Loader::class => Filter\LoaderFactory::class,
Expand All @@ -50,22 +48,6 @@ public function getDependencyConfig()
];
}

public function getDoctrineCriteriaFilterConfig()
{
return [
'aliases' => [
'between' => Filter\Criteria\Type\Between::class,
'isnull' => Filter\Criteria\Type\IsNull::class,
'isnotnull' => Filter\Criteria\Type\IsNotNull::class,
],
'factories' => [
Filter\Criteria\Type\Between::class => InvokableFactory::class,
Filter\Criteria\Type\IsNull::class => InvokableFactory::class,
Filter\Criteria\Type\IsNotNull::class => InvokableFactory::class,
],
];
}

public function getHydratorConfig()
{
return [
Expand Down
2 changes: 1 addition & 1 deletion src/Criteria/FilterTypeAbstractFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
];
}

if ($filterManager->has('isnull') && $filterManager->has('isnotnull')) {
if ($filterManager->has('eq') && $filterManager->has('neq')) {
$fields[$fieldName . '_isnull'] = [
'name' => $fieldName . '_isnull',
'type' => Type::boolean(),
Expand Down
9 changes: 4 additions & 5 deletions src/Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ public function getConfig()

return [
'service_manager' => $configProvider->getDependencyConfig(),
'zf-doctrine-criteria-filter' => $configProvider->getDoctrineCriteriaFilterConfig(),
'hydrators' => $configProvider->getHydratorConfig(),
'zf-doctrine-graphql-type' => $configProvider->getDoctrineGraphQLTypeConfig(),
'zf-doctrine-graphql-filter' => $configProvider->getDoctrineGraphQLFilterConfig(),
'zf-doctrine-graphql-criteria' => $configProvider->getDoctrineGraphQLCriteriaConfig(),
'zf-doctrine-graphql-resolve' => $configProvider->getDoctrineGraphQLResolveConfig(),
'controllers' => $configProvider->getControllerConfig(),
'console' => [
'router' => $configProvider->getConsoleRouterConfig(),
],
'zf-doctrine-graphql-type' => $configProvider->getDoctrineGraphQLTypeConfig(),
'zf-doctrine-graphql-filter' => $configProvider->getDoctrineGraphQLFilterConfig(),
'zf-doctrine-graphql-criteria' => $configProvider->getDoctrineGraphQLCriteriaConfig(),
'zf-doctrine-graphql-resolve' => $configProvider->getDoctrineGraphQLResolveConfig(),
];
}

Expand Down