Skip to content

Commit

Permalink
[TASK] Use master as development branch
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminkott authored Apr 5, 2019
2 parents 51afa3c + 4ee33f3 commit 3ce7104
Show file tree
Hide file tree
Showing 138 changed files with 43,851 additions and 7,815 deletions.
66 changes: 66 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# CSS-Files
[*.css]
indent_style = space
indent_size = 4

# HTML-Files
[*.html]
indent_style = space
indent_size = 4

# TMPL-Files
[*.tmpl]
indent_style = space
indent_size = 4

# LESS-Files
[*.less]
indent_style = space
indent_size = 4

# JS-Files
[*.js]
indent_style = space
indent_size = 4

# PHP-Files
[*.php]
indent_style = space
indent_size = 4

# MD-Files
[*.md]
indent_style = space
indent_size = 4

# ReST-Files
[*.rst]
indent_style = space
indent_size = 3

# TypoScript
[*.typoscript]
indent_style = space
indent_size = 4

# YML-Files
[{*.yml,*.yaml}]
indent_style = space
indent_size = 2

# package.json, composer.json or .travis.yml
[{package.json,composer.json,.travis.yml}]
indent_style = space
indent_size = 2
35 changes: 35 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Folders
/.ddev export-ignore
/.github export-ignore
/.vscode export-ignore
/Build export-ignore

# Files
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.php_cs.dist export-ignore
.scrutinizer.yml export-ignore
.travis.yml export-ignore

# Enforce checkout with linux lf consistent over all plattforms
*.xml text eol=lf
*.html text eol=lf
*.css text eol=lf
*.scss text eol=lf
*.svg text eol=lf
*.tmpl text eol=lf
*.less text eol=lf
*.js text eol=lf
*.json text eol=lf
*.php text eol=lf
*.rst text eol=lf
*.md text eol=lf
*.yml text eol=lf
*.ts text eol=lf
*.xlf text eol=lf
*.sql text eol=lf
*.t3s text eol=lf
*.txt text eol=lf
*.typoscript text eol=lf
*.tsconfig text eol=lf
32 changes: 21 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
# PHPStorm
.idea
# Build
/.build

# IDE
/.idea
/.vscode

# OSX
.DS_Store
/.DS_Store

# Development
/.ddev

# Composer
vendor/
bin/
/composer.lock

# TYPO3 test
.php_cs.cache
/public/
typo3/
var/
logs/
index.php
/.php_cs.cache
/var/
/logs/

# Vue
/Resources/Public/JavaScript/Library/demo.html
/Resources/Public/JavaScript/Library/filelist.common.js
/Resources/Public/JavaScript/Library/filelist.common.js.map
/Resources/Public/JavaScript/Library/*hot-update.js
/Resources/Public/JavaScript/Library/*hot-update.json
5 changes: 3 additions & 2 deletions Build/.php_cs.dist → .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ return PhpCsFixer\Config::create()
])
->setFinder(
PhpCsFixer\Finder::create()
->in('.')
->exclude(['bin', 'public', 'vendor'])
->exclude('.build')
->exclude('var')
->in(__DIR__)
);
84 changes: 68 additions & 16 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,73 @@
checks:
php: true
build:
environment:
php: 7.2
dependencies:
before:
- 'composer require typo3/minimal="^9"'
nodes:
analysis:
cache:
disabled: false
directories:
- ~/.composer/cache
tests:
override:
- php-scrutinizer-run
- js-scrutinizer-run
tests:
override:
-
command: './.build/bin/phpunit -c Build/UnitTests.xml --coverage-clover=coverage'
coverage:
file: 'coverage'
format: 'clover'


filter:
excluded_paths:
- Tests/*
- Resources/Privat/Scripts/*
- vendor/*
- ".build/"

build:
project_setup:
before:
- composer install
checks:
javascript: true
php:
code_rating: true
remove_extra_empty_lines: true
remove_php_closing_tag: true
remove_trailing_whitespace: true
verify_property_names: true
verify_argument_usable_as_reference: true

tests:
override:
-
command: './bin/phpunit -c Build/UnitTests.xml --coverage-clover=some-file'
coverage:
file: 'some-file'
format: 'clover'
tools:
external_code_coverage:
enabled: false

php_cpd:
enabled: true

php_cs_fixer:
enabled: true
config:
level: psr2

php_hhvm:
enabled: true
config:
use_undeclared_constant: false

php_mess_detector:
enabled: true
config:
controversial_rules:
superglobals: false

php_pdepend:
enabled: true

php_analyzer:
enabled: false

php_code_coverage:
enabled: false

sensiolabs_security_checker:
enabled: true
66 changes: 32 additions & 34 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,46 @@
# .travis.yml
sudo: false
language: php

matrix:
fast_finish: true
include:
- php: 7.2
env: UNIT_TESTS=yes FUNCTIONAL_TESTS=yes PHP_LINT=yes PHP_CS_FIXER=yes
sudo: false
php:
- 7.2

env:
- TYPO3_VERSION=^9
- TYPO3_VERSION=dev-master

addons:
apt:
packages:
- parallel

cache:
directories:
- $HOME/.composer/cache
- parallel

before_script:
- phpenv config-rm xdebug.ini
- composer install --no-interaction
- mkdir -p logs
install:
- composer require typo3/minimal:${TYPO3_VERSION}
- git checkout composer.json
- export TYPO3_PATH_WEB="$PWD/.build/web"

script:
- |
if [[ "$UNIT_TESTS" == "yes" ]]; then
- >
echo;
echo "Running unit tests";
composer t3g:test:php:unit
fi
- |
if [[ "FUNCTIONAL_TESTS" == "yes" ]]; then
composer test:php:unit
- >
echo;
echo "Running functional tests";
composer t3g:test:php:functional
fi
- |
if [[ "$PHP_CS_FIXER" == "yes" ]]; then
composer test:php:functional
- >
echo;
echo "Running PHP CS Fixer";
composer t3g:cgl
fi
- |-
if [[ "$PHP_LINT" == "yes" ]]; then
echo;
echo "Running php lint";
find . -name \*.php -not -path "./vendor/*" | parallel --gnu php -d display_errors=stderr -l {} > /dev/null \;
fi
echo "PHP lint";
find . -name \*.php ! -path "./.build/*" | parallel --gnu php -d display_errors=stderr -l {} > /dev/null \;
jobs:
include:
- stage: quality
php: 7.2
script: composer cgl

cache:
directories:
- $HOME/.composer/cache
2 changes: 1 addition & 1 deletion Build/FunctionalTests.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<phpunit
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="../vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
bootstrap="../.build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertWarningsToExceptions="true"
Expand Down
2 changes: 1 addition & 1 deletion Build/UnitTests.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<phpunit
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="../vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
bootstrap="../.build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertWarningsToExceptions="true"
Expand Down
3 changes: 3 additions & 0 deletions Build/Vue/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not ie <= 11
27 changes: 27 additions & 0 deletions Build/Vue/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.DS_Store
node_modules
/dist

/tests/e2e/reports/
selenium-debug.log

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw*

# build setup
public/typo3
5 changes: 5 additions & 0 deletions Build/Vue/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
presets: [
'@vue/app'
]
};
Loading

0 comments on commit 3ce7104

Please sign in to comment.