Merge pull request #25 from discoverygarden/fix/status

DGI9-628: Attempt to avoid making assertions on unpublished content.

Author: nchiasson-dgi

islandora_hierarchical_access.module

@@ -77,7 +77,7 @@ function islandora_hierarchical_access_entity_delete(EntityInterface $entity) :
 function islandora_hierarchical_access_entity_access(
   EntityInterface $entity,
   $operation,
-  AccountInterface $account
+  AccountInterface $account,
 ) : AccessResultInterface {
   /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
   $entity_type_manager = \Drupal::service('entity_type.manager');

src/Commands/IslandoraHierarchicalAccessCommands.php

@@ -35,7 +35,7 @@ class IslandoraHierarchicalAccessCommands extends DrushCommands {
    */
   public function __construct(
     LUTGeneratorInterface $lut_generator,
-    EntityTypeManagerInterface $entityTypeManager
+    EntityTypeManagerInterface $entityTypeManager,
   ) {
     parent::__construct();
     $this->lutGenerator = $lut_generator;

src/EntityAccessHandler.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Access\AccessResultReasonInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -106,7 +107,7 @@ public function __construct(
     EntityStorageInterface $storage,
     $column,
     $target_column,
-    array $op_map
+    array $op_map,
   ) {
     $this->database = $database;
     $this->ops = $ops;
@@ -140,6 +141,9 @@ public function check(EntityInterface $entity, string $operation, AccountInterfa
     if (!in_array($operation, $this->ops, TRUE)) {
       return AccessResult::neutral("Irrelevant operation.");
     }
+    if ($entity instanceof EntityPublishedInterface && !$entity->isPublished()) {
+      return AccessResult::neutral("Hierarchical access is only concerned with published content.");
+    }
 
     return $this->doCheck($entity, $operation, $account);
   }

src/EntityCUDHandler.php

@@ -82,7 +82,7 @@ public function __construct(
     Connection $database,
     LUTGeneratorInterface $generator,
     $column,
-    $operations
+    $operations,
   ) {
     $this->database = $database;
     $this->generator = $generator;

src/LUTGenerator.php

@@ -50,7 +50,7 @@ public function regenerate(): void {
   /**
    * {@inheritDoc}
    */
-  public function generate(EntityInterface $entity = NULL): void {
+  public function generate(?EntityInterface $entity = NULL): void {
     if (count($this->uniqueFileFields()) === 0) {
       // Did not find any fields over which to generate the LUT so abort the
       // attempt.

src/LUTGeneratorInterface.php

@@ -24,6 +24,6 @@ public function regenerate(): void;
    *   LUT will be completely regenerated. If provided, only those rows
    *   resulting from the given entity will be added to the table.
    */
-  public function generate(EntityInterface $entity = NULL): void;
+  public function generate(?EntityInterface $entity = NULL): void;
 
 }