Merge pull request #24 from mjrider/openstack-support

Openstack support

Author: mjrider

.travis.yml

@@ -19,7 +19,7 @@ cache:
 
 jobs:
   include:
-    - php: 7.3
+    - php: 7.4
       name: Linting
       stage: lint
       before_install:
@@ -45,17 +45,11 @@ jobs:
       after_script:
         - echo Dummy after script
     - stage: test
-      php: 7.4snapshot
-      allow_failures: true
+      php: 7.4
     - php: 7.3
     - php: 7.2
     - php: 7.1
     - php: 7.0
-    - php: 5.6
-    - php: 5.4
-      dist: trusty
-
-      fast_finish: true
 
 before_install:
   - env
@@ -64,23 +58,14 @@ before_install:
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 install:
-  - >
-    if [[ ${TRAVIS_PHP_VERSION} != '5.4' ]] ; then
-      composer global require jakub-onderka/php-parallel-lint jakub-onderka/php-console-highlighter sensiolabs/security-checker;
-    fi
+  - composer global require jakub-onderka/php-parallel-lint jakub-onderka/php-console-highlighter sensiolabs/security-checker;
   - "docker run -p 9999:9999 --name minio --rm \
     -e 'MINIO_ACCESS_KEY=TRAVISACCESSPHPUNIT' \
     -e 'MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/TRAVISKEYPHPUNIT' \
     --detach minio/minio server /data"
   - "docker run -d -p 21:21 -p 30000-30009:30000-30009 -e 'PUBLICHOST=localhost' jack12816/ftpd_test"
 
 script:
-  - >
-    if [[ ${TRAVIS_PHP_VERSION} == "5.4" ]] ;  then
-      composer remove  --dev --no-update --no-interaction league/flysystem-aws-s3-v3 ;
-      composer remove  --dev --no-update --no-interaction mhetreramesh/flysystem-backblaze ;
-      composer require --dev --no-update --no-interaction league/flysystem-aws-s3-v2 ;
-    fi
   - composer install --prefer-dist
 
   - "if [[ -e ~/.composer/vendor/bin/parallel-lint ]] ; then ~/.composer/vendor/bin/parallel-lint ./src ; fi"
@@ -91,6 +76,6 @@ script:
 
 after_script:
   - >
-    if [[ ${TRAVIS_PHP_VERSION} == "5.4" || ${TRAVIS_PHP_VERSION} == "7.2" ]] ; then
+    if [[ ${TRAVIS_PHP_VERSION} == "7.0" || ${TRAVIS_PHP_VERSION} == "7.4" ]] ; then
     php ~/.ocular/ocular.phar code-coverage:upload --format=php-clover coverage.xml -vvv ;
     fi

README.md

@@ -32,7 +32,6 @@ Adapters:
 
 - B2: `mhetreramesh/flysystem-backblaze`
 - S3: `league/flysystem-aws-s3-v3`
-- S3v2: `league/flysystem-aws-s3-v2`
 
 Caching:
 

composer.json

