PIEN-8157: PHP 8.1 (#150)

* CL + linting

* CL

* PHP 8.1 related fixes

* PHP 8.1 updates

* Linter fixes

* Fallback empty string for trim

* composer.json php version ^8.1 like in other themes

Author: tim0haapala

.github/workflows/phpcs-check.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           extensions: simplexml
           coverage: xdebug
         env:

CHANGELOG.MD

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- PIEN-8157: PHP 8.1
+
 ### Added
 
 - PIEN-8439: Add pageID meta tag #151

composer.json

@@ -45,7 +45,7 @@
         }
     },
     "require": {
-        "php": ">=7.4|^8.0",
+        "php": "^8.1",
         "devgeniem/dustpress": ">=1.33.0",
         "composer/installers": "^1.0.12"
     },

lib/ACF/Fields/DialTreduAccordionFields.php

@@ -42,7 +42,7 @@ public function __construct( $label = '', $key = null, $name = null ) {
      */
     protected function sub_fields() : array {
         $strings = [
-            'title'    => [
+            'title' => [
                 'label'        => 'Otsikko',
                 'instructions' => '',
             ],

lib/ACF/Fields/PlaceOfBusinessFields.php

@@ -47,15 +47,15 @@ public function __construct( $label = '', $key = null, $name = null ) {
      */
     protected function sub_fields() : array {
         $strings = [
-            'title'       => [
+            'title' => [
                 'label'        => 'Otsikko',
                 'instructions' => '',
             ],
             'description' => [
                 'label'        => 'Kuvaus',
                 'instructions' => '',
             ],
-            'contacts'    => [
+            'contacts' => [
                 'label'        => 'Yhteystiedot',
                 'instructions' => '',
             ],

lib/ACF/Fields/Settings/ChatTab.php

@@ -31,20 +31,20 @@ class ChatTab extends Tab {
      * @var array
      */
     protected $strings = [
-        'tab'         => 'Chat',
-        'chat_script' => [
+        'tab'           => 'Chat',
+        'chat_script'   => [
             'title'        => 'Chatin scripti',
             'instructions' => 'Sisällytä avaava <script> ja sulkeva </script> tagi',
         ],
-        'chat_pages'   => [
+        'chat_pages'    => [
             'title'        => 'Valitse sivut, joilla chat näytetään',
             'instructions' => '',
         ],
-        'chat_page'   => [
+        'chat_page'     => [
             'title'        => 'Sivu',
             'instructions' => '',
         ],
-        'show_on_child'   => [
+        'show_on_child' => [
             'title'        => 'Näytä tämän alasivuilla',
             'instructions' => '',
         ],

lib/ACF/Fields/Settings/DialTreduSettingsTab.php

@@ -31,7 +31,7 @@ class DialTreduSettingsTab extends Tab {
      * @var array
      */
     protected $strings = [
-        'tab'           => 'Dial Tredu',
+        'tab'             => 'Dial Tredu',
         'dial_tredu_page' => [
             'title'        => 'Listaussivu',
             'instructions' => 'Esitetään murupolussa.',

lib/ACF/Fields/Settings/TreduEventsSettingsTab.php

@@ -31,7 +31,7 @@ class TreduEventsSettingsTab extends Tab {
      * @var array
      */
     protected $strings = [
-        'tab'          => 'Tredun tapahtumat',
+        'tab'               => 'Tredun tapahtumat',
         'tredu_events_page' => [
             'title'        => 'Tredun tapahtumasivu',
             'instructions' => 'Esitetään Tredun tapahtumien murupolussa.',

lib/ACF/PageHeroGroup.php

@@ -31,8 +31,8 @@ public function __construct() {
         );
     }
 
-    /**ttred
-     * Register fields
+    /**
+     * Register fields.
      *
      * @return void
      */

lib/Blocks/DialTreduAccordion.php

@@ -30,16 +30,14 @@ class DialTreduAccordion extends BaseBlock {
     const KEY = 'dial-tredu-accordion';
 
     /**
-     * The block icon
+     * The block icon.
      *
      * @var string
      */
     protected $icon = 'format-status';
 
     /**
-     * Create the layout
-     *
-     * @param string $key Key from the flexible content.
+     * Create the layout.
      */
     public function __construct() {
         $this->title = 'Dial Tredu Haitari';