Merge pull request #135 from maciejlew/php-8.4

maciejlew · web-flow · commit ca181ae0af3b · 2025-07-03T11:57:01.000+02:00
PHP 8.4 support
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,6 +6,9 @@ on:
             - main
             - master
     pull_request:
+        branches:
+            - main
+            - master
 
 jobs:
     tests:
@@ -23,6 +26,7 @@ jobs:
                     - 8.1
                     - 8.2
                     - 8.3
+                    - 8.4
         steps:
             -   name: Checkout
                 uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Added
+- PHP-8.4 support
+
 ## [3.0.11] - 2024-03-27
 ### Added
 - service url scheme and host validation
diff --git a/build/Makefile b/build/Makefile
@@ -9,6 +9,7 @@ include $(CURDIR)/php-8.0/Makefile
 include $(CURDIR)/php-8.1/Makefile
 include $(CURDIR)/php-8.2/Makefile
 include $(CURDIR)/php-8.3/Makefile
+include $(CURDIR)/php-8.4/Makefile
 
 help:
 	@grep -hE '^[a-zA-Z0-9_.-]+:.*?## .*$$' $(MAKEFILE_LIST) \
@@ -28,6 +29,7 @@ test: ## test all against all php images
 	$(MAKE) test-php-8.1
 	$(MAKE) test-php-8.2
 	$(MAKE) test-php-8.3
+	$(MAKE) test-php-8.4
 
 test-unit: ## test unit suite against all php images
 	$(MAKE) test-suite-php-7.0 SUITE=unit
@@ -39,5 +41,6 @@ test-unit: ## test unit suite against all php images
 	$(MAKE) test-suite-php-8.1 SUITE=unit
 	$(MAKE) test-suite-php-8.2 SUITE=unit
 	$(MAKE) test-suite-php-8.3 SUITE=unit
+	$(MAKE) test-suite-php-8.4 SUITE=unit
 
 .DEFAULT_GOAL := help
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
@@ -63,4 +63,11 @@ services:
       context: php-8.3
     volumes:
       - ..:/app
+    network_mode: host
+
+  php-8.4:
+    build:
+      context: php-8.4
+    volumes:
+      - ..:/app
     network_mode: host
diff --git a/build/php-8.3/Makefile b/build/php-8.3/Makefile
@@ -1,7 +1,7 @@
 .PHONY: prepare-php-8.3 test-php-8.3 test-suite-php-8.3
 
 prepare-php-8.3: ## load dependencies with php 8.3
-	docker-compose run -T php-8.3 /usr/bin/composer update --ignore-platform-req=PHP
+	docker-compose run -T php-8.3 /usr/bin/composer update
 
 test-php-8.3: prepare-php-8.3 ## run tests against php 8.3
 	docker-compose run -T php-8.3 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
