Fix git branch

.travis.yml

@@ -37,19 +37,19 @@ before_script:
 
 # Install composer
   - composer validate
-  - composer require silverstripe/recipe-cms:$RECIPE_VERSION --no-update
+  - composer require silverstripe/recipe-cms:$RECIPE_VERSION --no-update --prefer-dist
   # Fix for running phpunit 5 on php 7.4+
   - composer require --no-update sminnee/phpunit-mock-objects:^3
   - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:^2 --no-update; fi
   - composer update --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG
 
   # Remove once everything is merged
-  - cd vendor/silverstripe/graphql
-  - git checkout -t origin/master
+  - cd vendor/silverstripe
+  - rm -rf graphql
+  - git clone https://github.com/silverstripe/silverstripe-graphql graphql
+  - cd graphql
+  - git checkout master
   - if [[ $BACKWARD_COMPAT ]]; then git remote add -f uc https://github.com/unclecheese/silverstripe-graphql && git checkout pulls/3/schemageddon-compat; fi
-  - cd ../admin
-  - git remote add -f uc https://github.com/unclecheese/silverstripe-admin
-  - git checkout pulls/1/schemageddon
   - cd ../../../
   - 'if [[ ! $BACKWARD_COMPAT ]]; then composer require webonyx/graphql-php:"14.0 as 0.12.6"; fi'
 ########################################################

src/GraphQL/Operations/AbstractPublishOperationCreator.php

@@ -49,9 +49,8 @@ abstract class AbstractPublishOperationCreator implements OperationCreator
     public function createOperation(
         SchemaModelInterface $model,
         string $typeName,
-        array $config = [])
-    : ?ModelOperation
-    {
+        array $config = []
+    ): ?ModelOperation {
         if (!Extensible::has_extension($model->getSourceClass(), Versioned::class)) {
             return null;
         }
@@ -68,7 +67,6 @@ public function createOperation(
             ->addResolverContext('action', $this->getAction())
             ->addResolverContext('dataClass', $model->getSourceClass())
             ->addArg('id', 'ID!');
-
     }
 
     abstract protected function createOperationName(string $typeName): string;

src/GraphQL/Operations/CopyToStageCreator.php

@@ -13,7 +13,6 @@
 use SilverStripe\Versioned\GraphQL\Resolvers\VersionedResolver;
 use SilverStripe\Versioned\Versioned;
 
-
 if (!interface_exists(OperationCreator::class)) {
     return;
 }

src/GraphQL/Operations/PublishCreator.php

@@ -30,5 +30,4 @@ protected function getAction(): string
     {
         return AbstractPublishOperationCreator::ACTION_PUBLISH;
     }
-
 }

src/GraphQL/Operations/UnpublishCreator.php

@@ -29,5 +29,4 @@ protected function getAction(): string
     {
         return AbstractPublishOperationCreator::ACTION_UNPUBLISH;
     }
-
 }

src/GraphQL/Plugins/UnpublishOnDelete.php

@@ -3,7 +3,6 @@
 
 namespace SilverStripe\Versioned\GraphQL\Plugins;
 
-
 use SilverStripe\Core\Extensible;
 use SilverStripe\GraphQL\QueryHandler\QueryHandler;
 use SilverStripe\GraphQL\Schema\Field\ModelMutation;
@@ -78,5 +77,4 @@ public static function unpublishOnDelete(array $context)
             });
         };
     }
-
 }

src/GraphQL/Plugins/VersionedDataObject.php

@@ -99,7 +99,7 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
                     ->addPlugin(Paginator::IDENTIFIER, [
                         'connection' => $type->getName() . 'Versions',
                     ]);
