Skip to content

Commit

Permalink
Require olvlvl/symfony-dependency-injection-proxy v6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
olvlvl committed Jan 20, 2024
1 parent b767e83 commit 9715126
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 47 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ indent_size = 4

[{*.yaml,*.yml,*.neon,*.json}]
indent_size = 2

[Dockerfile]
indent_style = tab
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
steps:
Expand Down
58 changes: 34 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,36 +1,46 @@
ARG PHP_VERSION
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 && \
RUN <<-EOF
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
EOF

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
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

RUN echo '\
display_errors=On\n\
error_reporting=E_ALL\n\
date.timezone=UTC\n\
' >> /usr/local/etc/php/conf.d/php.ini
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

# package specifics

RUN pecl install apcu && \
docker-php-ext-enable apcu opcache && \
echo '\
apc.enable_cli=On\n\
' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
RUN <<-EOF
pecl install apcu
docker-php-ext-enable apcu opcache
cat <<-SHELL >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
apc.enable_cli=On
SHELL
EOF
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The icanboogie/bind-symfony-dependency-injection package is free software.
It is released under the terms of the following BSD License.

Copyright (c) 2017-2024 by Olivier Laviale
Copyright (c) 2017-present by Olivier Laviale
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
5 changes: 5 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

# v5.0 to v6.0

### New requirements

- Requires PHP v8.2+
- Requires olvlvl/symfony-dependency-injection-proxy v6.0+

## Breaking changes

- The container proxy has been replaced by a container factory. The container is now created right away and returned. Also, the package doesn't deal with `ICanBoogie\Service` anymore and let ICanBoogie deal with it instead. The prototype method `Application::get_container` and `ApplicationBindings` are removed. The event listener for `BootEvent` is removed.
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ test-cleanup:
@rm -rf tests/sandbox/*

.PHONY: test-container
test-container: test-container-81

.PHONY: test-container-81
test-container-81:
@-docker-compose run --rm app81 bash
@docker-compose down -v
test-container: test-container-82

.PHONY: test-container-82
test-container-82:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.1",
"php": ">=8.2",
"icanboogie/icanboogie": "^6.0",
"olvlvl/symfony-dependency-injection-proxy": "^5.0",
"symfony/config": "^6.3",
"symfony/yaml": "^6.3"
"olvlvl/symfony-dependency-injection-proxy": "^6.0",
"symfony/config": "^7.0",
"symfony/yaml": "^7.0"
},
"require-dev": {
"phpstan/phpstan": "^1.10",
Expand Down
11 changes: 0 additions & 11 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
---
version: "3.2"
services:
app81:
build:
context: .
args:
PHP_VERSION: "8.1"
environment:
PHP_IDE_CONFIG: 'serverName=icanboogie-bind-symfony-dependency-injection'
volumes:
- .:/app:delegated
- ~/.composer:/root/.composer:delegated
working_dir: /app
app82:
build:
context: .
Expand Down

0 comments on commit 9715126

Please sign in to comment.