Merge pull request #18 from tawk/drupal-10-support

eug-L · web-flow · commit 233b0d89332f · 2024-09-26T15:16:34.000+08:00
Drupal 10 support
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
             "email": "accounts@tawk.to"
         }
     ],
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "tawk/url-utils": "2.0.2"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/docker/envs/drupal-10.env b/docker/envs/drupal-10.env
@@ -0,0 +1,3 @@
+DRUPAL_IMAGE_VERSION=10-apache
+
+COMPOSE_PROJECT_NAME=drupal-10-apache
diff --git a/src/core/TawktoGenerator.php b/src/core/TawktoGenerator.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\tawk_to\core;
 
-if (file_exists(drupal_get_path('module', 'tawk_to') . '/vendor/autoload.php')) {
-  require_once drupal_get_path('module', 'tawk_to') . '/vendor/autoload.php';
+if (file_exists(__DIR__ . '/../../vendor/autoload.php')) {
+  require_once __DIR__ . '/../../vendor/autoload.php';
 }
 
 use Drupal\Core\Cache\Cache;
diff --git a/tawk_to.info.yml b/tawk_to.info.yml
@@ -7,4 +7,4 @@ tags:
   - tawk
   - chat
 core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+DRUPAL_IMAGE_VERSION=10-apache`
	`2`	`+`
	`3`	`+COMPOSE_PROJECT_NAME=drupal-10-apache`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Drupal\tawk_to\core;`
`4`	`4`
`5`		`-if (file_exists(drupal_get_path('module', 'tawk_to') . '/vendor/autoload.php')) {`
`6`		`- require_once drupal_get_path('module', 'tawk_to') . '/vendor/autoload.php';`
	`5`	`+if (file_exists(__DIR__ . '/../../vendor/autoload.php')) {`
	`6`	`+ require_once __DIR__ . '/../../vendor/autoload.php';`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`use Drupal\Core\Cache\Cache;`