Skip to content

Commit f2ebeab

Browse files
authored
style(phpcs): Update Coder to 8.3.10 and fix warnings (#1078)
1 parent 0b9d489 commit f2ebeab

23 files changed

Lines changed: 97 additions & 40 deletions

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ install:
9191
- composer --no-interaction --working-dir=$DRUPAL_BUILD_DIR run-script drupal-phpunit-upgrade
9292

9393
# Install PHPCS to check for Drupal coding standards.
94-
- travis_retry composer global require drupal/coder:8.3.9
94+
- travis_retry composer global require drupal/coder:8.3.10
9595
- $HOME/.composer/vendor/bin/phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer
9696

9797
script:

src/Controller/ServerListBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Drupal\Core\Url;
88

99
/**
10-
* Class ServerListBuilder.
10+
* Admin page controller that shows the list of configured GraphQL servers.
1111
*
1212
* @package Drupal\graphql\Controller
1313
*

src/Entity/Server.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,10 @@ public function id() {
157157
*/
158158
public function executeOperation(OperationParams $operation) {
159159
$previous = Executor::getImplementationFactory();
160-
Executor::setImplementationFactory([\Drupal::service('graphql.executor'), 'create']);
160+
Executor::setImplementationFactory([
161+
\Drupal::service('graphql.executor'),
162+
'create',
163+
]);
161164

162165
try {
163166
$config = $this->configuration();
@@ -402,7 +405,7 @@ public function getPersistedQueryInstances() {
402405
return $this->persisted_query_instances;
403406
}
404407

405-
/* @var \Drupal\graphql\Plugin\PersistedQueryPluginManager $plugin_manager */
408+
/** @var \Drupal\graphql\Plugin\PersistedQueryPluginManager $plugin_manager */
406409
$plugin_manager = \Drupal::service('plugin.manager.graphql.persisted_query');
407410
$definitions = $plugin_manager->getDefinitions();
408411
$persisted_queries_settings = $this->get('persisted_queries_settings');

src/Form/PersistedQueriesForm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function getFormId() {
4848
public function form(array $form, FormStateInterface $form_state) {
4949
$form = parent::form($form, $form_state);
5050

51-
/* @var PersistedQueryPluginInterface[] $plugins */
51+
/** @var PersistedQueryPluginInterface[] $plugins */
5252
$plugins = $this->entity->getPersistedQueryInstances();
5353
$all_plugins = $this->getAllPersistedQueryPlugins();
5454
$form['#tree'] = TRUE;

src/Form/ServerForm.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function form(array $form, FormStateInterface $formState) {
143143
'#tree' => TRUE,
144144
];
145145

146-
/* @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
146+
/** @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
147147
$instance = $schema ? $this->schemaManager->createInstance($schema) : NULL;
148148
if ($instance instanceof PluginFormInterface && $instance instanceof ConfigurableInterface) {
149149
$instance->setConfiguration($server->get('schema_configuration')[$schema] ?? []);
@@ -218,7 +218,7 @@ public function validateForm(array &$form, FormStateInterface $formState) {
218218
$formState->setErrorByName('endpoint', 'The endpoint path contains invalid characters.');
219219
}
220220

221-
/* @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
221+
/** @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
222222
$schema = $formState->getValue('schema');
223223
$instance = $this->schemaManager->createInstance($schema);
224224
if (!empty($form['schema_configuration'][$schema]) && $instance instanceof PluginFormInterface && $instance instanceof ConfigurableInterface) {
@@ -233,7 +233,7 @@ public function validateForm(array &$form, FormStateInterface $formState) {
233233
public function submitForm(array &$form, FormStateInterface $formState) {
234234
parent::submitForm($form, $formState);
235235

236-
/* @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
236+
/** @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
237237
$schema = $formState->getValue('schema');
238238
$instance = $this->schemaManager->createInstance($schema);
239239
if ($instance instanceof PluginFormInterface && $instance instanceof ConfigurableInterface) {

src/GraphQL/ResolverRegistry.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,14 @@ class ResolverRegistry implements ResolverRegistryInterface {
5454
* @param callable|null $defaultTypeResolver
5555
*/
5656
public function __construct(callable $defaultFieldResolver = NULL, callable $defaultTypeResolver = NULL) {
57-
$this->defaultFieldResolver = $defaultFieldResolver ?: [$this, 'resolveFieldDefault'];
58-
$this->defaultTypeResolver = $defaultTypeResolver ?: [$this, 'resolveTypeDefault'];
57+
$this->defaultFieldResolver = $defaultFieldResolver ?: [
58+
$this,
59+
'resolveFieldDefault',
60+
];
61+
$this->defaultTypeResolver = $defaultTypeResolver ?: [
62+
$this,
63+
'resolveTypeDefault',
64+
];
5965
}
6066

6167
/**

src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ public function resolveField(FieldContext $field) {
4242

4343
// TODO: The field context should probably be the first argument.
4444
$context = $this->getContextValues();
45-
return call_user_func_array([$this, 'resolve'], array_merge($context, [$field]));
45+
return call_user_func_array(
46+
[$this, 'resolve'],
47+
array_merge($context, [$field])
48+
);
4649
}
4750

4851
}

src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function resolve($type, $id, $language, ?array $bundles, ?bool $access, ?
169169
// Check if the passed user (or current user if none is passed) has access
170170
// to the entity, if not return NULL.
171171
if ($access) {
172-
/* @var $accessResult \Drupal\Core\Access\AccessResultInterface */
172+
/** @var \Drupal\Core\Access\AccessResultInterface $accessResult */
173173
$accessResult = $entity->access($accessOperation, $accessUser, TRUE);
174174
$context->addCacheableDependency($accessResult);
175175
if (!$accessResult->isAllowed()) {

src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function resolve($type, $uuid, $language, $bundles, ?bool $access, ?Accou
169169
// Check if the passed user (or current user if none is passed) has access
170170
// to the entity, if not return NULL.
171171
if ($access) {
172-
/* @var $accessResult \Drupal\Core\Access\AccessResultInterface */
172+
/** @var \Drupal\Core\Access\AccessResultInterface $accessResult */
173173
$accessResult = $entity->access($accessOperation, $accessUser, TRUE);
174174
$context->addCacheableDependency($accessResult);
175175
if (!$accessResult->isAllowed()) {

src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function resolve($type, array $ids, $language, ?array $bundles, bool $acc
169169
}
170170

171171
if ($access) {
172-
/* @var $accessResult \Drupal\Core\Access\AccessResultInterface */
172+
/** @var \Drupal\Core\Access\AccessResultInterface $accessResult */
173173
$accessResult = $entities[$id]->access($accessOperation, $accessUser, TRUE);
174174
$context->addCacheableDependency($accessResult);
175175
// We need to call isAllowed() because isForbidden() returns FALSE

0 commit comments

Comments
 (0)