Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3150474 by jungle, munish.kumar: Inaccurate return type of \Drupal\views\Views::getView() 

(cherry picked from commit 19d2c39d0d)
merge-requests/64/head
Alex Pott 2020-06-15 13:24:28 +01:00
parent 57735992cf
commit fd046df3d9
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/views/src/Views.php
View File

@ -115,14 +115,15 @@ class Views {
* @param string $id
* The view ID to load.
*
* @return \Drupal\views\ViewExecutable
* A view executable instance, from the loaded entity.
* @return \Drupal\views\ViewExecutable|null
* A view executable instance or NULL if the view does not exist.
*/
public static function getView($id) {
$view = \Drupal::entityTypeManager()->getStorage('view')->load($id);
if ($view) {
return static::executableFactory()->get($view);
}
return NULL;
}
/**

16
core/modules/views/tests/src/Unit/ViewsTest.php
View File

@ -2,6 +2,7 @@
namespace Drupal\Tests\views\Unit;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Tests\UnitTestCase;
use Drupal\views\Views;
@ -72,6 +73,21 @@ class ViewsTest extends UnitTestCase {
$this->assertEquals(spl_object_hash($view), spl_object_hash($executable->storage));
}
/**
* Tests the getView() method against a non-existent view.
*
* @covers ::getView
*/
public function testGetNonExistentView() {
$entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
$storage = $this->prophesize(EntityStorageInterface::class);
$storage->load('test_view_non_existent')->willReturn(NULL);
$entity_type_manager->getStorage('view')->willReturn($storage->reveal());
$this->container->set('entity_type.manager', $entity_type_manager->reveal());
$executable_does_not_exist = Views::getView('test_view_non_existent');
$this->assertNull($executable_does_not_exist);
}
/**
* @covers ::getApplicableViews
*