This is a follow up from #2048827: Move Image toolkit API from system.module to Drupal\Core.

Moving the toolkit stuff to \Drupal\Core, we forgot \Drupal\system\Annotation\ImageToolkit under system module. Let's move it under \Drupal\Core\ImageToolkit too.

Files: 
CommentFileSizeAuthor
#8 move-toolkit-annotation-class-2108077-8.patch4.5 KBclaudiu.cristea
PASSED: [[SimpleTest]]: [MySQL] 58,972 pass(es).
[ View ]
#8 interdiff.txt1.6 KBclaudiu.cristea
#6 move-toolkit-annotation-class-2108077-5.patch4.43 KBclaudiu.cristea
FAILED: [[SimpleTest]]: [MySQL] 58,888 pass(es), 24 fail(s), and 1 exception(s).
[ View ]
#5 move-toolkit-annotation-class-2108077-5.patch34 bytesclaudiu.cristea
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]
#5 interdiff.txt2.04 KBclaudiu.cristea
#4 move-toolkit-annotation-class-2108077-3.patch2.85 KBclaudiu.cristea
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]
#1 move-toolkit-annotation-class-2108077-1.patch2.17 KBclaudiu.cristea
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]

Comments

Assigned:Unassigned» claudiu.cristea
Priority:Normal» Minor
Status:Active» Needs review
Issue tags:+API clean-up, +API consistency
StatusFileSize
new2.17 KB
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]

Patch.

Status:Needs review» Needs work

We should at least adapt the existing implementations as well. They work because we now have magic loading of annotations.

If you apply the patch there is still some use Drupal\system\Annotation\ImageToolkit;statements in core.

Status:Needs work» Needs review
StatusFileSize
new2.85 KB
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]

Here with cleaning of use statements.

StatusFileSize
new2.04 KB
new34 bytes
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]

Did it again :). Interdiff to #1.

StatusFileSize
new4.43 KB
FAILED: [[SimpleTest]]: [MySQL] 58,888 pass(es), 24 fail(s), and 1 exception(s).
[ View ]

Right patch

Status:Needs review» Needs work

I did a global search on " extends plugin" to find all annotation classes. They are always in an Annotation subdirectory. Most of the times they are under an Annotation subdirectory of the directooy where the plugin type itself can be found. The only exception is Action which is directly under /Core/Annotation instead of /Core/Action/Annotation.

So the file should be moved to Core\ImageToolkit\Annotation. and the namespace should be adapted accordingly.

Priority:Minor» Normal
Status:Needs work» Needs review
StatusFileSize
new1.6 KB
new4.5 KB
PASSED: [[SimpleTest]]: [MySQL] 58,972 pass(es).
[ View ]

OK. Moved under Annotation/.

Also changed priority to 'normal' as this blocks #2073759: Convert toolkit operations to plugins.

Status:Needs review» Reviewed & tested by the community

Under Annotation/ makes it more understandable, I believe.

Grepped the codebase after applying #8:

  • no more uses of the annotation class in the toolkit plugins (3 of them, GDToolkit, TestToolkit and BrokenToolkit)
  • no more API files under the system module, just the GDToolkit plugin implementation

RTBC

Status:Reviewed & tested by the community» Fixed

Committed and pushed to 8.x. Thanks!

Automatically closed -- issue fixed for 2 weeks with no activity.