PIEN-8157: PHP 8.1 (#92)

* CL + linting * PHP version for github + composer update * fix scss error dividing with / by using math.div instead * npm update * Update composer.json Co-authored-by: Timi-Artturi Mäkelä <[email protected]> --------- Co-authored-by: Timi-Artturi Mäkelä <[email protected]>
devgeniem · Apr 11, 2023 · 32554bc · 32554bc
1 parent 60ebc7f
commit 32554bc
Show file tree

Hide file tree

Showing 7 changed files with 4,603 additions and 2,388 deletions.
diff --git a/.github/workflows/phpcs-check.yml b/.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:

diff --git a/CHANGELOG.MD b/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
+
 ## [1.11.8] – 2023-03-13
 
 ### Changed

diff --git a/assets/styles/settings/brand/_functions.scss b/assets/styles/settings/brand/_functions.scss
@@ -1,10 +1,11 @@
+@use "sass:math";
 
 @function stripUnit($value) {
-    @return $value / ($value * 0 + 1);
+    @return math.div($value, $value * 0 + 1);
 }
 
 @function rem($pxValue, $body-font-size: 17px) {
-    @return #{stripUnit($pxValue) / stripUnit($body-font-size)}rem;
+    @return #{math.div(stripUnit($pxValue), stripUnit($body-font-size))}rem;
 }
 
 @function get_calculated_sizes($base_size: 17px, $scale_value: 1.165, $as_list: false) {

diff --git a/composer.json b/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"
     },

diff --git a/lib/ACF/Layouts/HeroLayout.php b/lib/ACF/Layouts/HeroLayout.php
@@ -47,31 +47,31 @@ public function add_layout_fields() : array {
         $key = $this->get_key();
 
         $strings = [
-            'image'         => [
+            'image' => [
                 'label'        => 'Kuva',
                 'instructions' => '',
             ],
-            'overlay'       => [
+            'overlay' => [
                 'label'        => 'Tummennus',
                 'instructions' => '',
             ],
-            'title'         => [
+            'title' => [
                 'label'        => 'Otsikko',
                 'instructions' => '',
             ],
-            'description'   => [
+            'description' => [
                 'label'        => 'Kuvaus',
                 'instructions' => '',
             ],
             'description_link' => [
                 'label'        => 'Kuvauksen linkki',
                 'instructions' => '',
             ],
-            'link'          => [
+            'link' => [
                 'label'        => 'Painike',
                 'instructions' => '',
             ],
-            'text_align'    => [
+            'text_align' => [
                 'label'        => 'Tekstin tasaus',
                 'instructions' => '',
             ],
@@ -90,7 +90,7 @@ public function add_layout_fields() : array {
                     'instructions' => '',
                 ],
             ],
-            'tickets'       => [
+            'tickets' => [
                 'label'  => 'Liput',
                 'title'  => [
                     'label'        => 'Otsikko',
@@ -109,7 +109,7 @@ public function add_layout_fields() : array {
                     'instructions' => '',
                 ],
             ],
-            'find_us'       => [
+            'find_us' => [
                 'label'  => 'Löydä meille',
                 'title'  => [
                     'label'        => 'Otsikko',