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

fix(dependency): fix doctrine deprecations #349

Merged
merged 1 commit into from
May 7, 2024
Merged

fix(dependency): fix doctrine deprecations #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions config/services.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
9 changes: 2 additions & 7 deletions docker/php81/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
9 changes: 2 additions & 7 deletions docker/php82/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
1 change: 1 addition & 0 deletions tests/Functional/app/config/framework.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
framework:
annotations: false
secret: megasecretkey
router:
resource: "%kernel.project_dir%/config/routing.yaml"
Expand Down
Loading