Skip to content

Commit 8e67496

Browse files
committed
Merge tag 'v2.7.1' into oracle121
This release fixes unintentional BC breaks: 1. It was impossible to use deprecated fetch modes with PDO-based drivers. 2. An unsupported option passed to the `Column` object prevented subsequent options from being applied. 3. Date interval values stored prior to upgrade to `v2.7.0` were reported as invalid. Total issues resolved: **10** **Backwards Compatibility Fixes:** - [3082: Custom PDO fetch modes and 2.7.0](doctrine#3082) thanks to @corphi - [3088: Fix doctrine#3082: Add BC for PDO-only fetch modes](doctrine#3088) thanks to @corphi - [3089: Don't skip column options.](doctrine#3089) thanks to @andytruong - [3093: When updating to version v2.7 type DateInterval throws errors](doctrine#3093) thanks to @fnagel - [3097: Fix compatibility for pre-2.7 DateIntervalType format](doctrine#3097) thanks to @Majkl578 **Documentation Improvements:** - [3083: Document the correct way of configuring a MariaDB database with serverVersion](doctrine#3083) thanks to @tristanbes - [3084: README: Add 2.7, drop 2.5](doctrine#3084) thanks to @Majkl578 **Continuous Integration Improvements:** - [3085: Tests: remove implicit verbose flag](doctrine#3085) thanks to @Majkl578 - [3090: Add symfony tests listener](doctrine#3090) thanks to @greg0ire - [3095: CI: Add missing listener for MariaDB @ mysqli](doctrine#3095) thanks to @Majkl578 # gpg: directory `/n/.gnupg' created # gpg: new configuration file `/n/.gnupg/gpg.conf' created # gpg: WARNING: options in `/n/.gnupg/gpg.conf' are not yet active during this run # gpg: DBG: locking for `/n/.gnupg/pubring.gpg.lock' done via O_EXCL # gpg: keyring `/n/.gnupg/pubring.gpg' created # gpg: Signature made Sun Apr 8 07:24:49 2018 using RSA key ID 543AE995 # gpg: Can't check signature: public key not found # Conflicts: # .gitignore # lib/Doctrine/DBAL/Driver/OCI8/Driver.php
2 parents 6f548a8 + 11037b4 commit 8e67496

File tree

397 files changed

+12318
-5346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

397 files changed

+12318
-5346
lines changed

.appveyor.yml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
build: false
2+
platform:
3+
- x64
4+
#matrix:
5+
# fast_finish: true # kills the build at the first failure
6+
clone_folder: C:\projects\dbal
7+
clone_depth: 1
8+
9+
cache:
10+
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
11+
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
12+
- C:\tools\php -> .appveyor.yml
13+
- composer.phar
14+
- '%LOCALAPPDATA%\Composer\files'
15+
#- vendor
16+
17+
## Build matrix for lowest and highest possible targets
18+
environment:
19+
matrix:
20+
- db: mssql
21+
driver: sqlsrv
22+
db_version: sql2008r2sp2
23+
php: 7.2
24+
- db: mssql
25+
driver: sqlsrv
26+
db_version: sql2012sp1
27+
php: 7.2
28+
- db: mssql
29+
driver: sqlsrv
30+
db_version: sql2017
31+
php: 7.2
32+
- db: mssql
33+
driver: pdo_sqlsrv
34+
db_version: sql2017
35+
php: 7.2
36+
37+
init:
38+
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
39+
- SET COMPOSER_NO_INTERACTION=1
40+
- SET ANSICON=121x90 (121x90)
41+
42+
## Install PHP and composer, and run the appropriate composer command
43+
install:
44+
- ps: |
45+
# Check if installation is cached
46+
if (!(Test-Path c:\tools\php)) {
47+
appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
48+
# install sqlite
49+
appveyor-retry cinst -y sqlite
50+
Get-ChildItem -Path c:\tools\php
51+
cd c:\tools\php
52+
53+
# Set PHP environment items that are always needed
54+
copy php.ini-production php.ini
55+
Add-Content php.ini "`n date.timezone=UTC"
56+
Add-Content php.ini "`n extension_dir=ext"
57+
Add-Content php.ini "`n extension=php_openssl.dll"
58+
Add-Content php.ini "`n extension=php_mbstring.dll"
59+
Add-Content php.ini "`n extension=php_fileinfo.dll"
60+
Add-Content php.ini "`n extension=php_pdo_sqlite.dll"
61+
Add-Content php.ini "`n extension=php_sqlite3.dll"
62+
63+
# Get and install the MSSQL DLL's
64+
$DLLVersion = "5.2.0rc1"
65+
cd c:\tools\php\ext
66+
$source = "https://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip"
67+
$destination = "c:\tools\php\ext\php_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip"
68+
Invoke-WebRequest $source -OutFile $destination
69+
7z x -y php_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip > $null
70+
$source = "https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip"
71+
$destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip"
72+
Invoke-WebRequest $source -OutFile $destination
73+
7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip > $null
74+
Remove-Item c:\tools\php\* -include .zip
75+
cd c:\tools\php
76+
Add-Content php.ini "`nextension=php_sqlsrv.dll"
77+
Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
78+
Add-Content php.ini "`n"
79+
80+
cd c:\projects\dbal
81+
82+
if (!(Test-Path c:\projects\dbal\composer.phar)) {
83+
appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
84+
}
85+
}
86+
# install composer dependencies
87+
- rm composer.lock
88+
- appveyor-retry php composer.phar self-update
89+
- appveyor-retry php composer.phar install --no-progress --profile
90+
91+
before_test:
92+
# Selectively start the services
93+
- ps: >-
94+
if ($env:db -eq "mssql") {
95+
$instanceName = $env:db_version.ToUpper()
96+
net start "MSSQL`$$instanceName"
97+
}
98+
99+
test_script:
100+
- cd C:\projects\dbal
101+
- ps: >-
102+
if ($env:db_version) {
103+
vendor\bin\phpunit -c tests\appveyor\%db%.%db_version%.%driver%.appveyor.xml
104+
}
105+
else {
106+
vendor\bin\phpunit -c tests\appveyor\%db%.%driver%.appveyor.xml
107+
}

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
.gitattributes export-ignore
44
.gitignore export-ignore
55
.gitmodules export-ignore
6+
.appveyor.yml export-ignore
67
.travis.yml export-ignore
78
build.properties export-ignore
89
build.xml export-ignore
910
phpunit.xml.dist export-ignore
1011
run-all.sh export-ignore
12+
/phpcs.xml.dist export-ignore
13+
/composer.lock export-ignore

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ dist/
55
download/
66
vendor/
77
*.phpunit.xml
8+
/phpunit.xml
9+
/.phpcs-cache
810
composer.lock
911
.idea/

.scrutinizer.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
build:
2-
environment:
3-
php:
4-
version: 7.1
2+
nodes:
3+
analysis:
4+
environment:
5+
php:
6+
version: 7.1
7+
cache:
8+
disabled: false
9+
directories:
10+
- ~/.composer/cache
11+
12+
project_setup:
13+
override: true
14+
tests:
15+
override:
16+
- php-scrutinizer-run
517

618
before_commands:
7-
- "composer install --no-dev --prefer-source"
19+
- "composer install --no-dev --prefer-source -a"
820

921
tools:
1022
external_code_coverage:
@@ -16,8 +28,6 @@ filter:
1628

1729
build_failure_conditions:
1830
- 'elements.rating(<= C).new.exists' # No new classes/methods with a rating of C or worse allowed
19-
- 'issues.label("coding-style").new.exists' # No new coding style issues allowed
2031
- 'issues.severity(>= MAJOR).new.exists' # New issues of major or higher severity
2132
- 'project.metric_change("scrutinizer.test_coverage", < 0)' # Code Coverage decreased from previous inspection
22-
- 'patches.label("Doc Comments").new.exists' # No new doc comments patches allowed
2333
- 'patches.label("Unused Use Statements").new.exists' # No new unused imports patches allowed

0 commit comments

Comments
 (0)