Skip to content

Commit 458acdc

Browse files
start on working with symfony 4.0 (#155)
* start on working with symfony 4.0 * let travis decide it * Master dev kit (#156) * DevKit updates * DevKit updates * remove sonata und fos/jsrouting dependency or bundles in bundle sets
1 parent 49f61e3 commit 458acdc

File tree

3 files changed

+6
-37
lines changed

3 files changed

+6
-37
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ matrix:
4343
env: SYMFONY_VERSION=3.3.*
4444
- php: 7.1
4545
env: SYMFONY_VERSION=^3.4@dev
46-
4746
fast_finish: true
48-
allow_failures:
4947

5048

5149
before_install:

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
}
1010
],
1111
"require": {
12-
"php": "^7.0",
12+
"php": "^7.1",
1313
"symfony/phpunit-bridge": "^3.2",
14-
"symfony/monolog-bundle": "^2.1|^3.0",
14+
"symfony/monolog-bundle": "^2.8|^3.3|^4.0",
1515
"doctrine/common": "^2.4",
1616
"doctrine/doctrine-bundle": "^1.0|^2.0",
17-
"doctrine/phpcr-odm": "^1.1|^2.0",
17+
"doctrine/phpcr-odm": "^1.4|^2.0",
1818
"doctrine/phpcr-bundle": "^2.0@dev",
1919
"doctrine/data-fixtures": "^1.0",
2020
"jackalope/jackalope": "^1.1.5",
2121
"jackalope/jackalope-doctrine-dbal": "^1.1.5",
22-
"friendsofsymfony/jsrouting-bundle": "^1.1",
23-
"symfony/yaml": "^2.8|^3.0"
22+
"symfony/yaml": "^2.8|^3.3|^4.0"
2423
},
2524
"autoload": {
2625
"psr-4": {
@@ -37,5 +36,6 @@
3736
"dev-master": "2.1-dev"
3837
}
3938
},
40-
"minimum-stability":"dev"
39+
"minimum-stability":"dev",
40+
"prefer-stable": true
4141
}

src/HttpKernel/TestKernel.php

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,7 @@
1313

1414
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
1515
use Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle;
16-
use FOS\JsRoutingBundle\FOSJsRoutingBundle;
1716
use Knp\Bundle\MenuBundle\KnpMenuBundle;
18-
use Sonata\AdminBundle\SonataAdminBundle;
19-
use Sonata\BlockBundle\SonataBlockBundle;
20-
use Sonata\CoreBundle\SonataCoreBundle;
21-
use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
22-
use Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle;
23-
use Sonata\jQueryBundle\SonatajQueryBundle;
2417
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
2518
use Symfony\Bundle\MonologBundle\MonologBundle;
2619
use Symfony\Bundle\SecurityBundle\SecurityBundle;
@@ -65,28 +58,6 @@ public function __construct($env, $debug)
6558
$this->registerBundleSet('phpcr_odm', [DoctrineBundle::class, DoctrinePHPCRBundle::class]);
6659
$this->registerBundleSet('doctrine_orm', [DoctrineBundle::class]);
6760

68-
$baseSonataBundles = [
69-
SonataBlockBundle::class,
70-
SonataCoreBundle::class,
71-
SonataAdminBundle::class,
72-
KnpMenuBundle::class,
73-
FOSJsRoutingBundle::class,
74-
];
75-
76-
if (class_exists(SonatajQueryBundle::class)) {
77-
$baseSonataBundles[] = SonatajQueryBundle::class;
78-
}
79-
80-
$this->registerBundleSet('sonata_admin_orm', array_merge(
81-
[SonataDoctrineORMAdminBundle::class],
82-
$baseSonataBundles
83-
));
84-
85-
$this->registerBundleSet('sonata_admin_phpcr', array_merge([
86-
SonataDoctrinePHPCRAdminBundle::class,
87-
CmfTreeBrowserBundle::class,
88-
], $baseSonataBundles));
89-
9061
parent::__construct($env, $debug);
9162
$this->configure();
9263
}

0 commit comments

Comments
 (0)