mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-26 06:43:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some configs

Browse source
This commit is contained in:
Alejandro Celaya 2019-02-04 19:43:21 +01:00
parent ccb7c8f8d9
commit 171b43c517
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitattributes vendored
View file

@ -1,12 +1,14 @@
/config/test export-ignore
/data/infra export-ignore /data/infra export-ignore
/docs export-ignore /docs export-ignore
/module/CLI/test export-ignore /module/CLI/test export-ignore
/module/CLI/test-resources export-ignore /module/CLI/test-resources export-ignore
/module/Common/test export-ignore /module/Common/test export-ignore
/module/Common/test-func export-ignore /module/Common/test-db export-ignore
/module/Core/test export-ignore /module/Core/test export-ignore
/module/Core/test-func export-ignore /module/Core/test-db export-ignore
/module/Rest/test export-ignore /module/Rest/test export-ignore
/module/Rest/test-api export-ignore
.env.dist export-ignore .env.dist export-ignore
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore
@ -17,9 +19,9 @@ build.sh export-ignore
CHANGELOG.md export-ignore CHANGELOG.md export-ignore
docker-compose.override.yml.dist export-ignore docker-compose.override.yml.dist export-ignore
docker-compose.yml export-ignore docker-compose.yml export-ignore
func_tests_bootstrap.php export-ignore
indocker export-ignore indocker export-ignore
phpcs.xml export-ignore phpcs.xml export-ignore
phpunit.xml.dist export-ignore phpunit.xml.dist export-ignore
phpunit-func.xml export-ignore phpunit-api.xml export-ignore
phpunit-db.xml export-ignore
phpstan.neon phpstan.neon

2
composer.json
View file

@ -29,7 +29,6 @@
"lstrojny/functional-php": "^1.8", "lstrojny/functional-php": "^1.8",
"mikehaertl/phpwkhtmltopdf": "^2.2", "mikehaertl/phpwkhtmltopdf": "^2.2",
"monolog/monolog": "^1.21", "monolog/monolog": "^1.21",
"roave/security-advisories": "dev-master",
"symfony/console": "^4.2", "symfony/console": "^4.2",
"symfony/filesystem": "^4.2", "symfony/filesystem": "^4.2",
"symfony/lock": "^4.2", "symfony/lock": "^4.2",
@ -57,6 +56,7 @@
"phpstan/phpstan": "^0.10.0", "phpstan/phpstan": "^0.10.0",
"phpunit/phpcov": "^5.0", "phpunit/phpcov": "^5.0",
"phpunit/phpunit": "^7.3", "phpunit/phpunit": "^7.3",
"roave/security-advisories": "dev-master",
"shlinkio/php-coding-standard": "~1.0.0", "shlinkio/php-coding-standard": "~1.0.0",
"symfony/dotenv": "^4.2", "symfony/dotenv": "^4.2",
"symfony/var-dumper": "^4.2", "symfony/var-dumper": "^4.2",

9
phpunit.xml.dist
View file

@ -1,9 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
bootstrap="./vendor/autoload.php" bootstrap="./vendor/autoload.php"
colors="true"> colors="true"
>
<testsuites> <testsuites>
<testsuite name="Common"> <testsuite name="Common">
<directory>./module/Common/test</directory> <directory>./module/Common/test</directory>