@@ -19,7 +19,7 @@
     }
   ],
   "require": {
-    "php": "~5.4 | ~7.0",
+    "php": "~7.0",
     "arc/web": "^1.1 || ^2.1",
     "league/flysystem": "^1.0",
     "league/flysystem-cached-adapter": "^1.0"
@@ -29,9 +29,10 @@
     "league/flysystem-aws-s3-v3": "1.0.23",
     "league/flysystem-rackspace": "1.0.5",
     "mhetreramesh/flysystem-backblaze": "1.1.4",
+    "nimbusoft/flysystem-openstack-swift": "^0.3.1",
+    "phpcompatibility/php-compatibility": "9.3.5",
     "phpunit/phpunit": "~4.0 | ~5.0 | ~6.0",
-    "predis/predis": "1.1.1",
-    "phpcompatibility/php-compatibility": "9.3.5"
+    "predis/predis": "1.1.1"
   },
   "autoload": {
     "files": [
@@ -49,10 +50,10 @@
   "suggest": {
     "ext-memcached": "memcached cache support",
     "ext-phpredis": "phpredis cache support",
-    "league/flysystem-aws-s3-v2": "For S3 support for php 5.4",
     "league/flysystem-aws-s3-v3": "For S3 support",
     "mhetreramesh/flysystem-backblaze": "For Backblaze support",
-    "predis/predis": "predis cache support"
+    "predis/predis": "predis cache support",
+    "nimbusoft/flysystem-openstack-swift": "For openstack support"
   },
   "config": {
     "sort-packages": true

examples.md

@@ -21,13 +21,6 @@ Aws:
 Minio:
 `s3://acccesstoken:secretkey@fakeregion/bucketname?endpoint=http://locationofminio:port`
 
-### S3v2
-Aws:
-`s3://accesstoken:secretkey@region/bucketname`
-
-Minio:
-`s3://acccesstoken:secretkey@fakeregion/bucketname?endpoint=http://locationofminio:port`
-
 ### B2
 `b2://exampleuser:examplekey@bucket/`  
 no futher settings are available

phpcs.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <ruleset name="Flysystem factory">
-    <config name="testVersion" value="5.6-7.1"/>
+    <config name="testVersion" value="7.0-"/>
 
     <exclude-pattern>vendor</exclude-pattern>
     <exclude-pattern>*.js</exclude-pattern>
     <exclude-pattern>*.css</exclude-pattern>
 
-    <rule ref="PSR2"/>
     <rule ref="PHPCompatibility"/>
+    <rule ref="PSR12"/>
+
 </ruleset>

src/Adapter/OpenStack.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace MJRider\FlysystemFactory\Adapter;
+
+use OpenStack\OpenStack as OpenStackClient;
+use Nimbusoft\Flysystem\OpenStack\SwiftAdapter;
+use MJRider\FlysystemFactory\Endpoint;
+use GuzzleHttp\MessageFormatter;
+
+/**
+ * Static factory class for creating an rackspace Adapter
+ */
+class Openstack implements AdapterFactoryInterface
+{
+    use Endpoint;
+
+    /**
+     * @inheritDoc
+     */
+    public static function create($url)
+    {
+        $auth = null;
+        $region = null;
+
+        if (isset($url->query->authendpoint)) {
+            $auth = urldecode($url->query->authendpoint);
+            unset($url->query->authendpoint);
+        }
+
+        if (isset($url->query->region)) {
+            $region = urldecode($url->query->region);
+            unset($url->query->region);
+        }
+
+        $auth = self::endpointToURL($auth);
+
+        $args = [
+            'authUrl' => $auth,
+            'user' => [
+                'name' => urldecode($url->user),
+                'password' => urldecode($url->pass),
+                "domain" => [ "id" => "default" ],
+            ],
+            'scope'   => ['project' => ['id' => $url->host ]]
+        ];
+
+        if (!is_null($region)) {
+            $args['region'] = $region;
+        }
+
+        $options = (array) $url->query;
+
+        $path = \arc\path::collapse($url->path);
+        $container = trim(\arc\path::head($path), '/');
+        $prefix = ltrim(\arc\path::tail($path), '/');
+
+        $client = new OpenStackClient($args);
+        $container = $client->objectStoreV1()->getContainer($container);
+
+        $adapter = new SwiftAdapter($container, $prefix);
+
+        return $adapter;
+    }
+}

src/Adapter/Rackspace.php

@@ -4,7 +4,7 @@
 
 use OpenCloud\OpenStack;
 use League\Flysystem\Rackspace\RackspaceAdapter;
-use \MJRider\FlysystemFactory\Endpoint;
+use MJRider\FlysystemFactory\Endpoint;
 
 /**
  * Static factory class for creating an rackspace Adapter

src/Adapter/S3.php

@@ -2,15 +2,14 @@
 
 namespace MJRider\FlysystemFactory\Adapter;
 
-use \arc\url as url;
-use \arc\path as path;
-use \Aws\S3\S3Client;
-use \League\Flysystem\AwsS3v3\AwsS3Adapter;
-use \MJRider\FlysystemFactory\Endpoint;
+use arc\url as url;
+use arc\path as path;
+use Aws\S3\S3Client;
+use League\Flysystem\AwsS3v3\AwsS3Adapter;
+use MJRider\FlysystemFactory\Endpoint;
 
 class S3 implements AdapterFactoryInterface
 {
-
     use Endpoint;
 
     protected static function buildArgs($url)

src/Adapter/S3v2.php

@@ -17,9 +17,9 @@ trait Endpoint
     public static function endpointToURL($endpoint)
     {
         if (strpos($endpoint, '//') === 0) {
-            $endpoint = 'https:'.$endpoint;
+            $endpoint = 'https:' . $endpoint;
         } elseif (strpos($endpoint, '://') === false) {
-            $endpoint = 'https://'.$endpoint;
+            $endpoint = 'https://' . $endpoint;
         }
 
         $url = \arc\url::url($endpoint);

src/Endpoint.php

@@ -24,9 +24,6 @@ function create($endpoint)
         case 's3':
             $adapter = Adapter\S3::create($url);
             break;
-        case 's3v2':
-            $adapter = Adapter\S3v2::create($url);
-            break;
         case 'b2':
             $adapter = Adapter\B2::create($url);
             break;
@@ -43,6 +40,9 @@ function create($endpoint)
         case 'rackspace':
             $adapter = Adapter\Rackspace::create($url);
             break;
+        case 'openstack':
+            $adapter = Adapter\OpenStack::create($url);
+            break;
         default:
             throw new \InvalidArgumentException(sprintf('Unknown scheme [%s]', $url->scheme));
     }

src/functions.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace MJRider\FlysystemFactory\Adapter;
+
+use PHPUnit\Framework\TestCase;
+
+class OpenStackTest extends TestCase
+{
+    protected $root = '';
+
+    public function setup()
+    {
+        $this->root = getenv('TEST_OPENSTACK_LOCATION');
+        if ($this->root === false) {
+            $this->markTestSkipped('no openstack endpoint available, test skipped');
+        }
+    }
+
+    public function testOpenStack()
+    {
+        $filesystem = \MJRider\FlysystemFactory\create($this->root);
+        $this->assertInstanceOf('\League\Flysystem\Filesystem', $filesystem);
+        $this->assertInstanceOf('\Nimbusoft\Flysystem\OpenStack\SwiftAdapter', $filesystem->getAdapter());
+    }
+}