Skip to content

Commit 4f18b4e

Browse files
BobMaliBobMali
authored
Merge pull request #32 from BobMali/v13_update
V13 update
2 parents 72986ce + 01c7f0f commit 4f18b4e

Some content is hidden

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

50 files changed

+791
-635
lines changed

‎.ddev/commands/web/install‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
VERSION=${1:-12}
3+
VERSION=${1:-13}
44

55
shopt -s extglob
66
rm -rf /var/www/html/* -- !(vendor)
@@ -10,24 +10,49 @@ composer config extra.typo3/cms.web-dir public -d /var/www/html/
1010
composer config repositories.$EXTENSION_KEY path /var/www/$EXTENSION_KEY -d /var/www/html/
1111
composer config --no-plugins allow-plugins.typo3/cms-composer-installers true -d /var/www/html/
1212
composer config --no-plugins allow-plugins.typo3/class-alias-loader true -d /var/www/html/
13-
composer req t3/cms:"^$VERSION" $PACKAGE_NAME:'*@dev' --no-progress -n -d /var/www/html/
13+
composer req typo3/cms-core:"^$VERSION" \
14+
typo3/cms-backend:"^$VERSION" \
15+
typo3/cms-frontend:"^$VERSION" \
16+
typo3/cms-install:"^$VERSION" \
17+
typo3/cms-extbase:"^$VERSION" \
18+
typo3/cms-fluid:"^$VERSION" \
19+
typo3/cms-recordlist:"^$VERSION" \
20+
typo3/cms-scheduler:"^$VERSION" \
21+
typo3/cms-setup:"^$VERSION" \
22+
typo3/cms-tstemplate:"^$VERSION" \
23+
typo3/cms-extensionmanager:"^$VERSION" \
24+
typo3/cms-filelist:"^$VERSION" \
25+
typo3/cms-lowlevel:"^$VERSION" \
26+
typo3/cms-info:"^$VERSION" \
27+
typo3/cms-viewpage:"^$VERSION" \
28+
typo3/cms-belog:"^$VERSION" \
29+
typo3/cms-beuser:"^$VERSION" \
30+
typo3/cms-dashboard:"^$VERSION" \
31+
typo3/cms-felogin:"^$VERSION" \
32+
typo3/cms-fluid-styled-content:"^$VERSION" \
33+
typo3/cms-form:"^$VERSION" \
34+
typo3/cms-impexp:"^$VERSION" \
35+
typo3/cms-seo:"^$VERSION" \
36+
typo3/cms-sys-note:"^$VERSION" \
37+
helhum/typo3-console:"*" \
38+
$PACKAGE_NAME:'*@dev' \
39+
--no-progress -n -d /var/www/html/
40+
1441
composer req --dev --no-progress -n -W -d /var/www/html/ \
15-
typo3/cms-lowlevel:"^$VERSION" \
1642
friendsofphp/php-cs-fixer:'^3' \
1743
helmich/typo3-typoscript-lint:'^3' \
18-
michielroos/typo3scan:'^1.7' \
19-
ssch/typo3-rector:'^1.3' \
20-
phpunit/phpunit:'^10.5'
44+
ssch/typo3-rector:'^3.5' \
45+
phpunit/phpunit:'^11'
2146

2247
cd /var/www/html/
2348

2449
mysql \
2550
--host=db \
26-
--user=db \
27-
--password=db \
51+
--user=root \
52+
--password=root \
2853
--execute="DROP DATABASE IF EXISTS test; CREATE DATABASE test; GRANT ALL PRIVILEGES ON test.* TO 'db'@'%'; FLUSH PRIVILEGES;"
2954

30-
vendor/bin/typo3 install:setup --database-user-name=db --database-user-password=db --database-host-name=db --database-name=test --use-existing-database --force --site-base-url "/"
55+
vendor/bin/typo3 install:setup --database-user-name=root --database-user-password=root --database-host-name=db --database-name=test --use-existing-database --force --site-base-url "/"
3156
vendor/bin/typo3 configuration:set 'BE/debug' 1
3257
vendor/bin/typo3 configuration:set 'FE/debug' 1
3358
vendor/bin/typo3 configuration:set 'SYS/devIPmask' '*'
@@ -37,7 +62,6 @@ vendor/bin/typo3 configuration:set 'MAIL/transport' 'smtp'
3762
vendor/bin/typo3 configuration:set 'MAIL/transport_smtp_server' 'localhost:1025'
3863
vendor/bin/typo3 configuration:set 'GFX/processor' 'ImageMagick'
3964
vendor/bin/typo3 configuration:set 'GFX/processor_path' '/usr/bin/'
40-
vendor/bin/typo3 backend:createadmin admin admin123
4165

4266
sed -i -e "s/base: ht\//base: \//g" /var/www/html/config/sites/main/config.yaml
4367
sed -i -e 's/base: \/en\//base: \//g' /var/www/html/config/sites/main/config.yaml

‎.ddev/commands/web/install-v13‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/bin/bash
2+
3+
VERSION=v13
4+
5+
rm -rf /var/www/html/$VERSION/*
6+
mkdir -p /var/www/html/$VERSION/
7+
echo "{}" > /var/www/html/$VERSION/composer.json
8+
composer config extra.typo3/cms.web-dir public -d /var/www/html/$VERSION
9+
composer config repositories.$EXTENSION_KEY path ../../$EXTENSION_KEY -d /var/www/html/$VERSION
10+
composer config --no-plugins allow-plugins.typo3/cms-composer-installers true -d /var/www/html/$VERSION
11+
composer config --no-plugins allow-plugins.typo3/class-alias-loader true -d /var/www/html/$VERSION
12+
composer req t3/cms:'^13' $PACKAGE_NAME:'*@dev' --no-progress -n -d /var/www/html/$VERSION
13+
composer req --dev --no-progress -n -W -d /var/www/html/$VERSION \
14+
friendsofphp/php-cs-fixer:'^3' \
15+
helmich/typo3-typoscript-lint:'^3' \
16+
ssch/typo3-rector:'^3.5'
17+
18+
cd /var/www/html/$VERSION
19+
20+
TYPO3_INSTALL_DB_DBNAME=$VERSION
21+
vendor/bin/typo3 install:setup
22+
vendor/bin/typo3 configuration:set 'BE/debug' 1
23+
vendor/bin/typo3 configuration:set 'FE/debug' 1
24+
vendor/bin/typo3 configuration:set 'SYS/devIPmask' '*'
25+
vendor/bin/typo3 configuration:set 'SYS/displayErrors' 1
26+
vendor/bin/typo3 configuration:set 'SYS/trustedHostsPattern' '.*.*'
27+
vendor/bin/typo3 configuration:set 'MAIL/transport' 'smtp'
28+
vendor/bin/typo3 configuration:set 'MAIL/transport_smtp_server' 'localhost:1025'
29+
vendor/bin/typo3 configuration:set 'GFX/processor' 'ImageMagick'
30+
vendor/bin/typo3 configuration:set 'GFX/processor_path' '/usr/bin/'
31+
32+
sed -i -e "s/base: ht\//base: \//g" /var/www/html/$VERSION/config/sites/main/config.yaml
33+
sed -i -e 's/base: \/en\//base: \//g' /var/www/html/$VERSION/config/sites/main/config.yaml
34+
35+
vendor/bin/typo3 cache:flush

‎.ddev/commands/web/phpstan‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
echo "running phpstan"
4+
cd /var/www/pw_comments
5+
./tools/phpstan analyze -c Build/phpstan.neon

‎.ddev/commands/web/test‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
echo "navigation to target folder"
4+
cd /var/www/pw_comments
5+
6+
echo "disabling xdebug"
7+
disable_xdebug
8+
9+
echo "running unit tests"
10+
XDEBUG_MODE=coverage ./tools/phpunit -c Build/phpunit.xml --do-not-cache

‎.ddev/commands/web/test-coverage‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
echo "navigation to target folder"
4+
cd /var/www/pw_comments
5+
6+
echo "enabling xdebug"
7+
enable_xdebug
8+
9+
echo "running unit tests with coverage"
10+
XDEBUG_MODE=coverage ./tools/phpunit -c Build/phpunit.xml --do-not-cache
11+
12+
echo "disabling xdebug"
13+
disable_xdebug

‎.ddev/commands/web/ts-lint‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
echo "navigation to target folder"
4+
cd /var/www/pw_comments
5+
./tools/typoscript-lint -c Build/.typoscript-lint.dist.yml

‎.ddev/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: pw-comments
22
type: php
33
docroot: public
4-
php_version: "8.1"
4+
php_version: "8.2"
55
webserver_type: apache-fpm
66
router_http_port: "80"
77
router_https_port: "443"

‎.ddev/docker-compose.web.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ services:
1818
- TYPO3_INSTALL_SITE_SETUP_TYPE=site
1919
- TYPO3_INSTALL_WEB_SERVER_CONFIG=apache
2020
- TYPO3_CONTEXT=Development
21+
- TYPO3_PATH_WEB=/var/www/html/public
2122
volumes:
2223
- type: bind
2324
source: ../

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
/log
66
vendor
77
.phpunit.cache
8-
.phpunit.result.cache
8+
.phpunit.result.cache
9+
tools
10+
Build/log/*

‎.phive/phars.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phive xmlns="https://phar.io/phive">
3+
<phar name="phpstan" version="^2.1.17" installed="2.1.17" location="./tools/phpstan" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.76.0" installed="3.76.0" location="./tools/php-cs-fixer" copy="true"/>
5+
<phar name="phpunit" version="^11.5.26" installed="11.5.26" location="./tools/phpunit" copy="true"/>
6+
<phar name="martin-helmich/typo3-typoscript-lint" version="^3.2.1" installed="3.2.1" location="./tools/typoscript-lint" copy="true"/>
7+
</phive>

0 commit comments

Comments
 (0)