composer.phar fix

rebing · Nov 5, 2019 · 361b4cd · 361b4cd
1 parent f68bcd5
commit 361b4cd
Show file tree

Hide file tree

Showing 34 changed files with 75 additions and 75 deletions.
diff --git a/config/config.php b/config/config.php
@@ -42,7 +42,7 @@
     //     'mutation' => '\Rebing\GraphQL\GraphQLController@mutation'
     // ]
     //
-    'controllers' => \Rebing\GraphQL\GraphQLController::class . '@query',
+    'controllers' => \Rebing\GraphQL\GraphQLController::class.'@query',
 
     // Any middleware for the graphql route group
     'middleware' => [],
@@ -174,7 +174,7 @@
      */
     'graphiql' => [
         'prefix' => '/graphiql',
-        'controller' => \Rebing\GraphQL\GraphQLController::class . '@graphiql',
+        'controller' => \Rebing\GraphQL\GraphQLController::class.'@graphiql',
         'middleware' => [],
         'view' => 'graphql::graphiql',
         'display' => env('ENABLE_GRAPHIQL', true),

diff --git a/src/Console/EnumMakeCommand.php b/src/Console/EnumMakeCommand.php
@@ -14,12 +14,12 @@ class EnumMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/enum.stub';
+        return __DIR__.'/stubs/enum.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Enums';
+        return $rootNamespace.'\GraphQL\Enums';
     }
 
     protected function buildClass($name)

diff --git a/src/Console/FieldMakeCommand.php b/src/Console/FieldMakeCommand.php
@@ -14,11 +14,11 @@ class FieldMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/field.stub';
+        return __DIR__.'/stubs/field.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Fields';
+        return $rootNamespace.'\GraphQL\Fields';
     }
 }
diff --git a/src/Console/InputMakeCommand.php b/src/Console/InputMakeCommand.php
@@ -14,12 +14,12 @@ class InputMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/input.stub';
+        return __DIR__.'/stubs/input.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Inputs';
+        return $rootNamespace.'\GraphQL\Inputs';
     }
 
     protected function buildClass($name)

diff --git a/src/Console/InterfaceMakeCommand.php b/src/Console/InterfaceMakeCommand.php
@@ -14,12 +14,12 @@ class InterfaceMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/interface.stub';
+        return __DIR__.'/stubs/interface.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Interfaces';
+        return $rootNamespace.'\GraphQL\Interfaces';
     }
 
     protected function buildClass($name)

diff --git a/src/Console/MutationMakeCommand.php b/src/Console/MutationMakeCommand.php
@@ -14,12 +14,12 @@ class MutationMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/mutation.stub';
+        return __DIR__.'/stubs/mutation.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Mutations';
+        return $rootNamespace.'\GraphQL\Mutations';
     }
 
     protected function buildClass($name)

diff --git a/src/Console/PublishCommand.php b/src/Console/PublishCommand.php
@@ -42,10 +42,10 @@ public function __construct(Filesystem $files)
         parent::__construct();
         $this->files = $files;
 
-        $fromPath = __DIR__ . '/../..';
+        $fromPath = __DIR__.'/../..';
         $this->fileMap = [
-            $fromPath . '/config/config.php' => app()->basePath('config/graphql.php'),
-            $fromPath . '/resources/views/graphiql.php' => app()->basePath('resources/views/vendor/graphql/graphiql.php'),
+            $fromPath.'/config/config.php' => app()->basePath('config/graphql.php'),
+            $fromPath.'/resources/views/graphiql.php' => app()->basePath('resources/views/vendor/graphql/graphiql.php'),
         ];
     }
 

diff --git a/src/Console/QueryMakeCommand.php b/src/Console/QueryMakeCommand.php
@@ -14,12 +14,12 @@ class QueryMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/query.stub';
+        return __DIR__.'/stubs/query.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Queries';
+        return $rootNamespace.'\GraphQL\Queries';
     }
 
     protected function buildClass($name)

diff --git a/src/Console/ScalarMakeCommand.php b/src/Console/ScalarMakeCommand.php
@@ -14,11 +14,11 @@ class ScalarMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/scalar.stub';
+        return __DIR__.'/stubs/scalar.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Scalars';
+        return $rootNamespace.'\GraphQL\Scalars';
     }
 }
