Merge pull request #70 from Metatavu/feature-69-php-8.1

Feature 69 php 8.1
Metatavu · Apr 21, 2022 · 55bdc22 · 55bdc22
2 parents 043c3e6 + 19f1619
commit 55bdc22
Show file tree

Hide file tree

Showing 13 changed files with 2,533 additions and 9,182 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/default-templates/event.php b/default-templates/event.php
@@ -1,14 +1,13 @@
 <?php
-  $result = "";
-
-  $result .= '<article>';
   $language = $data->language;
+  if (!$language) {
+    $language = "fi";
+  }
 
+  $result = '<article>';
   $eventName = $event["name"][$language];
   $eventLink = $event["externalLinks"][0]["link"];
-
   $result .= sprintf('<div><a href="%s">%s</a></div>', $eventLink, $eventName);
-
   $result .= '</article>';
 
   echo $result;

diff --git a/gutenberg/blocks/js/linkedevents-blocks.js b/gutenberg/blocks/js/linkedevents-blocks.js
diff --git a/gutenberg/blocks/js/linkedevents-blocks.js.LICENSE.txt b/gutenberg/blocks/js/linkedevents-blocks.js.LICENSE.txt
@@ -0,0 +1,3 @@
+//! moment.js
+
+//! moment.js locale configuration
diff --git a/gutenberg/blocks/ts/package-lock.json b/gutenberg/blocks/ts/package-lock.json
diff --git a/gutenberg/blocks/ts/package.json b/gutenberg/blocks/ts/package.json
@@ -7,22 +7,20 @@
     "name": "Metatavu",
     "email": "devs@metatavu.fi"
   },
+  "scripts": {
+    "build": "webpack"
+  },
   "devDependencies": {
-    "@babel/core": "^7.4.3",
-    "@babel/preset-env": "^7.4.3",
-    "@babel/preset-react": "^7.0.0",
     "@types/moment": "^2.13.0",
-    "@types/react": "^16.8.14",
-    "babel-loader": "^8.0.5",
-    "css-loader": "^3.2.0",
-    "node-sass": "^4.12.0",
-    "sass-loader": "^8.0.0",
-    "style-loader": "^1.0.0",
-    "ts-loader": "^5.3.3",
-    "tslint": "^5.16.0",
-    "typescript": "^3.4.4",
-    "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.1"
+    "@types/react": "^18.0.5",
+    "css-loader": "^6.7.1",
+    "sass": "^1.50.1",
+    "sass-loader": "^12.6.0",
+    "style-loader": "^3.3.1",
+    "ts-loader": "^9.2.8",
+    "typescript": "^4.6.3",
+    "webpack": "^5.72.0",
+    "webpack-cli": "^4.9.2"
   },
   "babel": {
     "presets": [

diff --git a/gutenberg/blocks/ts/webpack.config.js b/gutenberg/blocks/ts/webpack.config.js
@@ -12,16 +12,16 @@ module.exports = {
         path.resolve(__dirname, "src")
       ]
     }, {
-      test: /\.jsx?$/,
-      use: 'babel-loader',
-      exclude: /node_modules/,
-      include: [
-        path.resolve(__dirname, "src")
-      ]
-    }, {
-      test: /\.scss$/,
-      use: [ "style-loader", "css-loader", "sass-loader"]
-    }]
+      test: /\.s[ac]ss$/i,
+      use: [
+        // Creates `style` nodes from JS strings
+        "style-loader",
+        // Translates CSS into CommonJS
+        "css-loader",
+        // Compiles Sass to CSS
+        "sass-loader",
+      ],
+    },]
   },
   resolve: {
     extensions: [ '.tsx', '.ts', '.js', '.jsx' ]

diff --git a/linkedevents/linkedevents-api.php b/linkedevents/linkedevents-api.php
@@ -83,7 +83,7 @@ public static function getSearchApi($authenticated) {
        *
        * @return \Metatavu\LinkedEvents\ApiClient new LinkedEvents client
        */
-      private function getClient($authenticated) {
+      private static function getClient($authenticated) {
         return new \Metatavu\LinkedEvents\ApiClient(self::getConfiguration($authenticated));
       }
 
@@ -94,7 +94,7 @@ private function getClient($authenticated) {
        * 
        * @return \Metatavu\LinkedEvents\Configuration LinkedEvents client configuration
        */
-      private function getConfiguration($authenticated) {
+      private static function getConfiguration($authenticated) {
         $result = new \Metatavu\LinkedEvents\Configuration();
         $result->setHost(\Metatavu\LinkedEvents\Wordpress\Settings\Settings::getValue("api-url"));