Skip to content

Commit

Permalink
Merge pull request #77 from oroinc/2.x
Browse files Browse the repository at this point in the history
Preparing 2.0.0 release
  • Loading branch information
mbessolov authored Jan 13, 2021
2 parents 3dd5135 + a057bfe commit b3a3154
Show file tree
Hide file tree
Showing 142 changed files with 866 additions and 1,167 deletions.
16 changes: 0 additions & 16 deletions .scrutinizer.yml

This file was deleted.

70 changes: 9 additions & 61 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,80 +1,28 @@
os: linux
dist: trusty
dist: xenial
language: php

jobs:
include:
- php: 5.4
env: DB=mysql DB_IMAGE=mysql:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.5
env: DB=mysql DB_IMAGE=mysql:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.6
env: DB=mysql DB_IMAGE=mysql:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.0
- php: 7.3
env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1
- php: 7.4
env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.2
env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'

- php: 5.4
env: DB=mysql DB_IMAGE=mariadb:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.6
env: DB=mysql DB_IMAGE=mariadb:10.0 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.0
env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1
- php: 7.3
env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.2
- php: 7.4
env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'

- php: 5.4
env: DB=mysql DB_IMAGE=percona:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.6
env: DB=mysql DB_IMAGE=percona:5.6 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.0
env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1
- php: 7.3
env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.2
- php: 7.4
env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'

- php: 5.4
env: DB=pgsql DB_IMAGE=postgres:9.2 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 5.5
env: DB=pgsql DB_IMAGE=postgres:9.3 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 5.6
env: DB=pgsql DB_IMAGE=postgres:9.4 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 7.0
env: DB=pgsql DB_IMAGE=postgres:9.5 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 7.1
- php: 7.3
env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 7.2
- php: 7.4
env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'

install:
- composer self-update
Expand Down
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
The Oro Platform Software
Oro Doctrine Extensions

The MIT License (MIT)

Copyright (c) 2013, Oro, Inc.
Copyright (c) 2020, Oro, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
Loading

0 comments on commit b3a3154

Please sign in to comment.