Merge pull request #349 from pixelfederation/fix/doctrine-deprecations

fix(dependency): fix doctrine deprecations
pixelfederation · May 7, 2024 · a17df50 · a17df50
2 parents d0146b2 + d3e8315
commit a17df50
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/config/services.php b/config/services.php
@@ -6,7 +6,7 @@
 use Ackintosh\Ganesha\Storage\Adapter\Apcu;
 use Ackintosh\Ganesha\Storage\Adapter\ApcuStore;
 use Ackintosh\Ganesha\Strategy\Rate\Builder;
-use Doctrine\Common\Annotations\Reader;
+use Doctrine\Common\Annotations\AnnotationReader;
 use PixelFederation\CircuitBreakerBundle\AnnotationMetadataReader;
 use PixelFederation\CircuitBreakerBundle\Bridge\Ganesha\GaneshaCircuitBreaker;
 use PixelFederation\CircuitBreakerBundle\Bridge\Symfony\Command\GenerateCircuitBrokenProxiesCacheClearer;
@@ -57,8 +57,10 @@
 
     $services->alias(MetadataReader::class, AnnotationMetadataReader::class);
 
+    $services->set('app.doctrine_annotation_reader', AnnotationReader::class);
+
     $services->set(AnnotationMetadataReader::class)
-        ->arg('$annotationsReader', service(Reader::class));
+        ->arg('$annotationsReader', service('app.doctrine_annotation_reader'));
 
     $services->alias(MethodExtractor::class, ReflectionMethodExtractor::class);
 

diff --git a/docker/php81/Dockerfile b/docker/php81/Dockerfile
@@ -3,16 +3,11 @@ FROM php:8.1-fpm
 RUN apt-get update && apt-get install -y git-core zlib1g-dev libzip-dev zip unzip
 RUN docker-php-ext-install zip
 
-RUN pecl install xdebug apcu && \
-    docker-php-ext-enable xdebug apcu
+RUN pecl install apcu && \
+    docker-php-ext-enable apcu
 
 RUN echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 
-RUN echo 'xdebug.file_link_format="phpstorm://open?url=file://%f&line=%%l"' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-        echo "xdebug.mode=develop" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-        echo "xdebug.max_nesting_level=10000" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-        echo "xdebug.remote_handler=dbgp" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
     php -r "if (hash_file('SHA384', 'composer-setup.php') === trim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
     php composer-setup.php && \

diff --git a/docker/php82/Dockerfile b/docker/php82/Dockerfile
@@ -3,16 +3,11 @@ FROM php:8.2-fpm
 RUN apt-get update && apt-get install -y git-core zlib1g-dev libzip-dev zip unzip
 RUN docker-php-ext-install zip
 
-RUN pecl install xdebug apcu && \
-    docker-php-ext-enable xdebug apcu
+RUN pecl install apcu && \
+    docker-php-ext-enable apcu
 
 RUN echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 
-RUN echo 'xdebug.file_link_format="phpstorm://open?url=file://%f&line=%%l"' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-        echo "xdebug.mode=develop" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-        echo "xdebug.max_nesting_level=10000" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-        echo "xdebug.remote_handler=dbgp" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
     php -r "if (hash_file('SHA384', 'composer-setup.php') === trim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
     php composer-setup.php && \

diff --git a/tests/Functional/app/config/framework.yaml b/tests/Functional/app/config/framework.yaml
@@ -1,4 +1,5 @@
 framework:
+  annotations: false
   secret: megasecretkey
   router:
     resource: "%kernel.project_dir%/config/routing.yaml"