diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 8cd9f1d1e..41b4362ad 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -48,7 +48,7 @@ jobs: - 61613:61613 steps: - + - name: Checkout code uses: actions/checkout@v4 with: @@ -74,7 +74,7 @@ jobs: sudo apt-get install -y mysql-client - name: Cache Composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/composer-cache key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} @@ -105,7 +105,7 @@ jobs: - name: Test scripts run: $SCRIPT_DIR/travis_scripts.sh - + - name: Start chromedriver if: matrix.test-suite == 'functional-javascript' run: |- diff --git a/islandora.info.yml b/islandora.info.yml index 6dd0597f2..a43196a42 100644 --- a/islandora.info.yml +++ b/islandora.info.yml @@ -4,7 +4,7 @@ name: 'islandora' description: "Islandora Core" type: module package: Islandora -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10.2 dependencies: - context:context_ui - ctools:ctools diff --git a/src/Plugin/Field/FieldType/MediaTrackItem.php b/src/Plugin/Field/FieldType/MediaTrackItem.php index d281ed216..68756ae59 100644 --- a/src/Plugin/Field/FieldType/MediaTrackItem.php +++ b/src/Plugin/Field/FieldType/MediaTrackItem.php @@ -16,7 +16,7 @@ * id = "media_track", * label = @Translation("Media track"), * description = @Translation("This field stores the ID of a media track file as an integer value."), - * category = @Translation("Reference"), + * category = "reference", * default_widget = "media_track", * default_formatter = "file_default", * column_groups = { diff --git a/tests/src/Functional/AddMediaToNodeTest.php b/tests/src/Functional/AddMediaToNodeTest.php index 4b0b62c52..ab67a6604 100644 --- a/tests/src/Functional/AddMediaToNodeTest.php +++ b/tests/src/Functional/AddMediaToNodeTest.php @@ -3,7 +3,7 @@ namespace Drupal\Tests\islandora\Functional; use Drupal\Core\Url; -use Drupal\Tests\field\Traits\EntityReferenceTestTrait; +use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait; /** * Tests the RelatedLinkHeader view alter. @@ -12,7 +12,7 @@ */ class AddMediaToNodeTest extends IslandoraFunctionalTestBase { - use EntityReferenceTestTrait; + use EntityReferenceFieldCreationTrait; /** * Node to hold the media. diff --git a/tests/src/Functional/IslandoraFunctionalTestBase.php b/tests/src/Functional/IslandoraFunctionalTestBase.php index 1ad8081d1..e58ec0162 100644 --- a/tests/src/Functional/IslandoraFunctionalTestBase.php +++ b/tests/src/Functional/IslandoraFunctionalTestBase.php @@ -8,7 +8,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\link\LinkItemInterface; use Drupal\Tests\BrowserTestBase; -use Drupal\Tests\field\Traits\EntityReferenceTestTrait; +use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait; use Drupal\Tests\media\Traits\MediaTypeCreationTrait; use Drupal\Tests\TestFileCreationTrait; @@ -17,7 +17,7 @@ */ class IslandoraFunctionalTestBase extends BrowserTestBase { - use EntityReferenceTestTrait; + use EntityReferenceFieldCreationTrait; use TestFileCreationTrait; use MediaTypeCreationTrait; use StringTranslationTrait;