diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index fa402cc1b0e9e73d61b792ed1df6d2459801929c..c0edb8f4878b14cc5ca85e5d426739c211504a81 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -64,6 +64,36 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
      */
     public $content;
 
+    /**
+     * @var string
+     */
+    public $table;
+
+    /**
+     * @var string
+     */
+    public $details;
+
+    /**
+     * @var string
+     */
+    public $diffOnly;
+
+    /**
+     * @var int
+     */
+    public $uid;
+
+    /**
+     * @var array|bool
+     */
+    public $pageinfo;
+
+    /**
+     * @var bool
+     */
+    public $recordFound;
+
     /**
      * Accumulated content
      *
@@ -110,6 +140,11 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
      */
     public $recIndex = [];
 
+    /**
+     * @var string
+     */
+    public $REQUEST_URI = '';
+
     /**
      * The name of the module
      *
@@ -278,8 +313,8 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
         // Diffing:
         $diff_1 = GeneralUtility::_POST('diff_1');
         $diff_2 = GeneralUtility::_POST('diff_2');
+        $content = '';
         if (GeneralUtility::_POST('do_diff')) {
-            $content = '';
             $content .= '<div class="panel panel-space panel-default">';
             $content .= '<div class="panel-heading">' . $lang->getLL('diffing') . '</div>';
             if ($diff_1 && $diff_2) {
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntity.php b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
index 9f08ebd43103bc724729a899b04426089587faf6..80778aa20a34ed047a44d4999c959078756d16aa 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntity.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
@@ -352,7 +352,7 @@ class ElementEntity
     /**
      * Gets the outermost parent element.
      *
-     * @return ElementEntity
+     * @return ElementEntity|bool
      */
     public function getOuterMostParent()
     {
diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 9d2110a625af43f614313fb78abc0ce8a2e58e0f..2aabae35521772597f2141817c218606ea46e744 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -48,6 +48,11 @@ class DataHandlerHook
      */
     protected $remappedIds = [];
 
+    /**
+     * @var \TYPO3\CMS\Workspaces\Service\WorkspaceService
+     */
+    protected $workspaceService;
+
     /****************************
      *****  Cmdmap  Hooks  ******
      ****************************/