From 632c2ea3681de4b415db66b2fa204dc71dd3c714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20St=C3=B6ckler?= <tobiasstoeckler@gmail.com>
Date: Mon, 10 Feb 2014 01:13:17 +0100
Subject: [PATCH] Issue #2183087 by tstoeckler, rjacobs: Update for removed
core functions.
---
CHANGELOG.txt | 1 +
.../libraries/Tests/LibrariesUnitTest.php | 18 +++++++++++-------
.../libraries/Tests/LibrariesWebTest.php | 4 ++--
libraries.module | 3 ++-
.../libraries_test/libraries_test.module | 2 +-
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 40a28e0..bbfd965 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
Libraries 8.x-3.x, xxxx-xx-xx
-----------------------------
+#2183087 by tstoeckler, rjacobs: Update for removed core functions.
by tstoeckler: Fix tests.
by tstoeckler: Provide required 'type' key in test library info file.
#2090351 by tstoeckler: Remove obsolete hook_flush_caches().
diff --git a/lib/Drupal/libraries/Tests/LibrariesUnitTest.php b/lib/Drupal/libraries/Tests/LibrariesUnitTest.php
index 7558611..dee3fe3 100644
--- a/lib/Drupal/libraries/Tests/LibrariesUnitTest.php
+++ b/lib/Drupal/libraries/Tests/LibrariesUnitTest.php
@@ -7,12 +7,21 @@
namespace Drupal\libraries\Tests;
-use \Drupal\simpletest\UnitTestBase;
+use Drupal\simpletest\DrupalUnitTestBase;
/**
* Tests basic Libraries API functions.
*/
-class LibrariesUnitTest extends UnitTestBase {
+class LibrariesUnitTest extends DrupalUnitTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = array('libraries');
+
+ /**
+ * {@inheritdoc}
+ */
public static function getInfo() {
return array(
'name' => 'Libraries API unit tests',
@@ -21,11 +30,6 @@ class LibrariesUnitTest extends UnitTestBase {
);
}
- function setUp() {
- drupal_load('module', 'libraries');
- parent::setUp();
- }
-
/**
* Tests libraries_get_path().
*/
diff --git a/lib/Drupal/libraries/Tests/LibrariesWebTest.php b/lib/Drupal/libraries/Tests/LibrariesWebTest.php
index c2ca2c9..35e60c1 100644
--- a/lib/Drupal/libraries/Tests/LibrariesWebTest.php
+++ b/lib/Drupal/libraries/Tests/LibrariesWebTest.php
@@ -396,7 +396,7 @@ class LibrariesWebTest extends WebTestBase {
$this->assertLibraryFiles('example_4', 'Concurrent version and variant overloading');
// Test caching.
- variable_set('libraries_test_cache', TRUE);
+ \Drupal::state()->set('libraries_test.cache', TRUE);
cache('libraries')->delete('example_callback');
// When the library information is not cached, all callback groups should be
// invoked.
@@ -414,7 +414,7 @@ class LibrariesWebTest extends WebTestBase {
$this->assertNoRaw('The <em>post-detect</em> callback group was not invoked.', 'Post-detect callback not invoked for cached libraries.');
$this->assertRaw('The <em>pre-load</em> callback group was invoked.', 'Pre-load callback invoked for cached libraries.');
$this->assertRaw('The <em>post-load</em> callback group was invoked.', 'Post-load callback invoked for cached libraries.');
- variable_set('libraries_test_cache', FALSE);
+ \Drupal::state()->set('libraries_test.cache', FALSE);
}
/**
diff --git a/libraries.module b/libraries.module
index a5e4ba7..79893ed 100644
--- a/libraries.module
+++ b/libraries.module
@@ -680,7 +680,8 @@ function libraries_load_files($library) {
if (!isset($options['group'])) {
$options['group'] = ($type == 'js') ? JS_DEFAULT : CSS_AGGREGATE_DEFAULT;
}
- call_user_func('drupal_add_' . $type, $data, $options);
+ // @todo Avoid the usage of _drupal_add_js() and _drupal_add_css()
+ call_user_func('_drupal_add_' . $type, $data, $options);
$count++;
}
}
diff --git a/tests/modules/libraries_test/libraries_test.module b/tests/modules/libraries_test/libraries_test.module
index 5c25d02..bf319ea 100644
--- a/tests/modules/libraries_test/libraries_test.module
+++ b/tests/modules/libraries_test/libraries_test.module
@@ -458,7 +458,7 @@ function _libraries_test_callback(&$library, $version, $variant, $group) {
// The following is used to test caching of library information.
// Only set the message for the top-level library to prevent confusing,
// duplicate messages.
- if (!isset($version) && !isset($variant) && variable_get('libraries_test_cache', FALSE)) {
+ if (!isset($version) && !isset($variant) && \Drupal::state()->get('libraries_test.cache', FALSE)) {
drupal_set_message("The <em>$group</em> callback group was invoked.");
}
}
--
GitLab