Skip to content

Commit

Permalink
Merge 3f34f3e into 6c89f61
Browse files Browse the repository at this point in the history
  • Loading branch information
schiederme committed Dec 19, 2020
2 parents 6c89f61 + 3f34f3e commit 6f90722
Show file tree
Hide file tree
Showing 5 changed files with 5,209 additions and 35 deletions.
148 changes: 145 additions & 3 deletions .gitignore
@@ -1,3 +1,145 @@
/.idea
/vendor
composer.lock

# Created by https://www.toptal.com/developers/gitignore/api/phpunit,composer,phpstorm+all,macos
# Edit at https://www.toptal.com/developers/gitignore?templates=phpunit,composer,phpstorm+all,macos

### Composer ###
composer.phar
/vendor/

# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock

### macOS ###
# General
.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

### PhpStorm+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### PhpStorm+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr

# Sonarlint plugin
.idea/sonarlint

### PHPUnit ###
# Covers PHPUnit
# Reference: https://phpunit.de/

# Generated files
.phpunit.result.cache

# PHPUnit
/app/phpunit.xml
/phpunit.xml

# Build data
/build/

# End of https://www.toptal.com/developers/gitignore/api/phpunit,composer,phpstorm+all,macos
12 changes: 8 additions & 4 deletions composer.json
Expand Up @@ -10,21 +10,25 @@
"authors": [
{
"name": "Beno!t POLASZEK"
},
{
"name": "Maximilian Schieder",
"email": "maximilian.schieder@posteo.net"
}
],
"type": "library",
"license": "MIT",
"require": {
"php": ">=7.1",
"robinvdvleuten/ulid": "~2.0|~3.0"
"robinvdvleuten/ulid": "^5.0"
},
"require-dev": {
"doctrine/orm": "^2.3",
"phpunit/phpunit": "^5.0|^6.0|^7.0",
"doctrine/orm": "^2.8",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "@stable",
"php-coveralls/php-coveralls": "@stable",
"matthiasnoback/doctrine-orm-test-service-provider": "^3.0",
"symfony/var-dumper": "^4.2"
"symfony/var-dumper": "^5.2"
},
"autoload": {
"classmap": [
Expand Down

0 comments on commit 6f90722

Please sign in to comment.