Fixed CS

.gitignore

@@ -1,2 +1,3 @@
 /vendor/
 composer.lock
+.php_cs.cache

.php_cs

@@ -0,0 +1,7 @@
+<?php
+
+return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()->setFinder(
+    PhpCsFixer\Finder::create()
+        ->in(__DIR__ . '/src')
+        ->files()->name('*.php')
+);

composer.json

@@ -24,7 +24,9 @@
         }
     },
     "require-dev": {
-        "phpspec/phpspec": "^5.1"
+        "phpspec/phpspec": "^5.1",
+        "ezsystems/ezplatform-code-style": "^0.1.0",
+        "friendsofphp/php-cs-fixer": "^2.16.0"
     },
     "extra": {
         "branch-alias": {

doc/examples/nearby_places/NearbyPlacesQueryType.php

@@ -1,11 +1,9 @@
 <?php
+
 /**
- * Created by PhpStorm.
- * User: bdunogier
- * Date: 29/09/2018
- * Time: 16:46
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
-
 namespace AppBundle\QueryType;
 
 use eZ\Publish\API\Repository\Values\Content\Query;
@@ -39,4 +37,4 @@ public static function getName()
     {
         return 'NearbyPlaces';
     }
-}
+}

src/API/QueryFieldService.php

@@ -1,9 +1,9 @@
 <?php
+
 /**
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
-
 namespace EzSystems\EzPlatformQueryFieldType\API;
 
 use eZ\Publish\API\Repository\ContentTypeService;
@@ -50,6 +50,7 @@ public function __construct(
      * @param string $fieldDefinitionIdentifier
      *
      * @return \eZ\Publish\API\Repository\Values\Content\Content[]
+     *
      * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function loadFieldData(Content $content, string $fieldDefinitionIdentifier): array
@@ -59,7 +60,7 @@ public function loadFieldData(Content $content, string $fieldDefinitionIdentifie
         $parameters = $this->resolveParameters($fieldDefinition->fieldSettings['Parameters'], $content);
 
         return array_map(
-            function(SearchHit $searchHit) {
+            function (SearchHit $searchHit) {
                 return $searchHit->valueObject;
             },
             $this->searchService->findContent($queryType->getQuery($parameters))->searchHits
@@ -72,7 +73,6 @@ public function getFieldDefinition(ContentInfo $contentInfo, string $fieldDefini
             $this
                 ->contentTypeService->loadContentType($contentInfo->contentTypeId)
                 ->getFieldDefinition($fieldDefinitionIdentifier);
-
     }
 
     /**
@@ -105,4 +105,4 @@ private function applyContentToParameter(Content $content, string $parameter)
             ]
         );
     }
-}
+}

src/Controller/QueryFieldController.php

@@ -1,10 +1,13 @@
 <?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\Controller;
 
 use EzSystems\EzPlatformQueryFieldType\API\QueryFieldService;
-use EzSystems\EzPlatformQueryFieldType\GraphQL\QueryFieldResolver;
 use eZ\Publish\Core\MVC\Symfony\View\ContentView;
-use EzSystems\EzPlatformGraphQL\GraphQL\Value\Field as GraphQLField;
 
 final class QueryFieldController
 {
@@ -25,9 +28,9 @@ public function renderQueryFieldAction(ContentView $view, $queryFieldDefinitionI
             'query_results' => $this->queryFieldService->loadFieldData(
                 $view->getContent(),
                 $queryFieldDefinitionIdentifier
-            )
+            ),
         ]);
 
         return $view;
     }
-}
+}

src/Controller/QueryFieldRestController.php

@@ -1,4 +1,9 @@
 <?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\Controller;
 
 use EzSystems\EzPlatformQueryFieldType\API\QueryFieldService;
@@ -38,8 +43,7 @@ public function __construct(
         ContentService $contentService,
         ContentTypeService $contentTypeService,
         LocationService $locationService
-    )
-    {
+    ) {
         $this->queryFieldService = $queryFieldService;
         $this->contentService = $contentService;
         $this->contentTypeService = $contentTypeService;
@@ -52,7 +56,7 @@ public function getResults($contentId, $versionNumber, $fieldDefinitionIdentifie
 
         return new ContentList(
             array_map(
-                function(Content $content) {
+                function (Content $content) {
                     return new RestContent(
                         $content->contentInfo,
                         $this->locationService->loadLocation($content->contentInfo->mainLocationId),
@@ -76,4 +80,4 @@ private function getContentType(ContentInfo $contentInfo): ContentType
 
         return $contentTypes[$contentInfo->contentTypeId];
     }
-}
+}

src/FieldType/Mapper/QueryFormMapper.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\FieldType\Mapper;
 
 use EzSystems\EzPlatformQueryFieldType\Form\Type\FieldType\QueryFieldType;
@@ -20,7 +24,8 @@ class QueryFormMapper implements FieldDefinitionFormMapperInterface, FieldValueF
     private $contentTypeService;
 
     /**
-     * List of query types
+     * List of query types.
+     *
      * @var array
      */
     private $queryTypes;
@@ -34,7 +39,7 @@ public function __construct(ContentTypeService $contentTypeService, array $query
     public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, FieldDefinitionData $data)
     {
         $fieldDefinitionForm
-            ->add('QueryType',Type\ChoiceType::class,
+            ->add('QueryType', Type\ChoiceType::class,
                 [
                     'label' => 'Query type',
                     'property_path' => 'fieldSettings[QueryType]',
@@ -51,7 +56,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
             ->add('Parameters', Type\TextareaType::class,
                 [
                     'label' => 'Parameters',
-                    'property_path' => 'fieldSettings[Parameters]'
+                    'property_path' => 'fieldSettings[Parameters]',
                 ]
             );
     }

src/FieldType/Query/SearchField.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\FieldType\Query;
 
 use eZ\Publish\SPI\Persistence\Content\Field;
@@ -19,7 +23,7 @@ class SearchField implements Indexable
      */
     public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
     {
-        return array(
+        return [
             new Search\Field(
                 'value',
                 $field->value->data,
@@ -30,7 +34,7 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
                 $field->value->data,
                 new Search\FieldType\FullTextField()
             ),
-        );
+        ];
     }
 
     /**
@@ -40,9 +44,9 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
      */
     public function getIndexDefinition()
     {
-        return array(
+        return [
             'value' => new Search\FieldType\StringField(),
-        );
+        ];
     }
 
     /**

src/FieldType/Query/Type.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\FieldType\Query;
 
 use eZ\Publish\Core\FieldType\FieldType;
@@ -11,15 +15,14 @@
 
 class Type extends FieldType
 {
-    protected $validatorConfigurationSchema = array();
+    protected $validatorConfigurationSchema = [];
 
     protected $settingsSchema = [
         'QueryType' => ['type' => 'string', 'default' => ''],
         'Parameters' => ['type' => 'string', 'default' => ''],
         'ReturnedType' => ['type' => 'string', 'default' => ''],
     ];
 
-
     /**
      * Validates the validatorConfiguration of a FieldDefinitionCreateStruct or FieldDefinitionUpdateStruct.
      *
@@ -105,7 +108,7 @@ protected function createValueFromInput($inputValue)
     /**
      * Throws an exception if value structure is not of expected format.
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException If the value does not match the expected structure.
+     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException if the value does not match the expected structure
      *
      * @param \eZ\Publish\Core\FieldType\TextLine\Value $value
      */
@@ -180,16 +183,16 @@ public function validateFieldSettings($fieldSettings)
 
         if (isset($fieldSettings['QueryType'])) {
             /**
-             * $errors[] = new ValidationError("Query type %query_type does not exist", null, ['%query_type%' => $fieldSettings['QueryType']]);
+             * $errors[] = new ValidationError("Query type %query_type does not exist", null, ['%query_type%' => $fieldSettings['QueryType']]);.
              */
         }
 
         if (isset($fieldSettings['Parameters']) && $fieldSettings['Parameters']) {
             if (json_decode($fieldSettings['Parameters']) === null) {
-                $errors[] = new ValidationError("Parameters is not a valid json structure");
+                $errors[] = new ValidationError('Parameters is not a valid json structure');
             }
         }
 
-         return $errors;
+        return $errors;
     }
 }

src/FieldType/Query/Value.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\FieldType\Query;
 
 use eZ\Publish\Core\FieldType\Value as BaseValue;

src/Form/Type/FieldType/QueryFieldType.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\Form\Type\FieldType;
 
 use eZ\Publish\API\Repository\FieldTypeService;

src/GraphQL/QueryFieldDefinitionMapper.php

@@ -1,4 +1,9 @@
 <?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\GraphQL;
 
 use eZ\Publish\API\Repository\ContentTypeService;
@@ -51,4 +56,4 @@ private function getDomainTypeName($typeIdentifier)
             $this->contentTypeService->loadContentTypeByIdentifier($typeIdentifier)
         );
     }
-}
+}

