Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit cc79d4e

Browse files
committed
updated service definitions for symfony 4.0 support
1 parent 5fc00d0 commit cc79d4e

File tree

7 files changed

+21
-24
lines changed

7 files changed

+21
-24
lines changed

.travis.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
sudo: false
22

3+
env:
4+
global:
5+
- KERNEL_CLASS=DTL\\Bundle\\PhpcrMigrations\\Tests\\Resources\\App\\AppKernel
6+
37
matrix:
48
include:
5-
- language: php
6-
php: 5.6
7-
env:
8-
- SYMFONY_VERSION=2.8.*
9-
10-
- language: php
11-
php: 5.6
12-
env:
13-
- SYMFONY_VERSION=3.4.*
14-
159
- language: php
1610
php: 7.1
1711
env:
@@ -23,16 +17,14 @@ matrix:
2317
- SYMFONY_VERSION=3.4.*
2418

2519
- language: php
26-
php: 7.1
20+
php: 7.2
2721
env:
2822
- SYMFONY_VERSION=4.0.*
2923

3024
- language: php
31-
php: 7.1
25+
php: 7.2
3226
env:
33-
- SYMFONY_VERSION=dev-master
34-
allow_failures:
35-
- env: SYMFONY_VERSION=dev-master
27+
- SYMFONY_VERSION=4.1.*
3628

3729
before_script:
3830
- phpenv config-add travis.php.ini

Resources/config/services.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<services>
7-
<service id="phpcr_migrations.version_storage" class="PHPCR\Migrations\VersionStorage" public="false">
7+
<service id="phpcr_migrations.version_storage" class="PHPCR\Migrations\VersionStorage">
88
<argument type="service" id="doctrine_phpcr.default_session" />
99
<argument>%phpcr_migrations.version_node_name%</argument>
1010
</service>
1111

12-
<service id="phpcr_migrations.version_finder" class="PHPCR\Migrations\VersionFinder" public="false">
12+
<service id="phpcr_migrations.version_finder" class="PHPCR\Migrations\VersionFinder">
1313
<argument>%phpcr_migrations.paths%</argument>
1414
</service>
1515

@@ -19,19 +19,19 @@
1919
<argument type="service" id="doctrine_phpcr.session" />
2020
</service>
2121

22-
<service id="phpcr_migrations.command.status" class="DTL\Bundle\PhpcrMigrations\Command\StatusCommand">
22+
<service id="phpcr_migrations.command.status" class="DTL\Bundle\PhpcrMigrations\Command\StatusCommand" public="true">
2323
<argument type="service" id="phpcr_migrations.version_storage" />
2424
<argument type="service" id="phpcr_migrations.version_finder" />
2525
<tag name="console.command" />
2626
</service>
2727

28-
<service id="phpcr_migrations.command.migrate" class="DTL\Bundle\PhpcrMigrations\Command\MigrateCommand">
28+
<service id="phpcr_migrations.command.migrate" class="DTL\Bundle\PhpcrMigrations\Command\MigrateCommand" public="true">
2929
<argument type="service" id="phpcr_migrations.migrator_factory" />
3030
<argument type="service" id="service_container" />
3131
<tag name="console.command" />
3232
</service>
3333

34-
<service id="phpcr_migrations.command.initialize" class="DTL\Bundle\PhpcrMigrations\Command\InitializeCommand">
34+
<service id="phpcr_migrations.command.initialize" class="DTL\Bundle\PhpcrMigrations\Command\InitializeCommand" public="true">
3535
<argument type="service" id="phpcr_migrations.migrator_factory" />
3636
<tag name="console.command" />
3737
</service>

Tests/Resources/app/AppKernel.php renamed to Tests/Resources/App/AppKernel.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
* file that was distributed with this source code.
1010
*/
1111

12+
namespace DTL\Bundle\PhpcrMigrations\Tests\Resources\App;
13+
1214
use DTL\Bundle\PhpcrMigrations\PhpcrMigrationsBundle;
1315
use DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\OneTestBundle\OneTestBundle;
1416
use DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\TwoTestBundle\TwoTestBundle;

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
"require": {
1212
"phpcr/phpcr-migrations": "^1.1",
1313
"phpcr/phpcr-implementation": "^2.1",
14-
"doctrine/phpcr-bundle": "^1.3"
14+
"doctrine/phpcr-bundle": "^1.3 || ^2.0"
1515
},
1616
"require-dev": {
1717
"symfony/symfony": "~2.8 || ~3.4 || ~4.0",
18-
"symfony-cmf/testing": "~2.0",
18+
"symfony-cmf/testing": "~2.1",
1919
"phpunit/phpunit": "~5.7"
2020
},
21+
"conflict": {
22+
"symfony/symfony": "3.4.15"
23+
},
2124
"autoload": {
2225
"psr-4": {
2326
"DTL\\Bundle\\PhpcrMigrations\\": "."

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</filter>
2323

2424
<php>
25-
<server name="KERNEL_DIR" value="Tests/Resources/app" />
25+
<server name="KERNEL_CLASS" value="DTL\Bundle\PhpcrMigrations\Tests\Resources\App\AppKernel" />
2626
</php>
2727

2828
</phpunit>

travis.php.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
memory_limit = 4096M
1+
memory_limit = 2048M

0 commit comments

Comments
 (0)