diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5c494b9..2cf59f8 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -8,7 +8,7 @@ jobs: fail-fast: false steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 2 @@ -39,7 +39,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -71,7 +71,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -104,7 +104,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -140,12 +140,12 @@ jobs: name: Markdown coding standards steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn packages - uses: actions/cache@v2 + uses: actions/cache@v4 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} diff --git a/CHANGELOG.md b/CHANGELOG.md index d55400b..b0fa639 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Versioning](https://semver.org/spec/v2.0.0.html). ### Updated - Update GitHub workflows runner images +- D10 compatibility - updating RequestStack ## [1.1.3] diff --git a/src/Controller/WebformController.php b/src/Controller/WebformController.php index a0b8658..5f0f08d 100644 --- a/src/Controller/WebformController.php +++ b/src/Controller/WebformController.php @@ -4,7 +4,7 @@ use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Datetime\DrupalDateTime; -use Drupal\Core\Http\RequestStack; +use Symfony\Component\HttpFoundation\RequestStack; use Drupal\Core\Link; use Drupal\Core\Render\Markup; use Drupal\Core\Render\RendererInterface;