Review main Merged

21819[TASK] Replace inject methods with @inject; allow @Flow\Inject

Alexander Schnitzler CR +2 V +2 Expert +377 −1304 updated 07/06/13, 11:22

Commit message

Currently we are using inject methods like:

/*
 * @param $foo Foo
 */
public function injectFoo(Foo $foo) {
	$this->foo = $foo;
}

This patch removes these methods and introduces
property annotations:

/**
 * @var Foo
 * @inject
 */
protected $foo;

Besides that, it allows the use of @Flow\Inject
as well for compatibility to Flow.

Review

  • Code review CR +2
    • Stefan Neufeind +2
    • Alexander Schnitzler +1
  • Verified V +2
    • Stefan Neufeind +2
    • Alexander Schnitzler +1

Issues 1

Files 84

Show 64 more files

Review log 29

Show 4 earlier messages
  1. Mr. Jenkins commented on patch set 1 07/02/13, 18:25

  2. Alexander Schnitzler commented on patch set 1 CR -2 07/02/13, 18:35

    Breaks fluid unit tests.
  3. Stefan Neufeind uploaded patch set 2 07/02/13, 23:54

  4. Mr. Jenkins commented on patch set 2 07/02/13, 23:55

  1. Stefan Neufeind commented on patch set 2 07/02/13, 23:56

    @Alex: Please try again. Fixed fluid-testcases, which broke due to mocking and manual injections. Adjustments in AbstractWidgetControllerTest.php (1 line) and FormViewHelperTest.php (4x 1 line).
  2. Alexander Schnitzler uploaded patch set 3 07/03/13, 09:40

  3. Mr. Jenkins commented on patch set 3 07/03/13, 09:40

  4. Alexander Schnitzler commented on patch set 3 07/03/13, 09:41

    This ist the travis build of exactly this commit: https://travis-ci.org/alexanderschnitzler/TYPO3-Sandbox/builds/8689727
  5. Alexander Schnitzler rebased onto patch set 3 07/03/13, 09:44

  6. Mr. Jenkins commented on patch set 4 07/03/13, 09:45

  7. Markus Günther commented on patch set 4 07/04/13, 15:39

    One stupid question.... why we use Flow\inject as anotation and not only inject? I think it looks weird.
  8. Alexander Schnitzler commented on patch set 4 07/04/13, 20:06

    I think that we should adjust our code to the one of Flow as much as possible. If poeple are going to port their Extbase Extensions to Flow they have to change the @inject to @Flow\Inject anyway. My last patch introduced the possibility to use @Flow\Inject in Extbase extensions, so people can now go on and yet use this annotation. As the users can do this I think Extbase should be the prototype for all extensions. Therefore Extbase itself should use the new annotations. If someone somewhen looks into the Extbase code itself he is encouraged to use Flow\Inject. Imho the simple @inject has always been wrong and as soon as I backported the annotation parser of Flow I would like to remove the @validate annotations as well.
  9. Anja Leichsenring uploaded patch set 5 07/05/13, 16:28

  10. Mr. Jenkins commented on patch set 5 07/05/13, 16:29

  11. Anja Leichsenring uploaded patch set 6 07/05/13, 16:36

  12. Mr. Jenkins commented on patch set 6 07/05/13, 16:36

  13. Anja Leichsenring commented on patch set 6 V -1 07/05/13, 16:40

    three failing unit tests after resolving a conflict (that showed no conflicts). Please ignore patchset 5
  14. Alexander Schnitzler uploaded patch set 7 07/05/13, 20:35

  15. Alexander Schnitzler commented on patch set 7 07/05/13, 20:35

  16. Mr. Jenkins commented on patch set 7 07/05/13, 20:36

  17. Marc Bastian Heinrichs commented on patch set 7 07/05/13, 20:51

    needs to be adapted too then
    needs to be adapted too then
  18. Stefan Neufeind uploaded patch set 8 07/05/13, 21:08

  19. Mr. Jenkins commented on patch set 8 07/05/13, 21:09

  20. Stefan Neufeind commented on patch set 8 07/05/13, 21:09

    adjust commit-msg keep optional @Flow\Inject (got "messed up" during a search-replace I guess)
  21. Alexander Schnitzler commented on patch set 8 07/06/13, 08:17

    Yeah, thanks a lot!
  22. Alexander Schnitzler commented on patch set 8 V +1 CR +1 07/06/13, 09:16

  23. Stefan Neufeind commented on patch set 8 V +2 CR +2 07/06/13, 10:37

    Has been discussed several times now. We should put this to an end.
  24. Stefan Neufeind merged patch set 9 07/06/13, 10:37

  25. Marc Bastian Heinrichs commented on patch set 9 07/06/13, 11:22

    Reverted This patchset was reverted in change: I2113b5320f2a6f5dd56cfa7b06469fa1628d2645