Missing uploadprogress

Author: mistraloz

Makefile

@@ -10,8 +10,8 @@ _test-prerequisites: blueprint
 	docker pull ubuntu:20.04
 
 test-quick:  ## Test 8.0 and 8.1 quickly
-	VERSION=8.0 VARIANT=cli $(MAKE) _test-version
-	VERSION=8.1 VARIANT=cli $(MAKE) _test-version
+	VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick
+	VERSION=8.1 VARIANT=cli $(MAKE) _test-version-quick
 
 test-8.1:  ## Test php8.1 build only
 	VERSION=8.1 VARIANT=cli $(MAKE) _test-version
@@ -30,5 +30,12 @@ _test-version: _test-prerequisites ## Test php build for VERSION="" and VARIANT=
 	PHP_VERSION="$(VERSION)" BRANCH=v4 VARIANT=$(VARIANT) ./tests-suite/bash_unit -f tap ./tests-suite/*.sh || (notify-send -u critical "Tests failed ($(VERSION)-$(VARIANT))" && exit 1)
 	notify-send -u critical "Tests passed with success ($(VERSION)-$(VARIANT))"
 
+_test-version-quick: _test-prerequisites ## Test php build for VERSION="" and VARIANT="" (without node variants)
+	docker buildx bake --load \
+	    --set "*.platform=$$(uname -p)" \
+		php$${VERSION//.}-slim-$(VARIANT) php$${VERSION//.}-$(VARIANT)
+	PHP_VERSION="$(VERSION)" BRANCH=v4 VARIANT=$(VARIANT) ./tests-suite/bash_unit -f tap ./tests-suite/*.sh || (notify-send -u critical "Tests failed ($(VERSION)-$(VARIANT))" && exit 1)
+	notify-send -u critical "Tests passed with success ($(VERSION)-$(VARIANT)) - without node-*"
+
 clean: ## Clean dangles image after build
 	rm -rf /tmp/buildx-cache

extensions/core/uploadprogress/install.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-export PECL_EXTENSION=uploadprogress
+#if [[ "${PHP_VERSION}" =~ ^7 ]]; then
+#  export PECL_EXTENSION=uploadprogress
+#else
+export EXTENSION=uploadprogress
+#fi
 
 ../docker-install.sh

tests-suite/php-extensions.sh

@@ -17,6 +17,13 @@ test_presenceOfPDO() {
   RESULT=$(docker run ${RUN_OPTIONS} --rm "${REPO}:${TAG_PREFIX}${PHP_VERSION}-${BRANCH}-slim-${BRANCH_VARIANT}" php -m | tail -n +1 | grep --color=never PDO)
   assert_equals "PDO" "${RESULT}" "Missing php-PDO"
 }
+#################################################################
+## Let's check that uploadprogress is enabled explicitly with fat
+#################################################################
+test_presenceOfUploadprogressOnFat() {
+  RESULT=$(docker run ${RUN_OPTIONS} -e "PHP_EXTENSIONS=uploadprogress" --rm "${REPO}:${TAG_PREFIX}${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}" php -m | tail -n +1 | grep --color=never uploadprogress)
+  assert_equals "uploadprogress" "${RESULT}" "Missing php-uploadprogress"
+}
 ############################################################
 ## Let's check that the extensions are enabled when composer is run
 ############################################################