diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 481f1c8..d3fb0a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: Silverstripe: name: 'Silverstripe (bundle)' - uses: nswdpc/ci-files/.github/workflows/silverstripe_53_83.yml@v-4 + uses: nswdpc/ci-files/.github/workflows/silverstripe_6_83.yml@v-4 PHPStan: name: 'PHPStan (analyse)' uses: nswdpc/ci-files/.github/workflows/phpstan.silverstripe_83.yml@v-4 diff --git a/composer.json b/composer.json index ae83d8d..525a767 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,12 @@ } ], "require": { - "nswdpc/silverstripe-elemental-iframe":"^1", - "codem/silverstripe-html5-inputs": "^1", - "silverstripe/framework" : "^5" + "nswdpc/silverstripe-elemental-iframe":"dev-ss6", + "codem/silverstripe-html5-inputs": "^2", + "silverstripe/framework" : "^6" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^11.5", "friendsofphp/php-cs-fixer": "^3", "cambis/silverstripe-rector": "^2", "cambis/silverstan": "^2", @@ -33,6 +33,12 @@ "phpstan/phpstan-phpunit": "^2", "rector/rector": "^2" }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/nswdpc/silverstripe-link.git" + } + ], "autoload": { "psr-4": { "NSWDPC\\Datawrapper\\": [ @@ -51,8 +57,8 @@ }, "scripts": { "phpstan-analyse": "./vendor/bin/phpstan analyse --ansi --no-progress --no-interaction --configuration vendor/nswdpc/ci-files/phpstan/.phpstan.silverstripe.neon src/ tests/", - "rector-dryrun": "./vendor/bin/rector process --dry-run --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_53_83.php src/ tests/", - "rector-process": "./vendor/bin/rector process --no-diffs --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_53_83.php src/ tests/", + "rector-dryrun": "./vendor/bin/rector process --dry-run --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_6_83.php src/ tests/", + "rector-process": "./vendor/bin/rector process --no-diffs --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_6_83.php src/ tests/", "phpcsfixer-fix": "./vendor/bin/php-cs-fixer fix --ansi --no-interaction --config vendor/nswdpc/ci-files/php-cs-fixer/.php-cs-fixer.php src/ tests/" }, "extra": { @@ -67,5 +73,7 @@ "silverstripe/recipe-plugin": true, "phpstan/extension-installer": true } - } + }, + "prefer-stable": true, + "minimum-stability": "dev" } diff --git a/src/Models/Elements/ElementDatawrapper.php b/src/Models/Elements/ElementDatawrapper.php index eea080e..e1f7821 100644 --- a/src/Models/Elements/ElementDatawrapper.php +++ b/src/Models/Elements/ElementDatawrapper.php @@ -6,9 +6,9 @@ use NSWDPC\Datawrapper\WebHookController; use NSWDPC\Elemental\Models\Iframe\ElementIframe; use SilverStripe\Forms\CheckboxField; -use SilverStripe\Forms\RequiredFields; -use SilverStripe\ORM\ValidationException; -use SilverStripe\View\ArrayData; +use SilverStripe\Forms\Validation\RequiredFieldsValidator; +use SilverStripe\Core\Validation\ValidationException; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; /** @@ -33,7 +33,7 @@ class ElementDatawrapper extends ElementIframe private static string $title = 'Datawrapper visualisation'; - private static string $description = 'Display a Datawrapper visualisation'; + private static string $class_description = 'Display a Datawrapper visualisation'; private static string $default_host = 'datawrapper.dwcdn.net'; @@ -72,7 +72,7 @@ public function getType() * Apply requirements when templating */ #[\Override] - public function forTemplate($holder = true) + public function forTemplate($holder = true): string { Requirements::customScript( ArrayData::create([])->renderWith('NSWDPC/Elemental/Models/Datawrapper/ResponsiveScript'), @@ -181,7 +181,7 @@ public function DatawrapperIdAttribute(): string */ public function getCMSValidator() { - return RequiredFields::create(['InputURL']); + return RequiredFieldsValidator::create(['InputURL']); } /**