Merge branch 'vpsUUID' into 'master'

API exposes VPS' UUID now

See merge request transip/restapi-php-library!127

.gitlab-ci.yml

@@ -9,32 +9,36 @@ stages:
 
 lint:php:
   stage: lint
+  before_script:
+    - composer install
   script:
-    - parallel-lint .
+    - ./vendor/bin/parallel-lint --exclude vendor/ .
   tags:
-    - k8s
+    - 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
+    - k8s-tbk
 
 lint:composer:
   stage: lint
   script:
     - composer validate --no-interaction --strict
   tags:
-    - k8s
+    - k8s-tbk
 
 lint:secretsscan:
   image: '$IMAGE_URL_PYTHON'
   stage: lint
   script:
     - ci/scan_secrets.sh
   tags:
-    - k8s
+    - k8s-tbk
 
 validate:tag-message:
   stage: validate
@@ -43,7 +47,7 @@ validate:tag-message:
   script:
     - ci/validate_tag_message.sh $CI_COMMIT_TAG
   tags:
-    - k8s
+    - k8s-tbk
 
 validate:tag-version-consistency:
   stage: validate
@@ -53,7 +57,7 @@ validate:tag-version-consistency:
     - composer dump-autoload
     - php ci/ValidateTagVersionConsistency.php $CI_COMMIT_TAG
   tags:
-    - k8s
+    - k8s-tbk
 
 deploy:deploy-to-github:
   stage: deploy
@@ -62,7 +66,7 @@ deploy:deploy-to-github:
   script:
     - ci/deploy_to_github.sh
   tags:
-    - k8s
+    - k8s-tbk
 
 release:release-to-github:
   stage: release
@@ -71,4 +75,4 @@ release:release-to-github:
   script:
     - ci/release_to_github.sh $CI_COMMIT_TAG
   tags:
-    - k8s
+    - k8s-tbk

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

composer.json

@@ -16,6 +16,10 @@
         "ext-json": "*",
         "ext-openssl": "*"
     },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.17",
+        "php-parallel-lint/php-parallel-lint": "^1.2"
+    },
     "autoload": {
         "psr-4": {
             "Transip\\Api\\Library\\": "src/"