Skip to content

Commit 79481d9

Browse files
committed
Updated to use the RC versions of all packages
1 parent 3fd8cb5 commit 79481d9

File tree

6 files changed

+460
-471
lines changed

6 files changed

+460
-471
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
6-
# 7.0 is tested using composer install
5+
- 7.0
6+
# 7.1 is tested using composer install
77
- hhvm
88

99
sudo: false
@@ -15,9 +15,9 @@ cache:
1515
matrix:
1616
fast_finish: true
1717
include:
18-
- php: 7.0
18+
- php: 7.1
1919
env: TRANSPORT=jackrabbit COMPOSER_INSTALL=1
20-
- php: 7.0
20+
- php: 7.1
2121
env: TRANSPORT=doctrine_dbal COMPOSER_INSTALL=1
2222

2323
env:

app/config/config.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,11 @@ cmf_menu:
114114
content_identity: ~
115115

116116
cmf_resource:
117+
description:
118+
enhancers: [sonata_phpcr_admin]
117119
repositories:
118120
default:
119-
type: doctrine_phpcr_odm
120-
121-
cmf_resource_rest:
122-
enhancer_map:
123-
- { repository: default, enhancer: sonata_admin }
121+
type: doctrine/phpcr-odm
124122

125123
cmf_sonata_phpcr_admin_integration:
126124
bundles:

app/config/services.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ services:
1515
arguments: ['@knp_menu.helper', '@knp_menu.matcher']
1616
tags:
1717
- { name: twig.extension }
18+
19+
app.resource_voter:
20+
class: AppBundle\Security\ResourceVoter
21+
tags:
22+
- { name: security.voter }

composer.json

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,34 @@
1717
"psr-4": { "Tests\\": "tests/" }
1818
},
1919
"require": {
20-
"php": "^5.5.9|^7.0",
21-
"symfony/symfony": "^3.0",
20+
"php": "^5.6|^7.0",
21+
"symfony/symfony": "^3.2",
2222
"symfony/assetic-bundle": "^2.8",
23-
"symfony/swiftmailer-bundle": "^2.3",
24-
"symfony/monolog-bundle": "^2.8",
23+
"symfony/swiftmailer-bundle": "^2.3.10",
24+
"symfony/monolog-bundle": "^3.0.2",
25+
"symfony/polyfill-apcu": "^1.0",
2526
"sensio/distribution-bundle": "^5.0",
2627
"sensio/framework-extra-bundle": "^3.0.2",
2728
"incenteev/composer-parameter-handler": "^2.0",
2829

29-
"symfony-cmf/symfony-cmf": "^2.0",
30-
"symfony-cmf/seo-bundle": "2.0.*",
31-
"symfony-cmf/routing-auto-bundle": "2.0.*",
32-
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0",
30+
"symfony-cmf/symfony-cmf": "^2.0@dev",
31+
"symfony-cmf/seo-bundle": "^2.0",
32+
"symfony-cmf/tree-browser-bundle": "^2.0@dev",
33+
"symfony-cmf/content-bundle": "^2.0@dev",
34+
"symfony-cmf/block-bundle": "^2.0@dev",
35+
"symfony-cmf/routing-auto-bundle": "^2.0",
36+
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0@dev",
3337

3438
"jackalope/jackalope-doctrine-dbal": "1.2.*",
3539
"jackalope/jackalope-jackrabbit": "1.2.*",
3640
"doctrine/doctrine-bundle": "^1.6",
3741
"doctrine/data-fixtures": "^1.0",
38-
"doctrine/doctrine-cache-bundle": "^1.0",
39-
"doctrine/phpcr-odm": "^2.0",
42+
"doctrine/doctrine-cache-bundle": "^1.2",
43+
"doctrine/phpcr-odm": "^1.4",
4044

4145
"sonata-project/cache-bundle": "^2.1",
4246
"sonata-project/translation-bundle": "^2.0",
47+
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0@dev",
4348

4449
"jms/serializer-bundle": "^1.1",
4550
"friendsofsymfony/rest-bundle": "~1.7",
@@ -53,7 +58,7 @@
5358
"liip/functional-test-bundle": "^1.3",
5459
"symfony-cmf/testing": "^2.0"
5560
},
56-
"minimum-stability": "dev",
61+
"minimum-stability": "RC",
5762
"prefer-stable": true,
5863
"scripts": {
5964
"post-install-cmd": [

0 commit comments

Comments
 (0)