Merge pull request #2 from techdivision/neos-5x

WIP: Support neos 5.x

Author: mwitte

Classes/TechDivision/DocViewer/AccessManager.php

@@ -2,6 +2,7 @@
 namespace TechDivision\DocViewer;
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Package\PackageInterface;
 use Neos\Neos\Controller\Module\AbstractModuleController;
 
 /**
@@ -20,7 +21,7 @@ class AccessManager extends AbstractModuleController
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Package\PackageManagerInterface
+     * @var \Neos\Flow\Package\PackageManager
      */
     protected $packageManager;
 
@@ -31,10 +32,9 @@ class AccessManager extends AbstractModuleController
      * @return bool
      */
     public function isPackageAccessable($packageKey) {
-        return $this->packageManager->isPackageActive($packageKey) &&
-        (!array_key_exists($packageKey, $this->packagesConfiguration['hide']) ||
-            !$this->packagesConfiguration['hide'][$packageKey]
-        );
+
+        $packages = $this->packageManager->getAvailablePackages();
+        return isset($packages[$packageKey]);
     }
 
 }

Classes/TechDivision/DocViewer/Controller/ModuleController.php

@@ -20,7 +20,7 @@ class ModuleController extends AbstractModuleController
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Package\PackageManagerInterface
+     * @var \Neos\Flow\Package\PackageManager
      */
     protected $packageManager;
 
@@ -74,7 +74,7 @@ public function listAction() {
                 continue;
             }
 
-            $tree = new Tree($package, $this->controllerContext->getRequest()->getHttpRequest()->getBaseUri());
+            $tree = new Tree($package, $this->controllerContext->getRequest()->getHttpRequest()->getUri());
 
             if(!$tree->isDirectoryWithContent()) {
                 continue;
@@ -103,7 +103,7 @@ public function listAction() {
      * @return void
      */
     public function showAction($package, $filePath = null) {
-        $baseUri = $this->controllerContext->getRequest()->getHttpRequest()->getBaseUri();
+        $baseUri = $this->controllerContext->getRequest()->getHttpRequest()->getUri();
 
         if (!$this->accessManager->isPackageAccessable($package)) {
             throw new PackageNotAccessibleException("You are not allowed to access the package " . $package);

Classes/TechDivision/DocViewer/Controller/ResourceController.php

@@ -27,7 +27,7 @@ class ResourceController extends \Neos\Flow\Mvc\Controller\ActionController
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Package\PackageManagerInterface
+     * @var \Neos\Flow\Package\PackageManager
      */
     protected $packageManager;
 

Classes/TechDivision/DocViewer/File/Node.php

@@ -175,7 +175,12 @@ public function setIsParseable($isParseable)
      */
     public function getPackageKey()
     {
-        return $this->package->getPackageKey();
+        // very dirty workaround, refactoring soon
+        if(is_string($this->package)) {
+            return $this->package;
+        }else {
+            return $this->package->getPackageKey();
+        }
     }
 
 }

Classes/TechDivision/DocViewer/ViewHelpers/ResourceUrlViewHelper.php

@@ -13,17 +13,30 @@ class ResourceUrlViewHelper extends AbstractViewHelper
 {
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Package\PackageManagerInterface
+     * @var \Neos\Flow\Package\PackageManager
      */
     protected $packageManager;
 
     /**
-     * @param string $package
-     * @param string $filePath
+     * Initialize the arguments.
+     *
+     * @return void
+     * @api
+     */
+    public function initializeArguments()
+    {
+        $this->registerArgument('package', 'string', 'Package key for the resource', false, null);
+        $this->registerArgument('filePath', 'string', 'File path for the resource', false, null);
+    }
+
+    /**
      * @return string
      */
-    public function render($package, $filePath)
+    public function render()
     {
-        return Util::buildResourceUrl(new Node($this->packageManager->getPackage($package), $filePath), null, $this->controllerContext->getRequest()->getHttpRequest()->getBaseUri());
+
+        $package = $this->arguments['package'];
+        $filePath = $this->arguments['filePath'];
+        return Util::buildResourceUrl(new Node($this->packageManager->getPackage($package), $filePath), null, $this->controllerContext->getRequest()->getHttpRequest()->getUri());
     }
 }

composer.json

@@ -16,7 +16,7 @@
     ],
     "license": "GPL-3.0+",
     "require": {
-        "neos/neos": "^3.0",
+        "neos/neos": "^5.0",
         "erusev/parsedown": "1.6.*"
     },
     "autoload": {