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

Some deprecations in advance of Drupal 11 #1026

Merged
merged 9 commits into from
Jul 31, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build-2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- 61613:61613

steps:

- name: Checkout code
uses: actions/checkout@v4
with:
Expand All @@ -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') }}
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:

- name: Test scripts
run: $SCRIPT_DIR/travis_scripts.sh

- name: Start chromedriver
if: matrix.test-suite == 'functional-javascript'
run: |-
Expand Down
2 changes: 1 addition & 1 deletion islandora.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Field/FieldType/MediaTrackItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions tests/src/Functional/AddMediaToNodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -12,7 +12,7 @@
*/
class AddMediaToNodeTest extends IslandoraFunctionalTestBase {

use EntityReferenceTestTrait;
use EntityReferenceFieldCreationTrait;

/**
* Node to hold the media.
Expand Down
4 changes: 2 additions & 2 deletions tests/src/Functional/IslandoraFunctionalTestBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -17,7 +17,7 @@
*/
class IslandoraFunctionalTestBase extends BrowserTestBase {

use EntityReferenceTestTrait;
use EntityReferenceFieldCreationTrait;
use TestFileCreationTrait;
use MediaTypeCreationTrait;
use StringTranslationTrait;
Expand Down