From ef724a65e0a7039583268c16df440db1a08afc5d 2023-06-09 15:05:13 From: Lance Edgar Date: 2023-06-09 15:05:13 Subject: [PATCH] Hopefully fix composer-components path issue ? fannie/src/javascript/composer-components was not getting the necessary files, and i noticed the upstream composer.json used a different config style for mapping these paths. so copied that snippet and hoping this works... not clear why i would not have noticed that mapping before, or why i ignored if so..? --- diff --git a/composer.json b/composer.json index ba0aad6e009a4fd9af603bc3c66883006fc8fb52..764d16c02ac6ee0771463bd92e3c8a1b2c096a64 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,10 @@ "rattail/posterior": "^0.1.1" }, "extra": { + "installer-types": ["component"], + "installer-paths": { + "../IS4C/fannie/src/javascript/composer-components/{$name}/": ["type:component"] + }, "merge-plugin": { "require": [ "../IS4C/composer.json" @@ -20,8 +24,7 @@ } }, "config": { - "component-dir": "../IS4C/fannie/src/javascript/composer-components", - "vendor-dir": "../IS4C/vendor", + "vendor-dir": "../IS4C/vendor/", "allow-plugins": { "composer/installers": true, "oomphinc/composer-installers-extender": true, diff --git a/composer.lock b/composer.lock index 250fabc93c0d4f5000eccd2a1c69ca3f58fab67f..9f80c093964a38913dacc31fb7a207a15bb95d1f 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": "16b3d73f6937525c83bab51bb080a331", + "content-hash": "28d4f14f01418c8545cda86a7438312f", "packages": [ { "name": "automattic/woocommerce", @@ -57,44 +57,104 @@ }, "time": "2017-06-06T20:38:08+00:00" }, + { + "name": "aws/aws-crt-php", + "version": "v1.2.1", + "source": { + "type": "git", + "url": "https://github.com/awslabs/aws-crt-php.git", + "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5", + "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5", + "yoast/phpunit-polyfills": "^1.0" + }, + "suggest": { + "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality." + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "AWS SDK Common Runtime Team", + "email": "aws-sdk-common-runtime@amazon.com" + } + ], + "description": "AWS Common Runtime for PHP", + "homepage": "https://github.com/awslabs/aws-crt-php", + "keywords": [ + "amazon", + "aws", + "crt", + "sdk" + ], + "support": { + "issues": "https://github.com/awslabs/aws-crt-php/issues", + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1" + }, + "time": "2023-03-24T20:22:19+00:00" + }, { "name": "aws/aws-sdk-php", - "version": "3.130.3", + "version": "3.272.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "916356edb5c30fa564d02de94bde51a9c0bb4469" + "reference": "a0accaf4a16565c0b4438109c978602f27dff3a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/916356edb5c30fa564d02de94bde51a9c0bb4469", - "reference": "916356edb5c30fa564d02de94bde51a9c0bb4469", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a0accaf4a16565c0b4438109c978602f27dff3a0", + "reference": "a0accaf4a16565c0b4438109c978602f27dff3a0", "shasum": "" }, "require": { + "aws/aws-crt-php": "^1.0.4", "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", - "guzzlehttp/guzzle": "^5.3.3|^6.2.1", - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "^1.4.1", - "mtdowling/jmespath.php": "~2.2", - "php": ">=5.5" + "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", + "guzzlehttp/promises": "^1.4.0", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "mtdowling/jmespath.php": "^2.6", + "php": ">=5.5", + "psr/http-message": "^1.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", "aws/aws-php-sns-message-validator": "~1.0", "behat/behat": "~3.0", + "composer/composer": "^1.10.22", + "dms/phpunit-arraysubset-asserts": "^0.4.0", "doctrine/cache": "~1.4", "ext-dom": "*", "ext-openssl": "*", "ext-pcntl": "*", "ext-sockets": "*", "nette/neon": "^2.3", - "phpunit/phpunit": "^4.8.35|^5.4.3", + "paragonie/random_compat": ">= 2", + "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", "psr/cache": "^1.0", "psr/simple-cache": "^1.0", - "sebastian/comparator": "^1.2.3" + "sebastian/comparator": "^1.2.3 || ^4.0", + "yoast/phpunit-polyfills": "^1.0" }, "suggest": { "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", @@ -142,9 +202,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.130.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.272.1" }, - "time": "2020-01-02T19:13:50+00:00" + "time": "2023-06-09T18:21:02+00:00" }, { "name": "bacon/bacon-qr-code",