Merge branch 'vpsUUID' into 'master'

added UUID property to VPS See merge request transip/restapi-cli-client!120
transip · Jan 13, 2021 · f8ecb34 · f8ecb34
2 parents c6111b5 + 3733aaa
commit f8ecb34
Show file tree

Hide file tree

Showing 5 changed files with 1,189 additions and 455 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,15 +8,19 @@ stages:
 
 lint:php:
   stage: lint
+  before_script:
+    - composer install
   script:
-    - parallel-lint .
+    - ./vendor/bin/parallel-lint --exclude vendor/ .
   tags:
     - k8s-tbk
 
 lint:php-codestyle:
   stage: lint
+  before_script:
+    - composer install
   script:
-    - php-cs-fixer fix -v --dry-run --using-cache=no . --config .php_cs.dist
+    - ./vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no . --config .php_cs.dist
   tags:
     - k8s-tbk
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+6.4.0
+-----
+* Added UUID property to VPS
+
 6.3.0
 -----
 * Added tls mode property to HA-IP

diff --git a/composer.json b/composer.json
@@ -15,10 +15,14 @@
     "symfony/console": "^4.3",
     "symfony/finder": "^4.3",
     "symfony/filesystem": "^4.3",
-    "transip/transip-api-php": "6.3.*",
+    "transip/transip-api-php": "6.4.*",
     "symfony/yaml": "^4.3",
     "webmozart/path-util": "^2.3"
   },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^2.17",
+    "php-parallel-lint/php-parallel-lint": "^1.2"
+  },
   "autoload": {
     "psr-4": {
       "Transip\\Api\\CLI\\": "src"