Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
NamelessCoder committed Mar 18, 2015
2 parents 489c7eb + 60e92f6 commit f77990a
Show file tree
Hide file tree
Showing 36 changed files with 3,008 additions and 1,596 deletions.
24 changes: 24 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true
charset = utf-8

# Get rid of whitespace to avoid diffs with a bunch of EOL changes
trim_trailing_whitespace = true

[*]
end_of_line = lf
insert_final_newline = true

[*.{php,html,js,css}]
indent_size = 4
indent_style = tab

[*.{json,yml,txt,md,sql}]
indent_size = 2
indent_style = space

[*.{xml,xlf,xsd}]
indent_size = 2
indent_style = tab
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/logs
vendor
.idea
73 changes: 21 additions & 52 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,26 @@
language: php

php:
- 5.3
- 5.4
- 5.5
env: TYPO3="7.1.*"

env:
- DB=mysql TYPO3=master INTEGRATION=master
- DB=mysql TYPO3=TYPO3_6-1 INTEGRATION=master
php:
- "5.6"
- "7"
- "hhvm"

matrix:
fast_finish: true
include:
- php: 5.6
env: DB=mysql TYPO3=master INTEGRATION=master

before_script:
- cd ..
- git clone --single-branch --branch $INTEGRATION --depth 1 git://github.com/typo3-ci/TYPO3-Travis-Integration.git build-environment
- git clone --depth 1 git://github.com/FluidTYPO3/FluidTYPO3-CodingStandards.git build-environment/FluidTYPO3-CodingStandards
- git clone git://github.com/squizlabs/PHP_CodeSniffer.git build-environment/CodeSniffer
- git clone --single-branch --branch $TYPO3 --depth 1 https://github.com/TYPO3/TYPO3.CMS.git core
- source build-environment/install-helper.sh
- git clone --single-branch --branch $TYPO3 --depth 1 git://git.typo3.org/TYPO3CMS/Distributions/Introduction.git build-environment/Introduction
- mv core/typo3 .
- if [[ -d core/t3lib ]]; then mv core/t3lib . ; fi
- mv build-environment/typo3conf .
- mkdir fileadmin
- mkdir uploads
- mkdir typo3temp

- git clone --depth 1 --single-branch --branch $TRAVIS_BRANCH git://github.com/FluidTYPO3/flux.git typo3conf/ext/flux
- git clone --depth 1 git://git.typo3.org/TYPO3CMS/Extensions/phpunit.git typo3conf/ext/phpunit
- git clone --depth 1 --single-branch --branch development git://github.com/FluidTYPO3/builder.git typo3conf/ext/builder
- mv fluidcontent ./typo3conf/ext/

- if [[ "$DB" == "mysql" ]]; then mysql -e "DROP DATABASE IF EXISTS typo3_test;" -uroot; fi
- if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS typo3_test;" -uroot; fi
- if [[ "$DB" == "mysql" ]]; then mysql -uroot typo3_test < build-environment/Introduction/typo3conf/ext/introduction/Resources/Private/Subpackages/Introduction/Database/introduction.sql; fi

# post core schema import of extension schemas and state file from this and dependency extensions
- if [[ "$DB" == "mysql" && -f typo3conf/ext/builder/Build/ImportSchema.sql ]]; then mysql -uroot typo3_test < typo3conf/ext/builder/Build/ImportSchema.sql; fi
- if [[ "$DB" == "mysql" && -f typo3conf/ext/flux/Build/ImportSchema.sql ]]; then mysql -uroot typo3_test < typo3conf/ext/flux/Build/ImportSchema.sql; fi
- if [[ "$DB" == "mysql" && -f typo3conf/ext/fluidcontent/Build/ImportSchema.sql ]]; then mysql -uroot typo3_test < typo3conf/ext/fluidcontent/Build/ImportSchema.sql; fi
- if [[ -f typo3conf/LocalConfiguration.php && -f typo3conf/ext/fluidcontent/Build/LocalConfiguration.php ]]; then cp typo3conf/ext/fluidcontent/Build/LocalConfiguration.php typo3conf/LocalConfiguration.php; fi
- if [[ -f typo3conf/ext/fluidcontent/Build/PackageStates.php ]]; then cp typo3conf/ext/fluidcontent/Build/PackageStates.php typo3conf/PackageStates.php; fi
- if [[ -f typo3conf/localconf.php && -f typo3conf/ext/fluidcontent/Build/localconf.php ]]; then cp typo3conf/ext/fluidcontent/Build/localconf.php typo3conf/localconf.php; fi
- if [[ -f typo3conf/ext/fluidcontent/Tests/phpunit.xml ]]; then cp typo3conf/ext/fluidcontent/Tests/phpunit.xml phpunit.xml; fi

script:
# phplint checking on all PHP source files in extension
- typo3/cli_dispatch.phpsh extbase builder:phpsyntax --extension fluidcontent
# PHPCodeSniffer code inspection with only errors displayed (no warnings)
- build-environment/CodeSniffer/scripts/phpcs -n --standard=$PWD/build-environment/FluidTYPO3-CodingStandards/ruleset.xml $PWD/typo3conf/ext/fluidcontent
# PHPUnit tests from overridden phpunit tests configuration file
- if [[ -f typo3conf/ext/fluidcontent/Tests/phpunit.xml ]]; then typo3/cli_dispatch.phpsh phpunit -c phpunit.xml --coverage-text; fi
include:
- php: "5.4"
env: TYPO3="6.2.*"
- php: "5.5"
env: TYPO3="7.1.*" CHECKSTYLE="YES" COVERAGE="YES"
allow_failures:
- php: "7"
env: TYPO3="7.1.*"
- php: "hhvm"
env: TYPO3="7.1.*"

before_install: composer require typo3/cms:$TYPO3 --prefer-dist

install: composer install --prefer-dist

script: ./vendor/bin/ci-runner
195 changes: 0 additions & 195 deletions Build/ImportSchema.sql

This file was deleted.

0 comments on commit f77990a

Please sign in to comment.