Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: doctrine/orm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.3.x
Choose a base ref
...
head repository: JRDuncan/orm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing 1,573 changed files with 64,410 additions and 80,957 deletions.
43 changes: 43 additions & 0 deletions .doctrine-project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"active": true,
"name": "Object Relational Mapper",
"shortName": "ORM",
"slug": "orm",
"docsSlug": "doctrine-orm",
"versions": [
{
"name": "3.0",
"branchName": "master",
"slug": "latest",
"upcoming": true
},
{
"name": "2.7",
"branchName": "2.7",
"slug": "2.7",
"upcoming": true
},
{
"name": "2.6",
"branchName": "2.6",
"slug": "2.6",
"current": true,
"aliases": [
"current",
"stable"
]
},
{
"name": "2.5",
"branchName": "2.5",
"slug": "2.5",
"maintained": false
},
{
"name": "2.4",
"branchName": "2.4",
"slug": "2.4",
"maintained": false
}
]
}
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -11,3 +11,4 @@ CONTRIBUTING.md export-ignore
phpunit.xml.dist export-ignore
run-all.sh export-ignore
phpcs.xml.dist export-ignore
composer.lock export-ignore
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
patreon: phpdoctrine
tidelift: packagist/doctrine%2Form
custom: https://www.doctrine-project.org/sponsorship.html
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/BC_Break.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
name: 💥 BC Break
about: Have you encountered an issue during upgrade? 💣
---

<!--
Before reporting a BC break, please consult the upgrading document to make sure it's not an expected change: https://github.com/doctrine/orm/blob/master/UPGRADE.md
-->

### BC Break Report

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | ------
| BC Break | yes
| Version | x.y.z

#### Summary

<!-- Provide a summary describing the problem you are experiencing. -->

#### Previous behavior

<!-- What was the previous (working) behavior? -->

#### Current behavior

<!-- What is the current (broken) behavior? -->

#### How to reproduce

<!--
Provide steps to reproduce the BC break.
If possible, also add a code snippet with relevant configuration, entity mappings, DQL etc.
Adding a failing Unit or Functional Test would help us a lot - you can submit it in a Pull Request separately, referencing this bug report.
-->
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/Bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: 🐞 Bug Report
about: Something is broken? 🔨
---

### Bug Report

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | ------
| BC Break | yes/no
| Version | x.y.z

#### Summary

<!-- Provide a summary describing the problem you are experiencing. -->

#### Current behavior

<!-- What is the current (buggy) behavior? -->

#### How to reproduce

<!--
Provide steps to reproduce the bug.
If possible, also add a code snippet with relevant configuration, entity mappings, DQL etc.
Adding a failing Unit or Functional Test would help us a lot - you can submit one in a Pull Request separately, referencing this bug report.
-->

#### Expected behavior

<!-- What was the expected (correct) behavior? -->

18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature_Request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: 🎉 Feature Request
about: You have a neat idea that should be implemented? 🎩
---

### Feature Request

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | ------
| New Feature | yes
| RFC | yes/no
| BC Break | yes/no

#### Summary

<!-- Provide a summary of the feature you would like to see implemented. -->
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/Support_Question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: ❓ Support Question
about: Have a problem that you can't figure out? 🤔
---

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | -----
| Version | x.y.z

<!--
Before asking question here, please try asking on Gitter or Slack first.
Find out more about Doctrine support channels here: https://www.doctrine-project.org/community/
Keep in mind that GitHub is primarily an issue tracker.
-->

### Support Question

<!-- Describe the issue you are facing here. -->
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/Failing_Test.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: 🐞 Failing Test
about: You found a bug and have a failing Unit or Functional test? 🔨
---

### Failing Test

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | ------
| BC Break | yes/no
| Version | x.y.z


#### Summary

<!-- Provide a summary of the failing scenario. -->

18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/Improvement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: ⚙ Improvement
about: You have some improvement to make Doctrine better? 🎁
---

### Improvement

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | ------
| New Feature | yes
| RFC | yes/no
| BC Break | yes/no

#### Summary

<!-- Provide a summary of the improvement you are submitting. -->
26 changes: 26 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/New_Feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: 🎉 New Feature
about: You have implemented some neat idea that you want to make part of Doctrine? 🎩
---

<!--
Thank you for submitting new feature!
Pick the target branch based according to these criteria:
* submitting a bugfix: target the lowest active stable branch: 2.6
* submitting a new feature: target the master branch.
* submitting a BC-breaking change: target the master branch
-->

