Merge branch '3.3' into 3

2019-11-18 12:13:59 +13:00 · 2019-11-18 12:13:59 +13:00 · cfdffb394a
parent ce450103ac d0b6181b48
commit cfdffb394a
2 changed files with 2 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -13,6 +13,8 @@ matrix:
      env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
    - php: 7.3
      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 NPM_TEST=1
+    - php: 7.3
+      env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_TEST=1
    - php: 7.3
      env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1

--- a/composer.json
+++ b/composer.json
@ -25,9 +25,6 @@
        "squizlabs/php_codesniffer": "^3.0"
    },
    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        },
        "expose": [
            "client/dist",
            "client/lang",