Updating the generator to use a more advanced configuration file

myENA · Mar 1, 2018 · 7be9041 · 7be9041
1 parent 8953133
commit 7be9041
Show file tree

Hide file tree

Showing 28 changed files with 1,130 additions and 518 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: php
-
 dist: trusty
-
 sudo: false
 
 php:
   - 7.0
+  - 7.1
+  - 7.2
 
 matrix:
   include:
-    - php: 7.0
+    - php: 7.1
       env:
         - BUILD_PHAR=true
 
@@ -23,4 +23,4 @@ deploy:
   skip_cleanup: true
   on:
     tags: true
-    php: '7.0'
+    php: '7.1'
diff --git a/bin/php-cs b/bin/php-cs
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 
 if (PHP_SAPI !== 'cli') {
@@ -11,11 +12,8 @@ if (!(bool)getenv('PHPCS_PHAR')) {
 }
 
 use MyENA\CloudStackClientGenerator\Application;
-use Symfony\Component\Console\Formatter\OutputFormatter;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
-use Symfony\Component\Console\Output\ConsoleOutput;
 
 error_reporting(-1);
 
-$application = new Application('PHP CloudStack', '3.0.0');
+$application = new Application('PHP CloudStack', '5.0.0');
 $application->run();
diff --git a/composer.json b/composer.json
@@ -25,7 +25,6 @@
       "email": "[email protected]"
     }
   ],
-
   "autoload": {
     "psr-4": {
       "MyENA\\CloudStackClientGenerator\\": "src/"
@@ -34,7 +33,6 @@
       "files/constants.php"
     ]
   },
-
   "require": {
     "php": "^7.0",
     "symfony/console": "@stable",
@@ -46,10 +44,8 @@
     "guzzlehttp/guzzle": "@stable"
   },
   "require-dev": {
-    "myena/default-logger": "@stable",
-    "phpunit/phpunit": "@stable"
+    "myena/default-logger": "@stable"
   },
-
   "scripts": {
     "build": [
       "rm -rf vendor",

diff --git a/files/config_prototype.yml b/files/config_prototype.yml
@@ -12,18 +12,35 @@
 
 # php_cs_generator must be the root key
 php_cs_generator:
-  dev: # Name of this config.  Accessible via the "config-env" option
-    scheme: "http"
-    host: ~ # dev.ourcloudstack.com
-    port: 8080
-    apipath: "client/api"
-    consolepath: "client/console"
-    out: ~ # choose output path
-    namespace: "\\MyGreatNamespace"
-    key: ~ # your api key
-    secret: ~ # your api secret
-  prod:
-    host: prod.ourcloudstack.com
-    port: 8765
-    key: ~ # your api key
-    secret: ~ # your api secret
+  # environment configuration
+  environments:
+    dev: # Name of this config.  Accessible via the "env" option
+      scheme: "http"
+      host: ~ # dev.ourcloudstack.com
+      port: 8080
+      apipath: "client/api"
+      consolepath: "client/console"
+      out: ~ # choose output path
+      namespace: "\\MyGreatNamespace"
+      key: ~ # your api key
+      secret: ~ # your api secret
+      logger:
+        class: ~ # psr-3 compliant logger instance
+        level: ~ #level the environment's logger should be
+      http_client:
+        class: ~ # any class that implements \GuzzleHttp\ClientInterface
+        config:
+          allow_redirects: true
+          http_errors: true
+          verify: false
+    prod:
+      host: prod.ourcloudstack.com
+      port: 8765
+      key: ~ # your api key
+      secret: ~ # your api secret
+  # allows you to extend the classes constructed by this lib with your own class
+  overloaded_classes:
+    - name: Tags                  # name of class you are overloading
+      overload: MyGreatTagsClass  # fully qualified name of class extending the base class
+    - name: ListVirtualMachinesRequest
+      overload: DoSomethingCrazyRequest
diff --git a/src/Client.php b/src/Client.php
@@ -3,50 +3,53 @@
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Uri;
 use GuzzleHttp\RequestOptions;
+use MyENA\CloudStackClientGenerator\Configuration\Environment;
 
 /**
  * Class Client
  * @package MyENA\CloudStackClientGenerator
  */
 class Client {
-    /** @var \MyENA\CloudStackClientGenerator\Configuration */
-    protected $config;
+    /** @var \MyENA\CloudStackClientGenerator\Configuration\Environment */
+    protected $env;
 
     /**
      * Client constructor.
-     * @param \MyENA\CloudStackClientGenerator\Configuration $c
+     * @param \MyENA\CloudStackClientGenerator\Configuration\Environment $e
      */
-    public function __construct(Configuration $c) {
-        $this->config = $c;
+    public function __construct(Environment $e) {
+        $this->env = $e;
     }
 
     /**
      * @param string $command
      * @param array $parameters
      * @param array $headers
      * @return \stdClass
+     * @throws \Exception
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function do(string $command, array $parameters = [], array $headers = []): \stdClass {
         static $defaultHeaders =
             ['Accept' => ['application/json'], 'Content-Type' => ['application/x-www-form-urlencoded']];
 
-        $params = ['apikey' => $this->config->getKey(), 'command' => $command, 'response' => 'json'] + $parameters;
+        $params = ['apikey' => $this->env->getKey(), 'command' => $command, 'response' => 'json'] + $parameters;
 
         ksort($params);
 
         $query = http_build_query($params, '', '&', PHP_QUERY_RFC3986);
 
         $uri = new Uri(sprintf(
             '%s/%s?%s&signature=%s',
-            $this->config->getCompiledAddress(),
-            $this->config->getApiPath(),
+            $this->env->getCompiledAddress(),
+            $this->env->getApiPath(),
             $query,
-            $this->config->buildSignature($query)
+            $this->env->buildSignature($query)
         ));
 
         $r = new Request('GET', $uri, $headers + $defaultHeaders);
 
-        $resp = $this->config->HttpClient->send($r, [
+        $resp = $this->env->getHttpClient()->send($r, [
             RequestOptions::HTTP_ERRORS => false,
             RequestOptions::DECODE_CONTENT => false,
         ]);