Skip to content
Snippets Groups Projects
Commit dd83235d authored by Douglas Groene's avatar Douglas Groene
Browse files

Resolve #3455292 "Automated drupal 11"

parent 0396ae85
No related branches found
No related tags found
2 merge requests!8Resolve #3455292 "Automated drupal 11",!7Resolve #3455292 "Automated drupal 11"
File moved
......@@ -4,6 +4,6 @@
"type": "drupal-module",
"license": "GPL-2.0-or-later",
"require": {
"drupal/core": "^8.8 || ^9"
"drupal/core": "^8.8 || ^9 || ^10 || ^11"
}
}
This diff is collapsed.
......@@ -2,6 +2,7 @@ name: Redirect Extensions
type: module
description: Custom extensions to the Redirect module (www.drupal.org/project/redirect).
package: Custom
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9.4 || ^10 || ^11
dependencies:
- drupal:redirect
- drupal:views_data_export
......@@ -90,7 +90,7 @@ function redirect_extensions_update_8101() {
* Import updated View configuration.
*/
function redirect_extensions_update_8102() {
$config_path = drupal_get_path('module', 'redirect_extensions') . '/config/install';
$config_path = \Drupal::service('extension.list.module')->getPath('redirect_extensions') . '/config/install';
$source = new FileStorage($config_path);
$config_storage = \Drupal::service('config.storage');
$config_storage->write('views.view.url_redirects', $source->read('views.view.url_redirects'));
......@@ -102,7 +102,7 @@ function redirect_extensions_update_8102() {
* Import updated View configuration.
*/
function redirect_extensions_update_8103() {
$config_path = drupal_get_path('module', 'redirect_extensions') . '/config/install';
$config_path = \Drupal::service('extension.list.module')->getPath('redirect_extensions') . '/config/install';
$source = new FileStorage($config_path);
$config_storage = \Drupal::service('config.storage');
$config_storage->write('views.view.url_redirects', $source->read('views.view.url_redirects'));
......@@ -114,7 +114,7 @@ function redirect_extensions_update_8103() {
* Import updated View configuration.
*/
function redirect_extensions_update_8104() {
$config_path = drupal_get_path('module', 'redirect_extensions') . '/config/install';
$config_path = \Drupal::service('extension.list.module')->getPath('redirect_extensions') . '/config/install';
$source = new FileStorage($config_path);
$config_storage = \Drupal::service('config.storage');
$config_storage->write('views.view.url_redirects', $source->read('views.view.url_redirects'));
......
......@@ -2,7 +2,7 @@
namespace Drupal\redirect_extensions;
use Drupal\Core\Database\Driver\mysql\Connection;
use Drupal\mysql\Driver\Database\mysql\Connection;
use Drupal\Core\Session\AccountInterface;
use Drupal\Component\Datetime\TimeInterface;
......@@ -12,9 +12,9 @@ use Drupal\Component\Datetime\TimeInterface;
class RedirectDatabaseStorage implements RedirectDatabaseStorageInterface {
/**
* Drupal\Core\Database\Driver\mysql\Connection definition.
* Drupal\mysql\Driver\Database\mysql\Connection definition.
*
* @var \Drupal\Core\Database\Driver\mysql\Connection
* @var \Drupal\mysql\Driver\Database\mysql\Connection
*/
protected $database;
......@@ -35,7 +35,7 @@ class RedirectDatabaseStorage implements RedirectDatabaseStorageInterface {
/**
* Constructs a new RedirectDatabaseStorage object.
*
* @param \Drupal\Core\Database\Driver\mysql\Connection $database
* @param \Drupal\mysql\Driver\Database\mysql\Connection $database
* The Database connection.
* @param \Drupal\Core\Session\AccountInterface $current_user
* The current user.
......@@ -81,20 +81,13 @@ class RedirectDatabaseStorage implements RedirectDatabaseStorageInterface {
* True if redirect exists.
*/
public function redirectExists($redirect_id) {
$query = $this->database->select('redirect_extensions', 'r');
$query->fields('r');
$query->condition('rid', $redirect_id, '=');
$result = $query->execute();
$result->allowRowCount = TRUE;
if ($result->rowCount() > 0) {
return TRUE;
}
else {
return FALSE;
}
$result = $this->database->select('redirect_extensions', 'r')
->fields('r')
->condition('rid', $redirect_id, '=')
->countQuery()
->execute()
->fetchField();
return !empty($result) && $result > 0;
}
/**
......
<?php
/**
* Unit Tests for the RedirectDatabaseStorage class.
* User: rsimmons
* Date: 10/12/17
* Time: 2:36 PM
* PHPUnit_Framework_TestCase
*/
namespace Drupal\Tests\redirect_extensions\Unit;
use Prophecy\PhpUnit\ProphecyTrait;
use Drupal\redirect_extensions\RedirectDatabaseStorage;
use Drupal\Core\Database\Driver\mysql\Connection;
use Drupal\mysql\Driver\Database\mysql\Connection;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Database\StatementInterface;
use Drupal\Core\Session\AccountInterface;
......@@ -17,13 +12,15 @@ use Drupal\Component\Datetime\TimeInterface;
use Drupal\Tests\UnitTestCase;
/**
* Class RedirectDatabaseStorageTest.
* Tests the RedirectDatabaseStorage class.
*
* @coversDefaultClass \Drupal\redirect_extensions\RedirectDatabaseStorage
* @group redirect_extensions
*/
class RedirectDatabaseStorageTest extends UnitTestCase {
use ProphecyTrait;
/**
* @covers ::redirectExists
* @dataProvider addDataProvider
......@@ -35,15 +32,23 @@ class RedirectDatabaseStorageTest extends UnitTestCase {
$accountProphecy = $this->prophesize(AccountInterface::class);
$timeProphecy = $this->prophesize(TimeInterface::class);
$queryProphecy = $this->prophesize(SelectInterface::class);
$countQueryProphecy = $this->prophesize(SelectInterface::class);
$resultProphecy = $this->prophesize(StatementInterface::class);
$redirect_id = "1";
$resultProphecy->rowCount()->willReturn($count);
$queryProphecy->fields('r')->shouldBeCalledTimes(1);
$queryProphecy->condition('rid', $redirect_id, '=')->shouldBeCalledTimes(1);
$queryProphecy->execute()->willReturn($resultProphecy->reveal());
$queryProphecy->fields('r')->shouldBeCalledTimes(1)
->willReturn($queryProphecy->reveal());
$queryProphecy->condition('rid', $redirect_id, '=')->shouldBeCalledTimes(1)
->willReturn($queryProphecy->reveal());
$queryProphecy->countQuery()->shouldBeCalledTimes(1)
->willReturn($countQueryProphecy->reveal());
$countQueryProphecy->execute()->shouldBeCalledTimes(1)
->willReturn($resultProphecy->reveal());
$resultProphecy->fetchField()->shouldBeCalledTimes(1)
->willReturn($count);
$connectionProphecy->select("redirect_extensions", "r")
->willReturn($queryProphecy->reveal());
......@@ -58,7 +63,7 @@ class RedirectDatabaseStorageTest extends UnitTestCase {
/**
* Data provider for test.
*/
public function addDataProvider() {
public static function addDataProvider() {
return [
[0, FALSE],
[1, TRUE],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment