diff --git a/.travis.yml b/.travis.yml
index 48a1f5e6..cfc6d00a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,9 @@
language: php
php:
- - 5.4
- - 5.5
- 5.6
- 7.0
+ - 7.1
sudo: false
@@ -14,12 +13,14 @@ cache:
matrix:
include:
- - php: 5.3
- env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
- - php: 7.0
- env: SYMFONY_VERSION=2.7.*
- - php: 7.0
+ - php: 5.6
+ env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest"
+ - php: 7.1
env: SYMFONY_VERSION=2.8.*
+ - php: 7.1
+ env: SYMFONY_VERSION=2.8.*
+ - php: 7.1
+ env: SYMFONY_VERSION=3.3.*
- php: hhvm
dist: trusty
fast_finish: true
diff --git a/Resources/config/jackalope_doctrine_dbal.xml b/Resources/config/jackalope_doctrine_dbal.xml
index a4e5b081..cfd477a6 100644
--- a/Resources/config/jackalope_doctrine_dbal.xml
+++ b/Resources/config/jackalope_doctrine_dbal.xml
@@ -4,15 +4,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Doctrine\Bundle\PHPCRBundle\EventListener\JackalopeDoctrineDbalSchemaListener
- Jackalope\Transport\DoctrineDBAL\RepositorySchema
-
-
@@ -20,7 +15,7 @@
+ class="Doctrine\Bundle\PHPCRBundle\EventListener\JackalopeDoctrineDbalSchemaListener">
diff --git a/Resources/config/odm.xml b/Resources/config/odm.xml
index abf483c1..be75a358 100644
--- a/Resources/config/odm.xml
+++ b/Resources/config/odm.xml
@@ -4,54 +4,17 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-
- Doctrine\ODM\PHPCR\Configuration
- Doctrine\ODM\PHPCR\DocumentManager
-
-
- Doctrine\ODM\PHPCR\Translation\TranslationStrategy\AttributeTranslationStrategy
- Doctrine\ODM\PHPCR\Translation\TranslationStrategy\ChildTranslationStrategy
-
-
- Doctrine\Common\Cache\ArrayCache
- Doctrine\Common\Cache\ApcCache
- Doctrine\Common\Cache\MemcacheCache
- localhost
- 11211
- Memcache
- Doctrine\Common\Cache\MemcachedCache
- localhost
- 11211
- Memcached
- Doctrine\Common\Cache\XcacheCache
-
-
- Doctrine\Bundle\PHPCRBundle\Form\PhpcrOdmTypeGuesser
-
- Doctrine\Bundle\PHPCRBundle\Form\Type\PathType
-
- Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain
- Doctrine\ODM\PHPCR\Mapping\Driver\AnnotationDriver
- Doctrine\Bundle\PHPCRBundle\Mapping\Driver\XmlDriver
- Doctrine\Bundle\PHPCRBundle\Mapping\Driver\YamlDriver
- Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver
- Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer
- Doctrine\Bundle\PHPCRBundle\CacheWarmer\UniqueNodeTypeCacheWarmer
-
-
- Doctrine\Bundle\PHPCRBundle\Validator\Constraints\ValidPhpcrOdmValidator
-
-
-
-
@@ -61,52 +24,59 @@
-
+
-
+
-
+
-
+
%doctrine_phpcr.form.type_guess%
-
+
-
+
%doctrine_phpcr.odm.namespaces.translation.alias%
-
+
diff --git a/Resources/config/odm_multilang.xml b/Resources/config/odm_multilang.xml
index 0fc1acb4..53e6d9eb 100644
--- a/Resources/config/odm_multilang.xml
+++ b/Resources/config/odm_multilang.xml
@@ -4,19 +4,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooser
- Doctrine\Bundle\PHPCRBundle\EventListener\LocaleListener
-
-
-
+
%doctrine_phpcr.odm.locales%
%doctrine_phpcr.odm.default_locale%
-
+
%doctrine_phpcr.odm.allowed_locales%
diff --git a/Resources/config/phpcr.xml b/Resources/config/phpcr.xml
index 717c5cca..672e08d9 100644
--- a/Resources/config/phpcr.xml
+++ b/Resources/config/phpcr.xml
@@ -5,82 +5,84 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- PHPCR\SimpleCredentials
- Doctrine\Bundle\PHPCRBundle\ManagerRegistry
- Doctrine\Common\Proxy\Proxy
- PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper
- Doctrine\Bundle\PHPCRBundle\Initializer\InitializerManager
- Doctrine\Bundle\PHPCRBundle\Form\Type\PHPCRReferenceType
-
- Jackalope\Transport\Logging\LoggerChain
- Jackalope\Transport\Logging\Psr3Logger
- Jackalope\Transport\Logging\DebugStack
- Doctrine\Bundle\PHPCRBundle\DataCollector\StopWatchLogger
- Doctrine\Bundle\PHPCRBundle\DataCollector\PHPCRDataCollector
-
- Symfony\Bridge\Doctrine\ContainerAwareEventManager
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
PHPCR
%doctrine_phpcr.sessions%
%doctrine_phpcr.odm.document_managers%
%doctrine_phpcr.default_session%
%doctrine_phpcr.odm.default_document_manager%
- %doctrine_phpcr.proxy.class%
+ Doctrine\Common\Proxy\Proxy
-
+
-
-
+
-
+
diff --git a/composer.json b/composer.json
index 648b5134..5b373922 100644
--- a/composer.json
+++ b/composer.json
@@ -19,8 +19,8 @@
"prefer-stable": true,
"require": {
"php": "^5.3.9|~7.0",
- "symfony/framework-bundle": "~2.3|~3.0",
- "symfony/doctrine-bridge": "~2.3|~3.0",
+ "symfony/framework-bundle": "^2.8.0|^3.3.0",
+ "symfony/doctrine-bridge": "^2.8.0|^3.3.0",
"phpcr/phpcr-implementation": "2.1.*",
"phpcr/phpcr-utils": "^1.2.7"
},
@@ -29,7 +29,7 @@
"phpunit/php-code-coverage": "~2.2",
"symfony/form": "~2.3|~3.0",
"doctrine/phpcr-odm": "^1.3.0-rc4",
- "symfony-cmf/testing": "^1.3.0",
+ "symfony-cmf/testing": "^2.1@dev",
"matthiasnoback/symfony-dependency-injection-test": "~0.7",
"sllh/php-cs-fixer-styleci-bridge": "~1.1"
},
@@ -43,15 +43,14 @@
"burgov/key-value-form-bundle": "to edit assoc multivalue properties. require version 1.0.*"
},
"conflict": {
- "phpcr/phpcr-shell": "<1.0.0-beta1",
- "symfony/framework-bundle": "<2.3.27|>=2.4.0,<2.6.6"
+ "phpcr/phpcr-shell": "<1.0.0-beta1"
},
"autoload": {
"psr-4": { "Doctrine\\Bundle\\PHPCRBundle\\": "" }
},
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "2.0-dev"
}
}
}