Skip to content

Commit eadf8a3

Browse files
eebbieebbi
committed
Merge branch 'php83-deprecations' into stage
2 parents efc27ab + fc1ad7d commit eadf8a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+303
-150
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
Project: Tampereen kaupunki, konsernihallinto / Tietohallintoyksikkö:
2-
Ticket description:
1+
Project: Tampereen kaupunki, konsernihallinto / Tietohallintoyksikkö:
2+
Project task:
3+
34
Task: https://hiondigital.atlassian.net/browse/TMS-
5+
Task title:
46

57
<!--- Provide a general summary of your changes in the Title above -->
68

‎CHANGELOG.MD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99

1010
- TMS-1144: Change aria-attribute for menu-item
1111
- TMS-1164: Change button hover & focus styles
12+
- Fix PHP deprecations
13+
14+
## [1.68.1] - 2025-11-10
15+
1216
- TMS-1204-2: Remove external-link icon for tms.production.geniem.io links
1317

1418
## [1.68.0] - 2025-11-05

‎lib/ACF/BlogArticleGroup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected function get_authors_tab( string $key ) : Field\Tab {
8989
->set_placement( 'left' );
9090

9191
$authors_field = ( new Field\PostObject( $strings['authors']['title'] ) )
92-
->set_key( "${key}_authors" )
92+
->set_key( "{$key}_authors" )
9393
->set_name( 'authors' )
9494
->set_post_types( [ PostType\BlogAuthor::SLUG ] )
9595
->allow_multiple()

‎lib/ACF/CommentGroup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected function get_author_field( string $key ) : Field\PostObject {
8686
];
8787

8888
return ( new Field\PostObject( $strings['author']['title'] ) )
89-
->set_key( "${key}_author" )
89+
->set_key( "{$key}_author" )
9090
->set_name( 'author' )
9191
->set_post_types( [ PostType\BlogAuthor::SLUG ] )
9292
->allow_null()

‎lib/ACF/DynamicEventGroup.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected function get_event_tab( string $key ) : ?Field\Tab {
141141
->set_placement( 'left' );
142142

143143
$search_field = ( new Field\Text( $strings['text']['label'] ) )
144-
->set_key( "${key}_text" )
144+
->set_key( "{$key}_text" )
145145
->set_name( 'text' )
146146
->set_wrapper_width( 50 )
147147
->set_instructions( $strings['text']['instructions'] );
@@ -167,7 +167,7 @@ protected function get_event_tab( string $key ) : ?Field\Tab {
167167
->set_instructions( $strings['category']['instructions'] );
168168

169169
$target_field = ( new Field\Select( $strings['target']['label'] ) )
170-
->set_key( "${key}_target" )
170+
->set_key( "{$key}_target" )
171171
->set_name( 'target' )
172172
->use_ui()
173173
->use_ajax()
@@ -177,7 +177,7 @@ protected function get_event_tab( string $key ) : ?Field\Tab {
177177
->set_instructions( $strings['target']['instructions'] );
178178

179179
$tag_field = ( new Field\Select( $strings['tag']['label'] ) )
180-
->set_key( "${key}_tag" )
180+
->set_key( "{$key}_tag" )
181181
->set_name( 'tag' )
182182
->use_ui()
183183
->use_ajax()
@@ -187,7 +187,7 @@ protected function get_event_tab( string $key ) : ?Field\Tab {
187187
->set_instructions( $strings['tag']['instructions'] );
188188

189189
$event_field = ( new Field\Select( $strings['event']['label'] ) )
190-
->set_key( "${key}_event" )
190+
->set_key( "{$key}_event" )
191191
->set_name( 'event' )
192192
->allow_null()
193193
->use_ui()
@@ -344,7 +344,7 @@ protected function get_components_tab( string $key ) : Field\Tab {
344344
->set_placement( 'left' );
345345

346346
$components_field = ( new Field\FlexibleContent( $strings['components']['title'] ) )
347-
->set_key( "${key}_components" )
347+
->set_key( "{$key}_components" )
348348
->set_name( 'components' )
349349
->set_instructions( $strings['components']['instructions'] );
350350

‎lib/ACF/Fields/AccessibilityIconLinksFields.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected function sub_fields() : array {
6868
$key = $this->get_key();
6969

7070
$rows_field = ( new Field\Repeater( $strings['rows']['label'] ) )
71-
->set_key( "${key}_rows" )
71+
->set_key( "{$key}_rows" )
7272
->set_name( 'rows' )
7373
->set_min( 2 )
7474
->set_layout( 'block' )
@@ -79,28 +79,28 @@ protected function sub_fields() : array {
7979
$icons = apply_filters( 'tms/acf/field/' . $key . '_acc_icon/choices', $icons );
8080

8181
$icon_field = ( new Field\Select( $strings['icon']['label'] ) )
82-
->set_key( "${key}_acc_icon" )
82+
->set_key( "{$key}_acc_icon" )
8383
->set_name( 'acc_icon' )
8484
->set_choices( $icons )
8585
->allow_null()
8686
->set_wrapper_width( 50 )
8787
->set_instructions( $strings['icon']['instructions'] );
8888

8989
$title_field = ( new Field\Text( $strings['title']['label'] ) )
90-
->set_key( "${key}_title" )
90+
->set_key( "{$key}_title" )
9191
->set_name( 'title' )
9292
->set_wrapper_width( 50 )
9393
->set_instructions( $strings['title']['instructions'] );
9494

9595
$description_field = ( new Field\Textarea( $strings['description']['label'] ) )
96-
->set_key( "${key}_description" )
96+
->set_key( "{$key}_description" )
9797
->set_name( 'description' )
9898
->set_wrapper_width( 50 )
9999
->set_rows( 2 )
100100
->set_instructions( $strings['description']['instructions'] );
101101

102102
$link_field = ( new Field\Link( $strings['link']['label'] ) )
103-
->set_key( "${key}_link" )
103+
->set_key( "{$key}_link" )
104104
->set_name( 'link' )
105105
->set_wrapper_width( 50 )
106106
->set_instructions( $strings['link']['instructions'] );

‎lib/ACF/Fields/ArticlesFields.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ protected function sub_fields() : array {
134134
$key = $this->get_key();
135135

136136
$title_field = ( new Field\Text( $this->strings['title']['label'] ) )
137-
->set_key( "${key}_title" )
137+
->set_key( "{$key}_title" )
138138
->set_name( 'title' )
139139
->set_wrapper_width( 50 )
140140
->set_instructions( $this->strings['title']['instructions'] );
141141

142142
$description_field = ( new Field\Textarea( $this->strings['description']['label'] ) )
143-
->set_key( "${key}_description" )
143+
->set_key( "{$key}_description" )
144144
->set_name( 'description' )
145145
->set_wrapper_width( 50 )
146146
->set_rows( 4 )
@@ -153,22 +153,22 @@ protected function sub_fields() : array {
153153
->set_instructions( $this->strings['link']['instructions'] );
154154

155155
$highlight_article_field = ( new Field\PostObject( $this->strings['highlight_article']['label'] ) )
156-
->set_key( "${key}_highlight_article" )
156+
->set_key( "{$key}_highlight_article" )
157157
->set_name( 'highlight_article' )
158158
->set_post_types( [ Post::SLUG ] )
159159
->allow_null()
160160
->set_instructions( $this->strings['highlight_article']['instructions'] );
161161

162162
$display_image_field = ( new Field\TrueFalse( $this->strings['display_image']['label'] ) )
163-
->set_key( "${key}_display_image" )
163+
->set_key( "{$key}_display_image" )
164164
->set_name( 'display_image' )
165165
->set_wrapper_width( 50 )
166166
->set_default_value( true )
167167
->use_ui()
168168
->set_instructions( $this->strings['display_image']['instructions'] );
169169

170170
$feed_type_field = ( new Field\Radio( $this->strings['feed_type']['label'] ) )
171-
->set_key( "${key}_feed_type" )
171+
->set_key( "{$key}_feed_type" )
172172
->set_name( 'feed_type' )
173173
->set_choices( [
174174
'automatic' => $this->strings['feed_type']['type_automatic'],
@@ -182,15 +182,15 @@ protected function sub_fields() : array {
182182
->add_rule( $feed_type_field, '==', 'manual' );
183183

184184
$category_field = ( new Field\Taxonomy( $this->strings['category']['label'] ) )
185-
->set_key( "${key}_category" )
185+
->set_key( "{$key}_category" )
186186
->set_name( 'category' )
187187
->set_taxonomy( Category::SLUG )
188188
->set_return_format( 'id' )
189189
->set_wrapper_width( 50 )
190190
->set_instructions( $this->strings['category']['instructions'] );
191191

192192
$limit_field = ( new Field\Number( $this->strings['limit']['label'] ) )
193-
->set_key( "${key}_number" )
193+
->set_key( "{$key}_number" )
194194
->set_name( 'number' )
195195
->set_min( 4 )
196196
->set_max( 12 )

‎lib/ACF/Fields/BlogArticlesFields.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ protected function sub_fields() : array {
134134
$key = $this->get_key();
135135

136136
$title_field = ( new Field\Text( $this->strings['title']['label'] ) )
137-
->set_key( "${key}_title" )
137+
->set_key( "{$key}_title" )
138138
->set_name( 'title' )
139139
->set_wrapper_width( 50 )
140140
->set_instructions( $this->strings['title']['instructions'] );
141141

142142
$description_field = ( new Field\Textarea( $this->strings['description']['label'] ) )
143-
->set_key( "${key}_description" )
143+
->set_key( "{$key}_description" )
144144
->set_name( 'description' )
145145
->set_wrapper_width( 50 )
146146
->set_rows( 4 )
@@ -153,22 +153,22 @@ protected function sub_fields() : array {
153153
->set_instructions( $this->strings['link']['instructions'] );
154154

155155
$highlight_blog_article_field = ( new Field\PostObject( $this->strings['highlight_blog_article']['label'] ) )
156-
->set_key( "${key}_highlight_article" )
156+
->set_key( "{$key}_highlight_article" )
157157
->set_name( 'highlight_article' )
158158
->allow_null()
159159
->set_post_types( [ BlogArticle::SLUG ] )
160160
->set_instructions( $this->strings['highlight_blog_article']['instructions'] );
161161

162162
$display_image_field = ( new Field\TrueFalse( $this->strings['display_image']['label'] ) )
163-
->set_key( "${key}_display_image" )
163+
->set_key( "{$key}_display_image" )
164164
->set_name( 'display_image' )
165165
->set_wrapper_width( 50 )
166166
->set_default_value( true )
167167
->use_ui()
168168
->set_instructions( $this->strings['display_image']['instructions'] );
169169

170170
$feed_type_field = ( new Field\Radio( $this->strings['feed_type']['label'] ) )
171-
->set_key( "${key}_feed_type" )
171+
->set_key( "{$key}_feed_type" )
172172
->set_name( 'feed_type' )
173173
->set_choices( [
174174
'automatic' => $this->strings['feed_type']['type_automatic'],
@@ -182,15 +182,15 @@ protected function sub_fields() : array {
182182
->add_rule( $feed_type_field, '==', 'manual' );
183183

184184
$category_field = ( new Field\Taxonomy( $this->strings['category']['label'] ) )
185-
->set_key( "${key}_category" )
185+
->set_key( "{$key}_category" )
186186
->set_name( 'category' )
187187
->set_taxonomy( BlogCategory::SLUG )
188188
->set_return_format( 'id' )
189189
->set_wrapper_width( 50 )
190190
->set_instructions( $this->strings['category']['instructions'] );
191191

192192
$limit_field = ( new Field\Number( $this->strings['limit']['label'] ) )
193-
->set_key( "${key}_number" )
193+
->set_key( "{$key}_number" )
194194
->set_name( 'number' )
195195
->set_min( 4 )
196196
->set_max( 12 )

‎lib/ACF/Fields/EventsFields.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,36 +94,36 @@ protected function sub_fields() : array {
9494
$key = $this->get_key();
9595

9696
$title_field = ( new Field\Text( $strings['title']['label'] ) )
97-
->set_key( "${key}_title" )
97+
->set_key( "{$key}_title" )
9898
->set_name( 'title' )
9999
->set_instructions( $strings['title']['instructions'] );
100100

101101
$start_field = ( new Field\DatePicker( $strings['start']['label'] ) )
102-
->set_key( "${key}_start" )
102+
->set_key( "{$key}_start" )
103103
->set_name( 'start' )
104104
->set_display_format( 'j.n.Y' )
105105
->set_return_format( 'Y-m-d' )
106106
->set_wrapper_width( 50 )
107107
->set_instructions( $strings['start']['instructions'] );
108108

109109
$end_field = ( new Field\DatePicker( $strings['end']['label'] ) )
110-
->set_key( "${key}_end" )
110+
->set_key( "{$key}_end" )
111111
->set_name( 'end' )
112112
->set_display_format( 'j.n.Y' )
113113
->set_return_format( 'Y-m-d' )
114114
->set_wrapper_width( 50 )
115115
->set_instructions( $strings['end']['instructions'] );
116116

117117
$starts_today_field = ( new Field\TrueFalse( $strings['starts_today']['label'] ) )
118-
->set_key( "${key}_starts_today" )
118+
->set_key( "{$key}_starts_today" )
119119
->set_name( 'starts_today' )
120120
->use_ui()
121121
->set_default_value( false )
122122
->set_wrapper_width( 50 )
123123
->set_instructions( $strings['starts_today']['instructions'] );
124124

125125
$category_field = ( new Field\Select( $strings['category']['label'] ) )
126-
->set_key( "${key}_category" )
126+
->set_key( "{$key}_category" )
127127
->set_name( 'category' )
128128
->use_ui()
129129
->use_ajax()
@@ -133,7 +133,7 @@ protected function sub_fields() : array {
133133
->set_instructions( $strings['category']['instructions'] );
134134

135135
$area_field = ( new Field\Select( $strings['area']['label'] ) )
136-
->set_key( "${key}_area" )
136+
->set_key( "{$key}_area" )
137137
->set_name( 'area' )
138138
->use_ui()
139139
->allow_null()
@@ -163,13 +163,13 @@ protected function sub_fields() : array {
163163
->set_instructions( $strings['tag']['instructions'] );
164164

165165
$text_field = ( new Field\Text( $strings['text']['label'] ) )
166-
->set_key( "${key}_text" )
166+
->set_key( "{$key}_text" )
167167
->set_name( 'text' )
168168
->set_wrapper_width( 50 )
169169
->set_instructions( $strings['text']['instructions'] );
170170

171171
$page_size_field = ( new Field\Number( $strings['page_size']['label'] ) )
172-
->set_key( "${key}_page_size" )
172+
->set_key( "{$key}_page_size" )
173173
->set_name( 'page_size' )
174174
->set_min( 3 )
175175
->set_max( 12 )
@@ -178,15 +178,15 @@ protected function sub_fields() : array {
178178
->set_instructions( $strings['page_size']['instructions'] );
179179

180180
$show_images_field = ( new Field\TrueFalse( $strings['show_images']['label'] ) )
181-
->set_key( "${key}_show_images" )
181+
->set_key( "{$key}_show_images" )
182182
->set_name( 'show_images' )
183183
->use_ui()
184184
->set_default_value( true )
185185
->set_wrapper_width( 50 )
186186
->set_instructions( $strings['show_images']['instructions'] );
187187

188188
$all_events_link_field = ( new Field\Link( $strings['all_events_link']['label'] ) )
189-
->set_key( "${key}_all_events_link" )
189+
->set_key( "{$key}_all_events_link" )
190190
->set_name( 'all_events_link' )
191191
->set_wrapper_width( 50 )
192192
->set_instructions( $strings['all_events_link']['instructions'] );

‎lib/ACF/Fields/GravityFormFields.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function sub_fields() : array {
5151
$key = $this->get_key();
5252

5353
$field = ( new Field\GravityForms( $strings['text']['label'] ) )
54-
->set_key( "${key}_form" )
54+
->set_key( "{$key}_form" )
5555
->set_name( 'form' )
5656
->set_required()
5757
->set_instructions( $strings['text']['instructions'] );

0 commit comments

Comments
 (0)