Merge pull request #72 from punktDe/bugfix/replace-injects-for-typo3-v10

BUGFIX: replace @injects for typo3v10
punktDe · Feb 24, 2020 · 075d687 · 075d687
2 parents 093b310 + 1320e39
commit 075d687
Show file tree

Hide file tree

Showing 16 changed files with 279 additions and 94 deletions.
diff --git a/Classes/Extbase/Property/TypeConverter/ObjectConverter.php b/Classes/Extbase/Property/TypeConverter/ObjectConverter.php
@@ -53,17 +53,32 @@ class Tx_PtExtbase_Extbase_Property_TypeConverter_ObjectConverter extends \TYPO3
     protected $priority = 0;
 
     /**
-     * @inject
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
      */
     protected $objectManager;
 
     /**
-     * @inject
      * @var \TYPO3\CMS\Extbase\Reflection\ReflectionService
      */
     protected $reflectionService;
 
+
+    /**
+     * @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
+     */
+    public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager): void
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param \TYPO3\CMS\Extbase\Reflection\ReflectionService $reflectionService
+     */
+    public function injectReflectionService(\TYPO3\CMS\Extbase\Reflection\ReflectionService $reflectionService): void
+    {
+        $this->reflectionService = $reflectionService;
+    }
+
     /**
      * Only convert non-persistent types
      *

diff --git a/Classes/Logger/Logger.php b/Classes/Logger/Logger.php
@@ -35,36 +35,38 @@ class Logger implements SingletonInterface
      */
     protected $loggerManager;
 
-
     /**
      * @var \TYPO3\CMS\Core\Log\Logger
      */
     protected $logger;
 
-
     /**
      * @var string
      */
     protected $logFilePath;
 
-
     /**
      * @var string
      */
     protected $exceptionDirectory;
 
+    /**
+     * @var string
+     */
+    protected $defaultLogComponent;
 
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Logger\LoggerConfiguration
+     * @var LoggerConfiguration
      */
     protected $loggerConfiguration;
 
-
     /**
-     * @var string
+     * @param LoggerConfiguration $loggerConfiguration
      */
-    protected $defaultLogComponent;
+    public function injectLoggerConfiguration(LoggerConfiguration $loggerConfiguration): void
+    {
+        $this->loggerConfiguration = $loggerConfiguration;
+    }
 
 
     public function __construct()

