Better string handling and Scrutinizer fixes. (drupal-graphql#279)

Author: fubhy

.scrutinizer.yml

@@ -0,0 +1,6 @@
+filter:
+  excluded_paths:
+    - 'tests/*'
+
+checks:
+  php: true

.travis.yml

@@ -1,42 +1,28 @@
 language: php
 sudo: false
 
+php:
+  - 5.5
+  - 5.6
+  - 7
+
+env:
+  - DRUPAL_CORE=8.2.x
+  - DRUPAL_CORE=8.3.x
+  - DRUPAL_CORE=8.4.x
+
 matrix:
   # Don't wait for the allowed failures to build.
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DRUPAL_CORE=8.2.x
-    - php: 5.5
-      env:
-        - DRUPAL_CORE=8.3.x
-    - php: 5.5
-      env:
-        - DRUPAL_CORE=8.4.x
-    - php: 5.6
-      env:
-        - DRUPAL_CORE=8.2.x
-    - php: 5.6
-      env:
-        - DRUPAL_CORE=8.3.x
-    - php: 5.6
-      env:
-        - DRUPAL_CORE=8.4.x
-    - php: 7
-      env:
-        - DRUPAL_CORE=8.2.x
-    - php: 7
-      env:
-        - DRUPAL_CORE=8.3.x
-    - php: 7
-      env:
-        - DRUPAL_CORE=8.4.x
     - php: 7
       env:
         - DRUPAL_CORE=8.4.x
         # Only run code coverage on the latest php and drupal versions.
         - WITH_PHPDBG_COVERAGE=true
+  allow_failures:
+    # Allow the code coverage report to fail.
+    - env: WITH_PHPDBG_COVERAGE=true DRUPAL_CORE=8.4.x
 
 mysql:
   database: graphql
@@ -101,10 +87,6 @@ before_script:
   # Export web server URL for browser tests.
   - export SIMPLETEST_BASE_URL=http://localhost:8888
 
-  # Install PHPCS to check for Drupal coding standards.
-  - travis_retry composer global require drupal/coder
-  - $HOME/.composer/vendor/bin/phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer
-
 script:
   # Run the unit tests which also include the kernel tests. When running with
   # phpdbg we need to replace all code occurrences that check for 'cli' with
@@ -117,10 +99,10 @@ script:
         vendor/bin/phpunit --configuration core/phpunit.xml.dist modules/graphql;
     fi
 
-  # Check for coding standards violations
-  - cd modules/graphql && $HOME/.composer/vendor/bin/phpcs
-
 after_success:
   - if [[ "$WITH_PHPDBG_COVERAGE" == "true" ]];
-      then bash <(curl -s https://codecov.io/bash);
+      then
+        bash <(curl -s https://codecov.io/bash);
+        wget https://scrutinizer-ci.com/ocular.phar;
+        php ocular.phar code-coverage:upload --format=php-clover coverage.xml;
     fi

graphql.module

@@ -4,6 +4,7 @@
  * @file
  * The GraphQL module.
  */
+use Drupal\graphql\Utility\StringHelper;
 
 /**
  * Implements hook_help().
@@ -32,28 +33,19 @@ EOT;
 /**
  * Turn a list of machine names into a camel-cased string.
  *
- * @param string[]|string $components
- *   Name components to be concatenated.
- *
- * @return string
- *   A camel-cased concatenation of the input components.
+ * @deprecated in graphql 3.x and will be removed before 3.0-alpha6.
+ *   Use \Drupal\graphql\Utility\StringHelper::camelCase() instead.
  */
 function graphql_camelcase($components) {
-  $components = is_array($components) ? implode('_', $components) : $components;
-  $components = preg_split('/[^a-zA-Z0-9]/', $components);
-
-  return implode('', array_map('ucfirst', $components));
+  return StringHelper::camelCase($components);
 }
 
 /**
  * Turn a list of machine names into a property-cased string.
  *
- * @param string[]|string $components
- *   Name components to be concatenated.
- *
- * @return string
- *   A camel-cased concatenation of the input components.
+ * @deprecated in graphql 3.x and will be removed before 3.0-alpha6.
+ *   Use \Drupal\graphql\Utility\StringHelper::propCase() instead.
  */
 function graphql_propcase($components) {
-  return lcfirst(graphql_camelcase($components));
-}
+  return StringHelper::propCase($components);
+}

modules/graphql_block/src/Plugin/GraphQL/Fields/BlocksByRegion.php

@@ -116,15 +116,15 @@ protected function resolveSubrequest($value, array $args, ResolveInfo $info) {
       'region' => $region,
     ]);
 
-    $blocks = array_filter($blocks, function (Block $block) {
-      return array_reduce(iterator_to_array($block->getVisibilityConditions()), function ($value, ConditionInterface $condition) {
+    $blocks = array_filter($blocks, function(Block $block) {
+      return array_reduce(iterator_to_array($block->getVisibilityConditions()), function($value, ConditionInterface $condition) {
         return $value && (!$condition->isNegated() == $condition->evaluate());
       }, TRUE);
     });
 
     uasort($blocks, '\Drupal\Block\Entity\Block::sort');
 
-    $result = array_map(function (Block $block) {
+    $result = array_map(function(Block $block) {
       $plugin = $block->getPlugin();
       if ($plugin instanceof BlockContentBlock) {
         return $this->entityRepository->loadEntityByUuid('block_content', $plugin->getDerivativeId());

modules/graphql_breadcrumbs/src/Plugin/GraphQL/Fields/Label.php

@@ -3,7 +3,6 @@
 namespace Drupal\graphql_breadcrumbs\Plugin\GraphQL\Fields;
 
 use Drupal\graphql_core\GraphQL\FieldPluginBase;
-use Drupal\link\LinkItemInterface;
 use Youshido\GraphQL\Execution\ResolveInfo;
 use Drupal\Core\Link;
 

modules/graphql_breadcrumbs/src/Plugin/GraphQL/Fields/Url.php

@@ -3,7 +3,6 @@
 namespace Drupal\graphql_breadcrumbs\Plugin\GraphQL\Fields;
 
 use Drupal\graphql_core\GraphQL\FieldPluginBase;
-use Drupal\link\LinkItemInterface;
 use Youshido\GraphQL\Execution\ResolveInfo;
 use Drupal\Core\Link;
 

modules/graphql_breadcrumbs/tests/src/Kernel/BreadcrumbsTest.php

@@ -39,7 +39,7 @@ protected function setUp() {
     $breadcrumbManager = $this->prophesize('Drupal\Core\Breadcrumb\BreadcrumbManager');
 
     $breadcrumbManager->build(Argument::any())
-      ->will(function ($args) {
+      ->will(function($args) {
         /** @var RouteMatch $routeMatch */
         $routeMatch = $args[0];
         $breadcrumb = new Breadcrumb();

modules/graphql_content/src/ContentEntitySchemaConfig.php

@@ -64,20 +64,20 @@ public function isEntityBundleExposed($entityType, $bundle) {
    * @param string $bundle
    *   The bundle machine name.
    *
-   * @return string
-   *   The view mode machine name, or FALSE if no fields are exposed.
+   * @return string|null
+   *   The view mode machine name, or NULL if no fields are exposed.
    */
   public function getExposedViewMode($entityType, $bundle) {
     if (!$this->isEntityBundleExposed($entityType, $bundle)) {
-      return FALSE;
+      return NULL;
     }
 
     $viewMode = NestedArray::getValue($this->types, [
       $entityType, 'bundles', $bundle, 'view_mode',
     ]);
 
     if (!$viewMode || $viewMode == '__none__') {
-      return FALSE;
+      return NULL;
     }
 
     list($type, $mode) = explode('.', $viewMode);

modules/graphql_content/src/Form/ContentEntitySchemaConfigForm.php

@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -115,7 +116,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
           '#default_value' => isset($defaults[$type->id()]['exposed']) ? $defaults[$type->id()]['exposed'] : 0,
           '#title' => '<strong>' . $type->getLabel() . '</strong>',
           '#description' => $this->t('Add the <strong>%interface</strong> interface to the schema.', [
-            '%interface' => graphql_camelcase($type->id()),
+            '%interface' => StringHelper::camelCase($type->id()),
           ]),
           '#wrapper_attributes' => ['colspan' => 2, 'class' => ['highlight']],
         ];
@@ -134,7 +135,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
             ],
             '#title' => $info['label'],
             '#description' => $this->t('Add the <strong>%type</strong> type to the schema.', [
-              '%type' => graphql_camelcase([$type->id(), $bundle]),
+              '%type' => StringHelper::camelCase([$type->id(), $bundle]),
             ]),
           ];
 

modules/graphql_content/src/Plugin/Deriver/DisplayedFieldDeriver.php

@@ -5,11 +5,11 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\ContentEntitySchemaConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -132,8 +132,8 @@ public function getDerivativeDefinitions($basePluginDefinition) {
           if ($display = $this->getDisplay($typeId, $bundle, $viewMode)) {
             foreach (array_keys($display->getComponents()) as $field) {
               $this->derivatives[$typeId . '-' . $bundle . '-' . $field] = [
-                'name' => graphql_propcase($field),
-                'types' => [graphql_camelcase([$typeId, $bundle])],
+                'name' => StringHelper::propCase($field),
+                'types' => [StringHelper::camelCase([$typeId, $bundle])],
                 'entity_type' => $typeId,
                 'bundle' => $bundle,
                 'field' => $field,

modules/graphql_content/src/Plugin/Deriver/EntityBundleDeriver.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\ContentEntitySchemaConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -81,9 +82,9 @@ public function getDerivativeDefinitions($basePluginDefinition) {
             continue;
           }
           $this->derivatives[$typeId . '-' . $bundle] = [
-            'name' => graphql_camelcase([$typeId, $bundle]),
+            'name' => StringHelper::camelCase([$typeId, $bundle]),
             'entity_type' => $typeId,
-            'interfaces' => [graphql_camelcase($typeId)],
+            'interfaces' => [StringHelper::camelCase($typeId)],
             'bundle' => $bundle,
           ] + $basePluginDefinition;
         }

modules/graphql_content/src/Plugin/Deriver/EntityByIdDeriver.php

@@ -6,6 +6,7 @@
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\ContentEntitySchemaConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -59,8 +60,8 @@ public function getDerivativeDefinitions($basePluginDefinition) {
       }
       if ($type instanceof ContentEntityTypeInterface) {
         $derivative = [
-          'name' => graphql_propcase($id) . 'ById',
-          'type' => graphql_camelcase($id),
+          'name' => StringHelper::propCase([$id, 'by', 'id']),
+          'type' => StringHelper::camelCase($id),
           'entity_type' => $id,
         ] + $basePluginDefinition;
 

modules/graphql_content/src/Plugin/Deriver/EntityTypeDeriver.php

@@ -3,10 +3,10 @@
 namespace Drupal\graphql_content\Plugin\Deriver;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\ContentEntitySchemaConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -70,7 +70,7 @@ public function getDerivativeDefinitions($basePluginDefinition) {
       }
       if ($type instanceof ContentEntityTypeInterface) {
         $this->derivatives[$typeId] = [
-          'name' => graphql_camelcase($typeId),
+          'name' => StringHelper::camelCase($typeId),
           'data_type' => 'entity:' . $typeId,
           'entity_type' => $typeId,
         ] + $basePluginDefinition;

modules/graphql_content/src/Plugin/Deriver/FieldFormatterDeriver.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\ContentEntitySchemaConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -90,20 +91,22 @@ public function __construct(
    * @param \Drupal\Core\Field\FieldStorageDefinitionInterface|null $storage
    *   Field storage definition object.
    *
-   * @return array
+   * @return array|null
    *   Associative array of additional plugin definition values.
    */
   protected function getDefinition($entityType, $bundle, array $displayOptions, FieldStorageDefinitionInterface $storage = NULL) {
-    return [
-      'types' => [
-        graphql_camelcase([$entityType, $bundle]),
-      ],
-      'name' => graphql_propcase($storage->getName()),
-      'virtual' => !$storage,
-      'multi' => $storage ? $storage->getCardinality() != 1 : FALSE,
-      'nullable' => TRUE,
-      'field' => $storage->getName(),
-    ];
+    if (isset($storage)) {
+      return [
+        'types' => [StringHelper::camelCase([$entityType, $bundle])],
+        'name' => graphql_propcase($storage->getName()),
+        'virtual' => !$storage,
+        'multi' => $storage ? $storage->getCardinality() != 1 : FALSE,
+        'nullable' => TRUE,
+        'field' => $storage->getName(),
+      ];
+    }
+
+    return NULL;
   }
 
   /**

modules/graphql_content/src/Plugin/Deriver/RawValueFieldDeriver.php

@@ -3,6 +3,7 @@
 namespace Drupal\graphql_content\Plugin\Deriver;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\Plugin\GraphQL\Types\RawValueFieldType;
 
 /**
@@ -22,21 +23,23 @@ class RawValueFieldDeriver extends FieldFormatterDeriver {
    * @param \Drupal\Core\Field\FieldStorageDefinitionInterface|null $storage
    *   Field storage definition object.
    *
-   * @return array
+   * @return array|null
    *   Associative array of additional plugin definition values.
    */
   protected function getDefinition($entityType, $bundle, array $displayOptions, FieldStorageDefinitionInterface $storage = NULL) {
-    return [
-      'types' => [
-        graphql_camelcase([$entityType, $bundle]),
-      ],
-      'name' => graphql_propcase($storage->getName()),
-      'virtual' => !$storage,
-      'multi' => $storage ? $storage->getCardinality() != 1 : FALSE,
-      'nullable' => TRUE,
-      'field' => $storage->getName(),
-      'type' => RawValueFieldType::getId($entityType, $storage->getName()),
-    ];
+    if (isset($storage)) {
+      return [
+        'types' => [StringHelper::camelCase([$entityType, $bundle])],
+        'name' => graphql_propcase($storage->getName()),
+        'virtual' => !$storage,
+        'multi' => $storage ? $storage->getCardinality() != 1 : FALSE,
+        'nullable' => TRUE,
+        'field' => $storage->getName(),
+        'type' => RawValueFieldType::getId($entityType, $storage->getName()),
+      ];
+    }
+
+    return NULL;
   }
 
 }