Skip to content

Commit

Permalink
Merge branch 'release/38.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
einpraegsam committed Jan 14, 2025
2 parents af3333f + 8125843 commit 5341160
Show file tree
Hide file tree
Showing 24 changed files with 314 additions and 212 deletions.
10 changes: 10 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,13 @@ TYPO3_INSTALL_ADMIN_PASSWORD=Password123!
TYPO3_INSTALL_SITE_NAME="Lux"
TYPO3_INSTALL_SITE_SETUP_TYPE=no
TYPO3_INSTALL_WEB_SERVER_CONFIG=apache

# CodeCeption
SELENIARM_PORT_4442=61000
SELENIARM_PORT_4443=61001
SELENIARM_PORT_4444=61002
PORT_CHROME=61003
PORT_FIREFOX=61004
VNC_PORT_CHROME=61005
VNC_PORT_FIREFOX=61006
TEST_URL='https://local.lux.de'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ var/
/config/
/.phpunit.cache/
/.env.local
/Tests/Acceptance/_output/*
/Tests/Acceptance/_support/_generated/
11 changes: 11 additions & 0 deletions .project/docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
FROM in2code/php-dev:8.2-fpm

COPY zz_xdebug.ini /usr/local/etc/php/conf.d/zz_xdebug.ini

USER root

# Install CURL extension
RUN apt-get update && apt-get install -y \
libcurl4-openssl-dev \
&& docker-php-ext-install curl \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

USER www-data
3 changes: 2 additions & 1 deletion .project/tests/.php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
__DIR__ . '/../../Tests',
__DIR__ . '/../../Configuration',
]
);
)
->notPath('#^Acceptance/#');
// Return a Code Sniffing configuration using
// all sniffers needed for PSR-2
// and additionally:
Expand Down
2 changes: 1 addition & 1 deletion Classes/TCA/VisitorTitle.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class VisitorTitle
public function getContactTitle(array &$parameters, $parentObject): void
{
unset($parentObject);
$parameters['title'] = $this->getEmail($parameters['row']) . ' (uid' . $parameters['row']['uid'] . ')';
$parameters['title'] = $this->getEmail($parameters['row'] ?? []) . ' (uid' . $parameters['row']['uid'] . ')';
}

protected function getEmail(array $properties): string
Expand Down
1 change: 1 addition & 0 deletions Documentation/Technical/Changelog/Index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

| Version | Date | State | TYPO3 | Description |
|------------|------------|----------|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 38.2.0 | 2024-01-14 | Task | `12.4 + 13.4` | Small bugfix for command cleanup:deletedrecods, added first codeception test and framework, removed unneeded files, documentation update |
| 38.1.0 | 2024-12-08 | Task | `12.4 + 13.4` | Fix identification of logged in frontendusers, update some LUXletter related stuff (if LUX + LUXletter is in use), code cleanup |
| 38.0.1 | 2024-11-26 | Bugfix | `12.4 + 13.4` | Update TYPO3 dependencies in old ext_emconf file |
| 38.0.0 | 2024-11-25 | Feature | `12.4 + 13.4` | Add TYPO3 13 support, drop TYPO3 11 support, add darkmode styling, add LUX to TYPO3 livesearch in backend |
Expand Down
7 changes: 3 additions & 4 deletions Documentation/Technical/Identification/Index.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,14 @@ imports:
- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" }
editor:
externalPlugins:
luxEmail4Link:
resource: 'EXT:lux/Resources/Public/JavaScript/Static/CkEditorPlugins/luxEmail4Link/plugin.js'
config:
extraAllowedContent: 'a[data-*];'
contentsCss: ['EXT:lux/Resources/Public/Css/Modules.min.css']
importModules:
- 'EXT:lux/Resources/Public/JavaScript/Static/CkEditorPlugins/luxEmail4Link/plugin.js'
toolbarGroups:
- { name: 'styles', groups: [ 'styles' ] }
- { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] }
Expand Down
42 changes: 42 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,48 @@ ifeq ($(shell uname -s), Darwin)
docker-compose exec -u root php chown -R app:app /app/$(TYPO3_CACHE_DIR)/;
endif

## Test: PHP CS Fixer
test-phpcs:
echo "$(EMOJI_robot) Test: Start PHP CS Fixer tests"
docker-compose exec php composer test:php:cs

## Test: PHP Linter
test-phplint:
echo "$(EMOJI_robot) Test: Start PHP Linter tests"
docker-compose exec php composer test:php:lint

## Test: TypoScript Linter
test-tslint:
echo "$(EMOJI_robot) Test: Start TypoScript Linter tests"
docker-compose exec php composer test:ts:lint

## Test: Unit
test-unit:
echo "$(EMOJI_robot) Test: Start unit tests"
docker-compose exec php composer test:unit

## Run acceptance tests
test-acceptance: .selenium-start
echo "$(EMOJI_robot) Test: Start acceptance tests"
docker-compose exec php bash -c "\
sleep 2 && \
./.Build/bin/codecept clean && \
./.Build/bin/codecept build && \
./.Build/bin/codecept run acceptance --debug"
echo "$(EMOJI_broom) Cleaning up selenium services"; \
make .selenium-stop; \
exit $${EXIT_CODE:-0}

## Start Selenium services for testing
.selenium-start:
echo "$(EMOJI_rocket) Starting Selenium services for testing"
docker compose -f docker-compose.yml -f docker-compose.selenium.yml up -d seleniarm-hub chrome firefox

## Stop Selenium services for testing
.selenium-stop:
echo "$(EMOJI_stop) Stopping Selenium services"
docker compose -f docker-compose.selenium.yml stop seleniarm-hub chrome firefox

include .env

# SETTINGS
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

25 changes: 25 additions & 0 deletions Tests/Acceptance/_support/AcceptanceTester.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace In2code\Lux\Tests;

use In2code\Lux\Tests\_generated\AcceptanceTesterActions;

/**
* Inherited Methods
* @method void wantToTest($text)
* @method void wantTo($text)
* @method void execute($callable)
* @method void expectTo($prediction)
* @method void expect($prediction)
* @method void amGoingTo($argumentation)
* @method void am($role)
* @method void lookForwardTo($achieveValue)
* @method void comment($description)
* @method void pause()
*
* @SuppressWarnings(PHPMD)
*/
class AcceptanceTester extends \Codeception\Actor
{
use AcceptanceTesterActions;
}
15 changes: 15 additions & 0 deletions Tests/Acceptance/_support/Helper/BackendTester.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace In2code\Lux\Tests\Helper;

class BackendTester extends \Codeception\Module
{
public function loginToBackend($I, $username = 'akellner', $password = 'akellner')
{
$I->amOnPage('/typo3/');
$I->fillField('#t3-username', $username);
$I->fillField('#t3-password', $password);
$I->click('Login');
$I->waitForElement('#typo3-cms-backend-backend-toolbaritems-systeminformationtoolbaritem');
}
}
Loading

0 comments on commit 5341160

Please sign in to comment.