Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update php-scoper + bump min PHP version to 7.3 #499

Merged
merged 5 commits into from
Nov 30, 2020
Merged

update php-scoper + bump min PHP version to 7.3 #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b95ea41
update php-scoper to latest version 0.13.9
Nov 11, 2020
0621c23
test emulative php-parser lexer
Nov 11, 2020
fd31d46
try emulative lexer
Nov 13, 2020
24f4b8e
bump min PHP version to 7.3
Nov 18, 2020
399ca62
update php-scoper
Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .docker/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ if [[ "$(docker images -q box_php53 2> /dev/null)" == "" ]]; then
$DOCKER build -t box_php53 -f "$PWD/.docker/php53" .
fi

if [[ "$(docker images -q box_php72 2> /dev/null)" == "" ]]; then
$DOCKER build -t box_php72 -f "$PWD/.docker/php72" .
if [[ "$(docker images -q box_php73 2> /dev/null)" == "" ]]; then
$DOCKER build -t box_php73 -f "$PWD/.docker/php73" .
fi

if [[ "$(docker images -q box_php72_xdebug 2> /dev/null)" == "" ]]; then
$DOCKER build -t box_php72_xdebug -f "$PWD/.docker/php72_xdebug" .
if [[ "$(docker images -q box_php73_xdebug 2> /dev/null)" == "" ]]; then
$DOCKER build -t box_php73_xdebug -f "$PWD/.docker/php73_xdebug" .
fi
2 changes: 1 addition & 1 deletion .docker/php72 → .docker/php73
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.2-cli
FROM php:7.3-cli

RUN echo '' | \
apt-get -y update; \
Expand Down
2 changes: 1 addition & 1 deletion .docker/php72_xdebug → .docker/php73_xdebug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.2-cli
FROM php:7.3-cli

RUN echo '' | \
apt-get -y update; \
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ jobs:
fail-fast: false
matrix:
include:
- php: 7.2
tools: "composer:v1"
coverage: "none"
git-fetch-depth: 1
- php: 7.3
tools: "composer:v1"
coverage: "none"
Expand Down
36 changes: 18 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ e2e_scoper_whitelist: box fixtures/build/dir011/vendor

.PHONY: e2e_check_requirements
DOCKER=docker run -i --rm -w /opt/box
PHP7PHAR=box_php72 php index.phar -vvv --no-ansi
PHP7PHAR=box_php73 php index.phar -vvv --no-ansi
PHP5PHAR=box_php53 php index.phar -vvv --no-ansi
e2e_check_requirements: ## Runs the end-to-end tests for the check requirements feature
e2e_check_requirements: box .requirement-checker
Expand All @@ -128,13 +128,13 @@ e2e_check_requirements: box .requirement-checker
diff fixtures/check-requirements/pass-no-config/expected-output-53 fixtures/check-requirements/pass-no-config/actual-output

# 7.2
sed "s/PHP_VERSION/$$($(DOCKER) box_php72 php -r 'echo PHP_VERSION;')/" \
fixtures/check-requirements/pass-no-config/expected-output-72-dist \
> fixtures/check-requirements/pass-no-config/expected-output-72
sed "s/PHP_VERSION/$$($(DOCKER) box_php73 php -r 'echo PHP_VERSION;')/" \
fixtures/check-requirements/pass-no-config/expected-output-73-dist \
> fixtures/check-requirements/pass-no-config/expected-output-73

rm fixtures/check-requirements/pass-no-config/actual-output || true
$(DOCKER) -v "$$PWD/fixtures/check-requirements/pass-no-config":/opt/box $(PHP7PHAR) | tee fixtures/check-requirements/pass-no-config/actual-output
diff fixtures/check-requirements/pass-no-config/expected-output-72 fixtures/check-requirements/pass-no-config/actual-output
diff fixtures/check-requirements/pass-no-config/expected-output-73 fixtures/check-requirements/pass-no-config/actual-output

#
# Pass complete
Expand All @@ -152,13 +152,13 @@ e2e_check_requirements: box .requirement-checker
diff fixtures/check-requirements/pass-complete/expected-output-53 fixtures/check-requirements/pass-complete/actual-output

# 7.2
sed "s/PHP_VERSION/$$($(DOCKER) box_php72 php -r 'echo PHP_VERSION;')/" \
fixtures/check-requirements/pass-complete/expected-output-72-dist \
> fixtures/check-requirements/pass-complete/expected-output-72
sed "s/PHP_VERSION/$$($(DOCKER) box_php73 php -r 'echo PHP_VERSION;')/" \
fixtures/check-requirements/pass-complete/expected-output-73-dist \
> fixtures/check-requirements/pass-complete/expected-output-73

rm fixtures/check-requirements/pass-complete/actual-output || true
$(DOCKER) -v "$$PWD/fixtures/check-requirements/pass-complete":/opt/box $(PHP7PHAR) | tee fixtures/check-requirements/pass-complete/actual-output
diff fixtures/check-requirements/pass-complete/expected-output-72 fixtures/check-requirements/pass-complete/actual-output
diff fixtures/check-requirements/pass-complete/expected-output-73 fixtures/check-requirements/pass-complete/actual-output