diff --git a/Classes/Utility/GenericShellCommandWrapper/AbstractResult.php b/Classes/Utility/GenericShellCommandWrapper/AbstractResult.php
@@ -21,6 +21,8 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use PunktDe\PtExtbase\Logger\Logger;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
 /**
@@ -30,53 +32,74 @@
  */
 abstract class AbstractResult
 {
+
     /**
-     * @inject
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
+     * @var GenericShellCommand
      */
-    protected $objectManager;
+    protected $command;
 
 
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Logger\Logger
+     * @var int
      */
-    protected $logger;
+    protected $exitCode;
 
 
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Utility\GenericShellCommandWrapper\ExecutionManager
+     * @var string
      */
-    protected $executionManager;
+    protected $rawResult = '';
 
 
     /**
-     * @var \PunktDe\PtExtbase\Utility\GenericShellCommandWrapper\GenericShellCommand
+     * @var ResultObjectStorage
      */
-    protected $command;
+    protected $result;
 
 
     /**
-     * @var integer
+     * @var ObjectManagerInterface
      */
-    protected $exitCode;
+    protected $objectManager;
 
+    /**
+     * @var Logger
+     */
+    protected $logger;
 
     /**
-     * @var string
+     * @var ExecutionManager
      */
-    protected $rawResult = '';
+    protected $executionManager;
 
 
     /**
-     * @var ResultObjectStorage
+     * @param ObjectManagerInterface $objectManager
      */
-    protected $result;
+    public function injectObjectManager(ObjectManagerInterface $objectManager): void
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param Logger $logger
+     */
+    public function injectLogger(Logger $logger): void
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param ExecutionManager $executionManager
+     */
+    public function injectExecutionManager(ExecutionManager $executionManager): void
+    {
+        $this->executionManager = $executionManager;
+    }
 
 
     /**
-     * @param \PunktDe\PtExtbase\Utility\GenericShellCommandWrapper\GenericShellCommand $command
+     * @param GenericShellCommand $command
      */
     public function __construct($command)
     {

diff --git a/Classes/Utility/GenericShellCommandWrapper/ExecutionManager.php b/Classes/Utility/GenericShellCommandWrapper/ExecutionManager.php
@@ -21,6 +21,8 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use PunktDe\PtExtbase\Logger\Logger;
+use PunktDe\PtExtbase\Utility\ShellCommandService;
 use TYPO3\CMS\Core\SingletonInterface;
 
 /**
@@ -30,20 +32,35 @@
  */
 class ExecutionManager implements SingletonInterface
 {
+
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Utility\ShellCommandService
+     * @var ShellCommandService
      */
     protected $shellCommandService;
 
-
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Logger\Logger
+     * @var Logger
      */
     protected $logger;
 
 
+    /**
+     * @param ShellCommandService $shellCommandService
+     */
+    public function injectShellCommandService(ShellCommandService $shellCommandService): void
+    {
+        $this->shellCommandService = $shellCommandService;
+    }
+
+    /**
+     * @param Logger $logger
+     */
+    public function injectLogger(Logger $logger): void
+    {
+        $this->logger = $logger;
+    }
+
+
     /**
      * @var GenericShellCommand
      */

diff --git a/Classes/Utility/GenericShellCommandWrapper/GenericShellCommand.php b/Classes/Utility/GenericShellCommandWrapper/GenericShellCommand.php
@@ -21,6 +21,9 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use PunktDe\PtExtbase\Logger\Logger;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+
 /**
  * Generic Shell Command
  *
@@ -53,20 +56,32 @@ class GenericShellCommand
      */
     protected $subCommand;
 
-
     /**
-     * @inject
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
-
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Logger\Logger
+     * @var Logger
      */
     protected $logger;
 
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function injectObjectManager(ObjectManagerInterface $objectManager): void
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param Logger $logger
+     */
+    public function injectLogger(Logger $logger): void
+    {
+        $this->logger = $logger;
+    }
+
 
     /**
      * @return string

diff --git a/Classes/Utility/Git/GitRepository.php b/Classes/Utility/Git/GitRepository.php
@@ -21,8 +21,10 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use PunktDe\PtExtbase\Logger\Logger;
 use PunktDe\PtExtbase\Utility\GenericShellCommandWrapper\GenericShellCommand;
 use PunktDe\PtExtbase\Utility\Files;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 
 /**
  * Git Repository
@@ -31,27 +33,48 @@
  */
 class GitRepository
 {
+
     /**
-     * @inject
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
-
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Logger\Logger
+     * @var Logger
      */
     protected $logger;
 
-
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Utility\Git\GitExecutionManager
+     * @var GitExecutionManager
      */
     protected $gitExecutionManager;
 
 
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function injectObjectManager(ObjectManagerInterface $objectManager): void
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param Logger $logger
+     */
+    public function injectLogger(Logger $logger): void
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param GitExecutionManager $gitExecutionManager
+     */
+    public function injectGitExecutionManager(GitExecutionManager $gitExecutionManager): void
+    {
+        $this->gitExecutionManager = $gitExecutionManager;
+    }
+
+
     /**
      * @var string
      */

diff --git a/Classes/Utility/Git/Result/Result.php b/Classes/Utility/Git/Result/Result.php
@@ -22,6 +22,7 @@
  ***************************************************************/
 
 use PunktDe\PtExtbase\Utility\GenericShellCommandWrapper\AbstractResult;
+use PunktDe\PtExtbase\Utility\Git\GitExecutionManager;
 
 /**
  * Result
@@ -30,12 +31,20 @@
  */
 class Result extends AbstractResult
 {
+
     /**
-     * @inject
-     * @var \PunktDe\PtExtbase\Utility\Git\GitExecutionManager
+     * @var GitExecutionManager
      */
     protected $executionManager;
 
+    /**
+     * @param GitExecutionManager $executionManager
+     */
+    public function injectExecutionManager(GitExecutionManager $executionManager): void
+    {
+        $this->executionManager = $executionManager;
+    }
+
 
     /**
      * @return void