Skip to content

Commit

Permalink
Merge pull request #27 from jweiland-net/updateGitFiles
Browse files Browse the repository at this point in the history
Update git files
  • Loading branch information
sfroemkenjw committed Apr 24, 2023
2 parents 8fc2a7c + 8f3c4d1 commit 2a10275
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 30 deletions.
67 changes: 54 additions & 13 deletions .editorconfig
@@ -1,23 +1,64 @@
# EditorConfig is awesome: http://EditorConfig.org
#
# Use as master: https://github.com/TYPO3-Documentation/T3DocTeam/blob/master/.editorconfig

# top-most EditorConfig file
root = false
root = true

[{*.rst,*.rst.txt}]
# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 3

# MD-Files
[*.md]
charset = utf-8
end_of_line = lf
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space

# TS/JS-Files
[*.{ts,js}]
indent_size = 2

# JSON-Files
[*.json]
indent_style = tab

# ReST-Files
[*.{rst,rst.txt}]
indent_size = 4
max_line_length = 80

# Markdown-Files
[*.md]
max_line_length = 80

# YAML-Files
[*.{yaml,yml}]
indent_size = 2

# NEON-Files
[*.neon]
indent_size = 2
indent_style = tab

# stylelint
[.stylelintrc]
indent_size = 2

# package.json
[package.json]
indent_size = 2

# TypoScript
[*.{typoscript,tsconfig}]
indent_size = 2

# XLF-Files
[*.xlf]
indent_style = tab

# SQL-Files
[*.sql]
indent_style = tab
indent_size = 2

# .htaccess
[{_.htaccess,.htaccess}]
indent_style = tab
5 changes: 4 additions & 1 deletion .gitattributes
@@ -1,3 +1,6 @@
/.github/ export-ignore
/Build/ export-ignore
/Tests/ export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.editorconfig export-ignore
33 changes: 22 additions & 11 deletions .gitignore
@@ -1,25 +1,36 @@
########################
# jweiland.net MAPS2
# sync_crop_areas
# global ignore file
########################

# ignore generated documentation
# Ignore files generated by docs rendering
*GENERATED*
/docker-compose.yaml
/docker-compose.yml

# ignore typical clutter of IDEs and editors (this could be added in .git/info/exclude,
# but we add it here for convenience)
# Ignore temporary files (left by editors and OS)
*~
*.bak
*.swp
.DS_Store

# Ignore by common IDEs used directories/files
nbproject
*.idea
*.project
*.swp
.project
.buildpath
.settings
.TemporaryItems
.webprj
nbproject
.fleet

# Ignore temporary files
*.DS_Store
# Temporary files and folders
/.cache
.php_cs.cache
.php-cs-fixer.cache
.sass-cache
.session
*.log

# Ignore composer stuff
bin/*
vendor/*
/composer.lock
6 changes: 6 additions & 0 deletions Documentation/ChangeLog/Index.rst
Expand Up @@ -7,6 +7,12 @@
ChangeLog
=========

**Version 2.2.3**

- Task: Update .editorconfig
- Task: Update .gitignore
- Task: Update .gitattributes

**Version 2.2.2**

- Bugfix: Respect crop variants of non-types tables in columnsOverride
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
Expand Up @@ -22,7 +22,7 @@

project = sync_crop_areas (Sync Crop Areas)
version = 2.2
release = 2.2.2
release = 2.2.3
t3author = Stefan Froemken
copyright = since 2020 by jweiland.net

Expand Down
11 changes: 10 additions & 1 deletion composer.json
Expand Up @@ -3,7 +3,16 @@
"type": "typo3-cms-extension",
"description": "Sync first found crop area to all other CropVariants",
"license": "GPL-2.0-or-later",
"keywords": ["typo3", "TYPO3 CMS", "jweiland.net", "sync", "synchronize", "crop", "area", "variants"],
"keywords": [
"typo3",
"TYPO3 CMS",
"jweiland.net",
"sync",
"synchronize",
"crop",
"area",
"variants"
],
"homepage": "https://jweiland.net",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Expand Up @@ -3,7 +3,7 @@
$EM_CONF[$_EXTKEY] = [
'title' => 'Sync Crop Areas',
'description' => 'Sync first found crop area to all other CropVariants',
'version' => '2.2.2',
'version' => '2.2.3',
'category' => 'plugin',
'state' => 'stable',
'clearCacheOnLoad' => true,
Expand Down
5 changes: 3 additions & 2 deletions ext_localconf.php
Expand Up @@ -3,7 +3,8 @@
die('Access denied.');
}

call_user_func(static function(): void {
call_user_func(static function (): void {
// Copy first found CropVariant configuration to all others CropVariants
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \JWeiland\SyncCropAreas\Hook\DataHandlerHook::class;
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][]
= \JWeiland\SyncCropAreas\Hook\DataHandlerHook::class;
});

0 comments on commit 2a10275

Please sign in to comment.