Source migration for neos 3.0

mwitte · mwitte · commit 883e8e1f56bb · 2017-04-23T18:03:49.000+02:00
diff --git a/Classes/TechDivision/DocViewer/AccessManager.php b/Classes/TechDivision/DocViewer/AccessManager.php
@@ -1,8 +1,8 @@
 <?php
 namespace TechDivision\DocViewer;
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Neos\Controller\Module\AbstractModuleController;
+use Neos\Flow\Annotations as Flow;
+use Neos\Neos\Controller\Module\AbstractModuleController;
 
 /**
  *
@@ -20,7 +20,7 @@ class AccessManager extends AbstractModuleController
 
 	/**
 	 * @Flow\Inject
-	 * @var \TYPO3\Flow\Package\PackageManagerInterface
+	 * @var \Neos\Flow\Package\PackageManagerInterface
 	 */
 	protected $packageManager;
 
diff --git a/Classes/TechDivision/DocViewer/Controller/ModuleController.php b/Classes/TechDivision/DocViewer/Controller/ModuleController.php
@@ -8,8 +8,8 @@
 use TechDivision\DocViewer\Exceptions\ParsingNotAllowedException;
 use TechDivision\DocViewer\File\Parser;
 use TechDivision\DocViewer\File\Tree;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Neos\Controller\Module\AbstractModuleController;
+use Neos\Flow\Annotations as Flow;
+use Neos\Neos\Controller\Module\AbstractModuleController;
 
 /**
  *
@@ -20,7 +20,7 @@ class ModuleController extends AbstractModuleController
 
 	/**
 	 * @Flow\Inject
-	 * @var \TYPO3\Flow\Package\PackageManagerInterface
+	 * @var \Neos\Flow\Package\PackageManagerInterface
 	 */
 	protected $packageManager;
 
@@ -85,7 +85,8 @@ public function listAction() {
 				'version' => $package->getInstalledVersion(),
 				'name' => $package->getComposerManifest('name'),
 				'type' => $package->getComposerManifest('type'),
-				'description' => $package->getPackageMetaData()->getDescription()
+				//'description' => $package->getPackageMetaData()->getDescription()
+				'description' => $package->getComposerManifest('description')
 			);
 
 		}
diff --git a/Classes/TechDivision/DocViewer/Controller/ResourceController.php b/Classes/TechDivision/DocViewer/Controller/ResourceController.php
@@ -8,7 +8,7 @@
 use TechDivision\DocViewer\Exceptions\PackageNotAccessibleException;
 use TechDivision\DocViewer\File\Parser;
 use TechDivision\DocViewer\Util;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Rudimentary service for resources. Flow does not allow serving static files which are not in the resource folder.
@@ -17,7 +17,7 @@
  *
  * @Flow\Scope("singleton")
  */
