Wrong check for file status in _editor_record_file_usage

Surprised there is no existing issue about this, did you check?

As simple as the fix might be, the fact that it exists means that we need test coverage for this.

The solution looks good. I also confirmed that we have no other usages of == FILE_STATUS_ or != FILE_STATUS_ in core.

bump version

Queued #12 to be tested against 8.6.x

Fixed inline with changes in #3021833-12: Move FILE_STATUS_PERMANENT to \Drupal\file\FileInterface

Looks test should be extended to make sure that status really set

Rerolled the patch for 8.7.x.

Addressing my own review here, mainly cleaning up.

+++ b/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
@@ -60,6 +60,43 @@ protected function setUp() {
+    $file_entity_type = $this->entityManager->getDefinition('file');
...
+    $this->entityManager->clearCachedDefinitions();
...
+    $test_file_storage = $this->entityManager->getStorage('file');

Deprecated, lets use $this->entityTypeManager instead.

<code>
+++ b/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
@@ -60,6 +60,43 @@ protected function setUp() {
+    $node = $node = Node::create([

This should be just $node = Node::create([

+++ b/core/modules/editor/tests/modules/src/TestFileStorage.php
@@ -0,0 +1,47 @@
+    return $this->saveCount[$entity->id()];

If I'm reading this class correctly, the save count for the given entity is only available if it's been saved before, so we should default to returning 0 if $this->saveCount[$entity->id()] isn't set.

Re #19:

Looks test should be extended to make sure that status really set

Good point @andypost, adding coverage for that here.

+++ b/core/modules/editor/tests/modules/editor_test.module
@@ -44,3 +44,14 @@ function editor_test_editor_info_alter(&$items) {
+function editor_test_entity_type_alter(array &$entity_types) {

I think it would be better if we would record the number of saves with a hook_ENTITY_TYPE_presave() implementation rather than using a special entity storage handler.

Good idea @amateescu - that way this implementation is a lot simpler - thanks!

Using state to keep track of the number of times a file is saved here.

Note that I went for using the file name as the array key of the state value because the file id is not yet available when it's a new file. Opened to using something else if anyone has a better idea :)

Updating issue summary to reflect the solution proposed in the latest patch.

This looks much better now!

Committed and pushed aeefe0664b to 8.8.x and f3d837af83 to 8.7.x. Thanks!

Credited @amateescu and @douggreen for reviews.