Skip to content

Commit 2a4bc24

Browse files
committed
Update dependencies and fix build
1 parent 169ad7d commit 2a4bc24

File tree

5 files changed

+38
-24
lines changed

5 files changed

+38
-24
lines changed

Docker/ubuntu-18.04/Dockerfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ircmaxell/php-compiler:18.04-dev
2+
3+
COPY ./ /compiler
4+
5+
WORKDIR /compiler
6+
7+
RUN composer install --no-ansi --no-dev --no-interaction --no-progress --no-scripts --optimize-autoloader
8+
9+
ENTRYPOINT ["php", "/compiler/bin/jit.php"]
10+
11+
CMD ["-r", "echo \"Hello World\n\";"]

Docker/yaypatch.patch

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

Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ composer-update:
1414
shell:
1515
docker run -it --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -v $(shell pwd):/compiler ircmaxell/php-compiler:16.04-dev /bin/bash
1616

17+
.PHONY: shell-18
18+
shell-18:
19+
docker run -it --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -v $(shell pwd):/compiler ircmaxell/php-compiler:18.04-dev /bin/bash
20+
1721
.PHONY: docker-build-clean
1822
docker-build-clean:
1923
docker build --no-cache -t ircmaxell/php-compiler:16.04-dev Docker/dev/ubuntu-16.04
@@ -24,9 +28,15 @@ docker-build:
2428
docker build -t ircmaxell/php-compiler:16.04-dev Docker/dev/ubuntu-16.04
2529
docker build --no-cache -t ircmaxell/php-compiler:16.04 -f Docker/ubuntu-16.04/Dockerfile .
2630

31+
.PHONY: docker-build-clean-18
32+
docker-build-clean-18:
33+
docker build --no-cache -t ircmaxell/php-compiler:18.04-dev Docker/dev/ubuntu-18.04
34+
docker build --no-cache -t ircmaxell/php-compiler:18.04 -f Docker/ubuntu-18.04/Dockerfile .
35+
2736
.PHONY: docker-build-18
2837
docker-build-18:
2938
docker build -t ircmaxell/php-compiler:18.04-dev Docker/dev/ubuntu-18.04
39+
docker build --no-cache -t ircmaxell/php-compiler:18.04 -f Docker/ubuntu-18.04/Dockerfile .
3040

3141
.PHONY: benchmark
3242
benchmark: rebuild-changed
@@ -58,3 +68,7 @@ phan:
5868
.PHONY: test
5969
test: rebuild-changed
6070
docker run -v $(shell pwd):/compiler ircmaxell/php-compiler:16.04-dev php vendor/bin/phpunit
71+
72+
.PHONY: test-18
73+
test-18: rebuild-changed
74+
docker run -v $(shell pwd):/compiler ircmaxell/php-compiler:18.04-dev php vendor/bin/phpunit

composer.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/VM/HashTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function iterate(bool $resolveIndirect = false): \Traversable {
6363
}
6464
}
6565

66-
public function findVariable(Variable $index, bool $forWrite): Variable {
66+
public function findVariable(Variable $index, bool $forWrite): ?Variable {
6767
switch ($index->type) {
6868
case Variable::TYPE_INTEGER:
6969
$result = $this->findIndex($index->toInt());

0 commit comments

Comments
 (0)