-class ResourceController extends \TYPO3\Flow\Mvc\Controller\ActionController
+class ResourceController extends \Neos\Flow\Mvc\Controller\ActionController
 {
 
 	/**
@@ -28,7 +28,7 @@ class ResourceController extends \TYPO3\Flow\Mvc\Controller\ActionController
 
 	/**
 	 * @Flow\Inject
-	 * @var \TYPO3\Flow\Package\PackageManagerInterface
+	 * @var \Neos\Flow\Package\PackageManagerInterface
 	 */
 	protected $packageManager;
 
diff --git a/Classes/TechDivision/DocViewer/Exceptions/FileNotInsideDocumentationException.php b/Classes/TechDivision/DocViewer/Exceptions/FileNotInsideDocumentationException.php
@@ -4,6 +4,6 @@
 /**
  * File is not inside documentation exception
  */
-class FileNotInsideDocumentationException extends \TYPO3\Flow\Exception
+class FileNotInsideDocumentationException extends \Neos\Flow\Exception
 {
 }
diff --git a/Classes/TechDivision/DocViewer/Exceptions/PackageNotAccessableException.php b/Classes/TechDivision/DocViewer/Exceptions/PackageNotAccessableException.php
@@ -4,6 +4,6 @@
 /**
  * Package is not accessible exception
  */
-class PackageNotAccessibleException extends \TYPO3\Flow\Exception
+class PackageNotAccessibleException extends \Neos\Flow\Exception
 {
 }
diff --git a/Classes/TechDivision/DocViewer/Exceptions/ParsingNotAllowedException.php b/Classes/TechDivision/DocViewer/Exceptions/ParsingNotAllowedException.php
@@ -4,6 +4,6 @@
 /**
  * Parsing is not allowed exception
  */
-class ParsingNotAllowedException extends \TYPO3\Flow\Exception
+class ParsingNotAllowedException extends \Neos\Flow\Exception
 {
 }
diff --git a/Classes/TechDivision/DocViewer/File/Node.php b/Classes/TechDivision/DocViewer/File/Node.php
@@ -6,7 +6,7 @@
  */
 use TechDivision\DocViewer\Exceptions\FileNotInsideDocumentationException;
 use TechDivision\DocViewer\Util;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 class Node {
 
@@ -18,7 +18,7 @@ class Node {
 
 
 	/**
-	 * @var \TYPO3\Flow\Package\PackageInterface $package
+	 * @var \Neos\Flow\Package\PackageInterface $package
 	 */
 	protected $package;
 
@@ -59,10 +59,10 @@ class Node {
 
 	/**
 	 * Node constructor.
-	 * @param \TYPO3\Flow\Package\PackageInterface $package
+	 * @param \Neos\Flow\Package\PackageInterface $package
 	 * @param $path
 	 */
-	public function __construct(\TYPO3\Flow\Package\PackageInterface $package, $path)
+	public function __construct(\Neos\Flow\Package\PackageInterface $package, $path)
 	{
 		$this->package = $package;
 		$this->path = trim(str_replace(Util::getDocumentPath($package), '', $path), "/");
diff --git a/Classes/TechDivision/DocViewer/File/Parser.php b/Classes/TechDivision/DocViewer/File/Parser.php
@@ -5,7 +5,7 @@
  * This file is part of the TechDivision.DocViewer package.
  */
 use TechDivision\DocViewer\Exceptions\ParsingNotAllowedException;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 class Parser {
 
diff --git a/Classes/TechDivision/DocViewer/File/Tree.php b/Classes/TechDivision/DocViewer/File/Tree.php
@@ -5,7 +5,7 @@
  * This file is part of the TechDivision.DocViewer package.
  */
 use TechDivision\DocViewer\Util;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 class Tree {
 
@@ -29,10 +29,10 @@ class Tree {
 
 	/**
 	 * Tree constructor.
-	 * @param \TYPO3\Flow\Package\PackageInterface $package
+	 * @param \Neos\Flow\Package\PackageInterface $package
 	 * @param $baseUri
 	 */
-	public function __construct(\TYPO3\Flow\Package\PackageInterface $package, $baseUri)
+	public function __construct(\Neos\Flow\Package\PackageInterface $package, $baseUri)
 	{
 		$this->parser = new Parser($baseUri);
 		$this->rootNode = $this->buildFsNode($package);
@@ -101,11 +101,11 @@ public function isDirectoryWithContent() {
 
 	/**
 	 * Builds up given folder path as composite
-	 * @param \TYPO3\Flow\Package\PackageInterface $package
+	 * @param \Neos\Flow\Package\PackageInterface $package
 	 * @param string $path
 	 * @return null|Node
 	 */
-	protected function buildFsNode(\TYPO3\Flow\Package\PackageInterface $package, $path = null) {
+	protected function buildFsNode(\Neos\Flow\Package\PackageInterface $package, $path = null) {
 
 		if(!$path) {
 			$path = Util::getDocumentPath($package);
diff --git a/Classes/TechDivision/DocViewer/Util.php b/Classes/TechDivision/DocViewer/Util.php
@@ -4,7 +4,7 @@
 /*
  * This file is part of the TechDivision.DocViewer package.
  */
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 class Util {
 
@@ -18,7 +18,7 @@ class Util {
 	/**
 	 * Get the documentation path
 	 *
-	 * @param \TYPO3\Flow\Package\PackageInterface $package
+	 * @param \Neos\Flow\Package\PackageInterface $package
 	 * @return string
 	 */
 	public static function getDocumentPath($package) {
diff --git a/Classes/TechDivision/DocViewer/ViewHelpers/ResourceUrlViewHelper.php b/Classes/TechDivision/DocViewer/ViewHelpers/ResourceUrlViewHelper.php
@@ -3,8 +3,8 @@
 
 use TechDivision\DocViewer\File\Node;
 use TechDivision\DocViewer\File\Parser;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper;
+use Neos\Flow\Annotations as Flow;
+use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Renders a resource url by given packageKey and filePath
@@ -13,7 +13,7 @@ class ResourceUrlViewHelper extends AbstractViewHelper
 {
 	/**
 	 * @Flow\Inject
-	 * @var \TYPO3\Flow\Package\PackageManagerInterface
+	 * @var \Neos\Flow\Package\PackageManagerInterface
 	 */
 	protected $packageManager;
 
diff --git a/Configuration/Policy.yaml b/Configuration/Policy.yaml
@@ -1,12 +1,12 @@
 privilegeTargets:
-  'TYPO3\Flow\Security\Authorization\Privilege\Method\MethodPrivilege':
+  'Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilege':
     'TechDivision.DocViewer:Module':
       matcher: 'method(TechDivision\DocViewer\Controller\ModuleController->.*Action())'
     'TechDivision.DocViewer:Module:Resource':
       matcher: 'method(TechDivision\DocViewer\Controller\ResourceController->.*Action())'
 
 roles:
-  'TYPO3.Neos:Editor':
+  'Neos.Neos:Editor':
     privileges:
       -
         privilegeTarget: 'TechDivision.DocViewer:Module'
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -1,4 +1,4 @@
-TYPO3:
+Neos:
   Neos:
     modules:
       management:
@@ -18,11 +18,11 @@ TYPO3:
     mvc:
       routes:
         'TechDivision.DocViewer':
-          position: 'before TYPO3.Neos'
+          position: 'before Neos.Neos'
     security:
       authentication:
         providers:
-          Typo3BackendProvider:
+          'Neos.Neos:Backend':
             requestPatterns:
               'TechDivision.DocViewer:controllers':
                 pattern: 'ControllerObjectName'
diff --git a/Resources/Private/Layouts/Default.html b/Resources/Private/Layouts/Default.html
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="{f:uri.resource(path: 'resource://TYPO3.Twitter.Bootstrap/Public/2/css/bootstrap.min.css')}" />
+<link rel="stylesheet" href="{f:uri.resource(path: 'resource://Neos.Twitter.Bootstrap/Public/2/css/bootstrap.min.css')}" />
 <link rel="stylesheet" href="{f:uri.resource(path: 'resource://TechDivision.DocViewer/Public/Styles/Style.css')}" />
 
 <f:flashMessages class="flashmessages" />
diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
     ],
     "license": "GPL-3.0+",
     "require": {
-        "neos/neos": "2.3.*",
-        "erusev/parsedown": "*"
+        "neos/neos": "3.0.*",
+        "erusev/parsedown": "1.6.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "techdivision/docviewer",
-  "type": "typo3-flow-package",
+  "type": "neos-flow-package",
   "description": "docviewer",
   "version": "0.1.0",
   "author": "Matthias Witte <m.witte@techdivision.com>",

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`/**`
`5`	`5`	`* File is not inside documentation exception`
`6`	`6`	`*/`
`7`		`-class FileNotInsideDocumentationException extends \TYPO3\Flow\Exception`
	`7`	`+class FileNotInsideDocumentationException extends \Neos\Flow\Exception`
`8`	`8`	`{`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`/**`
`5`	`5`	`* Package is not accessible exception`
`6`	`6`	`*/`
`7`		`-class PackageNotAccessibleException extends \TYPO3\Flow\Exception`
	`7`	`+class PackageNotAccessibleException extends \Neos\Flow\Exception`
`8`	`8`	`{`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`/**`
`5`	`5`	`* Parsing is not allowed exception`
`6`	`6`	`*/`
`7`		`-class ParsingNotAllowedException extends \TYPO3\Flow\Exception`
	`7`	`+class ParsingNotAllowedException extends \Neos\Flow\Exception`
`8`	`8`	`{`
`9`	`9`	`}`