Merge pull request #79 from snapshotpl/fix-github-actions

bushbaby · Oct 21, 2021 · b8fccb3 · b8fccb3
2 parents 4db51e5 + ea2522b
commit b8fccb3
Show file tree

Hide file tree

Showing 31 changed files with 151 additions and 150 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,84 @@
+name: "Test"
+
+on:
+  pull_request:
+    branches:
+      - "master"
+  push:
+    branches:
+      - "master"
+
+jobs:
+  unit-tests:
+    name: "Unit Tests"
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        dependencies:
+          - "--prefer-lowest"
+          - ""
+        php-version:
+          - "8.0"
+          - "7.4"
+        composer:
+          - "v2"
+        include:
+          - php-version: "7.3"
+            composer: "v1"
+            dependencies: "--prefer-lowest"
+          - php-version: "7.3"
+            composer: "v1"
+            dependencies: ""
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          tools: "composer:${{ matrix.composer }}"
+      - name: "Install dependencies"
+        run: "composer update ${{ matrix.dependencies }} --no-interaction"
+      - name: "Run tests"
+        run: "vendor/bin/phpunit"
+
+  coverage:
+    name: "Publish coverage"
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "8.0"
+          tools: "composer:v2"
+          coverage: "pcov"
+      - name: "Install dependencies"
+        run: "composer update --no-interaction"
+      - name: "Install coveralls"
+        run: "composer require --dev php-coveralls/php-coveralls"
+      - name: "Generate coverage"
+        run: "vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml --configuration ./phpunit.xml.dist"
+      - name: "Publish coverage"
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: "vendor/bin/php-coveralls -v"
+
+
+  coding-standard:
+    name: "Coding standard"
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "8.0"
+          tools: "composer:v2"
+      - name: "Install dependencies"
+        run: "composer update --no-interaction"
+      - name: "Check coding standard"
+        run: "vendor/bin/php-cs-fixer fix -v --diff --dry-run"
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -23,7 +23,7 @@
 
 $config->getFinder()->in(__DIR__)->append([__FILE__]);
 
