Skip to content

Commit 2e51310

Browse files
Merge branch 'release/13.0.0'
2 parents f96b087 + 1012d2d commit 2e51310

236 files changed

Lines changed: 7265 additions & 16502 deletions

File tree

Some content is hidden

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

.ddev/commands/host/initialize

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,37 @@ fi
1313

1414
echo "Fetching database and fileadmin"
1515
git lfs pull
16-
echo "Copy configuration"
17-
mkdir -p config/sites/main
18-
cp .project/config/typo3/config.yaml config/sites/main/
19-
mkdir -p .build/public
20-
cp .project/config/typo3/.htaccess .build/public/
21-
mkdir -p config/system
22-
cp .project/config/typo3/settings.php config/system/
23-
cp .project/config/typo3/additional.php config/system/
16+
17+
echo "Initialize git hooks"
18+
./.github/hooks/setup.sh
19+
20+
echo "Symlink configuration"
21+
cp .build/vendor/typo3/cms-install/Resources/Private/FolderStructureTemplateFiles/root-htaccess .build/public/.htaccess
22+
mkdir -p .build/config/sites/main
23+
ln -snf ../../../../.project/typo3/config.yaml .build/config/sites/main/config.yaml
24+
mkdir -p .build/config/system
25+
ln -snf ../../../.project/typo3/settings.php .build/config/system/settings.php
26+
ln -snf ../../../.project/typo3/additional.php .build/config/system/additional.php
2427

2528
echo "Importing database"
26-
ddev import-db --src=.project/data/db.sql.gz
27-
echo "Provide fileadmin"
28-
cd .build/public && tar xf ../../.project/data/fileadmin.tar.gz
29+
ddev import-db --file=.project/data/db.sql.gz
30+
2931
echo "Run 'composer install'"
3032
ddev composer install
33+
34+
echo "Extracting fileadmin"
35+
tar xf .project/data/fileadmin.tar.gz -C .build/public/
36+
37+
echo "Copy .htaccess"
38+
cp .build/vendor/typo3/cms-install/Resources/Private/FolderStructureTemplateFiles/root-htaccess .build/public/.htaccess
39+
40+
echo "Update Languages"
41+
ddev typo3 language:update
42+
43+
echo "Update Database"
44+
ddev typo3 database:update
45+
3146
ddev describe
47+
3248
echo "Thanks for supporting 'EXT:studyfinder"
3349

.ddev/commands/web/build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
cd Resources/Private/Build/
4+
5+
echo 'Build frontend:'
6+
npm run build:frontend

.ddev/commands/web/qa-php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
echo 'run PHP Code Sniffer:'
4+
./.build/vendor/bin/phpcs
5+
6+
echo 'run PHP Mess Detector:'
7+
./.build/vendor/bin/phpmd ./Classes/ ansi .phpmd.xml

.ddev/commands/web/qa-php-fixer

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
echo 'run PHP Code Beautifier and Fixer:'
4+
./.build/vendor/bin/phpcbf

.ddev/commands/web/test-all

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
echo 'Run unit tests:'
4+
./.build/vendor/bin/phpunit -c /var/www/html/UnitTests.xml
5+
6+
echo 'Run functional tests:'
7+
./.build/vendor/bin/phpunit -c /var/www/html/FunctionalTests.xml

.ddev/commands/web/test-functional

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
echo 'Run functional tests:'
4+
./.build/vendor/bin/phpunit -c /var/www/html/FunctionalTests.xml

.ddev/commands/web/test-unit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
echo 'Run unit tests:'
4+
./.build/vendor/bin/phpunit -c /var/www/html/UnitTests.xml

.ddev/commands/web/typo3

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
# This assumes that the typo3 command will be in the $PATH; if in vendor/bin/ it will be
4+
5+
## Description: Run TYPO3 CLI (typo3) command inside the web container
6+
## Usage: typo3 [args]
7+
## Example: "ddev typo3 site:list" or "ddev typo3 list" or "ddev typo3 extension:list"
8+
## ProjectTypes: typo3
9+
10+
.build/vendor/bin/typo3 "$@"

0 commit comments

Comments
 (0)