Update .gitignore, docker-compose.yml, phpunit.xml.dist

This commit is contained in:
Meritoo
2019-08-02 12:35:07 +02:00
parent 79708f4e61
commit dabb1e90c3
5 changed files with 115 additions and 119 deletions

6
.env
View File

@@ -1,6 +1,6 @@
# ----------------------------------------------------------------------------- # ------------------------------------------------------------------------------
### Docker ### Docker
# ----------------------------------------------------------------------------- # ------------------------------------------------------------------------------
# #
# All containers # All containers
@@ -12,4 +12,4 @@ DOCKER_CONTAINER_PROJECT=common-library
# PHP configuration: # PHP configuration:
# - timezone # - timezone
# #
TIMEZONE=Europe/Warsaw PHP_DATE_TIMEZONE=Europe/London

204
.gitignore vendored
View File

@@ -1,61 +1,79 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
### Vendors ### Linux template
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
/vendor/ *~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
### Composer ### macOS template
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
/composer.lock # General
/composer.phar .DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
### Phing ### Windows template
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
/phing/properties # Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# ------------------------------------------------------------------------------ # Folder config file
### PHPUnit [Dd]esktop.ini
# ------------------------------------------------------------------------------
/phpunit.xml
/.phpunit.result.cache
# Recycle Bin used on file shares
$RECYCLE.BIN/
# ------------------------------------------------------------------------------ # Windows Installer files
### Infection *.cab
# ------------------------------------------------------------------------------ *.msi
/infection.json *.msix
*.msm
*.msp
# Windows shortcuts
# ------------------------------------------------------------------------------ *.lnk
### PHP Coding Standards Fixer
# ------------------------------------------------------------------------------
/.php_cs
/.php_cs.cache
# ------------------------------------------------------------------------------
### PHP_CodeSniffer
# ------------------------------------------------------------------------------
/.phpcs-cache
/phpcs.xml
# -----------------------------------------------------------------------------
### Build files
# -----------------------------------------------------------------------------
/build/
# ------------------------------------------------------------------------------
### Generated databases
# ------------------------------------------------------------------------------
/data/tmp
*.sql
*.sqlite
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -130,79 +148,57 @@ fabric.properties
# Android studio 3.1+ serialized cache file # Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser .idea/caches/build_file_checksums.ser
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
### macOS template ### Build files
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# General /build/
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
### Linux template ### Phing
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
*~ /phing/properties
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
### Windows template ### Infection
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Windows thumbnail cache files /infection.json
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# Folder config file # ------------------------------------------------------------------------------
[Dd]esktop.ini ### Temporary data & databases
# ------------------------------------------------------------------------------
/data/tmp
*.sqlite
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files # ------------------------------------------------------------------------------
*.cab ### Composer & vendors
*.msi # ------------------------------------------------------------------------------
*.msix /composer.lock
*.msm /composer.phar
*.msp /vendor/
# Windows shortcuts
*.lnk # ------------------------------------------------------------------------------
### PHPUnit
# ------------------------------------------------------------------------------
/phpunit.xml
/.phpunit.result.cache
/tests/Resources/var
# ------------------------------------------------------------------------------
### PHP Coding Standards Fixer
# ------------------------------------------------------------------------------
/.php_cs
/.php_cs.cache
# ------------------------------------------------------------------------------
### PHP_CodeSniffer
# ------------------------------------------------------------------------------
/.phpcs-cache
/phpcs.xml

View File

@@ -9,6 +9,7 @@ Common and useful classes, methods, exceptions etc.
3. composer > squizlabs/php_codesniffer package > use ^3.4 (instead of ^2.9) 3. composer > squizlabs/php_codesniffer package > use ^3.4 (instead of ^2.9)
4. Do not require name of class by BaseTestCaseTrait::assertMethodVisibilityAndArguments() method 4. Do not require name of class by BaseTestCaseTrait::assertMethodVisibilityAndArguments() method
5. PHP CS Fixer > configuration > make more readable & remove unnecessary code 5. PHP CS Fixer > configuration > make more readable & remove unnecessary code
6. Update .gitignore, docker-compose.yml, phpunit.xml.dist
# 1.0.5 # 1.0.5

View File

@@ -10,7 +10,7 @@ services:
entrypoint: php entrypoint: php
command: -S 0.0.0.0:9999 command: -S 0.0.0.0:9999
environment: environment:
TIMEZONE: ${TIMEZONE} PHP_DATE_TIMEZONE: ${PHP_DATE_TIMEZONE}
volumes: volumes:
- .:/var/www/application:cached - .:/var/www/application:cached
composer: composer:

View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- https://phpunit.readthedocs.io/en/8.0/ --> <!-- https://phpunit.readthedocs.io/en/8.2/configuration.html -->
<phpunit <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.2/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd"
backupGlobals="false" backupGlobals="false"
bootstrap="vendor/autoload.php" bootstrap="vendor/autoload.php"
colors="true" colors="true"
@@ -16,13 +15,13 @@
<testsuites> <testsuites>
<testsuite name="Meritoo Package - Main Test Suite"> <testsuite name="Meritoo Package - Main Test Suite">
<directory>tests/</directory> <directory>tests</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<filter> <filter>
<whitelist> <whitelist>
<directory>src/</directory> <directory>src</directory>
</whitelist> </whitelist>
</filter> </filter>