Merge pull request #11 from mficzel/task/neos7

TASK: Add Support for Neos 7
flownative · Nov 15, 2021 · 9a9efce · 9a9efce
2 parents ef003ec + 80ddfae
commit 9a9efce
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 23 deletions.
diff --git a/Classes/AssetSource/PixxioAssetSource.php b/Classes/AssetSource/PixxioAssetSource.php
@@ -23,6 +23,7 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Security\Account;
 use Neos\Flow\Security\Context;
+use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Media\Domain\Model\AssetSource\AssetProxyRepositoryInterface;
 use Neos\Media\Domain\Model\AssetSource\AssetSourceInterface;
 use Neos\Utility\MediaTypes;
@@ -57,6 +58,12 @@ class PixxioAssetSource implements AssetSourceInterface
      */
     protected $securityContext;
 
+    /**
+     * @Flow\Inject
+     * @var ResourceManager
+     */
+    protected $resourceManager;
+
     /**
      * @var string
      */
@@ -97,6 +104,16 @@ class PixxioAssetSource implements AssetSourceInterface
      */
     private $assetSourceOptions;
 
+    /**
+     * @var string
+     */
+    protected $iconPath;
+
+    /**
+     * @var string
+     */
+    protected $description = '';
+
     /**
      * @param string $assetSourceIdentifier
      * @param array $assetSourceOptions
@@ -161,6 +178,12 @@ public function __construct(string $assetSourceIdentifier, array $assetSourceOpt
                         }
                     }
                 break;
+                case 'icon':
+                    $this->iconPath = $optionValue;
+                    break;
+                case 'description':
+                    $this->description = $optionValue;
+                    break;
                 default:
                     throw new \InvalidArgumentException(sprintf('Unknown asset source option "%s" specified for Pixx.io asset source "%s". Please check your settings.', $optionName, $assetSourceIdentifier), 1525790910);
             }
@@ -276,4 +299,16 @@ public function getPixxioClient(): PixxioClient
         }
         return $this->pixxioClient;
     }
+
+    public function getIconUri(): string
+    {
+        return $this->resourceManager->getPublicPackageResourceUriByPath($this->iconPath);
+    }
+
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+
 }
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -41,6 +41,12 @@ Neos:
             enable: false
             inUseTag: 'used-by-neos'
 
+          # The icon for the asset source
+          icon: 'resource://Flownative.Pixxio/Public/Icons/PixxioWhite.svg'
+
+          # The description for the asset source
+          description: 'Pixxio assets'
+
   Neos:
     modules:
       management:

diff --git a/Migrations/Mysql/Version20180517083014.php b/Migrations/Mysql/Version20180517083014.php
@@ -1,7 +1,7 @@
 <?php
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 
 /**
@@ -13,7 +13,7 @@ class Version20180517083014 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return '';
     }
@@ -24,7 +24,7 @@ public function getDescription()
      * @throws \Doctrine\DBAL\DBALException
      * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
-    public function up(Schema $schema)
+    public function up(Schema $schema): void 
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
 
@@ -37,7 +37,7 @@ public function up(Schema $schema)
      * @throws \Doctrine\DBAL\DBALException
      * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
-    public function down(Schema $schema)
+    public function down(Schema $schema): void 
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
 

diff --git a/Resources/Public/Icons/PixxioWhite.svg b/Resources/Public/Icons/PixxioWhite.svg
diff --git a/composer.json b/composer.json
@@ -1,22 +1,31 @@
 {
-  "description": "Neos integration for pixx.io",
-  "type": "neos-package",
-  "name": "flownative/neos-pixxio",
-  "license": "MIT",
-  "require": {
-    "neos/flow": "6.* || dev-master",
-    "neos/media": "5.* || 6.* || dev-master",
-    "guzzlehttp/guzzle": "6.*",
-    "behat/transliterator": "~1.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Flownative\\Pixxio\\": "Classes/"
+    "description": "Neos integration for pixx.io",
+    "type": "neos-package",
+    "name": "flownative/neos-pixxio",
+    "license": "MIT",
+    "require": {
+        "neos/flow": "6.* || 7.* || dev-master",
+        "neos/media": "5.* || 6.* || 7.* || dev-master",
+        "guzzlehttp/guzzle": "6.*",
+        "behat/transliterator": "~1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flownative\\Pixxio\\": "Classes/"
+        }
+    },
+    "extra": {
+        "neos": {
+            "package-key": "Flownative.Pixxio"
+        },
+        "applied-flow-migrations": [
+            "Neos.Flow-20190425144900",
+            "Neos.Flow-20190515215000",
+            "Neos.Flow-20200813181400",
+            "Neos.Flow-20201003165200",
+            "Neos.Flow-20201109224100",
+            "Neos.Flow-20201205172733",
+            "Neos.Flow-20201207104500"
+        ]
     }
-  },
-  "extra": {
-    "neos": {
-      "package-key": "Flownative.Pixxio"
-    }
-  }
 }