diff --git a/.travis.yml b/.travis.yml
index 82f7cd10c..93aed4875 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,7 +105,7 @@ install:
     phpstan/phpstan-phpunit:^0.12
 
   # Install PHPCS to check for Drupal coding standards.
-  - travis_retry composer global require drupal/coder:8.3.10
+  - travis_retry composer global require drupal/coder:8.3.11
   - $HOME/.config/composer/vendor/bin/phpcs --config-set installed_paths $HOME/.config/composer/vendor/drupal/coder/coder_sniffer
 
 script:
diff --git a/src/Entity/Server.php b/src/Entity/Server.php
index 04f20f332..03e5d49e1 100644
--- a/src/Entity/Server.php
+++ b/src/Entity/Server.php
@@ -226,7 +226,7 @@ public function configuration() {
   }
 
   /**
-   * TODO: Handle this through configuration (e.g. a context value).
+   * @todo Handle this through configuration (e.g. a context value).
    *
    * Returns to root value to use when resolving queries against the schema.
    *
@@ -302,7 +302,7 @@ protected function getContext(SchemaPluginInterface $schema, array $config) {
   }
 
   /**
-   * TODO: Handle this through configuration on the server.
+   * @todo Handle this through configuration on the server.
    *
    * Returns the default field resolver.
    *
@@ -348,7 +348,7 @@ protected function getErrorFormatter() {
   }
 
   /**
-   * TODO: Handle this through configurable plugins on the server.
+   * @todo Handle this through configurable plugins on the server.
    *
    * Returns the error handler.
    *
@@ -438,7 +438,7 @@ public function getSortedPersistedQueryInstances() {
   }
 
   /**
-   * TODO: Handle this through configurable plugins on the server.
+   * @todo Handle this through configurable plugins on the server.
    *
    * Returns a callable for loading persisted queries.
    *
@@ -460,7 +460,7 @@ protected function getPersistedQueryLoader() {
   }
 
   /**
-   * TODO: Handle this through configurable plugins on the server.
+   * @todo Handle this through configurable plugins on the server.
    *
    * Returns the validation rules to use for the query.
    *
diff --git a/src/GraphQL/Execution/Executor.php b/src/GraphQL/Execution/Executor.php
index ee6716384..9da59b05c 100644
--- a/src/GraphQL/Execution/Executor.php
+++ b/src/GraphQL/Execution/Executor.php
@@ -264,10 +264,10 @@ protected function doExecuteUncached() {
    */
   protected function cachePrefix() {
     // Sorting the variables and extensions will cause fewer cache vectors.
-    // TODO: Should we try to sort these recursively?
+    // @todo Should we try to sort these recursively?
     $variables = $this->variables ?: [];
     ksort($variables);
-    // TODO: Should we submit a pull request to also pass the extensions in the
+    // @todo Should we submit a pull request to also pass the extensions in the
     // executor?
     $extensions = $this->context->getOperation()->extensions ?: [];
     ksort($extensions);
diff --git a/src/GraphQL/Resolver/Path.php b/src/GraphQL/Resolver/Path.php
index 3612c7073..91e2d8a55 100644
--- a/src/GraphQL/Resolver/Path.php
+++ b/src/GraphQL/Resolver/Path.php
@@ -13,7 +13,7 @@
 use GraphQL\Type\Definition\ResolveInfo;
 
 /**
- * @TODO: Delete this resolver. This is a plugin already.
+ * @todo Delete this resolver. This is a plugin already.
  */
 class Path implements ResolverInterface {
 
diff --git a/src/GraphQL/ResolverRegistryInterface.php b/src/GraphQL/ResolverRegistryInterface.php
index f246e7f55..913730761 100644
--- a/src/GraphQL/ResolverRegistryInterface.php
+++ b/src/GraphQL/ResolverRegistryInterface.php
@@ -47,7 +47,7 @@ public function addFieldResolver($type, $field, ResolverInterface $resolver);
   public function getFieldResolver($type, $field);
 
   /**
-   * TODO: Type resolvers should also get their own interface.
+   * @todo Type resolvers should also get their own interface.
    *
    * @param string $abstract
    * @param callable $resolver
diff --git a/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php b/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php
index e1db89150..b0049bf16 100644
--- a/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php
+++ b/src/Plugin/GraphQL/DataProducer/DataProducerPluginBase.php
@@ -40,7 +40,7 @@ public function resolveField(FieldContext $field) {
       throw new \LogicException('Missing data producer resolve method.');
     }
 
-    // TODO: The field context should probably be the first argument.
+    // @todo The field context should probably be the first argument.
     $context = $this->getContextValues();
     return call_user_func_array(
       [$this, 'resolve'],
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkAttribute.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkAttribute.php
index 0a6029695..304bc7019 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkAttribute.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkAttribute.php
@@ -7,7 +7,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input context type.
+ * @todo Fix input context type.
  *
  * @DataProducer(
  *   id = "menu_link_attribute",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkDescription.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkDescription.php
index d28f0363f..77a8f753c 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkDescription.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkDescription.php
@@ -6,7 +6,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input context type.
+ * @todo Fix input context type.
  *
  * @DataProducer(
  *   id = "menu_link_description",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkExpanded.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkExpanded.php
index b3434be76..7990bc434 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkExpanded.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkExpanded.php
@@ -6,7 +6,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input context type.
+ * @todo Fix input context type.
  *
  * @DataProducer(
  *   id = "menu_link_expanded",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkLabel.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkLabel.php
index 2cd191796..961ce4476 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkLabel.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkLabel.php
@@ -6,7 +6,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input context type.
+ * @todo Fix input context type.
  *
  * @DataProducer(
  *   id = "menu_link_label",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkUrl.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkUrl.php
index 8896489ea..230650575 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkUrl.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuLink/MenuLinkUrl.php
@@ -6,7 +6,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input and output context type.
+ * @todo Fix input and output context type.
  *
  * @DataProducer(
  *   id = "menu_link_url",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLinks.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLinks.php
index 1f17a6498..97cd00ae4 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuLinks.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuLinks.php
@@ -13,7 +13,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * TODO: Fix output context type.
+ * @todo Fix output context type.
  *
  * @DataProducer(
  *   id = "menu_links",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeLink.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeLink.php
index 7ff85de9e..1c4760603 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeLink.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeLink.php
@@ -6,7 +6,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input and output context type.
+ * @todo Fix input and output context type.
  *
  * @DataProducer(
  *   id = "menu_tree_link",
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php
index 040ea2988..db231f4da 100644
--- a/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php
+++ b/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php
@@ -7,7 +7,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix input and output context type.
+ * @todo Fix input and output context type.
  *
  * @DataProducer(
  *   id = "menu_tree_subtree",
diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php
index ceaecf80a..e7c4cef96 100644
--- a/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php
+++ b/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php
@@ -10,7 +10,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * TODO: Fix the type of the output context.
+ * @todo Fix the type of the output context.
  *
  * @DataProducer(
  *   id = "route_load",
diff --git a/src/Plugin/GraphQL/DataProducer/Routing/Url/UrlPath.php b/src/Plugin/GraphQL/DataProducer/Routing/Url/UrlPath.php
index 8a423dfdb..feee49777 100644
--- a/src/Plugin/GraphQL/DataProducer/Routing/Url/UrlPath.php
+++ b/src/Plugin/GraphQL/DataProducer/Routing/Url/UrlPath.php
@@ -7,7 +7,7 @@
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
- * TODO: Fix the type of the input context.
+ * @todo Fix the type of the input context.
  *
  * @DataProducer(
  *   id = "url_path",
diff --git a/src/Plugin/GraphQL/Schema/ComposableSchema.php b/src/Plugin/GraphQL/Schema/ComposableSchema.php
index cab488258..20eb2a823 100644
--- a/src/Plugin/GraphQL/Schema/ComposableSchema.php
+++ b/src/Plugin/GraphQL/Schema/ComposableSchema.php
@@ -98,7 +98,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
    * {@inheritdoc}
    */
   public function validateConfigurationForm(array &$form, FormStateInterface $formState) {
-    // TODO: Validate dependencies between extensions.
+    // @todo Validate dependencies between extensions.
   }
 
   /**
diff --git a/src/Plugin/SchemaPluginInterface.php b/src/Plugin/SchemaPluginInterface.php
index 0904570b6..f9a74970c 100644
--- a/src/Plugin/SchemaPluginInterface.php
+++ b/src/Plugin/SchemaPluginInterface.php
@@ -22,7 +22,7 @@ public function getSchema(ResolverRegistryInterface $registry);
   /**
    * Retrieves the resolver registry.
    *
-   * TODO: Instead, this should be configuration.
+   * @todo Instead, this should be configuration.
    *
    * @return \Drupal\graphql\GraphQL\ResolverRegistryInterface
    *   The resolver registry.
diff --git a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php
index 5cc1bfa59..1f00adc09 100644
--- a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php
+++ b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php
@@ -76,7 +76,7 @@ public function testImageDerivative() {
       $result
     );
 
-    // TODO: Add cache checks.
+    // @todo Add cache checks.
     // $this->assertContains('config:image.style.test_style',
     // $metadata->getCacheTags());
     // $this->assertContains('test_tag', $metadata->getCacheTags());
@@ -89,7 +89,7 @@ public function testImageDerivative() {
 
     $this->assertNull($result);
 
-    // TODO: Add cache checks.
+    // @todo Add cache checks.
     // $this->assertContains('test_tag_forbidden',
     // $metadata->getCacheTags());
   }
diff --git a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageUrlTest.php b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageUrlTest.php
index 234156eb1..95646ce84 100644
--- a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageUrlTest.php
+++ b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageUrlTest.php
@@ -49,7 +49,7 @@ public function testImageUrl() {
 
     $this->assertEquals($this->file_url, $result);
 
-    // TODO: Add cache checks.
+    // @todo Add cache checks.
     // $this->assertContains('test_tag', $metadata->getCacheTags());
     // Test that we do not get a file we don't have access to, but the cache
     // tags are still added.
@@ -59,7 +59,7 @@ public function testImageUrl() {
 
     $this->assertNull($result);
 
-    // TODO: Add cache checks.
+    // @todo Add cache checks.
     // $this->assertContains('test_tag_forbidden',
     // $metadata->getCacheTags());
   }
diff --git a/tests/src/Kernel/DataProducer/EntityTest.php b/tests/src/Kernel/DataProducer/EntityTest.php
index ffb57e3c4..62ff6669a 100644
--- a/tests/src/Kernel/DataProducer/EntityTest.php
+++ b/tests/src/Kernel/DataProducer/EntityTest.php
@@ -332,7 +332,7 @@ public function testResolveUnknownEntityLoad() {
       'id' => 0,
     ]);
 
-    // TODO: Add metadata check.
+    // @todo Add metadata check.
     // $this->assertContains('node_list', $metadata->getCacheTags());
     $this->assertNull($result);
   }
@@ -347,7 +347,7 @@ public function testResolveMismatchEntityLoad() {
       'bundles' => ['otherbundle'],
     ]);
 
-    // TODO: Add metadata check.
+    // @todo Add metadata check.
     // $this->assertContains('node:1', $metadata->getCacheTags());
     $this->assertNull($result);
   }
@@ -375,7 +375,7 @@ public function testResolveEntityRendered() {
       'mode' => 'default',
     ]);
 
-    // TODO: Add metadata check.
+    // @todo Add metadata check.
     // $this->assertContains('node:1', $metadata->getCacheTags());
     $this->assertStringContainsString('<a href="/node/1" rel="bookmark"><span>' . $this->node->getTitle() . '</span>', $result);
   }
diff --git a/tests/src/Kernel/DataProducer/Routing/RouteEntityTest.php b/tests/src/Kernel/DataProducer/Routing/RouteEntityTest.php
index 2591b9200..ae053d9c6 100644
--- a/tests/src/Kernel/DataProducer/Routing/RouteEntityTest.php
+++ b/tests/src/Kernel/DataProducer/Routing/RouteEntityTest.php
@@ -206,7 +206,7 @@ public function testRouteEntity() {
     // and the 4xx-response cache tags.
     $this->assertNull($result);
 
-    // TODO: Add cache checks.
+    // @todo Add cache checks.
     // $this->assertContains('node_list', $metadata->getCacheTags());
     // $this->assertContains('4xx-response', $metadata->getCacheTags());
   }