From 3315661467446acad56e15b9d1f79bcf6ebb3545 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 24 Feb 2023 10:09:11 +0200 Subject: [PATCH] Updated helfi_azure_fs to 1.1 version --- composer.json | 4 +- composer.lock | 607 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 578 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 48270d4f..bcbb6de6 100644 --- a/composer.json +++ b/composer.json @@ -9,11 +9,11 @@ "require": { "composer/installers": "^2.0", "cweagans/composer-patches": "^1.6.7", - "drupal/core-composer-scaffold": "^9.4", "drupal/core": "^9.4", + "drupal/core-composer-scaffold": "^9.4", "drupal/hdbt": "^4.0", "drupal/hdbt_admin": "^1.0", - "drupal/helfi_azure_fs": "^1.0", + "drupal/helfi_azure_fs": "^1.1", "drupal/helfi_drupal_tools": "dev-main", "drupal/helfi_navigation": "^2.0", "drupal/helfi_platform_config": "^2.0", diff --git a/composer.lock b/composer.lock index 24cb49ab..4214f703 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d7d2c21edc4c219c01f64a07a73676ea", + "content-hash": "daa0d1a092835b0f8e6f4fe81e52f38d", "packages": [ { "name": "asm89/stack-cors", @@ -3686,6 +3686,129 @@ "issues": "https://www.drupal.org/project/issues/filelog" } }, + { + "name": "drupal/flysystem", + "version": "2.0.0-beta1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/flysystem.git", + "reference": "2.0.0-beta1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/flysystem-2.0.0-beta1.zip", + "reference": "2.0.0-beta1", + "shasum": "877bd3666cdc0c48c3bbdc885455d01fd9089897" + }, + "require": { + "drupal/core": "^8.8 || ^9", + "league/flysystem": "^1.0.3", + "league/flysystem-replicate-adapter": "~1.0", + "twistor/flysystem-stream-wrapper": "^1.0.5" + }, + "require-dev": { + "league/flysystem-memory": "~1.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-beta1", + "datestamp": "1628606414", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + } + }, + "autoload": { + "psr-4": { + "Drupal\\flysystem\\": "src/" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "benjifisher", + "homepage": "https://www.drupal.org/user/683300" + }, + { + "name": "bradjones1", + "homepage": "https://www.drupal.org/user/405824" + }, + { + "name": "jungle", + "homepage": "https://www.drupal.org/user/2919723" + }, + { + "name": "lhridley", + "homepage": "https://www.drupal.org/user/1223730" + }, + { + "name": "mglaman", + "homepage": "https://www.drupal.org/user/2416470" + }, + { + "name": "twistor", + "homepage": "https://www.drupal.org/user/473738" + }, + { + "name": "vijaycs85", + "homepage": "https://www.drupal.org/user/93488" + } + ], + "description": "Provides access to various filesystem backends using Flysystem.", + "homepage": "https://www.drupal.org/project/flysystem", + "support": { + "source": "https://git.drupalcode.org/project/flysystem" + } + }, + { + "name": "drupal/flysystem_azure", + "version": "dev-1.0.x", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/flysystem_azure.git", + "reference": "1f54cbcccaf9a7a609a48353fca78c3bdca71f1d" + }, + "require": { + "drupal/core": "^8 || ^9", + "drupal/flysystem": "*", + "league/flysystem": "^1.0.20", + "league/flysystem-azure-blob-storage": "^1.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.0.x": "1.0.x-dev" + }, + "drupal": { + "version": "1.0.x-dev", + "datestamp": "1620053329", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "BryanLund", + "homepage": "https://www.drupal.org/user/3628719" + } + ], + "description": "Provides an Azure plugin for Flysystem.", + "homepage": "https://www.drupal.org/project/flysystem_azure", + "support": { + "source": "https://git.drupalcode.org/project/flysystem_azure" + } + }, { "name": "drupal/focal_point", "version": "1.5.0", @@ -4017,18 +4140,21 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "1.0.3", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "bd4cfb1244ae76544ca4a418cdc6a23da4762a94" + "reference": "e2486d70d0bcfb9c696065e2bded6c287fd7a079" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/bd4cfb1244ae76544ca4a418cdc6a23da4762a94", - "reference": "bd4cfb1244ae76544ca4a418cdc6a23da4762a94", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/e2486d70d0bcfb9c696065e2bded6c287fd7a079", + "reference": "e2486d70d0bcfb9c696065e2bded6c287fd7a079", "shasum": "" }, + "require": { + "drupal/flysystem_azure": "1.0.x-dev" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3" @@ -4039,10 +4165,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.1.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2021-05-21T07:49:50+00:00" + "time": "2022-11-15T03:27:28+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -7840,47 +7966,43 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.3", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "67c26b443f348a51926030c83481b85718457d3d" + "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", - "reference": "67c26b443f348a51926030c83481b85718457d3d", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "ralouphie/getallheaders": "^3.0" + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "provide": { - "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - }, "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "1.9-dev" } }, "autoload": { + "files": [ + "src/functions_include.php" + ], "psr-4": { "GuzzleHttp\\Psr7\\": "src/" } @@ -7919,11 +8041,6 @@ "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -7939,7 +8056,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.3" + "source": "https://github.com/guzzle/psr7/tree/1.9.0" }, "funding": [ { @@ -7955,7 +8072,7 @@ "type": "tidelift" } ], - "time": "2022-10-26T14:07:24+00:00" + "time": "2022-06-20T21:43:03+00:00" }, { "name": "http-interop/http-factory-guzzle", @@ -8541,6 +8658,251 @@ ], "time": "2021-07-09T08:23:52+00:00" }, + { + "name": "league/flysystem", + "version": "1.1.10", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1", + "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "league/mime-type-detection": "^1.3", + "php": "^7.2.5 || ^8.0" + }, + "conflict": { + "league/flysystem-sftp": "<1.0.6" + }, + "require-dev": { + "phpspec/prophecy": "^1.11.1", + "phpunit/phpunit": "^8.5.8" + }, + "suggest": { + "ext-ftp": "Allows you to use FTP server storage", + "ext-openssl": "Allows you to use FTPS server storage", + "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", + "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", + "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", + "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", + "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", + "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", + "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", + "league/flysystem-webdav": "Allows you to use WebDAV storage", + "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", + "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", + "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Flysystem\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frenky.net" + } + ], + "description": "Filesystem abstraction: Many filesystems, one API.", + "keywords": [ + "Cloud Files", + "WebDAV", + "abstraction", + "aws", + "cloud", + "copy.com", + "dropbox", + "file systems", + "files", + "filesystem", + "filesystems", + "ftp", + "rackspace", + "remote", + "s3", + "sftp", + "storage" + ], + "support": { + "issues": "https://github.com/thephpleague/flysystem/issues", + "source": "https://github.com/thephpleague/flysystem/tree/1.1.10" + }, + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], + "time": "2022-10-04T09:16:37+00:00" + }, + { + "name": "league/flysystem-azure-blob-storage", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem-azure-blob-storage.git", + "reference": "fbfd44cd758fefa6d3de26a962fba5db663497c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem-azure-blob-storage/zipball/fbfd44cd758fefa6d3de26a962fba5db663497c4", + "reference": "fbfd44cd758fefa6d3de26a962fba5db663497c4", + "shasum": "" + }, + "require": { + "guzzlehttp/psr7": "^1.5", + "league/flysystem": "^1.0", + "microsoft/azure-storage-blob": "^1.1", + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\Flysystem\\AzureBlobStorage\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frenky.net" + } + ], + "support": { + "issues": "https://github.com/thephpleague/flysystem-azure-blob-storage/issues", + "source": "https://github.com/thephpleague/flysystem-azure-blob-storage/tree/master" + }, + "time": "2020-08-09T13:19:24+00:00" + }, + { + "name": "league/flysystem-replicate-adapter", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem-replicate-adapter.git", + "reference": "864e80409c0918b0ed6921c3941247017d9db77c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem-replicate-adapter/zipball/864e80409c0918b0ed6921c3941247017d9db77c", + "reference": "864e80409c0918b0ed6921c3941247017d9db77c", + "shasum": "" + }, + "require": { + "league/flysystem": "~1.0", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Flysystem\\Replicate\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frenky.net" + } + ], + "description": "Flysystem adapter for Replica's", + "support": { + "issues": "https://github.com/thephpleague/flysystem-replicate-adapter/issues", + "source": "https://github.com/thephpleague/flysystem-replicate-adapter/tree/master" + }, + "time": "2015-08-18T21:07:17+00:00" + }, + { + "name": "league/mime-type-detection", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/mime-type-detection.git", + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.2", + "phpstan/phpstan": "^0.12.68", + "phpunit/phpunit": "^8.5.8 || ^9.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\MimeTypeDetection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frankdejonge.nl" + } + ], + "description": "Mime-type detection for Flysystem", + "support": { + "issues": "https://github.com/thephpleague/mime-type-detection/issues", + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" + }, + "funding": [ + { + "url": "https://github.com/frankdejonge", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "type": "tidelift" + } + ], + "time": "2022-04-17T13:12:02+00:00" + }, { "name": "league/uri", "version": "6.8.0", @@ -8894,6 +9256,102 @@ }, "time": "2022-08-18T16:18:26+00:00" }, + { + "name": "microsoft/azure-storage-blob", + "version": "1.5.4", + "source": { + "type": "git", + "url": "https://github.com/Azure/azure-storage-blob-php.git", + "reference": "1023ce1dbf062351a32ca5ec72ad1fd4a504f1bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Azure/azure-storage-blob-php/zipball/1023ce1dbf062351a32ca5ec72ad1fd4a504f1bf", + "reference": "1023ce1dbf062351a32ca5ec72ad1fd4a504f1bf", + "shasum": "" + }, + "require": { + "microsoft/azure-storage-common": "~1.5", + "php": ">=5.6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "MicrosoftAzure\\Storage\\Blob\\": "src/Blob" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Azure Storage PHP Client Library", + "email": "dmsh@microsoft.com" + } + ], + "description": "This project provides a set of PHP client libraries that make it easy to access Microsoft Azure Storage Blob APIs.", + "keywords": [ + "azure", + "blob", + "php", + "sdk", + "storage" + ], + "support": { + "issues": "https://github.com/Azure/azure-storage-blob-php/issues", + "source": "https://github.com/Azure/azure-storage-blob-php/tree/v1.5.4" + }, + "time": "2022-09-02T02:13:06+00:00" + }, + { + "name": "microsoft/azure-storage-common", + "version": "1.5.2", + "source": { + "type": "git", + "url": "https://github.com/Azure/azure-storage-common-php.git", + "reference": "8ca7b1bf4c9ca7c663e75a02a0035b05b37196a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Azure/azure-storage-common-php/zipball/8ca7b1bf4c9ca7c663e75a02a0035b05b37196a0", + "reference": "8ca7b1bf4c9ca7c663e75a02a0035b05b37196a0", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~6.0|^7.0", + "php": ">=5.6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "MicrosoftAzure\\Storage\\Common\\": "src/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Azure Storage PHP Client Library", + "email": "dmsh@microsoft.com" + } + ], + "description": "This project provides a set of common code shared by Azure Storage Blob, Table, Queue and File PHP client libraries.", + "keywords": [ + "azure", + "common", + "php", + "sdk", + "storage" + ], + "support": { + "issues": "https://github.com/Azure/azure-storage-common-php/issues", + "source": "https://github.com/Azure/azure-storage-common-php/tree/v1.5.2" + }, + "time": "2021-10-09T03:03:47+00:00" + }, { "name": "mkalkbrenner/php-htmldiff-advanced", "version": "0.0.8", @@ -13417,6 +13875,93 @@ ], "time": "2022-12-27T12:26:20+00:00" }, + { + "name": "twistor/flysystem-stream-wrapper", + "version": "v1.0.9", + "source": { + "type": "git", + "url": "https://github.com/twistor/flysystem-stream-wrapper.git", + "reference": "c97389f188a6493759389861f9fc732652460c58" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twistor/flysystem-stream-wrapper/zipball/c97389f188a6493759389861f9fc732652460c58", + "reference": "c97389f188a6493759389861f9fc732652460c58", + "shasum": "" + }, + "require": { + "league/flysystem": "^1.0.9", + "twistor/stream-util": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Twistor\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Leppanen", + "email": "chris.leppanen@gmail.com" + } + ], + "description": "Adapts Flysystem filesystems to PHP stream wrappers.", + "homepage": "http://github.com/twistor/flysystem-stream-wrapper", + "support": { + "issues": "https://github.com/twistor/flysystem-stream-wrapper/issues", + "source": "https://github.com/twistor/flysystem-stream-wrapper/tree/master" + }, + "time": "2018-11-14T06:41:03+00:00" + }, + { + "name": "twistor/stream-util", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/City-of-Helsinki/stream-util.git", + "reference": "c1a574981d6c68d0892ec339e198d11b67d0a057" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/City-of-Helsinki/stream-util/zipball/c1a574981d6c68d0892ec339e198d11b67d0a057", + "reference": "c1a574981d6c68d0892ec339e198d11b67d0a057", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Twistor\\": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Leppanen", + "email": "chris.leppanen@gmail.com" + } + ], + "description": "Helper utilities for dealing with streams.", + "homepage": "http://github.com/twistor/stream-util", + "support": { + "source": "https://github.com/City-of-Helsinki/stream-util/tree/v1.0.2" + }, + "time": "2021-08-18T11:42:39+00:00" + }, { "name": "typo3/phar-stream-wrapper", "version": "v3.1.7",