merged in changes from release/3

vaimo · Feb 20, 2021 · aba4a6b · aba4a6b
2 parents 99b0581 + cf795e5
commit aba4a6b
Show file tree

Hide file tree

Showing 148 changed files with 3,443 additions and 1,478 deletions.
diff --git a/.config/phpcs/package.xml b/.config/phpcs/package.xml
@@ -12,4 +12,13 @@
 
     <rule ref="PSR1"/>
     <rule ref="PSR2"/>
+
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
+        <severity>5</severity>
+    </rule>
 </ruleset>
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,8 @@ test/installations/**/patches.json
 test/dependencies/modules
 *.org
 .history
-output.exp
+output.exp
+.devcontainer
+Dockerfile
+mutagen*
+docker-compose.yml
diff --git a/.travis.yml b/.travis.yml
@@ -2,17 +2,26 @@
 # See LICENSE_VAIMO.txt for license details.
 language: php
 
+addons:
+  apt:
+    update: true
+
 git:
   depth: 1
-
-cache:
-  directories:
-    - "$HOME/.cache/composer"
-    - "$HOME/.composer/cache"
 
-install:
-  - composer self-update 1.8.4
-  - composer install
+before_install:
+  - sudo apt-get -y install git
+
+env:
+  jobs:
+    - COMPOSER_VERSION=1.8.4
+    - COMPOSER_VERSION=2.0.9
 
 script:
+  # removed to allow GIT applier to trigger as well (tests output does cover it)
+  - rm -rf .git
+  - composer self-update ${COMPOSER_VERSION}
+  - cp test/files/composer-v${COMPOSER_VERSION:0:1}.json composer.json 2>/dev/null || true
+  - cp test/files/composer-v${COMPOSER_VERSION:0:1}.lock composer.lock 2>/dev/null || true
+  - composer install
   - composer ci:build