diff --git a/src/Console/TypeMakeCommand.php b/src/Console/TypeMakeCommand.php
@@ -14,12 +14,12 @@ class TypeMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/type.stub';
+        return __DIR__.'/stubs/type.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Types';
+        return $rootNamespace.'\GraphQL\Types';
     }
 
     protected function buildClass($name)

diff --git a/src/Console/UnionMakeCommand.php b/src/Console/UnionMakeCommand.php
@@ -14,12 +14,12 @@ class UnionMakeCommand extends GeneratorCommand
 
     protected function getStub()
     {
-        return __DIR__ . '/stubs/union.stub';
+        return __DIR__.'/stubs/union.stub';
     }
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\GraphQL\Unions';
+        return $rootNamespace.'\GraphQL\Unions';
     }
 
     protected function buildClass($name)

diff --git a/src/GraphQL.php b/src/GraphQL.php
@@ -339,7 +339,7 @@ protected function clearTypeInstances(): void
 
     public function paginate(string $typeName, string $customName = null): Type
     {
-        $name = $customName ?: $typeName . 'Pagination';
+        $name = $customName ?: $typeName.'Pagination';
 
         if (! isset($this->typesInstances[$name])) {
             $paginationType = config('graphql.pagination_type', PaginationType::class);
@@ -374,7 +374,7 @@ public function wrapType(string $typeName, string $customTypeName, string $wrapp
      * @param  Error  $e
      * @return array
      */
-    public static function formatError(Error $e): array
+    public static function formatError(PhpError $e): array
     {
         $debug = config('app.debug') ? (Debug::INCLUDE_DEBUG_MESSAGE | Debug::INCLUDE_TRACE) : 0;
         $formatter = FormattedError::prepareFormatter(null, $debug);
@@ -444,14 +444,14 @@ public static function routeNameTransformer(string $name, string $schemaParamete
             }
 
             foreach ($multiLevelPath as $multiName) {
-                $routeName = ! $routeName ? null : $routeName . '/';
+                $routeName = ! $routeName ? null : $routeName.'/';
                 $routeName =
                     $routeName
-                    . preg_replace($schemaParameterPattern, '{' . $multiName . '}', $queryRoute);
+                    .preg_replace($schemaParameterPattern, '{'.$multiName.'}', $queryRoute);
             }
         }
 
-        return $routeName ?: preg_replace($schemaParameterPattern, '{' . (Helpers::isLumen() ? "$name:$name" : $name) . '}', $queryRoute);
+        return $routeName ?: preg_replace($schemaParameterPattern, '{'.(Helpers::isLumen() ? "$name:$name" : $name).'}', $queryRoute);
     }
 
     /**
@@ -463,7 +463,7 @@ protected function getSchemaConfiguration($schema)
         $schemaName = is_string($schema) ? $schema : config('graphql.default_schema', 'default');
 
         if (! is_array($schema) && ! isset($this->schemas[$schemaName])) {
-            throw new SchemaNotFound('Type ' . $schemaName . ' not found.');
+            throw new SchemaNotFound('Type '.$schemaName.' not found.');
         }
 
         return is_array($schema) ? $schema : $this->schemas[$schemaName];

diff --git a/src/GraphQLController.php b/src/GraphQLController.php
@@ -88,9 +88,9 @@ protected function queryContext(string $query, ?array $params, string $schema)
 
     public function graphiql(Request $request, string $schema = null): View
     {
-        $graphqlPath = '/' . config('graphql.prefix');
+        $graphqlPath = '/'.config('graphql.prefix');
         if ($schema) {
-            $graphqlPath .= '/' . $schema;
+            $graphqlPath .= '/'.$schema;
         }
 
         $view = config('graphql.graphiql.view', 'graphql::graphiql');

diff --git a/src/GraphQLLumenServiceProvider.php b/src/GraphQLLumenServiceProvider.php
@@ -10,11 +10,11 @@ class GraphQLLumenServiceProvider extends GraphQLServiceProvider
 {
     protected function bootPublishes(): void
     {
-        $configPath = __DIR__ . '/../config';
+        $configPath = __DIR__.'/../config';
 
-        $this->mergeConfigFrom($configPath . '/config.php', 'graphql');
+        $this->mergeConfigFrom($configPath.'/config.php', 'graphql');
 
-        $viewsPath = __DIR__ . '/../resources/views';
+        $viewsPath = __DIR__.'/../resources/views';
         $this->loadViewsFrom($viewsPath, 'graphql');
     }
 

diff --git a/src/GraphQLServiceProvider.php b/src/GraphQLServiceProvider.php
@@ -42,7 +42,7 @@ public function boot(): void
     protected function bootRouter(): void
     {
         if (config('graphql.routes')) {
-            include __DIR__ . '/routes.php';
+            include __DIR__.'/routes.php';
         }
     }
 
@@ -53,15 +53,15 @@ protected function bootRouter(): void
      */
     protected function bootPublishes(): void
     {
-        $configPath = __DIR__ . '/../config';
+        $configPath = __DIR__.'/../config';
 
-        $this->mergeConfigFrom($configPath . '/config.php', 'graphql');
+        $this->mergeConfigFrom($configPath.'/config.php', 'graphql');
 
         $this->publishes([
-            $configPath . '/config.php' => config_path('graphql.php'),
+            $configPath.'/config.php' => config_path('graphql.php'),
         ], 'config');
 
-        $viewsPath = __DIR__ . '/../resources/views';
+        $viewsPath = __DIR__.'/../resources/views';
         $this->loadViewsFrom($viewsPath, 'graphql');
     }
 

diff --git a/src/GraphQLUploadMiddleware.php b/src/GraphQLUploadMiddleware.php
@@ -104,7 +104,7 @@ private function validateParsedBody(Request $request): void
 
         if (! is_array($bodyParams)) {
             throw new RequestError(
-                'GraphQL Server expects JSON object or array, but got ' . Utils::printSafeJson($bodyParams)
+                'GraphQL Server expects JSON object or array, but got '.Utils::printSafeJson($bodyParams)
             );
         }
 

diff --git a/src/Support/PaginationType.php b/src/Support/PaginationType.php
@@ -14,7 +14,7 @@ class PaginationType extends ObjectType
 {
     public function __construct(string $typeName, string $customName = null)
     {
-        $name = $customName ?: $typeName . 'Pagination';
+        $name = $customName ?: $typeName.'Pagination';
 
         $config = [
             'name' => $name,

diff --git a/src/Support/SelectFields.php b/src/Support/SelectFields.php
@@ -94,7 +94,7 @@ public static function getSelectableFieldsAndRelations(
 
         // If a primary key is given, but not in the selects, add it
         if (null !== $primaryKey) {
-            $primaryKey = $parentTable ? ($parentTable . '.' . $primaryKey) : $primaryKey;
+            $primaryKey = $parentTable ? ($parentTable.'.'.$primaryKey) : $primaryKey;
             if (! in_array($primaryKey, $select)) {
                 $select[] = $primaryKey;
             }
@@ -189,11 +189,11 @@ protected static function handleFields(
                             $foreignKey = $relation->getQualifiedForeignKeyName();
                         }
 
-                        $foreignKey = $parentTable ? ($parentTable . '.' . preg_replace('/^' . preg_quote($parentTable, '/') . '\./', '', $foreignKey)) : $foreignKey;
+                        $foreignKey = $parentTable ? ($parentTable.'.'.preg_replace('/^'.preg_quote($parentTable, '/').'\./', '', $foreignKey)) : $foreignKey;
 
                         if (is_a($relation, MorphTo::class)) {
                             $foreignKeyType = $relation->getMorphType();
-                            $foreignKeyType = $parentTable ? ($parentTable . '.' . $foreignKeyType) : $foreignKeyType;
+                            $foreignKeyType = $parentTable ? ($parentTable.'.'.$foreignKeyType) : $foreignKeyType;
 
                             if (! in_array($foreignKey, $select)) {
                                 $select[] = $foreignKey;
@@ -373,7 +373,7 @@ protected static function addFieldToSelect($field, array &$select, ?string $pare
                 'fields' => true,
             ];
         } elseif (! $forRelation && ! in_array($field, $select)) {
-            $field = $parentTable ? ($parentTable . '.' . $field) : $field;
+            $field = $parentTable ? ($parentTable.'.'.$field) : $field;
             if (! in_array($field, $select)) {
                 $select[] = $field;
             }

diff --git a/src/Support/Type.php b/src/Support/Type.php
@@ -57,7 +57,7 @@ protected function getFieldResolver(string $name, array $field): ?callable
             return $field['resolve'];
         }
 
-        $resolveMethod = 'resolve' . Str::studly($name) . 'Field';
+        $resolveMethod = 'resolve'.Str::studly($name).'Field';
 
         if (method_exists($this, $resolveMethod)) {
             $resolver = [$this, $resolveMethod];

diff --git a/src/Support/UploadType.php b/src/Support/UploadType.php
@@ -51,7 +51,7 @@ public function parseValue($value)
      */
     public function parseLiteral($valueNode, ?array $variables = null)
     {
-        throw new Error('`Upload` cannot be hardcoded in query, be sure to conform to GraphQL multipart request specification. Instead got: ' . $valueNode->kind, [$valueNode]);
+        throw new Error('`Upload` cannot be hardcoded in query, be sure to conform to GraphQL multipart request specification. Instead got: '.$valueNode->kind, [$valueNode]);
     }
 
     public function toType(): Type

diff --git a/src/routes.php b/src/routes.php
@@ -26,7 +26,7 @@
     }
 
     // Controllers
-    $controllers = config('graphql.controllers', GraphQLController::class . '@query');
+    $controllers = config('graphql.controllers', GraphQLController::class.'@query');
     $queryController = null;
     $mutationController = null;
     if (is_array($controllers)) {
@@ -42,8 +42,8 @@
     // Query
     if ($queryRoute) {
         if (preg_match($schemaParameterPattern, $queryRoute)) {
-            $defaultMiddleware = config('graphql.schemas.' . config('graphql.default_schema') . '.middleware', []);
-            $defaultMethod = config('graphql.schemas.' . config('graphql.default_schema') . '.method', ['get', 'post']);
+            $defaultMiddleware = config('graphql.schemas.'.config('graphql.default_schema').'.middleware', []);
+            $defaultMethod = config('graphql.schemas.'.config('graphql.default_schema').'.method', ['get', 'post']);
 
             foreach ($defaultMethod as $method) {
                 $routeName = 'graphql.query';
@@ -95,8 +95,8 @@
     // Mutation routes (define only if different than query)
     if ($mutationRoute && $mutationRoute !== $queryRoute) {
         if (preg_match($schemaParameterPattern, $mutationRoute)) {
-            $defaultMiddleware = config('graphql.schemas.' . config('graphql.default_schema') . '.middleware', []);
-            $defaultMethod = config('graphql.schemas.' . config('graphql.default_schema') . '.method', ['get', 'post']);
+            $defaultMiddleware = config('graphql.schemas.'.config('graphql.default_schema').'.middleware', []);
+            $defaultMethod = config('graphql.schemas.'.config('graphql.default_schema').'.method', ['get', 'post']);
 
             foreach ($defaultMethod as $method) {
                 $routeName = 'graphql.mutation';
@@ -152,7 +152,7 @@
         'middleware' => config('graphql.graphiql.middleware', []),
     ], function ($router): void {
         /** @var \Illuminate\Routing\Router|\Laravel\Lumen\Routing\Router $router */
-        $graphiqlController = config('graphql.graphiql.controller', GraphQLController::class . '@graphiql');
+        $graphiqlController = config('graphql.graphiql.controller', GraphQLController::class.'@graphiql');
         $schemaParameterPattern = '/\{\s*graphql\_schema\s*\?\s*\}/';
         $graphiqlAction = ['uses' => $graphiqlController];
 

diff --git a/tests/Database/AuthorizeArgsTests/AuthorizeArgsTest.php b/tests/Database/AuthorizeArgsTests/AuthorizeArgsTest.php
@@ -24,7 +24,7 @@ protected function getEnvironmentSetUp($app)
     {
         parent::getEnvironmentSetUp($app);
 
-        $app['config']->set('graphql.controllers', GraphQLController::class . '@query');
+        $app['config']->set('graphql.controllers', GraphQLController::class.'@query');
 
         $app['config']->set('graphql.schemas.default', [
             'query' => [

diff --git a/tests/Database/SelectFields/QueryArgsAndContextTests/NestedRelationLoadingTest.php b/tests/Database/SelectFields/QueryArgsAndContextTests/NestedRelationLoadingTest.php
@@ -939,7 +939,7 @@ protected function getEnvironmentSetUp($app)
     {
         parent::getEnvironmentSetUp($app);
 
-        $app['config']->set('graphql.controllers', GraphQLController::class . '@query');
+        $app['config']->set('graphql.controllers', GraphQLController::class.'@query');
 
         $app['config']->set('graphql.schemas.default', [
             'query' => [