Skip to content

Commit 06ba6e3

Browse files
dhoffmann1979dhoffmann1979
committed
[RELEASE] Version 12.5.0 with performance improvements and fixes
Resolves: https://projekte.in2code.de/issues/62123 Resolves: https://projekte.in2code.de/issues/62160 Resolves: https://projekte.in2code.de/issues/62309 Resolves: https://projekte.in2code.de/issues/62310 Resolves: https://projekte.in2code.de/issues/62320 Resolves: https://projekte.in2code.de/issues/62547 Resolves: https://projekte.in2code.de/issues/62718 Resolves: https://projekte.in2code.de/issues/62738 Resolves: https://projekte.in2code.de/issues/62739 Resolves: https://projekte.in2code.de/issues/62883 Resolves: https://projekte.in2code.de/issues/62884 Resolves: https://projekte.in2code.de/issues/62886 Resolves: https://projekte.in2code.de/issues/62894 Resolves: https://projekte.in2code.de/issues/62975 Resolves: https://projekte.in2code.de/issues/63066 Resolves: https://projekte.in2code.de/issues/63166 Resolves: https://projekte.in2code.de/issues/63386
2 parents 2abe731 + e08a71a commit 06ba6e3

File tree

97 files changed

+1155
-1040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1155
-1040
lines changed

‎.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/Build export-ignore
66
.gitkeep export-ignore
77
/.editorconfig export-ignore
8+
/.env export-ignore
89
/.gitattributes export-ignore
910
/.gitignore export-ignore
1011
/.phpstorm.meta.php export-ignore
@@ -16,6 +17,9 @@
1617
/Tests export-ignore
1718
/Makefile export-ignore
1819
/phive.xml export-ignore
20+
/phpunit.browser.xml export-ignore
21+
/phpunit.functional.xml export-ignore
22+
/phpunit.unit.xml export-ignore
1923

2024
/Tests/Browser/files/* filter=lfs diff=lfs merge=lfs -text
2125
/Tests/Manual/images/* filter=lfs diff=lfs merge=lfs -text

‎.project/data/dumps/local/tx_in2publish_workflow_history.csv

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.project/data/dumps/local/tx_in2publish_workflow_state.csv

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎.project/docker/docker-compose.ci.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
services:
42
local:
53
image: in2code/httpd:2.4-alpine
@@ -21,7 +19,6 @@ services:
2119
build:
2220
context: .project/docker/local-php
2321
dockerfile: Dockerfile
24-
target: base
2522
args:
2623
USER_ID: ${USER_ID:-1000}
2724
GROUP_ID: ${GROUP_ID:-1000}
@@ -61,7 +58,6 @@ services:
6158
build:
6259
context: .project/docker/foreign-php
6360
dockerfile: Dockerfile
64-
target: base
6561
args:
6662
USER_ID: ${USER_ID:-1000}
6763
GROUP_ID: ${GROUP_ID:-1000}

‎.project/docker/docker-compose.darwin.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
services:
42
local:
53
image: in2code/httpd:2.4-alpine
@@ -24,7 +22,6 @@ services:
2422
build:
2523
context: .project/docker/local-php
2624
dockerfile: Dockerfile
27-
target: base
2825
args:
2926
USER_ID: ${USER_ID:-1000}
3027
GROUP_ID: ${GROUP_ID:-1000}
@@ -67,7 +64,6 @@ services:
6764
build:
6865
context: .project/docker/foreign-php
6966
dockerfile: Dockerfile
70-
target: base
7167
args:
7268
USER_ID: ${USER_ID:-1000}
7369
GROUP_ID: ${GROUP_ID:-1000}

‎.project/docker/docker-compose.linux.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
services:
42
local:
53
image: in2code/httpd:2.4-alpine
@@ -24,7 +22,6 @@ services:
2422
build:
2523
context: .project/docker/local-php
2624
dockerfile: Dockerfile
27-
target: base
2825
args:
2926
USER_ID: ${USER_ID:-1000}
3027
GROUP_ID: ${GROUP_ID:-1000}
@@ -69,7 +66,6 @@ services:
6966
build:
7067
context: .project/docker/foreign-php
7168
dockerfile: Dockerfile
72-
target: base
7369
args:
7470
USER_ID: ${USER_ID:-1000}
7571
GROUP_ID: ${GROUP_ID:-1000}

‎.project/docker/foreign-php/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM in2code/php-dev:8.1-fpm AS base
1+
FROM in2code/php-dev:8.1-fpm
22

33
ARG USER_ID=1000
44
ARG GROUP_ID=1000
@@ -21,13 +21,8 @@ RUN chmod 600 /home/app/.ssh/authorized_keys \
2121
&& apt-get autoremove -y \
2222
&& apt-get clean \
2323
&& echo "php_admin_value[memory_limit] = 256M" >> /usr/local/etc/php-fpm.d/www.conf \
24-
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini \
25-
&& echo "xdebug.mode=off" > /usr/local/etc/php/conf.d/zz_xdebug.ini
24+
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini
2625

2726
COPY docker-php-entrypoint /usr/local/bin/docker-php-entrypoint
2827

2928
EXPOSE 22
30-
31-
FROM base AS local
32-
33-
COPY xdebug.ini /usr/local/etc/php/conf.d/zz_xdebug.ini

‎.project/docker/foreign-php/xdebug.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.project/docker/local-php/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM in2code/php-dev:8.1-fpm AS base
1+
FROM in2code/php-dev:8.1-fpm
22

33
ARG USER_ID=1000
44
ARG GROUP_ID=1000
@@ -23,11 +23,6 @@ RUN apt-get update \
2323
&& apt-get autoremove -y \
2424
&& apt-get clean \
2525
&& echo "php_admin_value[memory_limit] = 256M" >> /usr/local/etc/php-fpm.d/www.conf \
26-
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini \
27-
&& echo "xdebug.mode=off" > /usr/local/etc/php/conf.d/zz_xdebug.ini
26+
&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/zz_custom.ini
2827

2928
USER $USER_ID:$GROUP_ID
30-
31-
FROM base AS local
32-
33-
COPY xdebug.ini /usr/local/etc/php/conf.d/zz_xdebug.ini

‎.project/docker/local-php/xdebug.ini

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.project/githooks/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DIFF=$(git -c diff.mnemonicprefix=false -c diff.noprefix=false --no-pager diff -
2121
-v $PWD:$PWD \
2222
-w $PWD \
2323
-e GRUMPHP_GIT_WORKING_DIR="$(git rev-parse --show-toplevel)" \
24-
in2code/php:7.4-fpm \
24+
in2code/php:8.1-fpm \
2525
'.project/phars/grumphp' \
2626
'git:pre-commit' \
2727
'--skip-success-output' \

0 commit comments

Comments
 (0)