diff --git a/.editorconfig b/.editorconfig index bf70677..72bdfe1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,24 +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 = 4 - -# MD-Files -[*.md] -charset = utf-8 -end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -indent_style = space + +# TS/JS-Files +[*.{ts,js,mjs}] +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 diff --git a/.gitattributes b/.gitattributes index 3e9f198..b680a1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ /.github/ export-ignore /Build/ export-ignore /Tests/ export-ignore +/.crowdin.yml export-ignore /.gitattributes export-ignore /.gitignore export-ignore /.editorconfig export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37ccf0c..e75322b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,13 +13,8 @@ jobs: strategy: fail-fast: false matrix: - typo3: [^10.4, ^11.5] - php: ['7.4'] - include: - - typo3: ^11.5 - php: '8.0' - - typo3: ^11.5 - php: '8.1' + typo3: ['^11.5'] + php: ['7.4', '8.0', '8.1'] services: mysql: @@ -34,7 +29,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP ${{ matrix.php }}, with composer and extensions uses: shivammathur/setup-php@v2 @@ -48,17 +43,6 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache composer dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer- - - name: Install dependencies with typo3/cms-core:${{ matrix.typo3 }} run: | composer require typo3/cms-core:${{ matrix.typo3 }} --no-progress diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst index 70a5af4..5fbf6a2 100644 --- a/Documentation/Changelog/Index.rst +++ b/Documentation/Changelog/Index.rst @@ -7,6 +7,16 @@ ChangeLog ========= +Version 6.0.1 +============= + +* Add status badges to README.md +* Add missing column area_of_activity to ext_tables.sql +* Add .crowdin.yml to .gitattributes +* Remove tests for out-dated TYPO3 10 +* Remove security advisory package because of out-dated TYPO3 10 +* Update .editorconfig + Version 6.0.0 ============= diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 86e2bcd..0e3e1b2 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -4,7 +4,7 @@ [general] project = pfprojects -version = 6.0.0 +version = 6.0.1 release = 6.0 copyright = since 2013 by jweiland.net diff --git a/README.md b/README.md index 239ca57..8a206b1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # TYPO3 Extension `pfprojects` -![Build Status](https://github.com/jweiland-net/pfprojects/workflows/CI/badge.svg) +[![Latest Stable Version](https://poser.pugx.org/jweiland/pfprojects/v/stable.svg)](https://packagist.org/packages/jweiland/pfprojects) +[![TYPO3 10.4](https://img.shields.io/badge/TYPO3-10.4-green.svg)](https://get.typo3.org/version/10) +[![TYPO3 11.5](https://img.shields.io/badge/TYPO3-11.5-green.svg)](https://get.typo3.org/version/11) +[![License](http://poser.pugx.org/jweiland/pfprojects/license)](https://packagist.org/packages/jweiland/pfprojects) +[![Total Downloads](https://poser.pugx.org/jweiland/pfprojects/downloads.svg)](https://packagist.org/packages/jweiland/pfprojects) +[![Monthly Downloads](https://poser.pugx.org/jweiland/pfprojects/d/monthly)](https://packagist.org/packages/jweiland/pfprojects) +![Build Status](https://github.com/jweiland-net/pfprojects/actions/workflows/ci.yml/badge.svg) Pfprojects is an extension for TYPO3 CMS. It shows you a list of projects. Useful extension for example city/town websites diff --git a/composer.json b/composer.json index 329a176..344d80d 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,6 @@ "jweiland/service-bw2": ">=5.0" }, "require-dev": { - "roave/security-advisories": "dev-latest", "friendsofphp/php-cs-fixer": "^3.0", "nimut/testing-framework": "^6.0", "phpunit/phpunit": "^9.5", diff --git a/ext_emconf.php b/ext_emconf.php index 49e3dd0..dbbe89d 100755 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -8,7 +8,7 @@ 'author_email' => 'projects@jweiland.net', 'state' => 'stable', 'clearCacheOnLoad' => 0, - 'version' => '6.0.0', + 'version' => '6.0.1', 'constraints' => [ 'depends' => [ 'typo3' => '10.4.36-11.5.99', diff --git a/ext_localconf.php b/ext_localconf.php index 88dcc80..b400bfa 100755 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -19,7 +19,10 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['pfProjectUpdateSlug'] = \JWeiland\Pfprojects\Updates\SlugUpdateWizard::class; - $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class); + // ToDo: Migrate to Icons.php while removing TYPO3 10 compatibility + $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( + \TYPO3\CMS\Core\Imaging\IconRegistry::class + ); $iconRegistry->registerIcon( 'ext-pfprojects-wizard-icon', \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, diff --git a/ext_tables.sql b/ext_tables.sql index 87f7cf6..972f063 100755 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -3,20 +3,21 @@ # CREATE TABLE tx_pfprojects_domain_model_project ( - title varchar(255) DEFAULT '' NOT NULL, - path_segment varchar(2048) DEFAULT '' NOT NULL, - start_date date DEFAULT '1000-01-01', - status varchar(10) DEFAULT '' NOT NULL, - contact_person varchar(255) DEFAULT '' NOT NULL, - telephone varchar(255) DEFAULT '' NOT NULL, - email varchar(255) DEFAULT '' NOT NULL, - office_type tinyint(1) unsigned DEFAULT '0' NOT NULL, - organisationseinheit int(11) unsigned DEFAULT '0' NOT NULL, - office_manuell varchar(255) DEFAULT '' NOT NULL, - images int(11) unsigned DEFAULT '0' NOT NULL, - description text NOT NULL, - files int(11) unsigned DEFAULT '0' NOT NULL, - links int(11) unsigned NOT NULL default '0' + title varchar(255) DEFAULT '' NOT NULL, + path_segment varchar(2048) DEFAULT '' NOT NULL, + start_date date DEFAULT '1000-01-01', + status varchar(10) DEFAULT '' NOT NULL, + contact_person varchar(255) DEFAULT '' NOT NULL, + telephone varchar(255) DEFAULT '' NOT NULL, + email varchar(255) DEFAULT '' NOT NULL, + office_type tinyint(1) unsigned DEFAULT '0' NOT NULL, + organisationseinheit int(11) unsigned DEFAULT '0' NOT NULL, + office_manuell varchar(255) DEFAULT '' NOT NULL, + images int(11) unsigned DEFAULT '0' NOT NULL, + description text NOT NULL, + files int(11) unsigned DEFAULT '0' NOT NULL, + links int(11) unsigned DEFAULT '0' NOT NULL, + area_of_activity int(11) DEFAULT '0' NOT NULL ); # @@ -24,7 +25,7 @@ CREATE TABLE tx_pfprojects_domain_model_project # CREATE TABLE tx_pfprojects_domain_model_link ( - title varchar(255) DEFAULT '' NOT NULL, - link varchar(255) DEFAULT '' NOT NULL, - project int(11) DEFAULT '0' NOT NULL + title varchar(255) DEFAULT '' NOT NULL, + link varchar(255) DEFAULT '' NOT NULL, + project int(11) DEFAULT '0' NOT NULL );