src/GraphQL/QueryFieldResolver.php

@@ -1,4 +1,9 @@
 <?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\GraphQL;
 
 use EzSystems\EzPlatformQueryFieldType\API\QueryFieldService;
@@ -12,12 +17,13 @@ class QueryFieldResolver
      */
     private $queryFieldService;
 
-    public function __construct(QueryFieldService $queryFieldService) {
+    public function __construct(QueryFieldService $queryFieldService)
+    {
         $this->queryFieldService = $queryFieldService;
     }
 
     public function resolveQueryField(Field $field, Content $content)
     {
         return $this->queryFieldService->loadFieldData($content, $field->fieldDefIdentifier);
     }
-}
+}

src/Persistence/Legacy/Content/FieldValue/Converter/QueryConverter.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\Persistence\Legacy\Content\FieldValue\Converter;
 
 use eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter;
@@ -72,7 +76,7 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
         $fieldDef->fieldTypeConstraints->fieldSettings = [
             'QueryType' => $storageDef->dataText1 ?: null,
             'ReturnedType' => $storageDef->dataText2 ?: null,
-            'Parameters' => $storageDef->dataText5 ?: ''
+            'Parameters' => $storageDef->dataText5 ?: '',
         ];
     }
 

src/Symfony/DependencyInjection/BDEzPlatformQueryFieldTypeExtension.php

@@ -1,4 +1,9 @@
 <?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace EzSystems\EzPlatformQueryFieldType\Symfony\DependencyInjection;
 
 use EzSystems\EzPlatformQueryFieldType\Controller\QueryFieldController;
@@ -52,9 +57,9 @@ protected function setContentViewConfig(ContainerBuilder $container): void
         $contentViewDefaults['query_field'] = [
             'default' => [
                 'controller' => QueryFieldController::class . ':renderQueryFieldAction',
-                'template' => "BDEzPlatformQueryFieldTypeBundle::query_field_view.html.twig",
+                'template' => 'BDEzPlatformQueryFieldTypeBundle::query_field_view.html.twig',
                 'match' => [],
-            ]
+            ],
         ];
         $container->setParameter('ezsettings.default.content_view_defaults', $contentViewDefaults);
     }