-            });
+        });
     }
 
     /**
@@ -109,7 +109,7 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
     public static function sortVersions(array $config): Closure
     {
         $fieldName = $config['fieldName'];
-        return function (Sortable $list, array $args) use($fieldName) {
+        return function (Sortable $list, array $args) use ($fieldName) {
             $versionSort = $args[$fieldName]['version'] ?? null;
             if ($versionSort) {
                 $list = $list->sort('Version', $versionSort);

src/GraphQL/Plugins/VersionedRead.php

@@ -3,7 +3,6 @@
 
 namespace SilverStripe\Versioned\GraphQL\Plugins;
 
-
 use SilverStripe\Core\Extensible;
 use SilverStripe\GraphQL\Schema\Field\ModelQuery;
 use SilverStripe\GraphQL\Schema\Interfaces\ModelQueryPlugin;

src/GraphQL/Resolvers/VersionedResolver.php

@@ -3,7 +3,6 @@
 
 namespace SilverStripe\Versioned\GraphQL\Resolvers;
 
-
 use GraphQL\Type\Definition\ResolveInfo;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\GraphQL\QueryHandler\QueryHandler;
@@ -42,7 +41,7 @@ class VersionedResolver extends DefaultResolverProvider
     public static function resolveVersionFields(DataObject $obj, array $args, array $context, ResolveInfo $info)
     {
         /* @var DataObject&Versioned $obj */
-        switch($info->fieldName) {
+        switch ($info->fieldName) {
             case 'author':
                 return $obj->Author();
             case 'publisher':
@@ -103,7 +102,6 @@ public static function resolveVersionedRead(DataList $list, array $args, array $
 
         return Injector::inst()->get(VersionFilters::class)
             ->applyToList($list, $args['versioning']);
-
     }
 
     /**

src/GraphQL/_legacy/Operations/ReadVersions.php

@@ -33,7 +33,6 @@ public function __construct($dataObjectClass, $versionTypeName)
 
         // Allow clients to sort the versions list by Version ID
         $this->addArg('sort', 'VersionSortType');
-
     }
 
     public function resolve($object, array $args, $context, ResolveInfo $info)

src/GraphQL/_legacy/Types/VersionSortType.php

@@ -3,7 +3,6 @@
 
 namespace SilverStripe\Versioned\GraphQL\Types;
 
-
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\GraphQL\Pagination\SortDirectionTypeCreator;
 use SilverStripe\GraphQL\TypeCreator;

tests/php/GraphQL/Legacy/Extensions/DataObjectScaffolderExtensionTest.php

@@ -24,7 +24,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
     public function testDataObjectScaffolderAddsVersionedFields()

tests/php/GraphQL/Legacy/Extensions/ReadExtensionTest.php

@@ -28,7 +28,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
     public function testReadExtensionAppliesFilters()

tests/php/GraphQL/Legacy/Extensions/ReadOneExtensionTest.php

@@ -29,7 +29,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
     public function testReadOneExtensionAppliesFilters()

tests/php/GraphQL/Legacy/Extensions/SchemaScaffolderExtensionTest.php

@@ -27,7 +27,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
     public function testSchemaScaffolderEnsuresMemberType()

tests/php/GraphQL/Legacy/Operations/CopyToStageTest.php

@@ -31,7 +31,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
 

tests/php/GraphQL/Legacy/Operations/PublishTest.php

@@ -29,7 +29,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
     public function testPublish()

tests/php/GraphQL/Legacy/Operations/ReadVersionsTest.php

@@ -31,7 +31,6 @@ protected function setUp()
         if (class_exists(Schema::class)) {
             $this->markTestSkipped('Skipped GraphQL 3 test ' . __CLASS__);
         }
-
     }
 
 

tests/php/GraphQL/Plugins/VersionedDataObjectPluginTest.php

@@ -121,6 +121,4 @@ public function testItReadsVersions()
         $this->assertEquals(1, $result->first()->Version);
         $this->assertEquals(3, $result->last()->Version);
     }
-
-
 }

tests/php/GraphQL/Plugins/VersionedReadTest.php

@@ -49,5 +49,4 @@ public function testReadOneExtensionAppliesFilters()
         $this->assertCount(1, $query->getArgs());
         $this->assertEquals('versioning', $query->getArgs()[0]);
     }
-
 }