Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API Bump minimum SilverStripe version to 4.3 and implement multi-schema GraphQL support #310

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ env:
matrix:
include:
- php: 5.6
env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
#- php: 7.0
# env: DB=PGSQL PHPUNIT_TEST=1
- php: 7.0
env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_TEST=1
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2
env: DB=MYSQL RECIPE_VERSION=4.2.x-dev BEHAT_TEST=1
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev BEHAT_TEST=1
- php: 7.2
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1

Expand All @@ -38,7 +38,7 @@ before_script:
# Install composer dependencies
- composer validate
- composer require silverstripe/recipe-cms:$RECIPE_VERSION silverstripe/recipe-testing:^1 --no-update
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --no-update; fi
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

# Behat bootstrapping
Expand Down
31 changes: 16 additions & 15 deletions _config/graphql.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
---
Name: elementalgraphqlconfig
---
SilverStripe\GraphQL\Controller:
schema:
scaffolding:
types:
DNADesign\Elemental\Models\BaseElement:
fields: [ID, LastEdited, AbsoluteLink]
operations:
copyToStage: true
readOne: true
SilverStripe\Security\Member:
fields: [ID, FirstName, Surname]
operations:
readOne: true
typeNames:
DNADesign\Elemental\Models\BaseElement: Block
SilverStripe\GraphQL\Manager:
schemas:
admin:
scaffolding:
types:
DNADesign\Elemental\Models\BaseElement:
fields: [ID, LastEdited, AbsoluteLink]
operations:
copyToStage: true
readOne: true
SilverStripe\Security\Member:
fields: [ID, FirstName, Surname]
operations:
readOne: true
typeNames:
DNADesign\Elemental\Models\BaseElement: Block
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"silverstripe/cms": "^4.2",
"silverstripe/cms": "^4.3",
"silverstripe/versioned-admin": "^1.0",
"symbiote/silverstripe-gridfieldextensions": "^3.1",
"silverstripe/vendor-plugin": "^1"
Expand Down