From 8996cef6487c7003b210994b76202f6ae6798e69 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Feb 2023 10:00:53 +0100
Subject: [PATCH 1/2] MOBILE-4069 a11y: Remove unneeded aria-labelledby

With the latest Ionic update, these aria-labelledby aren't needed and one of them even caused a behat test to fail
---
 .../forum/pages/new-discussion/new-discussion.html |  8 ++++----
 src/addons/mod/glossary/pages/edit/edit.html       | 11 +++++------
 src/addons/mod/lesson/pages/player/player.html     |  8 +++-----
 .../mod/lesson/pages/user-retake/user-retake.html  |  5 ++---
 .../components/index/addon-mod-survey-index.html   |  5 ++---
 .../components/group-selector/group-selector.html  |  5 ++---
 .../components/group-selector/group-selector.ts    | 14 ++------------
 .../login/pages/email-signup/email-signup.html     |  5 ++---
 8 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index f403daa71..205501ce7 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -46,10 +46,10 @@
                     <ion-toggle [(ngModel)]="newDiscussion.postToAllGroups" name="postallgroups"></ion-toggle>
                 </ion-item>
                 <ion-item *ngIf="showGroups" class="core-edit-set-group">
-                    <ion-label id="addon-mod-forum-groupslabel">{{ 'addon.mod_forum.group' | translate }}</ion-label>
-                    <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups"
-                        aria-labelledby="addon-mod-forum-groupslabel" interface="action-sheet" name="groupid"
-                        [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}" (ionChange)="calculateGroupName()">
+                    <ion-label>{{ 'addon.mod_forum.group' | translate }}</ion-label>
+                    <ion-select [(ngModel)]="newDiscussion.groupId" [disabled]="newDiscussion.postToAllGroups" interface="action-sheet"
+                        name="groupid" [interfaceOptions]="{header: 'addon.mod_forum.group' | translate}"
+                        (ionChange)="calculateGroupName()">
                         <ion-select-option *ngFor="let group of groups" [value]="group.id">{{ group.name }}</ion-select-option>
                     </ion-select>
                 </ion-item>
diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html
index f943c19e3..8850c93d3 100644
--- a/src/addons/mod/glossary/pages/edit/edit.html
+++ b/src/addons/mod/glossary/pages/edit/edit.html
@@ -28,11 +28,11 @@
                 </core-rich-text-editor>
             </ion-item>
             <ion-item *ngIf="categories.length > 0">
-                <ion-label position="stacked" id="addon-mod-glossary-categories-label">
+                <ion-label position="stacked">
                     {{ 'addon.mod_glossary.categories' | translate }}
                 </ion-label>
-                <ion-select [(ngModel)]="options.categories" multiple="true" aria-labelledby="addon-mod-glossary-categories-label"
-                    interface="action-sheet" [placeholder]="'addon.mod_glossary.categories' | translate" name="categories"
+                <ion-select [(ngModel)]="options.categories" multiple="true" interface="action-sheet"
+                    [placeholder]="'addon.mod_glossary.categories' | translate" name="categories"
                     [interfaceOptions]="{header: 'addon.mod_glossary.categories' | translate}">
                     <ion-select-option *ngFor="let category of categories" [value]="category.id">
                         {{ category.name }}
@@ -40,11 +40,10 @@
                 </ion-select>
             </ion-item>
             <ion-item>
-                <ion-label position="stacked" id="addon-mod-glossary-aliases-label">
+                <ion-label position="stacked">
                     {{ 'addon.mod_glossary.aliases' | translate }}
                 </ion-label>
-                <ion-textarea [(ngModel)]="options.aliases" rows="1" [core-auto-rows]="options.aliases"
-                    aria-labelledby="addon-mod-glossary-aliases-label" name="aliases">
+                <ion-textarea [(ngModel)]="options.aliases" rows="1" [core-auto-rows]="options.aliases" name="aliases">
                 </ion-textarea>
             </ion-item>
             <ion-item-divider>
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index da29653c9..9613763db 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -138,14 +138,12 @@
                             <ion-item class="ion-text-wrap" *ngFor="let row of question.rows">
                                 <ion-label>
                                     <p>
