Update dependencies

Also replaced Docksal in favor of Docker-compose
unreal4u · May 6, 2020 · e3a9f0c · e3a9f0c
1 parent ecba9e7
commit e3a9f0c
Show file tree

Hide file tree

Showing 15 changed files with 344 additions and 214 deletions.
diff --git a/.docksal/commands/composer-update b/.docksal/commands/composer-update
diff --git a/.docksal/commands/run-tests b/.docksal/commands/run-tests
diff --git a/.docksal/docksal.env b/.docksal/docksal.env
diff --git a/.docksal/docksal.yml b/.docksal/docksal.yml
diff --git a/.docksal/services/cli/Dockerfile b/.docksal/services/cli/Dockerfile
diff --git a/bin/composer.sh b/bin/composer.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [[ "$1" == "" ]]
+then
+  echo "Missing argument, must be one of 70, 71, 72, 73, 74 or latest (defaults to 74). Assuming 74"
+  PHP_VERSION="74"
+elif [[ "$1" == "latest" ]]
+then
+  PHP_VERSION="74"
+else
+  PHP_VERSION="$1"
+fi
+
+rm -rf tests/report/
+docker-compose run "php${PHP_VERSION}" composer "$2"
diff --git a/bin/run-tests.sh b/bin/run-tests.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [[ "$1" == "" ]]
+then
+  echo "Missing argument, must be one of 70, 71, 72, 73, 74 or latest (defaults to 74). Assuming 74"
+  PHP_VERSION="74"
+elif [[ "$1" == "latest" ]]
+then
+  PHP_VERSION="74"
+else
+  PHP_VERSION="$1"
+fi
+
+rm -rf tests/report/
+docker-compose run "php${PHP_VERSION}" phpdbg -qrr vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -18,15 +18,15 @@
     "ext-json": "*",
     "unreal4u/dummy-logger": "^1.0",
     "react/http-client": "^0.5",
-    "react/promise": "^2.5",
-    "clue/block-react": "^1.1",
+    "react/promise": "^2.7",
+    "clue/block-react": "^1.3",
     "yoshi2889/multipart-builder": "^0.1.1",
     "amphp/artax": "^3",
     "paragonie/random_compat": "1.2.2"
   },
   "require-dev": {
     "monolog/monolog": "^1.17",
-    "squizlabs/php_codesniffer": "^3.0",
+    "squizlabs/php_codesniffer": "^3.5",
     "phpunit/phpunit": "^6.2",
     "phpunit/php-code-coverage": "^5.2"
   },