### New Feature

<!-- Fill in the relevant information below to help triage your issue. -->

| Q | A
|------------ | ------
| New Feature | yes
| RFC | yes/no
| BC Break | yes/no

#### Summary

<!-- Provide a summary of the feature you have implemented. -->
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -7,11 +7,13 @@ lib/api/
lib/Doctrine/Common
lib/Doctrine/DBAL
/.settings/
*.iml
.buildpath
.project
.idea
*.iml
vendor/
composer.lock
composer.phar
/tests/Doctrine/Performance/history.db
/.phpcs-cache
phpbench.phar
phpbench.phar.pubkey
12 changes: 5 additions & 7 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -3,20 +3,20 @@ build:
analysis:
environment:
php:
version: 7.1
version: 7.2
cache:
disabled: false
directories:
- ~/.composer/cache

project_setup:
override: true
tests:
override:
- php-scrutinizer-run

before_commands:
- "composer install --no-dev --prefer-source"
- phpcs-run
dependencies:
override:
- composer install --no-interaction --prefer-dist

tools:
external_code_coverage:
@@ -25,10 +25,8 @@ tools:
filter:
excluded_paths:
- docs
- tools

build_failure_conditions:
- 'elements.rating(<= C).new.exists' # No new classes/methods with a rating of C or worse allowed
- 'issues.severity(>= MAJOR).new.exists' # New issues of major or higher severity
- 'project.metric_change("scrutinizer.test_coverage", < 0)' # Code Coverage decreased from previous inspection
- 'patches.label("Unused Use Statements").new.exists' # No new unused imports patches allowed
39 changes: 21 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ sudo: false
language: php

php:
- 7.1
- 7.2
- nightly
- 7.3
- 7.4snapshot

env:
- DB=sqlite
@@ -16,12 +16,15 @@ before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- composer self-update

install: travis_retry composer update --prefer-dist
install:
- rm composer.lock
- travis_retry composer update --prefer-dist

script:
- if [[ "$DB" == "mysql" || "$DB" == "mariadb" ]]; then mysql -e "CREATE SCHEMA doctrine_tests; GRANT ALL PRIVILEGES ON doctrine_tests.* to travis@'%'"; fi
- ENABLE_SECOND_LEVEL_CACHE=0 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml
- ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional
# temporarily disabled
#- ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional

jobs:
include:
@@ -30,13 +33,6 @@ jobs:
addons:
mariadb: 10.1

- stage: Test
env: DB=mysql MYSQL_VERSION=5.7
php: 7.1
before_script:
- ./tests/travis/install-mysql-$MYSQL_VERSION.sh
sudo: required

- stage: Test
env: DB=mysql MYSQL_VERSION=5.7
php: 7.2
@@ -46,7 +42,7 @@ jobs:

- stage: Test
env: DB=mysql MYSQL_VERSION=5.7
php: nightly
php: 7.4snapshot
before_script:
- ./tests/travis/install-mysql-$MYSQL_VERSION.sh
sudo: required
@@ -57,8 +53,10 @@ jobs:

- stage: Test
if: type = cron
php: 7.3
env: DB=sqlite DEV_DEPENDENCIES
install:
- rm composer.lock
- composer config minimum-stability dev
- travis_retry composer update --prefer-dist

@@ -75,26 +73,31 @@ jobs:

- stage: Code Quality
env: DB=none STATIC_ANALYSIS
install: travis_retry composer update --prefer-dist --prefer-stable
install: travis_retry composer install --prefer-dist
before_script:
- echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.9
script: vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib
script: vendor/bin/phpstan analyse

- stage: Code Quality
env: DB=none BENCHMARK
before_script: wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey
script: php phpbench.phar run -l dots --report=default
script: php phpbench.phar run --bootstrap=tests/Doctrine/Tests/TestInit.php -l dots --report=default

- stage: Code Quality
env: DB=none CODING_STANDARDS
php: nightly
install: travis_retry composer install --prefer-dist
php: 7.2
script:
- ./vendor/bin/phpcs

allow_failures:
- php: nightly
- php: 7.4snapshot
# temporarily disabled
- env: DB=mysql
- env: DB=mariadb
- env: DB=pgsql
- env: DB=mysql MYSQL_VERSION=5.7

cache:
directories:
Loading