-$cacheDir = \getenv('TRAVIS') ? \getenv('HOME') . '/.php-cs-fixer' : __DIR__;
+$cacheDir = getenv('TRAVIS') ? getenv('HOME') . '/.php-cs-fixer' : __DIR__;
 
 $config->setCacheFile($cacheDir . '/.php_cs.cache');
 

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -7,9 +7,8 @@ A simple Laminas module that bridges the Flysystem filesystem.
 [![Latest Unstable Version](https://poser.pugx.org/bushbaby/flysystem/v/unstable)](https://packagist.org/packages/bushbaby/flysystem) 
 [![License](https://poser.pugx.org/bushbaby/flysystem/license)](https://packagist.org/packages/bushbaby/flysystem)
 
-[![Build Status](https://travis-ci.org/bushbaby/BsbFlysystem.svg?branch=master)](https://travis-ci.org/bushbaby/BsbFlysystem)
+![Build Status](https://github.com/bushbaby/BsbFlysystem/actions/workflows/test.yml/badge.svg)
 [![Code Coverage](https://scrutinizer-ci.com/g/bushbaby/BsbFlysystem/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/bushbaby/BsbFlysystem/?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bushbaby/BsbFlysystem/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bushbaby/BsbFlysystem/?branch=master)
 
 Provides a way to configure the various filesystem adapters provided by thephpleague's 'Flysystem'. And allows to retrieve fully configured filesystems by name from the ServiceLocator. Whether the defined filesystems are local- or dropbox filesystems becomes a configuration detail.
 

diff --git a/composer.json b/composer.json
@@ -22,6 +22,7 @@
         "psr/container": "^1.0"
     },
     "require-dev": {
+        "bushbaby/php-cs-fixer-config": "^2.0",
         "laminas/laminas-code": "^3.3.1 || ^4.0.0",
         "laminas/laminas-config": "^3.1",
         "laminas/laminas-filter": "^2.9.1",
@@ -38,7 +39,7 @@
         "league/flysystem-vfs": "^1.0",
         "league/flysystem-webdav": "~1.0",
         "league/flysystem-ziparchive": "~1.0",
-        "ocramius/proxy-manager": "~1.0 || ~2.0",
+        "ocramius/proxy-manager": "~2.0",
         "phpunit/phpunit": "^9.4.2",
         "spatie/flysystem-dropbox": "~1.0",
         "superbalist/flysystem-google-storage": "^7.2"

diff --git a/src/Adapter/Factory/AbstractAdapterFactory.php b/src/Adapter/Factory/AbstractAdapterFactory.php
@@ -67,11 +67,11 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
 
     public function createService(ContainerInterface $container): AdapterInterface
     {
-        if (\method_exists($container, 'getServiceLocator')) {
+        if (method_exists($container, 'getServiceLocator')) {
             $container = $container->getServiceLocator();
         }
 
-        return $this($container, \func_get_arg(2));
+        return $this($container, func_get_arg(2));
     }
 
     /**
@@ -125,7 +125,7 @@ public function getLazyFactory(ContainerInterface $container): LazyLoadingValueH
             $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
         }
 
-        \spl_autoload_register($factoryConfig->getProxyAutoloader());
+        spl_autoload_register($factoryConfig->getProxyAutoloader());
 
         return new LazyLoadingValueHolderFactory($factoryConfig);
     }

diff --git a/src/Adapter/Factory/AwsS3v3AdapterFactory.php b/src/Adapter/Factory/AwsS3v3AdapterFactory.php
@@ -30,7 +30,7 @@ class AwsS3v3AdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/flysystem-aws-s3-v3'], 'AwsS3v3');
         }
         $config = [
@@ -53,7 +53,7 @@ public function doCreateService(ContainerInterface $container): AdapterInterface
                 'key' => $this->options['credentials']['key'],
                 'secret' => $this->options['credentials']['secret'],
             ];
-            $config = \array_merge(\compact('credentials'), $config);
+            $config = array_merge(compact('credentials'), $config);
         }
 
         $adapterOptions = $this->options['options'] ?? [];

diff --git a/src/Adapter/Factory/AzureAdapterFactory.php b/src/Adapter/Factory/AzureAdapterFactory.php
@@ -30,10 +30,10 @@ class AzureAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/flysystem-azure'], 'Azure');
         }
-        $endpoint = \sprintf(
+        $endpoint = sprintf(
             'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
             $this->options['account-name'],
             $this->options['account-key']

diff --git a/src/Adapter/Factory/DropboxAdapterFactory.php b/src/Adapter/Factory/DropboxAdapterFactory.php
@@ -30,7 +30,7 @@ class DropboxAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['spatie/flysystem-dropbox'], 'Dropbox');
         }
 

diff --git a/src/Adapter/Factory/GoogleCloudDriveAdapterFactory.php b/src/Adapter/Factory/GoogleCloudDriveAdapterFactory.php
@@ -30,7 +30,7 @@ class GoogleCloudDriveAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['superbalist/flysystem-google-storage'], 'GoogleCloudDrive');
         }
 

diff --git a/src/Adapter/Factory/RackspaceAdapterFactory.php b/src/Adapter/Factory/RackspaceAdapterFactory.php
@@ -31,8 +31,8 @@ class RackspaceAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class) ||
-            ! \class_exists(LazyLoadingValueHolderFactory::class)
+        if (! class_exists(Adapter::class) ||
+            ! class_exists(LazyLoadingValueHolderFactory::class)
         ) {
             throw new RequirementsException(['league/flysystem-rackspace', 'ocramius/proxy-manager'], 'Rackspace');
         }

diff --git a/src/Adapter/Factory/ReplicateAdapterFactory.php b/src/Adapter/Factory/ReplicateAdapterFactory.php
@@ -29,7 +29,7 @@ class ReplicateAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/flysystem-replicate-adapter'], 'Replicate');
         }
 

diff --git a/src/Adapter/Factory/SftpAdapterFactory.php b/src/Adapter/Factory/SftpAdapterFactory.php
@@ -29,7 +29,7 @@ class SftpAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/flysystem-sftp'], 'Sftp');
         }
 

diff --git a/src/Adapter/Factory/VfsAdapterFactory.php b/src/Adapter/Factory/VfsAdapterFactory.php
@@ -29,7 +29,7 @@ class VfsAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/flysystem-vfs'], 'Vfs');
         }
 

diff --git a/src/Adapter/Factory/WebDAVAdapterFactory.php b/src/Adapter/Factory/WebDAVAdapterFactory.php
@@ -30,7 +30,7 @@ class WebDAVAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/flysystem-webdav'], 'WebDAV');
         }
 

diff --git a/src/Adapter/Factory/ZipArchiveAdapterFactory.php b/src/Adapter/Factory/ZipArchiveAdapterFactory.php
@@ -29,7 +29,7 @@ class ZipArchiveAdapterFactory extends AbstractAdapterFactory
 {
     public function doCreateService(ContainerInterface $container): AdapterInterface
     {
-        if (! \class_exists(Adapter::class)) {
+        if (! class_exists(Adapter::class)) {
             throw new RequirementsException(['league/ziparchive'], 'ZipArchive');
         }
 

diff --git a/src/Exception/RequirementsException.php b/src/Exception/RequirementsException.php
@@ -25,13 +25,13 @@ class RequirementsException extends RuntimeException
 {
     public function __construct(array $requirements, string $for, int $code = 0, Exception $previous = null)
     {
-        $requirements = \array_map(function ($r) {
-            return \sprintf("'%s'", \trim($r));
+        $requirements = array_map(function ($r) {
+            return sprintf("'%s'", trim($r));
         }, $requirements);
 
-        $message = \sprintf(
+        $message = sprintf(
             "Install %s to use '%s'",
-            \implode(' & ', $requirements),
+            implode(' & ', $requirements),
             $for
         );
 

diff --git a/src/Filesystem/Factory/FilesystemFactory.php b/src/Filesystem/Factory/FilesystemFactory.php
@@ -53,11 +53,11 @@ public function setCreationOptions(array $options): void
 
     public function createService(ContainerInterface $container): FilesystemInterface
     {
-        if (\method_exists($container, 'getServiceLocator')) {
+        if (method_exists($container, 'getServiceLocator')) {
             $serviceLocator = $container->getServiceLocator();
         }
 
-        $requestedName = \func_get_arg(2);
+        $requestedName = func_get_arg(2);
 
         return $this($container, $requestedName);
     }
@@ -67,7 +67,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $config = $container->get('config');
         $fsConfig = $config['bsb_flysystem']['filesystems'][$requestedName];
         if (! isset($fsConfig['adapter'])) {
-            throw new UnexpectedValueException(\sprintf("Missing 'adapter' key for the filesystem '%s' configuration", $requestedName));
+            throw new UnexpectedValueException(sprintf("Missing 'adapter' key for the filesystem '%s' configuration", $requestedName));
         }
 
         if (null !== $options) {
@@ -81,7 +81,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $options = $fsConfig['options'] ?? [];
 
         if (isset($fsConfig['cache']) && \is_string($fsConfig['cache'])) {
-            if (! \class_exists(CachedAdapter::class)) {
+            if (! class_exists(CachedAdapter::class)) {
                 throw new RequirementsException(['league/flysystem-cached-adapter'], 'CachedAdapter');
             }
 
@@ -98,8 +98,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             }
         }
 
-        if (isset($fsConfig['eventable']) && \filter_var($fsConfig['eventable'], FILTER_VALIDATE_BOOLEAN)) {
-            if (! \class_exists(EventableFilesystem::class)) {
+        if (isset($fsConfig['eventable']) && filter_var($fsConfig['eventable'], FILTER_VALIDATE_BOOLEAN)) {
+            if (! class_exists(EventableFilesystem::class)) {
                 throw new RequirementsException(['league/flysystem-eventable-filesystem'], 'EventableFilesystem');
             }