Refactor: Support new services layer

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 php:
-    - '7.3'
-    - '7.4'
+    - '8.0'
 
 before_script:
     - composer install

CHANGELOG.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.1.0 - 2021-04-21
+### Refactor
+- Support new services layer.
+
 ## 1.0.0 - 2020-11-10
 ### Added
 - The initial implementation of the package.
 
 # Versions
-- [1.0.0 > Unreleased](https://github.com/ulrack/environment-extension/compare/1.0.0...HEAD)
+- [1.1.0 > Unreleased](https://github.com/ulrack/environment-extension/compare/1.1.0...HEAD)
+- [1.0.0 > 1.1.0](https://github.com/ulrack/environment-extension/compare/1.0.0...1.1.0)

composer.json

@@ -11,13 +11,12 @@
     "prefer-stable": true,
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.3",
-        "grizz-it/configuration": "^1.2",
-        "grizz-it/storage": "^1.0",
-        "ulrack/command": "^2.0",
-        "ulrack/invocation-extension": "^1.1",
-        "ulrack/persistent-extension": "^1.1",
-        "ulrack/services": "^3.3"
+        "php": "^8.0",
+        "grizz-it/command": "^1.0",
+        "grizz-it/configuration": "^1.3",
+        "grizz-it/services": "^1.0",
+        "grizz-it/storage": "^1.1",
+        "ulrack/persistent-extension": "^1.2"
     },
     "authors": [
         {
@@ -55,7 +54,7 @@
         ]
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpunit/phpunit": "^9.5",
+        "squizlabs/php_codesniffer": "^3.6"
     }
 }

configuration/schema/environment.schema.json

@@ -0,0 +1,9 @@
+{
+    "$id": "environment.schema.json",
+    "type": "object",
+    "properties": {
+        "default": {
+            "default": null
+        }
+    }
+}

configuration/services/environment.core.json

@@ -0,0 +1,59 @@
+{
+    "parameters": {
+        "service.configuration.validation.environment": {
+            "key": "environment",
+            "schema": "environment.schema.json"
+        }
+    },
+    "services": {
+        "command.environment.get": {
+            "class": "\\Ulrack\\EnvironmentExtension\\Command\\EnvironmentGetCommand",
+            "parameters": {
+                "serviceFactory": "@{internal.core.service.factory}"
+            }
+        },
+        "command.environment.set": {
+            "class": "\\Ulrack\\EnvironmentExtension\\Command\\EnvironmentSetCommand",
+            "parameters": {
+                "environmentStorage": "@{persistent.environment}"
+            }
+        },
+        "command.environment.list": {
+            "class": "\\Ulrack\\EnvironmentExtension\\Command\\EnvironmentListCommand",
+            "parameters": {
+                "configRegistry": "@{invocations.get.config.registry}"
+            }
+        },
+        "service.factory.environment": {
+            "class": "\\Ulrack\\EnvironmentExtension\\Factory\\Extension\\EnvironmentFactory"
+        }
+    },
+    "invocations": {
+        "get.config.registry": {
+            "service": "internal.core.configuration.manager",
+            "method": "getConfigRegistry"
+        },
+        "add.environment.service.factory": {
+            "service": "internal.core.service.factory",
+            "method": "addExtension",
+            "parameters": {
+                "scope": "environment",
+                "extension": "@{services.service.factory.environment}"
+            },
+            "cache": true
+        }
+    },
+    "persistent": {
+        "environment": {}
+    },
+    "tags": {
+        "add.environment.factory": {
+            "trigger": "triggers.core.service.factories",
+            "service": "invocations.add.environment.service.factory"
+        },
+        "add.service.validation.environment": {
+            "service": "parameters.service.configuration.validation.environment",
+            "trigger": "triggers.service.configuration.validation"
+        }
+    }
+}

docs/usage/create-an-environment-variable.md

@@ -3,12 +3,14 @@
 This package add the ability to create and manage environment variables for
 projects. This is being managed through the services layer, so multiple
 declarations can be made per file. To create an environment variable create a
-file in the `configuration/environment` directory with the following content.
+file in the `configuration/services` directory with the following content.
 
 ```json
 {
-    "foo": {
-        "default": null
+    "environment": {
+        "foo": {
+            "default": null
+        }
     }
 }
 ```

src/Command/EnvironmentGetCommand.php

@@ -7,10 +7,10 @@
 
 namespace Ulrack\EnvironmentExtension\Command;
 
-use Ulrack\Command\Common\Command\InputInterface;
-use Ulrack\Command\Common\Command\OutputInterface;
-use Ulrack\Command\Common\Command\CommandInterface;
-use Ulrack\Services\Common\ServiceFactoryInterface;
+use GrizzIt\Command\Common\Command\InputInterface;
+use GrizzIt\Command\Common\Command\OutputInterface;
+use GrizzIt\Command\Common\Command\CommandInterface;
+use GrizzIt\Services\Common\Factory\ServiceFactoryInterface;
 
 class EnvironmentGetCommand implements CommandInterface
 {

src/Command/EnvironmentListCommand.php

@@ -8,29 +8,28 @@
 namespace Ulrack\EnvironmentExtension\Command;
 
 use Exception;
-use Ulrack\Command\Common\Command\InputInterface;
-use Ulrack\Command\Common\Command\OutputInterface;
-use Ulrack\Command\Common\Command\CommandInterface;
-use Ulrack\Services\Common\ServiceFactoryInterface;
-use Ulrack\EnvironmentExtension\Factory\Extension\EnvironmentFactory;
+use GrizzIt\Command\Common\Command\InputInterface;
+use GrizzIt\Command\Common\Command\OutputInterface;
+use GrizzIt\Configuration\Common\RegistryInterface;
+use GrizzIt\Command\Common\Command\CommandInterface;
 
 class EnvironmentListCommand implements CommandInterface
 {
     /**
-     * Contains the environment factory.
+     * Contains the databases service factory.
      *
-     * @var EnvironmentFactory
+     * @var RegistryInterface
      */
-    private $environmentFactory;
+    private $configRegistry;
 
     /**
      * Constructor.
      *
-     * @param EnvironmentFactory $environmentFactory
+     * @param RegistryInterface $serviceRegsitry
      */
-    public function __construct(EnvironmentFactory $environmentFactory)
+    public function __construct(RegistryInterface $configRegistry)
     {
-        $this->environmentFactory = $environmentFactory;
+        $this->configRegistry = $configRegistry;
     }
 
     /**
@@ -45,7 +44,15 @@ public function __invoke(
         InputInterface $input,
         OutputInterface $output
     ): void {
-        $keys = $this->environmentFactory->getKeys();
+        $keys = array_keys(
+            array_merge(
+                ...array_column(
+                    $this->configRegistry->toArray()['services'],
+                    'environment'
+                )
+            )
+        );
+
         if (count($keys) > 0) {
             $output->outputList($keys);
 

src/Command/EnvironmentSetCommand.php

@@ -8,9 +8,9 @@
 namespace Ulrack\EnvironmentExtension\Command;
 
 use GrizzIt\Storage\Common\StorageInterface;
-use Ulrack\Command\Common\Command\InputInterface;
-use Ulrack\Command\Common\Command\OutputInterface;
-use Ulrack\Command\Common\Command\CommandInterface;
+use GrizzIt\Command\Common\Command\InputInterface;
+use GrizzIt\Command\Common\Command\OutputInterface;
+use GrizzIt\Command\Common\Command\CommandInterface;
 
 class EnvironmentSetCommand implements CommandInterface
 {
@@ -51,7 +51,7 @@ public function __invoke(
         }
 
         $this->environmentStorage->set(
-            $input->getParameter('key'),
+            'environment.' . $input->getParameter('key'),
             $value
         );
     }