Skip to content

Commit bb375cb

Browse files
author
camilo.sperberg
committed
General maintenance
- Removed vagrant, added Docksal instead - Added PHP 7.3 to the list of testing in travis - Updated the composer.lock file to include dependencies for max. PHP 7.0
1 parent a44d55f commit bb375cb

File tree

12 files changed

+184
-411
lines changed

12 files changed

+184
-411
lines changed

.docksal/commands/composer-update

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
fin composer update -o --prefer-dist

.docksal/commands/run-tests

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
rm -rf tests/report/
4+
fin exec /usr/local/bin/phpdbg -qrr vendor/bin/phpunit

.docksal/docksal.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DOCKSAL_STACK=node
2+
DOCROOT=examples
3+
CLI_IMAGE='docksal/cli:2.6-php7.0'

.docksal/docksal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version: "2.1"

.docksal/services/cli/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Use a stock Docksal image as the base
2+
FROM docksal/cli:2.6-php7.0
3+
4+
# Install phpdbg extension for PHP
5+
RUN set -xe; \
6+
apt-get update >/dev/null; \
7+
apt-get install php7.0-phpdbg >/dev/null </dev/null \
8+
; \

.gitattributes

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
tests/ export-ignore
33
vendor/ export-ignore
44
logs/ export-ignore
5-
.vagrant/ export-ignore
5+
.docksal/ export-ignore
66

77
.git* export-ignore
88
.*.yml export-ignore
99
phpunit.xml.dist export-ignore
1010

11-
Vagrantfile export-ignore
12-
composer-install.sh export-ignore
13-
execute-tests.sh export-ignore
14-
1511
*.php diff=php

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ php:
33
- 7.0
44
- 7.1
55
- 7.2
6+
- 7.3
67
matrix:
78
include:
89
- php: 7.0
910
env: dependencies=lowest
10-
- php: 7.2
11+
- php: 7.3
1112
env: dependencies=highest
1213
before_script:
1314
- composer self-update -q

VagrantProvisionScripts/base.sh

Lines changed: 0 additions & 43 deletions
This file was deleted.

Vagrantfile

Lines changed: 0 additions & 17 deletions
This file was deleted.

bin/composer-update.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)