mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
- Updated composer.json and composer.lock
- Changed phpci.yml to be used with the new CI machine
This commit is contained in:
@@ -278,9 +278,6 @@
|
||||
"zetacomponents/workflow-database-tiein": "1.*",
|
||||
"zetacomponents/workflow-event-log-tiein": "1.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"squizlabs/php_codesniffer": "2.*"
|
||||
},
|
||||
"config": {
|
||||
"bin-dir": "vendor/bin"
|
||||
}
|
||||
|
||||
Generated
+9
-88
@@ -4,8 +4,8 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "5cc3ff3f9a49ae251ef22baabfd33768",
|
||||
"content-hash": "7b2f22ffd076c3cf329fe7d2c01a174d",
|
||||
"hash": "ddbbad487c655512e6983408339cb85f",
|
||||
"content-hash": "b5902c71fe21cd14397101dba5a3080c",
|
||||
"packages": [
|
||||
{
|
||||
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
|
||||
@@ -2180,16 +2180,16 @@
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v1.40.1",
|
||||
"version": "v1.41.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "35889516bbd6bbe46a600c2c33b03515df4a076e"
|
||||
"reference": "575cd5028362da591facde1ef5d7b94553c375c9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/35889516bbd6bbe46a600c2c33b03515df4a076e",
|
||||
"reference": "35889516bbd6bbe46a600c2c33b03515df4a076e",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/575cd5028362da591facde1ef5d7b94553c375c9",
|
||||
"reference": "575cd5028362da591facde1ef5d7b94553c375c9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2204,7 +2204,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.40-dev"
|
||||
"dev-master": "1.41-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -2242,7 +2242,7 @@
|
||||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2019-04-29 14:12:28"
|
||||
"time": "2019-05-14 11:59:08"
|
||||
},
|
||||
{
|
||||
"name": "zetacomponents/base",
|
||||
@@ -2630,86 +2630,7 @@
|
||||
"time": "2007-12-17 09:04:44"
|
||||
}
|
||||
],
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "squizlabs/php_codesniffer",
|
||||
"version": "2.9.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
|
||||
"reference": "2acf168de78487db620ab4bc524135a13cfe6745"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745",
|
||||
"reference": "2acf168de78487db620ab4bc524135a13cfe6745",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-simplexml": "*",
|
||||
"ext-tokenizer": "*",
|
||||
"ext-xmlwriter": "*",
|
||||
"php": ">=5.1.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~4.0"
|
||||
},
|
||||
"bin": [
|
||||
"scripts/phpcs",
|
||||
"scripts/phpcbf"
|
||||
],
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"CodeSniffer.php",
|
||||
"CodeSniffer/CLI.php",
|
||||
"CodeSniffer/Exception.php",
|
||||
"CodeSniffer/File.php",
|
||||
"CodeSniffer/Fixer.php",
|
||||
"CodeSniffer/Report.php",
|
||||
"CodeSniffer/Reporting.php",
|
||||
"CodeSniffer/Sniff.php",
|
||||
"CodeSniffer/Tokens.php",
|
||||
"CodeSniffer/Reports/",
|
||||
"CodeSniffer/Tokenizers/",
|
||||
"CodeSniffer/DocGenerators/",
|
||||
"CodeSniffer/Standards/AbstractPatternSniff.php",
|
||||
"CodeSniffer/Standards/AbstractScopeSniff.php",
|
||||
"CodeSniffer/Standards/AbstractVariableSniff.php",
|
||||
"CodeSniffer/Standards/IncorrectPatternException.php",
|
||||
"CodeSniffer/Standards/Generic/Sniffs/",
|
||||
"CodeSniffer/Standards/MySource/Sniffs/",
|
||||
"CodeSniffer/Standards/PEAR/Sniffs/",
|
||||
"CodeSniffer/Standards/PSR1/Sniffs/",
|
||||
"CodeSniffer/Standards/PSR2/Sniffs/",
|
||||
"CodeSniffer/Standards/Squiz/Sniffs/",
|
||||
"CodeSniffer/Standards/Zend/Sniffs/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Greg Sherwood",
|
||||
"role": "lead"
|
||||
}
|
||||
],
|
||||
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
|
||||
"homepage": "http://www.squizlabs.com/php-codesniffer",
|
||||
"keywords": [
|
||||
"phpcs",
|
||||
"standards"
|
||||
],
|
||||
"time": "2018-11-07 22:31:41"
|
||||
}
|
||||
],
|
||||
"packages-dev": [],
|
||||
"aliases": [],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": [],
|
||||
|
||||
@@ -1,55 +1,111 @@
|
||||
# Globally valid entries
|
||||
build_settings:
|
||||
verbose: false
|
||||
prefer_symlink: false
|
||||
ignore:
|
||||
ignore: # Ignores vendor and tests folders
|
||||
- "vendor"
|
||||
- "tests"
|
||||
pgsql:
|
||||
host: 'localhost;dbname=template1'
|
||||
user: 'fhcomplete'
|
||||
pass: 'fhcomplete'
|
||||
pgsql: # PostgreSQL connection parameters
|
||||
host: "localhost;dbname=template1" # Connects to the template1 database to be able to drop database fhcomplete
|
||||
user: "fhcomplete"
|
||||
pass: "fhcomplete"
|
||||
|
||||
setup:
|
||||
composer:
|
||||
setup: # First!
|
||||
pgsql: # Close previous connections to database -> drop database -> create database
|
||||
- "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhcomplete';"
|
||||
- "DROP DATABASE IF EXISTS fhcomplete;"
|
||||
- "CREATE DATABASE fhcomplete;"
|
||||
composer: # Run composer to install all the required 3rd party software
|
||||
action: "install"
|
||||
prefer_dist: true
|
||||
no_dev: true
|
||||
pgsql:
|
||||
- "UPDATE pg_database SET datallowconn = 'false' WHERE datname = 'fhctest';" # Stops connections to database
|
||||
- "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhctest';" # Close previous connections to database
|
||||
- "DROP DATABASE IF EXISTS fhctest;" # Drops database
|
||||
- "CREATE DATABASE fhctest OWNER fhcomplete;" # Creates database
|
||||
shell:
|
||||
- "rm -f /var/www/html/build" # Remove the previous soft link, if exists, to the build directory
|
||||
- "ln -s %BUILD_PATH% /var/www/html/build" # Create a new soft link to the actual build directory
|
||||
# Copies configuration files
|
||||
- "cp /home/phpci/config/*.inc.php %BUILD_PATH%/config/"
|
||||
- "cp /home/phpci/config/*.php %BUILD_PATH%/application/config/"
|
||||
- "cd %BUILD_PATH% && php index.ci.php DBTools migrate" # Install Database
|
||||
test:
|
||||
lint:
|
||||
directories:
|
||||
- "application/"
|
||||
recursive: true
|
||||
codeception:
|
||||
# Install addons
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Abrechnung.git %BUILD_PATH%/addons/abrechnung"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Asterisk.git %BUILD_PATH%/addons/asterisk"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Aufnahme.git %BUILD_PATH%/addons/aufnahme"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Bewerbung.git %BUILD_PATH%/addons/bewerbung"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-CaseTime.git %BUILD_PATH%/addons/casetime"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LDAP.git %BUILD_PATH%/addons/ldap"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Lehrmittel.git %BUILD_PATH%/addons/lehrmittel"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LV-Evaluierung.git %BUILD_PATH%/addons/lvevaluierung"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LVInfo.git %BUILD_PATH%/addons/lvinfo"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Kompetenzen.git %BUILD_PATH%/addons/kompetenzen"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Moodle.git %BUILD_PATH%/addons/moodle"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Reports.git %BUILD_PATH%/addons/reports"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Studiengangsverwaltung.git %BUILD_PATH%/addons/studiengangsverwaltung"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Textbausteine.git %BUILD_PATH%/addons/textbausteine"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-WaWi.git %BUILD_PATH%/addons/wawi"
|
||||
# Copy addons configs
|
||||
- "cp -R /var/www/configs/fhc/abrechnung/* %BUILD_PATH%/addons/abrechnung"
|
||||
- "cp -R /var/www/configs/fhc/asterisk/* %BUILD_PATH%/addons/asterisk"
|
||||
- "cp -R /var/www/configs/fhc/bewerbung/* %BUILD_PATH%/addons/bewerbung"
|
||||
- "cp -R /var/www/configs/fhc/casetime/* %BUILD_PATH%/addons/casetime"
|
||||
- "cp -R /var/www/configs/fhc/lehrmittel/* %BUILD_PATH%/addons/lehrmittel"
|
||||
- "cp -R /var/www/configs/fhc/lvinfo/* %BUILD_PATH%/addons/lvinfo"
|
||||
- "cp -R /var/www/configs/fhc/reports/* %BUILD_PATH%/addons/reports"
|
||||
- "cp -R /var/www/configs/fhc/wawi/* %BUILD_PATH%/addons/wawi"
|
||||
# Copy core configs and .htaccess
|
||||
- "cp -R /var/www/configs/fhc/configs/* ./config"
|
||||
- "cp /var/www/configs/fhc/configs/.htaccess ./cis/private/"
|
||||
- "cp /var/www/configs/fhc/configs/.htaccess ./content"
|
||||
- "cp /var/www/configs/fhc/configs/.htaccess ./rdf"
|
||||
- "cp /var/www/configs/fhc/configs/.htaccess ./system"
|
||||
- "cp /var/www/configs/fhc/configs/.htaccess ./vilesci"
|
||||
# Create core directories
|
||||
- "mkdir documents"
|
||||
- "mkdir documents/csv_import"
|
||||
- "mkdir documents/dms"
|
||||
- "mkdir documents/import"
|
||||
- "mkdir documents/benotungstool"
|
||||
- "mkdir paabgabe"
|
||||
# Copy codeigniter configs
|
||||
- "mkdir ./application/config/development"
|
||||
- "cp -R /var/www/configs/ci/* ./application/config/development"
|
||||
# Clone extensions
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-MobilityOnline.git /tmp/FHC-Core-MobilityOnline"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-Budget.git /tmp/FHC-Core-Budget"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-DSMS.git /tmp/FHC-Core-DSMS"
|
||||
- "git clone --quiet https://github.com/FH-Complete/FHC-Core-Nextcloud.git /tmp/FHC-Core-Nextcloud"
|
||||
# Create extensions archives
|
||||
- "tar cfzP /tmp/FHC-Core-MobilityOnline.tgz /tmp/FHC-Core-MobilityOnline/"
|
||||
- "tar cfzP /tmp/FHC-Core-Budget.tgz /tmp/FHC-Core-Budget/"
|
||||
- "tar cfzP /tmp/FHC-Core-DSMS.tgz /tmp/FHC-Core-DSMS/"
|
||||
- "tar cfzP /tmp/FHC-Core-Nextcloud.tgz /tmp/FHC-Core-Nextcloud/"
|
||||
# Install extensions
|
||||
- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-MobilityOnline /tmp/FHC-Core-MobilityOnline.tgz"
|
||||
- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-Budget /tmp/FHC-Core-Budget.tgz"
|
||||
- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-DSMS /tmp/FHC-Core-DSMS.tgz"
|
||||
- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-Nextcloud /tmp/FHC-Core-Nextcloud.tgz"
|
||||
# Remove temporary files
|
||||
- "rm -fR /tmp/FHC-Core-MobilityOnline*"
|
||||
- "rm -fR /tmp/FHC-Core-Budget*"
|
||||
- "rm -fR /tmp/FHC-Core-DSMS*"
|
||||
- "rm -fR /tmp/FHC-Core-Nextcloud*"
|
||||
# Change files permissions
|
||||
- "chmod -R 0770 *"
|
||||
- "find . -type f -exec chmod 0644 {} \\;"
|
||||
# Create a symlink to the current build folder
|
||||
- "ln -s %BUILD_PATH% ../fhcomplete"
|
||||
|
||||
test: # Run tests
|
||||
php_parallel_lint: # Lint
|
||||
allow_failures: true
|
||||
php_mess_detector: # Mess detector
|
||||
allow_failures: true
|
||||
php_cpd: # Copy/paste detector
|
||||
allow_failures: true
|
||||
php_code_sniffer: # Code sniffer
|
||||
standard: "tests/codesniffer/FHComplete"
|
||||
allow_failures: true
|
||||
codeception: # Codeception
|
||||
config: "tests/codeception/"
|
||||
path: "tests/codeception/_output/"
|
||||
# php_docblock_checker:
|
||||
# path: "application/controllers/"
|
||||
# allowed_warnings: 100
|
||||
# skip_classes: false
|
||||
# php_code_sniffer:
|
||||
# path: "application/controllers/"
|
||||
# standard: "tests/codesniffer/FHComplete"
|
||||
# allowed_errors: 200
|
||||
# allowed_warnings: 200
|
||||
# php_unit:
|
||||
# directory: "tests/phpunit/"
|
||||
allow_failures: true
|
||||
|
||||
complete:
|
||||
pgsql:
|
||||
- "UPDATE pg_database SET datallowconn = 'false' WHERE datname = 'fhctest';" # Stops connections to database
|
||||
- "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhctest';" # Close previous connections to database
|
||||
- "DROP DATABASE IF EXISTS fhctest;" # Drops database
|
||||
shell:
|
||||
- "rm -f /var/www/html/build" # Remove the previous soft link, if exists, to the build directory
|
||||
failure: # On failure
|
||||
email: # Send an email to warn the team
|
||||
default_mailto_address: systementwicklung@technikum-wien.at
|
||||
|
||||
complete: # Last!
|
||||
pgsql: # Close previous connections to database -> drop database
|
||||
- "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhcomplete';"
|
||||
- "DROP DATABASE IF EXISTS fhcomplete;"
|
||||
shell: # Remove the previously created symlink
|
||||
- "rm ../fhcomplete"
|
||||
|
||||
Reference in New Issue
Block a user