diff --git a/CHANGELOG.md b/CHANGELOG.md index a3cde93..36373d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v0.1.7 (2023-10-30) +* Removed default composer license value +* Refactored package file structure + ## v0.1.6 (2023-10-16) * Updated Atlas dependency diff --git a/README.md b/README.md index c38fa77..cc6a675 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![PHP from Packagist](https://img.shields.io/packagist/php-v/decodelabs/integra?style=flat)](https://packagist.org/packages/decodelabs/integra) [![Latest Version](https://img.shields.io/packagist/v/decodelabs/integra.svg?style=flat)](https://packagist.org/packages/decodelabs/integra) [![Total Downloads](https://img.shields.io/packagist/dt/decodelabs/integra.svg?style=flat)](https://packagist.org/packages/decodelabs/integra) -[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/decodelabs/integra/integrate.yml?branch=develop)](https://github.com/string|int|floatdecodelabs/integra/actions/workflows/integrate.yml) +[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/decodelabs/integra/integrate.yml?branch=develop)](https://github.com/decodelabs/integra/actions/workflows/integrate.yml) [![PHPStan](https://img.shields.io/badge/PHPStan-enabled-44CC11.svg?longCache=true&style=flat)](https://github.com/phpstan/phpstan) [![License](https://img.shields.io/packagist/l/decodelabs/integra?style=flat)](https://packagist.org/packages/decodelabs/integra) diff --git a/composer.json b/composer.json index dc54892..c9b094e 100644 --- a/composer.json +++ b/composer.json @@ -25,10 +25,10 @@ }, "autoload": { "psr-4": { - "DecodeLabs\\Integra\\": "src/Integra" + "DecodeLabs\\Integra\\": "src/" }, "files": [ - "src/global.php" + "src/Context.php" ] }, "extra": { diff --git a/src/Integra/Context.php b/src/Context.php similarity index 98% rename from src/Integra/Context.php rename to src/Context.php index d40f230..f914430 100644 --- a/src/Integra/Context.php +++ b/src/Context.php @@ -15,8 +15,10 @@ use DecodeLabs\Coercion; use DecodeLabs\Collections\Tree; use DecodeLabs\Exceptional; +use DecodeLabs\Integra; use DecodeLabs\Systemic; use DecodeLabs\Terminus\Session; +use DecodeLabs\Veneer; use DecodeLabs\Veneer\LazyLoad; use DecodeLabs\Veneer\Plugin; @@ -486,3 +488,6 @@ public function getExtra(): Tree return $this->getLocalManifest()->getExtra(); } } + +// Register the Veneer facade +Veneer::register(Context::class, Integra::class); diff --git a/src/Integra/Manifest.php b/src/Manifest.php similarity index 98% rename from src/Integra/Manifest.php rename to src/Manifest.php index b33ffdd..c0794cf 100644 --- a/src/Integra/Manifest.php +++ b/src/Manifest.php @@ -139,9 +139,7 @@ public function getLicense(): string|array|null return Coercion::toStringOrNull(array_pop($arr)); } - return $this->data->license->as('?string', [ - 'default' => 'proprietary' - ]); + return $this->data->license->as('?string'); } /** diff --git a/src/Integra/Structure/Author.php b/src/Structure/Author.php similarity index 100% rename from src/Integra/Structure/Author.php rename to src/Structure/Author.php diff --git a/src/Integra/Structure/Funding.php b/src/Structure/Funding.php similarity index 100% rename from src/Integra/Structure/Funding.php rename to src/Structure/Funding.php diff --git a/src/Integra/Structure/Package.php b/src/Structure/Package.php similarity index 100% rename from src/Integra/Structure/Package.php rename to src/Structure/Package.php diff --git a/src/global.php b/src/global.php deleted file mode 100644 index 83c4338..0000000 --- a/src/global.php +++ /dev/null @@ -1,21 +0,0 @@ -