From a979845f8fe7f69ab4abd1e4999af5e70d70678e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20St=C3=B6ckler?= <tobiasstoeckler@googlemail.com>
Date: Wed, 31 Aug 2016 20:48:11 +0200
Subject: [PATCH] Issue #2770983 by tstoeckler: Make Libraries API work on
Windows.
---
CHANGELOG.txt | 2 ++
src/ExternalLibrary/PhpFile/PhpFileLibrary.php | 2 +-
tests/src/Kernel/ExternalLibrary/PhpFile/PhpFileLibraryTest.php | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8241598..102bf49 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
Libraries 8.x-3.x, xxxx-xx-xx
-----------------------------
+#2770983 by tstoeckler: Make Libraries API work on Windows.
+#2770983 by tstoeckler: Allow libraries to be symlinked to their right place.
#2756265 by rajeshwari10: Replace deprecated usage of SafeMarkup::checkPlain().
#2742333 by jrockowitz: Fix missing @group in LinePatternDetectorTest
by tstoeckler: Document plugin alter hooks
diff --git a/src/ExternalLibrary/PhpFile/PhpFileLibrary.php b/src/ExternalLibrary/PhpFile/PhpFileLibrary.php
index da46df3..6134849 100644
--- a/src/ExternalLibrary/PhpFile/PhpFileLibrary.php
+++ b/src/ExternalLibrary/PhpFile/PhpFileLibrary.php
@@ -57,7 +57,7 @@ class PhpFileLibrary extends LibraryBase implements PhpFileLibraryInterface {
$processed_files = [];
foreach ($this->files as $file) {
- $processed_files[] = $this->getLocalPath() . DIRECTORY_SEPARATOR . $file;
+ $processed_files[] = $this->getLocalPath() . '/' . $file;
}
return $processed_files;
}
diff --git a/tests/src/Kernel/ExternalLibrary/PhpFile/PhpFileLibraryTest.php b/tests/src/Kernel/ExternalLibrary/PhpFile/PhpFileLibraryTest.php
index 832eda5..10c1d2c 100644
--- a/tests/src/Kernel/ExternalLibrary/PhpFile/PhpFileLibraryTest.php
+++ b/tests/src/Kernel/ExternalLibrary/PhpFile/PhpFileLibraryTest.php
@@ -39,7 +39,7 @@ class PhpFileLibraryTest extends LibraryTypeKernelTestBase {
/** @var \Drupal\libraries\ExternalLibrary\PhpFile\PhpFileLibrary $library */
$library = $this->getLibrary();
$this->assertTrue($library->isInstalled());
- $library_path = $this->modulePath . DIRECTORY_SEPARATOR . 'tests/libraries/test_php_file_library';
+ $library_path = $this->modulePath . '/tests/libraries/test_php_file_library';
$this->assertEquals($library_path, $library->getLocalPath());
$this->assertEquals(["$library_path/test_php_file_library.php"], $library->getPhpFiles());
}
--
GitLab