Compare commits
21 Commits
202302.03.
...
63489e7055
Author | SHA1 | Date | |
---|---|---|---|
63489e7055 | |||
6d8b858cc8 | |||
efed281312 | |||
a6a988a33a | |||
859eb37526 | |||
b55914e40f | |||
7f1085d2c2 | |||
|
b81638eda9 | ||
571d662737 | |||
78a98bff40
|
|||
2f18130e72 | |||
2af27e8b42 | |||
fcd00855f9 | |||
e9c478c062 | |||
d38e9a5c0a | |||
b63a4f2a5f | |||
1a1188c612 | |||
39b9e839c2 | |||
23c438f0d7 | |||
a4fd3dbeb6 | |||
da2149cb60
|
33
.drone.yml
33
.drone.yml
@@ -79,3 +79,36 @@ steps:
|
|||||||
Dockerfile: docker/nginx/Dockerfile
|
Dockerfile: docker/nginx/Dockerfile
|
||||||
depends_on:
|
depends_on:
|
||||||
- build-assets
|
- build-assets
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: build-base-image-php82
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- cron
|
||||||
|
- push
|
||||||
|
cron:
|
||||||
|
- base-image-php82
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: build-base-image
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
username:
|
||||||
|
from_secret: docker_username_gitea
|
||||||
|
password:
|
||||||
|
from_secret: docker_password_gitea
|
||||||
|
registry: gitea.champs-libres.be/chill-project/chill-skeleton-basic
|
||||||
|
repo: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image
|
||||||
|
tag: php82
|
||||||
|
target: chill_base_php82
|
||||||
|
pull_image: true
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: signature
|
||||||
|
hmac: 212da184e3fedeb03530cc66dbf9c8974e461e214dda5a698b11012e66e4531a
|
||||||
|
|
||||||
|
...
|
||||||
|
2
.env.dev
2
.env.dev
@@ -11,3 +11,5 @@ MAILER_URL=smtp://smtp:1025
|
|||||||
PGADMIN_DEFAULT_EMAIL=admin@chill.social
|
PGADMIN_DEFAULT_EMAIL=admin@chill.social
|
||||||
PGADMIN_DEFAULT_PASSWORD=password
|
PGADMIN_DEFAULT_PASSWORD=password
|
||||||
|
|
||||||
|
## Phpstorm IDE project path
|
||||||
|
PROJECT_DIR=
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@@ -9,6 +9,7 @@ config/secrets/
|
|||||||
|
|
||||||
## env files
|
## env files
|
||||||
.env.local
|
.env.local
|
||||||
|
.env.dev.local
|
||||||
|
|
||||||
.composer/*
|
.composer/*
|
||||||
composer.phar
|
composer.phar
|
||||||
@@ -49,17 +50,18 @@ phpunit.xml
|
|||||||
nbproject/*
|
nbproject/*
|
||||||
|
|
||||||
.idea
|
.idea
|
||||||
|
.ignore
|
||||||
|
|
||||||
### template/api/specs.yaml should be compiled
|
### template/api/specs.yaml should be compiled
|
||||||
templates/api/specs.yaml
|
templates/api/specs.yaml
|
||||||
|
|
||||||
|
|
||||||
###> symfony/webpack-encore-bundle ###
|
###> symfony/webpack-encore-bundle ###
|
||||||
/node_modules/
|
/node_modules/
|
||||||
/public/build/
|
/public/build/
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
yarn-error.log
|
yarn-error.log
|
||||||
###< symfony/webpack-encore-bundle ###
|
###< symfony/webpack-encore-bundle ###
|
||||||
|
|
||||||
###> symfony/phpunit-bridge ###
|
###> symfony/phpunit-bridge ###
|
||||||
.phpunit
|
.phpunit
|
||||||
.phpunit.result.cache
|
.phpunit.result.cache
|
||||||
|
66
Dockerfile
66
Dockerfile
@@ -1,4 +1,4 @@
|
|||||||
FROM php:7.4-fpm-buster AS chill_base_php
|
FROM php:8.2-fpm-alpine AS chill_base_php82
|
||||||
|
|
||||||
ENV POSTGRES_VERSION 14
|
ENV POSTGRES_VERSION 14
|
||||||
|
|
||||||
@@ -6,27 +6,31 @@ ENV POSTGRES_VERSION 14
|
|||||||
ARG UID=1000
|
ARG UID=1000
|
||||||
ARG GID=1000
|
ARG GID=1000
|
||||||
|
|
||||||
RUN apt update && apt -y --no-install-recommends install wget gnupg \
|
# install php extensions and deps
|
||||||
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
|
RUN apk update && apk add --no-cache \
|
||||||
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
|
wget gnupg \
|
||||||
&& apt update && apt -y --no-install-recommends install \
|
libpq-dev \
|
||||||
libicu-dev \
|
icu-dev icu-libs icu-data-full \
|
||||||
g++ \
|
oniguruma-dev \
|
||||||
postgresql-server-dev-$POSTGRES_VERSION \
|
libzip libzip-dev \
|
||||||
libzip-dev libzip4 unzip \
|
linux-headers \
|
||||||
libfreetype6-dev \
|
gcc g++ make autoconf \
|
||||||
libonig-dev `# install oniguruma, required for mbstring` \
|
bash git \
|
||||||
libpng-dev \
|
&& docker-php-ext-install pdo_pgsql intl mbstring zip bcmath exif sockets \
|
||||||
libjpeg62-turbo-dev \
|
&& git clone https://github.com/nikic/php-ast.git \
|
||||||
git \
|
&& cd php-ast \
|
||||||
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
|
&& phpize \
|
||||||
&& docker-php-ext-install -j$(nproc) gd \
|
&& ./configure \
|
||||||
&& docker-php-ext-install intl pdo_pgsql mbstring zip bcmath sockets exif \
|
&& make install \
|
||||||
&& pecl install redis \
|
&& echo 'extension=ast.so' > /usr/local/etc/php/php.ini \
|
||||||
&& docker-php-ext-enable redis \
|
&& cd .. && rm -rf php-ast \
|
||||||
&& apt remove -y wget libicu-dev g++ gnupg libzip-dev \
|
&& pecl install redis \
|
||||||
&& apt autoremove -y \
|
&& docker-php-ext-enable redis \
|
||||||
&& apt purge -y
|
&& apk add libpng-dev libjpeg-turbo-dev freetype-dev \
|
||||||
|
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
|
||||||
|
&& docker-php-ext-install -j$(nproc) gd \
|
||||||
|
&& apk add postgresql${POSTGRES_VERSION}-client \
|
||||||
|
&& apk del --purge wget gnupg libpq-dev icu-dev oniguruma-dev libzip-dev linux-headers gcc g++ make autoconf
|
||||||
|
|
||||||
RUN { \
|
RUN { \
|
||||||
echo ""; \
|
echo ""; \
|
||||||
@@ -41,15 +45,31 @@ RUN { \
|
|||||||
echo ""; \
|
echo ""; \
|
||||||
} >> /usr/local/etc/php/conf.d/date.ini
|
} >> /usr/local/etc/php/conf.d/date.ini
|
||||||
|
|
||||||
|
# temporary fix, while php-cs-fixer has conflict dependencies
|
||||||
|
# with chill
|
||||||
|
RUN curl -o /usr/local/bin/php-cs-fixer https://cs.symfony.com/download/php-cs-fixer-v3.phar \
|
||||||
|
&& chmod +x /usr/local/bin/php-cs-fixer
|
||||||
|
# to make php-cs-fixer works with php 8.2
|
||||||
|
ENV PHP_CS_FIXER_IGNORE_ENV=1
|
||||||
|
|
||||||
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
||||||
ENV COMPOSER_ALLOW_SUPERUSER=1
|
ENV COMPOSER_ALLOW_SUPERUSER=1
|
||||||
ENV COMPOSER_MEMORY_LIMIT=-1
|
ENV COMPOSER_MEMORY_LIMIT=-1
|
||||||
|
|
||||||
|
# shell bash preference
|
||||||
|
RUN sed -i " \
|
||||||
|
s|root:x:0:0:root:/root:/bin/ash|root:x:0:0:root:/root:/bin/bash|g; \
|
||||||
|
s|postgres:x:70:70:PostgreSQL user:/var/lib/postgresql:/bin/sh|postgres:x:70:70:PostgreSQL user:/var/lib/postgresql:/bin/bash|g" \
|
||||||
|
/etc/passwd
|
||||||
|
|
||||||
|
# chmod on redis.so
|
||||||
|
RUN chmod 755 -R /usr/local/lib/php/extensions/
|
||||||
|
|
||||||
WORKDIR /var/www/app
|
WORKDIR /var/www/app
|
||||||
|
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
|
|
||||||
FROM chill_base_php AS chill_php
|
FROM chill_base_php82 AS chill_php82
|
||||||
|
|
||||||
# copy directories
|
# copy directories
|
||||||
|
|
||||||
|
8
Makefile
8
Makefile
@@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
|
|||||||
PWD:=$(shell echo ${PWD})
|
PWD:=$(shell echo ${PWD})
|
||||||
UID:=$(shell id -u)
|
UID:=$(shell id -u)
|
||||||
GID:=$(shell id -g)
|
GID:=$(shell id -g)
|
||||||
BASE_TAG=chill_base_php
|
BASE_TAG=chill_base_php82
|
||||||
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
|
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
|
||||||
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
|
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
|
||||||
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG)
|
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG)
|
||||||
PHP_BASE_IMAGE=php:7.4-fpm-buster
|
PHP_BASE_IMAGE=php:8.2-fpm-alpine
|
||||||
PHP_BASE_IMAGE_CHILL=chill_base_php
|
PHP_BASE_IMAGE_CHILL=chill_php82
|
||||||
NGINX_BASE_IMAGE=nginx
|
NGINX_BASE_IMAGE=nginx
|
||||||
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
|
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
|
||||||
ifneq (,$(wildcard ./.env))
|
ifneq (,$(wildcard ./.env))
|
||||||
@@ -39,7 +39,7 @@ build-assets:
|
|||||||
$(DOCKERNODE_CMD) yarn run encore production
|
$(DOCKERNODE_CMD) yarn run encore production
|
||||||
|
|
||||||
init:
|
init:
|
||||||
docker build --target chill_base_php -t $(BASE_TAG) .
|
docker build --target $(PHP_BASE_IMAGE_CHILL) -t $(BASE_TAG) .
|
||||||
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
|
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
|
||||||
@$(MAKE) -f $(THIS_FILE) build-assets
|
@$(MAKE) -f $(THIS_FILE) build-assets
|
||||||
@$(MAKE) -f $(THIS_FILE) post-install
|
@$(MAKE) -f $(THIS_FILE) post-install
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"chill-project/chill-bundles": "dev-master#c64ec89274196fa1532fc88584a3a88430c4cfa1",
|
"chill-project/chill-bundles": "dev-master#de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
|
||||||
"symfony/flex": "^1.9",
|
"symfony/flex": "^1.9",
|
||||||
"symfony/http-client": "^4.4 || ^5",
|
"symfony/http-client": "^4.4 || ^5",
|
||||||
"nelmio/alice": "^3.8",
|
"nelmio/alice": "^3.8",
|
||||||
@@ -23,8 +23,7 @@
|
|||||||
"phpstan/phpstan": "^1.0",
|
"phpstan/phpstan": "^1.0",
|
||||||
"spomky-labs/base64url": "^2.0",
|
"spomky-labs/base64url": "^2.0",
|
||||||
"twig/string-extra": "^3.3",
|
"twig/string-extra": "^3.3",
|
||||||
"symfony/mailer": "^5.4",
|
"symfony/mailer": "^5.4"
|
||||||
"symfony/dependency-injection": "5.4.16"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fakerphp/faker": "^1.13",
|
"fakerphp/faker": "^1.13",
|
||||||
|
100
composer.lock
generated
100
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "1ca80eaac185c24391302101a2d24efd",
|
"content-hash": "a31ca489792a6a2e37aa63ff45008c4b",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
@@ -232,12 +232,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git@gitlab.com:Chill-Projet/chill-bundles.git",
|
"url": "git@gitlab.com:Chill-Projet/chill-bundles.git",
|
||||||
"reference": "c64ec89274196fa1532fc88584a3a88430c4cfa1"
|
"reference": "de55ff920f1ffee00b0d5ea47aa5028a23dff5a7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=c64ec89274196fa1532fc88584a3a88430c4cfa1",
|
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
|
||||||
"reference": "c64ec89274196fa1532fc88584a3a88430c4cfa1",
|
"reference": "de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -343,7 +343,7 @@
|
|||||||
"chill",
|
"chill",
|
||||||
"social worker"
|
"social worker"
|
||||||
],
|
],
|
||||||
"time": "2023-02-01T13:14:43+00:00"
|
"time": "2023-01-31T18:41:43+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/package-versions-deprecated",
|
"name": "composer/package-versions-deprecated",
|
||||||
@@ -420,16 +420,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/annotations",
|
"name": "doctrine/annotations",
|
||||||
"version": "1.14.3",
|
"version": "1.14.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/annotations.git",
|
"url": "https://github.com/doctrine/annotations.git",
|
||||||
"reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af"
|
"reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
|
"url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b",
|
||||||
"reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
|
"reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -490,9 +490,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/doctrine/annotations/issues",
|
"issues": "https://github.com/doctrine/annotations/issues",
|
||||||
"source": "https://github.com/doctrine/annotations/tree/1.14.3"
|
"source": "https://github.com/doctrine/annotations/tree/1.14.2"
|
||||||
},
|
},
|
||||||
"time": "2023-02-01T09:20:38+00:00"
|
"time": "2022-12-15T06:48:22+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/cache",
|
"name": "doctrine/cache",
|
||||||
@@ -3038,21 +3038,21 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "knpuniversity/oauth2-client-bundle",
|
"name": "knpuniversity/oauth2-client-bundle",
|
||||||
"version": "v2.13.0",
|
"version": "v2.12.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/knpuniversity/oauth2-client-bundle.git",
|
"url": "https://github.com/knpuniversity/oauth2-client-bundle.git",
|
||||||
"reference": "3d130053e7e510a97f976ca5ba3107e5bd84c9bc"
|
"reference": "d162e3da5d2fd6e71401de8ce23c75abe1457a05"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/knpuniversity/oauth2-client-bundle/zipball/3d130053e7e510a97f976ca5ba3107e5bd84c9bc",
|
"url": "https://api.github.com/repos/knpuniversity/oauth2-client-bundle/zipball/d162e3da5d2fd6e71401de8ce23c75abe1457a05",
|
||||||
"reference": "3d130053e7e510a97f976ca5ba3107e5bd84c9bc",
|
"reference": "d162e3da5d2fd6e71401de8ce23c75abe1457a05",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"league/oauth2-client": "^2.0",
|
"league/oauth2-client": "^2.0",
|
||||||
"php": ">=7.4",
|
"php": ">=7.2.5",
|
||||||
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
|
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
|
||||||
"symfony/framework-bundle": "^4.4|^5.0|^6.0",
|
"symfony/framework-bundle": "^4.4|^5.0|^6.0",
|
||||||
"symfony/http-foundation": "^4.4|^5.0|^6.0",
|
"symfony/http-foundation": "^4.4|^5.0|^6.0",
|
||||||
@@ -3092,9 +3092,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/knpuniversity/oauth2-client-bundle/issues",
|
"issues": "https://github.com/knpuniversity/oauth2-client-bundle/issues",
|
||||||
"source": "https://github.com/knpuniversity/oauth2-client-bundle/tree/v2.13.0"
|
"source": "https://github.com/knpuniversity/oauth2-client-bundle/tree/v2.12.0"
|
||||||
},
|
},
|
||||||
"time": "2023-02-02T14:57:35+00:00"
|
"time": "2023-01-31T15:00:52+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laminas/laminas-code",
|
"name": "laminas/laminas-code",
|
||||||
@@ -6086,16 +6086,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/recursion-context",
|
"name": "sebastian/recursion-context",
|
||||||
"version": "4.0.5",
|
"version": "4.0.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/recursion-context.git",
|
"url": "https://github.com/sebastianbergmann/recursion-context.git",
|
||||||
"reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
|
"reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
|
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
|
||||||
"reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
|
"reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -6134,10 +6134,10 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Provides functionality to recursively process PHP variables",
|
"description": "Provides functionality to recursively process PHP variables",
|
||||||
"homepage": "https://github.com/sebastianbergmann/recursion-context",
|
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
|
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
|
"source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -6145,7 +6145,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2023-02-03T06:07:39+00:00"
|
"time": "2020-10-26T13:17:30+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sensio/framework-extra-bundle",
|
"name": "sensio/framework-extra-bundle",
|
||||||
@@ -7062,16 +7062,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/dependency-injection",
|
"name": "symfony/dependency-injection",
|
||||||
"version": "v5.4.16",
|
"version": "v5.4.20",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/dependency-injection.git",
|
"url": "https://github.com/symfony/dependency-injection.git",
|
||||||
"reference": "a93e1863500940780fc1235f52d54397be2d14b3"
|
"reference": "8185ed0df129005a26715902f1a53bad0fe67102"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a93e1863500940780fc1235f52d54397be2d14b3",
|
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8185ed0df129005a26715902f1a53bad0fe67102",
|
||||||
"reference": "a93e1863500940780fc1235f52d54397be2d14b3",
|
"reference": "8185ed0df129005a26715902f1a53bad0fe67102",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -7131,7 +7131,7 @@
|
|||||||
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
|
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.16"
|
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.20"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -7147,7 +7147,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-11-25T07:33:13+00:00"
|
"time": "2023-01-27T11:08:11+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/deprecation-contracts",
|
"name": "symfony/deprecation-contracts",
|
||||||
@@ -13406,16 +13406,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "9.6.0",
|
"version": "9.5.28",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "70fc8be1d0b9fad56a199a4df5f9cfabfc246f84"
|
"reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/70fc8be1d0b9fad56a199a4df5f9cfabfc246f84",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
|
||||||
"reference": "70fc8be1d0b9fad56a199a4df5f9cfabfc246f84",
|
"reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -13457,7 +13457,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "9.6-dev"
|
"dev-master": "9.5-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@@ -13488,7 +13488,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.0"
|
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -13504,7 +13504,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2023-02-03T07:32:24+00:00"
|
"time": "2023-01-14T12:32:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/cli-parser",
|
"name": "sebastian/cli-parser",
|
||||||
@@ -13732,16 +13732,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/environment",
|
"name": "sebastian/environment",
|
||||||
"version": "5.1.5",
|
"version": "5.1.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/environment.git",
|
"url": "https://github.com/sebastianbergmann/environment.git",
|
||||||
"reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
|
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
|
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
|
||||||
"reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
|
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -13783,7 +13783,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/environment/issues",
|
"issues": "https://github.com/sebastianbergmann/environment/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
|
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -13791,7 +13791,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2023-02-03T06:03:51+00:00"
|
"time": "2022-04-03T09:37:03+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/global-state",
|
"name": "sebastian/global-state",
|
||||||
@@ -14083,16 +14083,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/type",
|
"name": "sebastian/type",
|
||||||
"version": "3.2.1",
|
"version": "3.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/type.git",
|
"url": "https://github.com/sebastianbergmann/type.git",
|
||||||
"reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
|
"reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
|
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
|
||||||
"reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
|
"reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -14127,7 +14127,7 @@
|
|||||||
"homepage": "https://github.com/sebastianbergmann/type",
|
"homepage": "https://github.com/sebastianbergmann/type",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/type/issues",
|
"issues": "https://github.com/sebastianbergmann/type/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
|
"source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -14135,7 +14135,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2023-02-03T06:13:03+00:00"
|
"time": "2022-09-12T14:47:03+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/version",
|
"name": "sebastian/version",
|
||||||
|
@@ -56,7 +56,6 @@ chill_budget:
|
|||||||
- { key: mutuelle, labels: [{lang: fr, label: "Mutuelle"}]}
|
- { key: mutuelle, labels: [{lang: fr, label: "Mutuelle"}]}
|
||||||
- { key: transport, labels: [{lang: fr, label: "Frais de transport"}]}
|
- { key: transport, labels: [{lang: fr, label: "Frais de transport"}]}
|
||||||
- { key: decouvbank, labels: [{lang: fr, label: "Découvert bancaire utilisé"}]}
|
- { key: decouvbank, labels: [{lang: fr, label: "Découvert bancaire utilisé"}]}
|
||||||
- { key: credit, labels: [{lang: fr, label: "Procédure de saisie"}]}
|
|
||||||
- { key: procsaisie, labels: [{lang: fr, label: "Procédure de saisie"}]}
|
- { key: procsaisie, labels: [{lang: fr, label: "Procédure de saisie"}]}
|
||||||
- { key: indus, labels: [{lang: fr, label: "Indus"}]}
|
- { key: indus, labels: [{lang: fr, label: "Indus"}]}
|
||||||
- { key: apurement, labels: [{lang: fr, label: "Plan d'apurement"}]}
|
- { key: apurement, labels: [{lang: fr, label: "Plan d'apurement"}]}
|
||||||
|
@@ -3,3 +3,10 @@ framework:
|
|||||||
# allow to debug from ngrok, useful for webhooks coming from outside:
|
# allow to debug from ngrok, useful for webhooks coming from outside:
|
||||||
- '^(.+\.)?ngrok\.io$'
|
- '^(.+\.)?ngrok\.io$'
|
||||||
- 'nginx'
|
- 'nginx'
|
||||||
|
|
||||||
|
## Open files in phpstorm IDE from profiler links
|
||||||
|
# ref: https://symfony.com/doc/current/reference/configuration/framework.html#ide
|
||||||
|
# need: https://github.com/sanduhrs/phpstorm-url-handler/blob/master/phpstorm-url-handler
|
||||||
|
# set var in file .env.dev.local (PROJECT_DIR=<relative path from home folder>)
|
||||||
|
ide: 'phpstorm://open?file=%%f&line=%%l&/var/www/app/>%env(resolve:PROJECT_DIR)%'
|
||||||
|
|
||||||
|
@@ -1,2 +1,3 @@
|
|||||||
wopi:
|
wopi:
|
||||||
server: "%env(resolve:WOPI_SERVER)%"
|
server: "%env(resolve:WOPI_SERVER)%"
|
||||||
|
enable_lock: false
|
||||||
|
@@ -8,7 +8,7 @@ services:
|
|||||||
args:
|
args:
|
||||||
UID: ${PHP_FPM_USER:-1000}
|
UID: ${PHP_FPM_USER:-1000}
|
||||||
# uncomment and set your own image if needed
|
# uncomment and set your own image if needed
|
||||||
image: ${IMAGE_PHP-chill_php}:${VERSION:-latest}
|
image: ${IMAGE_PHP-chill_php82}:${VERSION:-latest}
|
||||||
volumes:
|
volumes:
|
||||||
- .:/var/www/app
|
- .:/var/www/app
|
||||||
environment:
|
environment:
|
||||||
|
@@ -10,7 +10,7 @@ services:
|
|||||||
args:
|
args:
|
||||||
UID: ${PHP_FPM_USER:-1000}
|
UID: ${PHP_FPM_USER:-1000}
|
||||||
# uncomment and set your own image if needed
|
# uncomment and set your own image if needed
|
||||||
image: ${IMAGE_PHP-chill_php}:${VERSION:-latest}
|
image: ${IMAGE_PHP-chill_php82}:${VERSION:-latest}
|
||||||
#
|
#
|
||||||
# normally, you should not mount any volume and use your own image
|
# normally, you should not mount any volume and use your own image
|
||||||
#
|
#
|
||||||
|
@@ -8,7 +8,7 @@ services:
|
|||||||
args:
|
args:
|
||||||
UID: ${PHP_FPM_USER:-1000}
|
UID: ${PHP_FPM_USER:-1000}
|
||||||
# uncomment and set your own image if needed
|
# uncomment and set your own image if needed
|
||||||
image: ${IMAGE_PHP:-chill_php}:${VERSION:-latest}
|
image: ${IMAGE_PHP:-chill_php82}:${VERSION:-latest}
|
||||||
volumes:
|
volumes:
|
||||||
- .:/var/www/app
|
- .:/var/www/app
|
||||||
environment:
|
environment:
|
||||||
|
@@ -358,9 +358,6 @@
|
|||||||
"psr/http-message": {
|
"psr/http-message": {
|
||||||
"version": "1.0.1"
|
"version": "1.0.1"
|
||||||
},
|
},
|
||||||
"psr/link": {
|
|
||||||
"version": "1.0.0"
|
|
||||||
},
|
|
||||||
"psr/log": {
|
"psr/log": {
|
||||||
"version": "1.1.3"
|
"version": "1.1.3"
|
||||||
},
|
},
|
||||||
@@ -820,9 +817,6 @@
|
|||||||
"symfony/var-exporter": {
|
"symfony/var-exporter": {
|
||||||
"version": "v5.1.3"
|
"version": "v5.1.3"
|
||||||
},
|
},
|
||||||
"symfony/web-link": {
|
|
||||||
"version": "v5.2.12"
|
|
||||||
},
|
|
||||||
"symfony/web-profiler-bundle": {
|
"symfony/web-profiler-bundle": {
|
||||||
"version": "3.3",
|
"version": "3.3",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
Reference in New Issue
Block a user