diff --git a/build/php-8.4/Dockerfile b/build/php-8.4/Dockerfile
@@ -0,0 +1,18 @@
+FROM composer:latest AS composer
+FROM php:8.4-cli-alpine
+
+RUN apk update && \
+    apk upgrade && \
+    apk add --no-cache \
+        autoconf \
+        g++ \
+        make \
+        linux-headers
+
+RUN pecl install xdebug-3.4.4 && \
+    pecl clear-cache && \
+    docker-php-ext-enable xdebug
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+WORKDIR /app/
diff --git a/build/php-8.4/Makefile b/build/php-8.4/Makefile
@@ -0,0 +1,10 @@
+.PHONY: prepare-php-8.4 test-php-8.4 test-suite-php-8.4
+
+prepare-php-8.4: ## load dependencies with php 8.4
+	docker-compose run -T php-8.4 /usr/bin/composer update
+
+test-php-8.4: prepare-php-8.4 ## run tests against php 8.4
+	docker-compose run -T php-8.4 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
+
+test-suite-php-8.4: prepare-php-8.4 ## run suite tests against php 8.4, ex: make test-suite-php-8.4 SUITE="unit"
+	docker-compose run -T php-8.4 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     },
     "require": {
-        "php": "^7 || ~8.0 || ~8.1 || ~8.2 || ~8.3",
+        "php": "^7 || ~8.0 || ~8.1 || ~8.2 || ~8.3 || ~8.4",
         "ext-json": "*",
         "psr/log": "^1 || ^2 || ^3",
         "psr/http-message": "~1.0 || ~1.1 || ~2.0",
diff --git a/src/Feature/Contacts/ContactsFeature.php b/src/Feature/Contacts/ContactsFeature.php
@@ -19,6 +19,7 @@ interface ContactsFeature
 {
     /**
      * @return Contact[]
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
      */
     public function findContacts(FindContactsBag $findContactsBag = null): array;
 
diff --git a/src/Feature/Contacts/ContactsHttpFeature.php b/src/Feature/Contacts/ContactsHttpFeature.php
@@ -31,6 +31,9 @@ public function __construct(RestRequestExecutor $restRequestExecutor, DataFactor
         $this->dataFactoryProvider = $dataFactoryProvider;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function findContacts(FindContactsBag $findContactsBag = null): array
     {
         $result = $this->restRequestExecutor->read('contacts', (array)$findContactsBag);
diff --git a/src/Feature/Sms/Bag/ScheduleSmsBag.php b/src/Feature/Sms/Bag/ScheduleSmsBag.php
@@ -67,6 +67,9 @@ public function setParams(array $params): self
         return $this;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function setExternalId(string $idx, bool $checkIdx = null): self
     {
         $this->idx = [$idx];
diff --git a/src/Feature/Sms/Bag/ScheduleSmsToGroupBag.php b/src/Feature/Sms/Bag/ScheduleSmsToGroupBag.php
@@ -55,6 +55,9 @@ public static function withTemplateName(DateTimeInterface $scheduleAt, string $g
         return $bag;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function setExternalId(string $idx, bool $checkIdx = null): self
     {
         $this->idx = [$idx];
diff --git a/src/Feature/Sms/Bag/ScheduleSmssBag.php b/src/Feature/Sms/Bag/ScheduleSmssBag.php
@@ -68,6 +68,9 @@ public function setParams(array $params): self
         return $this;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function setExternalId(array $idx, bool $checkIdx = null): self
     {
         $this->idx = $idx;
diff --git a/src/Feature/Sms/Bag/SendSmsBag.php b/src/Feature/Sms/Bag/SendSmsBag.php
@@ -62,6 +62,9 @@ public function setParams(array $params): self
         return $this;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function setExternalId(string $idx, bool $checkIdx = null): self
     {
         $this->idx = [$idx];
diff --git a/src/Feature/Sms/Bag/SendSmsToGroupBag.php b/src/Feature/Sms/Bag/SendSmsToGroupBag.php
@@ -48,6 +48,9 @@ public static function withTemplateName(string $group, string $templateName): se
         return $bag;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function setExternalId(string $idx, bool $checkIdx = null): self
     {
         $this->idx = [$idx];
diff --git a/src/Feature/Sms/Bag/SendSmssBag.php b/src/Feature/Sms/Bag/SendSmssBag.php
@@ -63,6 +63,9 @@ public function setParams(array $params): self
         return $this;
     }
 
+    /**
+     * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4
+     */
     public function setExternalId(array $idx, bool $checkIdx = null): self
     {
         $this->idx = $idx;
diff --git a/src/SmsapiClient.php b/src/SmsapiClient.php
@@ -12,7 +12,7 @@
  */
 interface SmsapiClient extends LoggerAwareInterface
 {
-    const VERSION = '3.0.11';
+    const VERSION = 'Unreleased';
 
     public function smsapiPlService(string $apiToken): SmsapiPlService;
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`	`"require": {`
`19`		`- "php": "^7 \|\| ~8.0 \|\| ~8.1 \|\| ~8.2 \|\| ~8.3",`
	`19`	`+ "php": "^7 \|\| ~8.0 \|\| ~8.1 \|\| ~8.2 \|\| ~8.3 \|\| ~8.4",`
`20`	`20`	`"ext-json": "*",`
`21`	`21`	`"psr/log": "^1 \|\| ^2 \|\| ^3",`
`22`	`22`	`"psr/http-message": "~1.0 \|\| ~1.1 \|\| ~2.0",`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ interface ContactsFeature`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @return Contact[]`
	`22`	`+ * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4`
`22`	`23`	`*/`
`23`	`24`	`public function findContacts(FindContactsBag $findContactsBag = null): array;`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ public function __construct(RestRequestExecutor $restRequestExecutor, DataFactor`
`31`	`31`	`$this->dataFactoryProvider = $dataFactoryProvider;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ /**`
	`35`	`+ * @todo method signature to be changed in next major release as implicitly marking parameter as nullable is deprecated since PHP 8.4`
	`36`	`+ */`
`34`	`37`	`public function findContacts(FindContactsBag $findContactsBag = null): array`
`35`	`38`	`{`
`36`	`39`	`$result = $this->restRequestExecutor->read('contacts', (array)$findContactsBag);`