Test against PHP 8.4.0RC3

Author: olvlvl

.editorconfig

@@ -8,8 +8,11 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[{*.yaml,*yml,*.neon}]
+[{*.yaml,*.yml,*.neon,*.json}]
 indent_size = 2
 
-[Makefile]
+[*.md]
+max_line_length = 100
+
+[{Dockerfile,Makefile}]
 indent_style = tab

.github/workflows/test.yml

@@ -13,6 +13,7 @@ jobs:
         php-version:
         - "8.2"
         - "8.3"
+        - "8.4"
     steps:
     - name: Checkout
       uses: actions/checkout@v4

Dockerfile

@@ -1,31 +1,43 @@
-ARG PHP_VERSION
+ARG PHP_VERSION=8.2
 FROM php:${PHP_VERSION}-cli-bookworm
 
-RUN apt-get update && \
-	apt-get install -y autoconf pkg-config && \
-	pecl channel-update pecl.php.net && \
-    pecl install xdebug &&\
-	docker-php-ext-enable opcache xdebug
+RUN <<-EOF
+	docker-php-ext-enable opcache
 
-RUN echo '\
-xdebug.client_host=host.docker.internal\n\
-xdebug.mode=develop\n\
-xdebug.start_with_request=yes\n\
-' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+	if [ "$PHP_VERSION" \< "8.4" ]; then
+		apt-get update
+		apt-get install -y autoconf pkg-config
+		pecl channel-update pecl.php.net
+		pecl install xdebug
+		docker-php-ext-enable xdebug
+	fi
+EOF
 
-RUN echo '\
-display_errors=On\n\
-error_reporting=E_ALL\n\
-date.timezone=UTC\n\
-' >> /usr/local/etc/php/conf.d/php.ini
+RUN <<-EOF
+	cat <<-SHELL >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+	xdebug.client_host=host.docker.internal
+	xdebug.mode=develop
+	xdebug.start_with_request=yes
+	SHELL
+
+	cat <<-SHELL >> /usr/local/etc/php/conf.d/php.ini
+	display_errors=On
+	error_reporting=E_ALL
+	date.timezone=UTC
+	SHELL
+EOF
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
-RUN apt-get update && \
-	apt-get install unzip && \
-	curl -s https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && \
-	mv composer.phar /usr/local/bin/composer && \
-	echo 'export PATH="$HOME/.composer/vendor/bin:$PATH"\n' >> /root/.bashrc
+RUN <<-EOF
+	apt-get update
+	apt-get install unzip
+	curl -s https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet
+	mv composer.phar /usr/local/bin/composer
+	cat <<-SHELL >> /root/.bashrc
+	export PATH="$HOME/.composer/vendor/bin:$PATH"
+	SHELL
+EOF
 
 RUN composer global require squizlabs/php_codesniffer
 

Makefile

@@ -8,7 +8,7 @@ test-dependencies: vendor test-cleanup
 
 .PHONY: test
 test: test-dependencies
-	@$(PHPUNIT)
+	@$(PHPUNIT) $(ARGS)
 
 .PHONY: test-coverage
 test-coverage: test-dependencies
@@ -37,6 +37,11 @@ test-container-83:
 	@-docker-compose run --rm app83 bash
 	@docker-compose down -v
 
+.PHONY: test-container-84
+test-container-84:
+	@-docker-compose run --rm app84 bash
+	@docker-compose down -v
+
 .PHONY: lint
 lint:
 	@XDEBUG_MODE=off phpcs -s

docker-compose.yaml

@@ -1,5 +1,4 @@
 ---
-version: "3.2"
 services:
   app82:
     build:
@@ -9,8 +8,8 @@ services:
     environment:
       PHP_IDE_CONFIG: "serverName=symfony-di-proxy"
     volumes:
-    - .:/app:delegated
-    - ~/.composer:/root/.composer:delegated
+      - .:/app:delegated
+      - ~/.composer:/root/.composer:delegated
   app83:
     build:
       context: .
@@ -19,5 +18,15 @@ services:
     environment:
       PHP_IDE_CONFIG: "serverName=symfony-di-proxy"
     volumes:
-    - .:/app:delegated
-    - ~/.composer:/root/.composer:delegated
+      - .:/app:delegated
+      - ~/.composer:/root/.composer:delegated
+  app84:
+    build:
+      context: .
+      args:
+        PHP_VERSION: "8.4.0RC3"
+    environment:
+      PHP_IDE_CONFIG: "serverName=symfony-di-proxy"
+    volumes:
+      - .:/app:delegated
+      - ~/.composer:/root/.composer:delegated

lib/ProxyDumper.php

@@ -34,7 +34,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
+    public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
     {
         $class = $definition->getClass();
 
@@ -76,7 +76,7 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
     /**
      * @inheritdoc
      */
-    public function getProxyCode(Definition $definition, string $id = null): string
+    public function getProxyCode(Definition $definition, ?string $id = null): string
     {
         return '';
     }

phpunit.xml

@@ -3,6 +3,7 @@
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          colors="true"
          bootstrap="tests/bootstrap.php"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <testsuites>
         <testsuite name="olvlvl/symfony-dependency-injection-proxy">

tests/IntegrationTest.php

@@ -39,7 +39,7 @@ final class IntegrationTest extends TestCase
      *
      * @param Definition[] $definitions
      */
-    public function testCompilation(array $definitions, callable $assert, callable $tweakBuilder = null): void
+    public function testCompilation(array $definitions, callable $assert, ?callable $tweakBuilder = null): void
     {
         $builder = new ContainerBuilder();
         $builder->addDefinitions($definitions);