Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add column area of activity #18

Merged
merged 10 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 52 additions & 12 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
22 changes: 3 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Documentation/Changelog/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
ChangeLog
=========

Version 6.0.1
=============

* Add status badges to README.md
sfroemkenjw marked this conversation as resolved.
Show resolved Hide resolved
* 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
=============

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[general]

project = pfprojects
version = 6.0.0
version = 6.0.1
release = 6.0
copyright = since 2013 by jweiland.net

Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'author_email' => '[email protected]',
'state' => 'stable',
'clearCacheOnLoad' => 0,
'version' => '6.0.0',
'version' => '6.0.1',
'constraints' => [
'depends' => [
'typo3' => '10.4.36-11.5.99',
Expand Down
5 changes: 4 additions & 1 deletion ext_localconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
35 changes: 18 additions & 17 deletions ext_tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,29 @@
#
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
);

#
# Table structure for table 'tx_pfprojects_domain_model_link'
#
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
);