PIEN-8157: PHP 8.1 (#66)

* CL + linting * linter fixes * linter fixes * linter fixes * PHP versions * composer update and php version in phpcs.xml.dist * npm ci * npm lint-fix * js linter ignore * composer update * Updated deps * Update composer.json Co-authored-by: Timi-Artturi Mäkelä <[email protected]> * Update phpcs.xml.dist Co-authored-by: Timi-Artturi Mäkelä <[email protected]> * composer update * Update phpcs.xml.dist Co-authored-by: Timi-Artturi Mäkelä <[email protected]> --------- Co-authored-by: Timi-Artturi Mäkelä <[email protected]>
devgeniem · Apr 11, 2023 · 7914cb0 · 7914cb0
1 parent bbf4670
commit 7914cb0
Show file tree

Hide file tree

Showing 10 changed files with 540 additions and 10,070 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][semver].
 
 ## [Unreleased]
 
+- PIEN-8157: PHP 8.1
+
 ## [0.2.2] - 2022-11-03
 
 - PIEN-7780: Remove link manipulation when importing from Drupal, handle problem with styles.

diff --git a/assets/scripts/news.js b/assets/scripts/news.js
@@ -39,8 +39,9 @@ class News {
 
         this.exoveContent.find( 'use' ).each( function() {
             const xlinkHref = $( this ).attr( 'xlink:href' );
-            const iconName  = xlinkHref.substr( xlinkHref.indexOf( '#' ) );
-            $( this ).attr( 'xlink:href', `${exoveData.iconsPath}${iconName}` );
+            const iconName = xlinkHref.substr( xlinkHref.indexOf( '#' ) );
+            // exoveData defined in NewsImporterPlugin.php localize script
+            $( this ).attr( 'xlink:href', `${ exoveData.iconsPath }${ iconName }` ); // eslint-disable-line no-undef
         } );
     }
 
@@ -51,7 +52,7 @@ class News {
      *
      * @return {void}
      */
-     toggle( event ) {
+    toggle( event ) {
         const toggleTrigger = $( event.currentTarget );
         const ariaExpandedState = toggleTrigger.attr( 'aria-expanded' ) === 'false';
         const duration = typeof toggleTrigger.data( 'duration' ) !== undefined ? toggleTrigger.data( 'duration' ) : 400;

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "wordpress", "wp", "plugin"
     ],
     "require": {
-        "php": ">=7.4|^8",
+        "php": "^8.1",
         "composer/installers": "^v1.10.0",
         "symfony/dom-crawler": "^5.4",
         "symfony/css-selector": "^5.4"
@@ -29,9 +29,9 @@
         "devgeniem/geniem-rules-codesniffer": "^1"
     },
     "scripts": {
-        "lint": "vendor/bin/phpcs --standard=phpcs.xml.dist src/ -s --warning-severity=0",
-        "lint-all": "vendor/bin/phpcs --standard=phpcs.xml.dist src/",
-        "lint-fix": "vendor/bin/phpcbf --standard=phpcs.xml.dist --basepath=. .src/"
+        "lint": "vendor/bin/phpcs --standard=phpcs.xml.dist src/ -s --warning-severity=0 --ignore=node_modules/ --runtime-set minimum_supported_wp_version 6.0",
+        "lint-all": "vendor/bin/phpcs --standard=phpcs.xml.dist src/ --ignore=node_modules/ --runtime-set minimum_supported_wp_version 6.0",
+        "lint-fix": "vendor/bin/phpcbf --standard=phpcs.xml.dist --basepath=. .src/ --ignore=node_modules/ --runtime-set minimum_supported_wp_version 6.0"
     },
     "config": {
         "allow-plugins": {