Skip to content

Commit d0aaf9e

Browse files
authored
Merge pull request #339 from doctrine/3.0.x
Merge 3.0.x into master
2 parents 3d23c13 + 28b7389 commit d0aaf9e

File tree

4 files changed

+18
-42
lines changed

4 files changed

+18
-42
lines changed

.scrutinizer.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ language: php
55
php:
66
- 7.2
77
- 7.3
8-
- 7.4snapshot
8+
- 7.4
99

1010
cache:
1111
directories:
@@ -37,9 +37,8 @@ jobs:
3737
- if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
3838
script:
3939
- ./vendor/bin/phpunit --coverage-clover clover.xml
40-
after_script:
41-
- wget https://scrutinizer-ci.com/ocular.phar
42-
- php ocular.phar code-coverage:upload --format=php-clover clover.xml
40+
after_success:
41+
- bash <(curl -s https://codecov.io/bash)
4342

4443
- stage: Code Quality
4544
env: CODING_STANDARDS

Resources/doc/index.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ application:
9595
9696
9797
98-
- The ``services`` node allows you to provide custom services to the underlying ``DependencyFactory`` part
99-
of ``doctrine/migrations``.
100-
98+
- The ``services`` node allows you to provide custom services to the underlying ``DependencyFactory`` part of ``doctrine/migrations``.
10199
- The node ``factories`` is similar to ``services``, with the difference that it accepts only callables.
102100
The provided callable must return the service to be passed to the ``DependencyFactory``.
103101
The callable will receive as first argument the ``DependencyFactory`` itself,

UPGRADE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,17 @@ doctrine_migrations:
5555
After
5656
5757
The parameter `name` has been dropped.
58+
59+
- Custom migration templates:
60+
61+
Before
62+
63+
```php
64+
final class Version<version> extends AbstractMigration
65+
```
66+
67+
After
68+
69+
```php
70+
final class <className> extends AbstractMigration
71+
```

0 commit comments

Comments
 (0)