-                                        <core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component"
-                                            [componentId]="lesson?.coursemodule" [text]="row.text" contextLevel="module"
-                                            [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="row.text"
+                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </p>
                                 </ion-label>
-                                <ion-select [id]="row.id" [formControlName]="row.name" interface="action-sheet"
-                                    [attr.aria-labelledby]="'addon-mod_lesson-matching-' + row.id">
+                                <ion-select [id]="row.id" [formControlName]="row.name" interface="action-sheet">
                                     <ion-select-option *ngFor="let option of row.options" [value]="option.value">
                                         {{option.label}}
                                     </ion-select-option>
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index 41e59c571..46392fcec 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -27,9 +27,8 @@
 
             <!-- Retake selector if there is more than one retake. -->
             <ion-item class="ion-text-wrap" *ngIf="student.attempts && student.attempts.length > 1">
-                <ion-label id="addon-mod_lesson-retakeslabel">{{ 'addon.mod_lesson.attemptheader' | translate }}</ion-label>
-                <ion-select [(ngModel)]="selectedRetake" (ionChange)="changeRetake(selectedRetake!)"
-                    aria-labelledby="addon-mod_lesson-retakeslabel" interface="action-sheet"
+                <ion-label>{{ 'addon.mod_lesson.attemptheader' | translate }}</ion-label>
+                <ion-select [(ngModel)]="selectedRetake" (ionChange)="changeRetake(selectedRetake!)" interface="action-sheet"
                     [interfaceOptions]="{header: 'addon.mod_lesson.attemptheader' | translate}">
                     <ion-select-option *ngFor="let retake of student.attempts" [value]="retake.try">
                         {{retake.label}}
diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
index a8aa106d4..94418bb86 100644
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@@ -102,13 +102,12 @@
                     </ion-row>
 
                     <ion-item *ngIf="question.type === 0" class="ion-text-wrap" [class.even]="isEven">
-                        <ion-label position="floating" id="addon-mod_survey-{{question.name}}">
+                        <ion-label position="floating">
                             <span [core-mark-required]="question.required">
                                 <strong>{{question.num}}.</strong> {{ question.text }}
                             </span>
                         </ion-label>
-                        <ion-textarea [(ngModel)]="answers[question.name]" [name]="question.name"
-                            [attr.aria-labelledby]="'addon-mod_survey-'+question.name" [required]="question.required">
+                        <ion-textarea [(ngModel)]="answers[question.name]" [name]="question.name" [required]="question.required">
                         </ion-textarea>
                     </ion-item>
                 </ng-container>
diff --git a/src/core/components/group-selector/group-selector.html b/src/core/components/group-selector/group-selector.html
index 3c667d8ea..8febfda04 100644
--- a/src/core/components/group-selector/group-selector.html
+++ b/src/core/components/group-selector/group-selector.html
@@ -7,12 +7,11 @@
     </ion-card>
 
     <ion-item class="ion-text-wrap core-group-selector">
-        <ion-label id="core-groups-selector-groupslabel-{{id}}">
+        <ion-label>
             <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
             <ng-container *ngIf="groupInfo.visibleGroups">{{'core.groupsvisible' | translate }}</ng-container>
         </ion-label>
-        <ion-select [(ngModel)]="selected" (ionChange)="selectedChange.emit(selected)"
-            [attr.aria-labelledby]="'core-groups-selector-groupslabel-' + id" interface="action-sheet"
+        <ion-select [(ngModel)]="selected" (ionChange)="selectedChange.emit(selected)" interface="action-sheet"
             [interfaceOptions]="{header: 'core.group' | translate}">
             <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
                 {{groupOpt.name}}
diff --git a/src/core/components/group-selector/group-selector.ts b/src/core/components/group-selector/group-selector.ts
index b98b5ec5e..2365e3ffe 100644
--- a/src/core/components/group-selector/group-selector.ts
+++ b/src/core/components/group-selector/group-selector.ts
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, Output, EventEmitter, OnInit, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core';
 import { CoreGroupInfo } from '@services/groups';
-import { CoreUtils } from '@services/utils/utils';
 
 /**
  * Component to display a group selector.
@@ -24,20 +23,11 @@ import { CoreUtils } from '@services/utils/utils';
     templateUrl: 'group-selector.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CoreGroupSelectorComponent implements OnInit {
+export class CoreGroupSelectorComponent {
 
     @Input() groupInfo?: CoreGroupInfo;
     @Input() multipleGroupsMessage?: string;
     @Input() selected!: number;
     @Output() selectedChange = new EventEmitter<number>();
 
-    id!: number;
-
-    /**
-     * @inheritdoc
-     */
-    ngOnInit(): void {
-        this.id = CoreUtils.getUniqueId('CoreGroupSelectorComponent');
-    }
-
 }
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index fa5eed501..0fa136230 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -159,9 +159,8 @@
                         </ion-input>
                     </ion-item>
                     <ion-item class="ion-text-wrap">
-                        <ion-label position="stacked" id="core-login-signup-country">{{ 'core.user.country' | translate }}</ion-label>
-                        <ion-select name="country" formControlName="country" aria-labelledby="core-login-signup-country"
-                            [placeholder]="'core.login.selectacountry' | translate">
+                        <ion-label position="stacked">{{ 'core.user.country' | translate }}</ion-label>
+                        <ion-select name="country" formControlName="country" [placeholder]="'core.login.selectacountry' | translate">
 
                             <ion-select-option value="">{{ 'core.login.selectacountry' | translate }}</ion-select-option>
                             <ion-select-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-select-option>

From 3dd333243b76658ed85750d14c31263ab9d93092 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Feb 2023 11:56:53 +0100
Subject: [PATCH 2/2] MOBILE-4069 behat: Increase Docker PHP version

---
 .github/workflows/acceptance.yml  | 2 +-
 .github/workflows/performance.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index d8ff19c9d..b2df84a3d 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -26,7 +26,7 @@ jobs:
     env:
       MOODLE_DOCKER_DB: pgsql
       MOODLE_DOCKER_BROWSER: chrome
-      MOODLE_DOCKER_PHP_VERSION: 7.4
+      MOODLE_DOCKER_PHP_VERSION: '8.0'
       MOODLE_BRANCH: ${{ github.event.inputs.moodle_branch || 'master' }}
       MOODLE_REPOSITORY: ${{ github.event.inputs.moodle_repository || 'https://github.com/moodle/moodle' }}
       BEHAT_TAGS: ${{ github.event.inputs.behat_tags || '~@performance' }}
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 746a6c38a..47e3fbf71 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -8,7 +8,7 @@ jobs:
     env:
       MOODLE_DOCKER_DB: pgsql
       MOODLE_DOCKER_BROWSER: chrome
-      MOODLE_DOCKER_PHP_VERSION: 7.4
+      MOODLE_DOCKER_PHP_VERSION: '8.0'
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v3