#
# Fail complete
Expand All @@ -176,13 +176,13 @@ e2e_check_requirements: box .requirement-checker
diff fixtures/check-requirements/fail-complete/expected-output-53 fixtures/check-requirements/fail-complete/actual-output

# 7.2
sed "s/PHP_VERSION/$$($(DOCKER) box_php72 php -r 'echo PHP_VERSION;')/" \
fixtures/check-requirements/fail-complete/expected-output-72-dist \
> fixtures/check-requirements/fail-complete/expected-output-72
sed "s/PHP_VERSION/$$($(DOCKER) box_php73 php -r 'echo PHP_VERSION;')/" \
fixtures/check-requirements/fail-complete/expected-output-73-dist \
> fixtures/check-requirements/fail-complete/expected-output-73

rm fixtures/check-requirements/fail-complete/actual-output || true
$(DOCKER) -v "$$PWD/fixtures/check-requirements/fail-complete":/opt/box $(PHP7PHAR) | tee fixtures/check-requirements/fail-complete/actual-output || true
diff fixtures/check-requirements/fail-complete/expected-output-72 fixtures/check-requirements/fail-complete/actual-output
diff fixtures/check-requirements/fail-complete/expected-output-73 fixtures/check-requirements/fail-complete/actual-output

#
# Skip the requirement check
Expand All @@ -208,7 +208,7 @@ endif
e2e_php_settings_checker: ## Runs the end-to-end tests for the PHP settings handler
e2e_php_settings_checker: docker-images fixtures/php-settings-checker/output-xdebug-enabled vendor box
@echo "$(CCYELLOW)No restart needed$(CCEND)"
$(DOCKER) -v "$$PWD":/opt/box box_php72 \
$(DOCKER) -v "$$PWD":/opt/box box_php73 \
php -dphar.readonly=0 -dmemory_limit=-1 \
$(BOX_COMPILE) \
| grep '\[debug\]' \
Expand All @@ -217,7 +217,7 @@ e2e_php_settings_checker: docker-images fixtures/php-settings-checker/output-xde
diff fixtures/php-settings-checker/output-all-clear fixtures/php-settings-checker/actual-output

@echo "$(CCYELLOW)Xdebug enabled: restart needed$(CCEND)"
$(DOCKER) -v "$$PWD":/opt/box box_php72_xdebug \
$(DOCKER) -v "$$PWD":/opt/box box_php73_xdebug \
php -dphar.readonly=0 -dmemory_limit=-1 \
$(BOX_COMPILE) \
| grep '\[debug\]' \
Expand All @@ -227,7 +227,7 @@ e2e_php_settings_checker: docker-images fixtures/php-settings-checker/output-xde
diff fixtures/php-settings-checker/output-xdebug-enabled fixtures/php-settings-checker/actual-output

@echo "$(CCYELLOW)phar.readonly enabled: restart needed$(CCEND)"
$(DOCKER) -v "$$PWD":/opt/box box_php72 \
$(DOCKER) -v "$$PWD":/opt/box box_php73 \
php -dphar.readonly=1 -dmemory_limit=-1 \
$(BOX_COMPILE) \
| grep '\[debug\]' \
Expand All @@ -238,7 +238,7 @@ e2e_php_settings_checker: docker-images fixtures/php-settings-checker/output-xde
diff fixtures/php-settings-checker/output-pharreadonly-enabled fixtures/php-settings-checker/actual-output

@echo "$(CCYELLOW)Bump min memory limit if necessary (limit lower than default)$(CCEND)"
$(DOCKER) -v "$$PWD":/opt/box box_php72 \
$(DOCKER) -v "$$PWD":/opt/box box_php73 \
php -dphar.readonly=0 -dmemory_limit=124M \
$(BOX_COMPILE) \
| grep '\[debug\]' \
Expand All @@ -249,7 +249,7 @@ e2e_php_settings_checker: docker-images fixtures/php-settings-checker/output-xde
diff fixtures/php-settings-checker/output-min-memory-limit fixtures/php-settings-checker/actual-output

@echo "$(CCYELLOW)Bump min memory limit if necessary (limit higher than default)$(CCEND)"
$(DOCKER) -e BOX_MEMORY_LIMIT=64M -v "$$PWD":/opt/box box_php72 \
$(DOCKER) -e BOX_MEMORY_LIMIT=64M -v "$$PWD":/opt/box box_php73 \
php -dphar.readonly=0 -dmemory_limit=1024M \
$(BOX_COMPILE) \
| grep '\[debug\]' \
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^7.2",
"php": "^7.3",
"ext-phar": "*",
"amphp/parallel-functions": "^0.1.3",
"beberlei/assert": "^3.2",
Expand All @@ -50,7 +50,7 @@
"composer/xdebug-handler": "^1.3.2",
"composer-plugin-api": "^1.0 || ^2.0",
"hoa/compiler": "^3.17",
"humbug/php-scoper": "^0.13",
"humbug/php-scoper": "^0.13.10",
"justinrainbow/json-schema": "^5.2.9",
"nikic/iter": "^2.0",
"nikic/php-parser": "^4.2",
Expand Down Expand Up @@ -78,7 +78,7 @@
"config": {
"bin-dir": "bin",
"platform": {
"php": "7.2.9"
"php": "7.3"
theofidry marked this conversation as resolved.
Show resolved Hide resolved
},
"sort-packages": true
},
Expand Down
Loading