[BUGFIX] Fix the PHAR inclusion in TYPO3 8.7.17

Also document that the extension cannot be symlinked anymore. Fixes #59
oliverklee · Jul 18, 2018 · 1268c44 · 1268c44
1 parent 2cbfea9
commit 1268c44
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Remove the obsolete ext_autoload.php (#56)
 
 ### Fixed
+- Fix the PHAR inclusion in TYPO3 8.7.17 (#59, #60)
 - Only include the PHAR from the test runners (#57, #53)
 - Use the DB name from the connection pool in TYPO3 >= 8.7 (#58, #55)
 - Hide the test tables from BE user table permission lists (#52)

diff --git a/Classes/BackEnd/Module.php b/Classes/BackEnd/Module.php
@@ -211,7 +211,7 @@ protected function translate($key)
      */
     public function main()
     {
-        require_once __DIR__ . '/../../Resources/Private/Libraries/phpunit-library.phar';
+        require_once PATH_site . 'typo3conf/ext/phpunit/Resources/Private/Libraries/phpunit-library.phar';
 
         $this->doc = GeneralUtility::makeInstance(DocumentTemplate::class);
         $this->doc->backPath = $GLOBALS['BACK_PATH'];

diff --git a/Classes/TestRunner/CliTestRunner.php b/Classes/TestRunner/CliTestRunner.php
@@ -20,7 +20,7 @@ public function run()
         // This is needed as the configuration might include closures which cannot be backed up
         $globalBackup = $this->removeClosures($GLOBALS['TYPO3_CONF_VARS']);
 
-        require_once __DIR__ . '/../../Resources/Private/Libraries/phpunit-library.phar';
+        require_once PATH_site . 'typo3conf/ext/phpunit/Resources/Private/Libraries/phpunit-library.phar';
 
         // Run unit tests
         /** @var string */

diff --git a/Documentation/UsersManual/Installation/Index.rst b/Documentation/UsersManual/Installation/Index.rst
@@ -29,6 +29,9 @@ These are basic requirements for using this extension:
 #. View the extension's options in the Extension Manager and save them at
    least once.
 
+Please note that this extension will only work if it is installed directly
+in typo3conf/ext/phpunit/. If it is symlinked, the PHAR inclusion will fail.
+
 If you would like to run the unit tests of the phpunit extension
 itself, you'll also need to install the following dummy extension
 which are located in EXT:phpunit/TestExtensions/:

diff --git a/Tests/Unit/BackEnd/AjaxTest.php b/Tests/Unit/BackEnd/AjaxTest.php
@@ -9,7 +9,7 @@
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class AjaxTest extends \Tx_Phpunit_TestCase
+class AjaxTest2 extends \Tx_Phpunit_TestCase
 {
     /**
      * @var \Tx_Phpunit_BackEnd_Ajax

diff --git a/composer.json b/composer.json
@@ -86,12 +86,9 @@
             "@ci:static",
             "@ci:dynamic"
         ],
-        "link-extension": [
-            "@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'",
-            "@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/phpunit\") || symlink(__DIR__,$extFolder);'"
-        ],
+        "copy-extension": "cp -rfa . .Build/public/typo3conf/ext/phpunit",
         "post-autoload-dump": [
-            "@link-extension"
+            "@copy-extension"
         ]
     },
     "extra": {