opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

1
web/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
View file

@ -32,7 +32,6 @@ class UserTrackerTab extends LocalTaskDefault {
return $this->currentUser;
}
/**
* {@inheritdoc}
*/

2
web/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerNode.php
View file

@ -9,7 +9,7 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
*
* @MigrateSource(
* id = "d7_tracker_node",
* source_provider = "tracker"
* source_module = "tracker"
* )
*/
class TrackerNode extends DrupalSqlBase {

2
web/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerUser.php
View file

@ -9,7 +9,7 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
*
* @MigrateSource(
* id = "d7_tracker_user",
* source_provider = "tracker"
* source_module = "tracker"
* )
*/
class TrackerUser extends DrupalSqlBase {

9
web/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
View file

@ -2,6 +2,8 @@
namespace Drupal\tracker\Tests\Views;
@trigger_error(__NAMESPACE__ . '\TrackerTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\tracker\Functional\Views\TrackerTestBase', E_USER_DEPRECATED);
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Core\Language\LanguageInterface;
use Drupal\views\Tests\ViewTestBase;
@ -10,6 +12,9 @@ use Drupal\comment\Entity\Comment;
/**
* Base class for all tracker tests.
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\tracker\Functional\Views\TrackerTestBase instead.
*/
abstract class TrackerTestBase extends ViewTestBase {
@ -36,8 +41,8 @@ abstract class TrackerTestBase extends ViewTestBase {
*/
protected $comment;
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
ViewTestData::createTestViews(get_class($this), ['tracker_test_views']);

68
web/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
View file

@ -1,68 +0,0 @@
<?php
namespace Drupal\tracker\Tests\Views;
use Drupal\views\Views;
/**
* Tests the tracker user uid handlers.
*
* @group tracker
*/
class TrackerUserUidTest extends TrackerTestBase {
/**
* Views used by this test.
*
* @var array
*/
public static $testViews = ['test_tracker_user_uid'];
/**
* Tests the user uid filter and argument.
*/
public function testUserUid() {
$map = [
'nid' => 'nid',
'title' => 'title',
];
$expected = [
[
'nid' => $this->node->id(),
'title' => $this->node->label(),
]
];
$view = Views::getView('test_tracker_user_uid');
$this->executeView($view);
// We should have no results as the filter is set for uid 0.
$this->assertIdenticalResultSet($view, [], $map);
$view->destroy();
// Change the filter value to our user.
$view->initHandlers();
$view->filter['uid_touch_tracker']->value = $this->node->getOwnerId();
$this->executeView($view);
// We should have one result as the filter is set for the created user.
$this->assertIdenticalResultSet($view, $expected, $map);
$view->destroy();
// Remove the filter now, so only the argument will affect the query.
$view->removeHandler('default', 'filter', 'uid_touch_tracker');
// Test the incorrect argument UID.
$view->initHandlers();
$this->executeView($view, [rand()]);
$this->assertIdenticalResultSet($view, [], $map);
$view->destroy();
// Test the correct argument UID.
$view->initHandlers();
$this->executeView($view, [$this->node->getOwnerId()]);
$this->assertIdenticalResultSet($view, $expected, $map);
}
}