Skip to content

Commit

Permalink
[TASK] Add TYPO3 v13 packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@buepro
buepro committed Aug 17, 2024
1 parent 5f2b70f commit ddccf01
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 95 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
typo3: [ '^12' ]
typo3: [ '^12', '^13' ]
php: [ '8.1', '8.2', '8.3' ]
mysql: [ '8.0' ]
exclude:
- typo3: '^13'
php: '8.1'
steps:
- id: checkout
name: Checkout Code
Expand Down
20 changes: 0 additions & 20 deletions Documentation/Develop/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,6 @@ following steps:
}
}
Work with the container
~~~~~~~~~~~~~~~~~~~~~~~

Use the ddev container during development. Like this the system environment
is being respected. E.g.:

.. code-block:: bash
ddev composer update
Uninstallation
--------------

To remove the development site use:

.. code-block:: bash
composer ddev:uninstall
Create tests
============

Expand Down
69 changes: 20 additions & 49 deletions composer-dev.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,33 @@
"docs": "https://docs.typo3.org/p/buepro/typo3-pizpalue/main/en-us/"
},
"require": {
"bk2k/bootstrap-package": "~14.0.7 || dev-main",
"buepro/typo3-pvh": "^2.0",
"typo3/cms-core": "^12.4"
"bk2k/bootstrap-package": "^14.0.7 || ^15.0.0@dev",
"buepro/typo3-pvh": "^3.0.0@dev",
"typo3/cms-core": "^12.4 || ^13.2"
},
"require-dev": {
"buepro/typo3-container-elements": "^5.0.1",
"buepro/typo3-easyconf": "^1.4.0 || ^2.0.0",
"buepro/typo3-user-pizpalue": "dev-main",
"ergebnis/composer-normalize": "^2.15.0",
"friendsofphp/php-cs-fixer": "^3.14",
"b13/container": "^2.3.6 || dev-master",
"buepro/typo3-container-elements": "^6.0.0@dev",
"buepro/typo3-pvh": "^3.0.0",
"ergebnis/composer-normalize": "^2.43.0",
"friendsofphp/php-cs-fixer": "^3.62.0",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"friendsoftypo3/tt-address": "^8.0.1",
"georgringer/eventnews": "6.0.2",
"georgringer/news": "^11",
"overtrue/phplint": "^3.2.0 || ^4.3.0 || ^5.3.0",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "^1.8.5",
"phpstan/phpstan-deprecation-rules": "^1.0.0",
"phpstan/phpstan-phpunit": "^1.1.1",
"phpstan/phpstan-strict-rules": "^1.4.3",
"typo3/cms-base-distribution": "^12.4",
"typo3/cms-lowlevel": "^12.4",
"typo3/cms-recycler": "^12.4",
"typo3/testing-framework": "^7.0.0 || ^8.0.0"
"overtrue/phplint": "^9.0.0",
"phpspec/prophecy-phpunit": "^2.2.0",
"phpstan/phpstan": "^1.11.10",
"phpstan/phpstan-deprecation-rules": "^1.2.0",
"phpstan/phpstan-phpunit": "^1.4.0",
"phpstan/phpstan-strict-rules": "^1.6.0",
"typo3/cms-core": "^12.4",
"typo3/cms-impexp": "^12.4 || ^13.2",
"typo3/testing-framework": "^8.2.0"
},
"conflict": {
"buepro/typo3-container-elements": "<5.3"
},
"suggest": {
"buepro/typo3-container-elements": "Flexibel elements to structure the content area with container",
"buepro/typo3-easyconf": "Backend module to provide an easy website configuration",
"buepro/typo3-flux-elements": "Flexibel elements to structure the content area with flux",
"buepro/typo3-pp-gridelements": "Flexibel elements to structure the content area with gridelements",
"friendsoftypo3/tt-address": "Manage addresses",
"georgringer/eventnews": "Calendar based on extension news",
"georgringer/news": "Flexible news system"
Expand Down Expand Up @@ -170,18 +167,6 @@
"ci:tests:unit": [
"phpunit -c Build/phpunit-unit.xml"
],
"ddev:install": [
"composer install",
"ddev start",
"ddev composer site:install",
"ddev launch typo3",
"echo '\\033[0;32mINFO: Login to BE using admin/admin\\033[0m'"
],
"ddev:uninstall": [
"ddev composer typo3cms:database:export",
"ddev delete",
"rm -rf .build/"
],
"fix": [
"@fix:composer:normalize",
"@fix:php:cs"
Expand All @@ -193,20 +178,6 @@
],
"fix:php:stan": [
"phpstan analyze --level max --configuration Build/phpstan.neon --generate-baseline Build/phpstan-baseline.neon"
],
"site:install": [
"@typo3cms:install:setup",
"@typo3cms:database:import"
],
"typo3cms:database:export": [
".build/bin/typo3cms database:export -c Default -e 'cf_*' -e 'cache_*' -e '[bf]e_sessions' -e sys_log | gzip -c > Build/site/db12.sql.gz",
"ls -l Build/site/db12.sql.gz"
],
"typo3cms:database:import": [
"gzip -cdk Build/site/db12.sql.gz | .build/bin/typo3cms database:import"
],
"typo3cms:install:setup": [
".build/bin/typo3cms install:setup --no-interaction --use-existing-database --database-host-name='db' --database-name='db' --database-user-name='db' --database-user-password='db' --admin-user-name='admin' --admin-password='admin123ADMIN:)' --site-name='pizpalue dev' --web-server-config='apache'"
]
}
}
65 changes: 46 additions & 19 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,37 @@
"docs": "https://docs.typo3.org/p/buepro/typo3-pizpalue/main/en-us/"
},
"require": {
"bk2k/bootstrap-package": "^14.0.7",
"buepro/typo3-pvh": "^2.0",
"typo3/cms-core": "^12.4"
},
"conflict": {
"buepro/typo3-container-elements": "<=5"
"bk2k/bootstrap-package": "^14.0.7 || ^15.0.0@dev",
"buepro/typo3-pvh": "^3.0.0@dev",
"typo3/cms-core": "^12.4 || ^13.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.14",
"b13/container": "^2.3.6 || dev-master",
"buepro/typo3-container-elements": "^6.0.0@dev",
"buepro/typo3-pvh": "^3.0.0",
"ergebnis/composer-normalize": "^2.43.0",
"friendsofphp/php-cs-fixer": "^3.62.0",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"overtrue/phplint": "^3.2.0 || ^4.3.0 || ^5.3.0",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "^1.8.5",
"phpstan/phpstan-deprecation-rules": "^1.0.0",
"phpstan/phpstan-phpunit": "^1.1.1",
"phpstan/phpstan-strict-rules": "^1.4.3",
"typo3/cms-impexp": "^12.4",
"typo3/testing-framework": "^7.0.0 || ^8.0.0"
"overtrue/phplint": "^9.0.0",
"phpspec/prophecy-phpunit": "^2.2.0",
"phpstan/phpstan": "^1.11.10",
"phpstan/phpstan-deprecation-rules": "^1.2.0",
"phpstan/phpstan-phpunit": "^1.4.0",
"phpstan/phpstan-strict-rules": "^1.6.0",
"typo3/cms-core": "^12.4",
"typo3/cms-impexp": "^12.4 || ^13.2",
"typo3/testing-framework": "^8.2.0"
},
"conflict": {
"buepro/typo3-container-elements": "<5.3"
},
"suggest": {
"buepro/typo3-container-elements": "Flexibel elements to structure the content area with container",
"buepro/typo3-easyconf": "Backend module to provide an easy website configuration",
"buepro/typo3-flux-elements": "Flexibel elements to structure the content area with flux",
"buepro/typo3-pp-gridelements": "Flexibel elements to structure the content area with gridelements",
"friendsoftypo3/tt-address": "Manage addresses",
"georgringer/eventnews": "Calendar based on extension news",
"georgringer/news": "Flexible news system"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4": {
"Buepro\\Pizpalue\\": "Classes/",
Expand Down Expand Up @@ -108,6 +109,11 @@
"if [ ${IS_DDEV_PROJECT:-0} = \"true\" ]; then mkdir -p config/sites; fi",
"if [ ${IS_DDEV_PROJECT:-0} = \"true\" ] && [ ! -e \"config/sites/development\" ]; then ln -svf ../../Build/site/development config/sites/development; fi"
],
"ci": [
"@ci:static",
"@ci:tests"
],
"ci:composer:normalize": "@composer normalize --dry-run",
"ci:php:cs": [
"php-cs-fixer --diff -v --dry-run fix",
"php-cs-fixer --config=.php-cs-fixer.dist-strict.php --diff -v --dry-run fix"
Expand All @@ -118,11 +124,32 @@
"ci:php:stan": [
"phpstan analyze --configuration Build/phpstan.neon"
],
"ci:static": [
"@ci:php:cs",
"@ci:php:lint",
"@ci:php:stan"
],
"ci:tests": [
"@ci:tests:unit",
"@ci:tests:functional"
],
"ci:tests:functional": [
"phpunit -c Build/phpunit-functional.xml"
],
"ci:tests:unit": [
"phpunit -c Build/phpunit-unit.xml"
],
"fix": [
"@fix:composer:normalize",
"@fix:php:cs"
],
"fix:composer:normalize": "@composer normalize",
"fix:php:cs": [
"php-cs-fixer --diff -v fix",
"php-cs-fixer --config=.php-cs-fixer.dist-strict.php --diff -v fix"
],
"fix:php:stan": [
"phpstan analyze --level max --configuration Build/phpstan.neon --generate-baseline Build/phpstan-baseline.neon"
]
}
}
10 changes: 4 additions & 6 deletions ext_emconf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@
'author_email' => '[email protected]',
'constraints' => [
'depends' => [
'typo3' => '12.4.18-12.99.99',
'bootstrap_package' => '14.0.7-14.99.99',
'pvh' => '2.0.0-2.99.99'
'typo3' => '12.4.18-13.99.99',
'bootstrap_package' => '14.0.7-15.99.99',
'pvh' => '3.0.0-3.99.99'
],
'conflicts' => [
'container_elements' => '0.0.0-5.0.0'
'container_elements' => '0.0.0-5.3.0'
],
'suggests' => [
'container_elements' => '',
'easyconf' => '',
'eventnews' => '5.0.0',
'flux_elements' => '',
'news' => '',
'pp_gridelements' => '',
'tt_address' => '',
],
],
Expand Down

0 comments on commit ddccf01

Please sign in to comment.