From 713f0baec29a34ecb1a53db32b7342ef1a00ec18 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Tue, 31 Oct 2017 08:55:17 +0100
Subject: [PATCH] remove .class parameters and start 2.0 preparation

---
 .travis.yml                                  | 15 +++--
 Resources/config/jackalope_doctrine_dbal.xml |  9 +--
 Resources/config/odm.xml                     | 70 ++++++--------------
 Resources/config/odm_multilang.xml           | 11 ++-
 Resources/config/phpcr.xml                   | 60 +++++++++--------
 composer.json                                | 11 ++-
 6 files changed, 70 insertions(+), 106 deletions(-)

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">
 
-    <parameters>
-        <parameter key="doctrine_phpcr.jackalope_doctrine_dbal.schema_listener.class">Doctrine\Bundle\PHPCRBundle\EventListener\JackalopeDoctrineDbalSchemaListener</parameter>
-        <parameter key="doctrine_phpcr.jackalope_doctrine_dbal.repository_schema.class">Jackalope\Transport\DoctrineDBAL\RepositorySchema</parameter>
-    </parameters>
-
     <services>
 
         <service id="doctrine_phpcr.jackalope_doctrine_dbal.schema"
-                 class="%doctrine_phpcr.jackalope_doctrine_dbal.repository_schema.class%"
+                 class="Jackalope\Transport\DoctrineDBAL\RepositorySchema"
                  public="false"
         >
             <argument type="collection"/>
@@ -20,7 +15,7 @@
         </service>
 
         <service id="doctrine_phpcr.jackalope_doctrine_dbal.schema_listener"
-                 class="%doctrine_phpcr.jackalope_doctrine_dbal.schema_listener.class%">
+                 class="Doctrine\Bundle\PHPCRBundle\EventListener\JackalopeDoctrineDbalSchemaListener">
             <argument type="service" id="doctrine_phpcr.jackalope_doctrine_dbal.schema" />
         </service>
 
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">
 
-    <parameters>
-
-        <parameter key="doctrine_phpcr.odm.configuration.class">Doctrine\ODM\PHPCR\Configuration</parameter>
-        <parameter key="doctrine_phpcr.odm.document_manager.class">Doctrine\ODM\PHPCR\DocumentManager</parameter>
-
-        <!-- Translation strategies -->
-        <parameter key="doctrine_phpcr.odm.translation.strategy.attribute.class">Doctrine\ODM\PHPCR\Translation\TranslationStrategy\AttributeTranslationStrategy</parameter>
-        <parameter key="doctrine_phpcr.odm.translation.strategy.child.class">Doctrine\ODM\PHPCR\Translation\TranslationStrategy\ChildTranslationStrategy</parameter>
-
-        <!-- cache -->
-        <parameter key="doctrine_phpcr.odm.cache.array.class">Doctrine\Common\Cache\ArrayCache</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.apc.class">Doctrine\Common\Cache\ApcCache</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcache.class">Doctrine\Common\Cache\MemcacheCache</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcache_host">localhost</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcache_port">11211</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcache_instance.class">Memcache</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcached.class">Doctrine\Common\Cache\MemcachedCache</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcached_host">localhost</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcached_port">11211</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.memcached_instance.class">Memcached</parameter>
-        <parameter key="doctrine_phpcr.odm.cache.xcache.class">Doctrine\Common\Cache\XcacheCache</parameter>
-
-        <!-- form field factory guesser -->
-        <parameter key="form.type_guesser.doctrine_phpcr.class">Doctrine\Bundle\PHPCRBundle\Form\PhpcrOdmTypeGuesser</parameter>
-
-        <parameter key="doctrine_phpcr.odm.form.path.type.class">Doctrine\Bundle\PHPCRBundle\Form\Type\PathType</parameter>
-
-        <parameter key="doctrine_phpcr.odm.metadata.driver_chain.class">Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain</parameter>
-        <parameter key="doctrine_phpcr.odm.metadata.annotation.class">Doctrine\ODM\PHPCR\Mapping\Driver\AnnotationDriver</parameter>
-        <parameter key="doctrine_phpcr.odm.metadata.xml.class">Doctrine\Bundle\PHPCRBundle\Mapping\Driver\XmlDriver</parameter>
-        <parameter key="doctrine_phpcr.odm.metadata.yml.class">Doctrine\Bundle\PHPCRBundle\Mapping\Driver\YamlDriver</parameter>
-        <parameter key="doctrine_phpcr.odm.metadata.php.class">Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver</parameter>
-        <parameter key="doctrine_phpcr.odm.proxy_cache_warmer.class">Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer</parameter>
-        <parameter key="doctrine_phpcr.odm.unique_node_type_cache_warmer.class">Doctrine\Bundle\PHPCRBundle\CacheWarmer\UniqueNodeTypeCacheWarmer</parameter>
-
-        <!-- validator -->
-        <parameter key="doctrine_phpcr.odm.validator.valid_phpcr_odm.class">Doctrine\Bundle\PHPCRBundle\Validator\Constraints\ValidPhpcrOdmValidator</parameter>
-    </parameters>
-
     <services>
 
-        <service id="doctrine_phpcr.odm.proxy_cache_warmer" class="%doctrine_phpcr.odm.proxy_cache_warmer.class%"
+        <service id="doctrine_phpcr.odm.proxy_cache_warmer"
+                 class="Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer"
                  public="false">
             <tag name="kernel.cache_warmer"/>
             <argument type="service" id="doctrine_phpcr"/>
         </service>
 
-        <service id="doctrine_phpcr.odm.unique_node_type_cache_warmer" class="%doctrine_phpcr.odm.unique_node_type_cache_warmer.class%"
+        <service id="doctrine_phpcr.odm.unique_node_type_cache_warmer"
+                 class="Doctrine\Bundle\PHPCRBundle\CacheWarmer\UniqueNodeTypeCacheWarmer"
                  public="false">
             <tag name="kernel.cache_warmer"/>
             <argument type="service" id="doctrine_phpcr"/>
@@ -61,52 +24,59 @@
 
         <service
             id="doctrine_phpcr.odm.configuration"
-            class="%doctrine_phpcr.odm.configuration.class%"
+            class="Doctrine\ODM\PHPCR\Configuration"
             abstract="true"
             public="false"
         />
 
         <service
             id="doctrine_phpcr.odm.document_manager.abstract"
-            class="%doctrine_phpcr.odm.document_manager.class%"
+            class="Doctrine\ODM\PHPCR\DocumentManager"
             abstract="true"
         />
 
-        <service id="form.type.phpcr_odm.reference_collection" class="Doctrine\Bundle\PHPCRBundle\Form\Type\PHPCRODMReferenceCollectionType">
+        <service id="form.type.phpcr_odm.reference_collection"
+                 class="Doctrine\Bundle\PHPCRBundle\Form\Type\PHPCRODMReferenceCollectionType">
             <tag name="form.type" alias="phpcr_odm_reference_collection"/>
             <argument type="service" id="doctrine_phpcr.odm.document_manager"/>
         </service>
 
-        <service id="form.type.phpcr.document" class="Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType">
+        <service id="form.type.phpcr.document"
+                 class="Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType">
             <tag name="form.type" alias="phpcr_document"/>
             <argument type="service" id="doctrine_phpcr"/>
         </service>
 
-        <service id="doctrine_phpcr.odm.form.type.path" class="%doctrine_phpcr.odm.form.path.type.class%">
+        <service id="doctrine_phpcr.odm.form.type.path"
+                 class="Doctrine\Bundle\PHPCRBundle\Form\Type\PathType">
             <argument type="service" id="doctrine_phpcr"/>
             <tag name="form.type" alias="phpcr_odm_path"/>
         </service>
 
-        <service id="form.type_guesser.doctrine_phpcr" class="%form.type_guesser.doctrine_phpcr.class%">
+        <service id="form.type_guesser.doctrine_phpcr"
+                 class="Doctrine\Bundle\PHPCRBundle\Form\PhpcrOdmTypeGuesser">
             <tag name="form.type_guesser"/>
             <argument type="service" id="doctrine_phpcr"/>
             <argument>%doctrine_phpcr.form.type_guess%</argument>
         </service>
 
-        <service id="doctrine_phpcr.odm.validator.valid_phpcr_odm" class="%doctrine_phpcr.odm.validator.valid_phpcr_odm.class%">
+        <service id="doctrine_phpcr.odm.validator.valid_phpcr_odm"
+                 class="Doctrine\Bundle\PHPCRBundle\Validator\Constraints\ValidPhpcrOdmValidator">
             <argument type="service" id="doctrine_phpcr" />
             <tag name="validator.constraint_validator" alias="doctrine_phpcr.odm.validator.valid_phpcr_odm"/>
         </service>
 
         <!-- Translation strategies -->
-        <service id="doctrine_phpcr.odm.translation.strategy.attribute" class="%doctrine_phpcr.odm.translation.strategy.attribute.class%">
+        <service id="doctrine_phpcr.odm.translation.strategy.attribute"
+                 class="Doctrine\ODM\PHPCR\Translation\TranslationStrategy\AttributeTranslationStrategy">
             <argument />
             <call method="setPrefix">
                 <argument>%doctrine_phpcr.odm.namespaces.translation.alias%</argument>
             </call>
         </service>
 
-        <service id="doctrine_phpcr.odm.translation.strategy.child" class="%doctrine_phpcr.odm.translation.strategy.child.class%">
+        <service id="doctrine_phpcr.odm.translation.strategy.child"
+                 class="Doctrine\ODM\PHPCR\Translation\TranslationStrategy\ChildTranslationStrategy">
             <argument />
         </service>
 
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">
 
-    <parameters>
-        <parameter key="doctrine_phpcr.odm.locale_chooser.class">Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooser</parameter>
-        <parameter key="doctrine_phpcr.odm.locale_listener.class">Doctrine\Bundle\PHPCRBundle\EventListener\LocaleListener</parameter>
-    </parameters>
-
     <services>
 
-        <service id="doctrine_phpcr.odm.locale_chooser" class="%doctrine_phpcr.odm.locale_chooser.class%">
+        <service id="doctrine_phpcr.odm.locale_chooser"
+                 class="Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooser">
             <argument>%doctrine_phpcr.odm.locales%</argument>
             <argument>%doctrine_phpcr.odm.default_locale%</argument>
         </service>
 
-        <service id="doctrine_phpcr.odm.locale_listener" class="%doctrine_phpcr.odm.locale_listener.class%">
+        <service id="doctrine_phpcr.odm.locale_listener"
+                 class="Doctrine\Bundle\PHPCRBundle\EventListener\LocaleListener">
             <tag name="kernel.event_subscriber"/>
             <argument type="service" id="doctrine_phpcr.odm.locale_chooser"/>
             <argument>%doctrine_phpcr.odm.allowed_locales%</argument>
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">
 
     <parameters>
-
-        <parameter key="doctrine_phpcr.credentials.class">PHPCR\SimpleCredentials</parameter>
-        <parameter key="doctrine_phpcr.class">Doctrine\Bundle\PHPCRBundle\ManagerRegistry</parameter>
-        <parameter key="doctrine_phpcr.proxy.class">Doctrine\Common\Proxy\Proxy</parameter>
         <parameter key="doctrine_phpcr.sessions" type="collection" />
         <parameter key="doctrine_phpcr.odm.document_managers" type="collection" />
         <parameter key="doctrine_phpcr.default_session" />
         <parameter key="doctrine_phpcr.odm.default_document_manager" />
-        <parameter key="doctrine_phpcr.console_dumper.class">PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper</parameter>
-        <parameter key="doctrine_phpcr.initializer_manager.class">Doctrine\Bundle\PHPCRBundle\Initializer\InitializerManager</parameter>
-        <parameter key="doctrine_phpcr.form.type.phpcr_reference.class">Doctrine\Bundle\PHPCRBundle\Form\Type\PHPCRReferenceType</parameter>
-
-        <parameter key="doctrine_phpcr.logger.chain.class">Jackalope\Transport\Logging\LoggerChain</parameter>
-        <parameter key="doctrine_phpcr.logger.class">Jackalope\Transport\Logging\Psr3Logger</parameter>
-        <parameter key="doctrine_phpcr.logger.profiling.class">Jackalope\Transport\Logging\DebugStack</parameter>
-        <parameter key="doctrine_phpcr.logger.stop_watch.class">Doctrine\Bundle\PHPCRBundle\DataCollector\StopWatchLogger</parameter>
-        <parameter key="doctrine_phpcr.data_collector.class">Doctrine\Bundle\PHPCRBundle\DataCollector\PHPCRDataCollector</parameter>
-
-        <parameter key="doctrine_phpcr.session.event_manager.class">Symfony\Bridge\Doctrine\ContainerAwareEventManager</parameter>
-
     </parameters>
 
     <services>
 
-        <service id="doctrine_phpcr.session.event_manager" class="%doctrine_phpcr.session.event_manager.class%" public="false" abstract="true">
+        <service id="doctrine_phpcr.session.event_manager"
+                 class="Symfony\Bridge\Doctrine\ContainerAwareEventManager" public="false" abstract="true">
             <argument type="service" id="service_container"/>
         </service>
 
-        <service id="doctrine_phpcr.logger.chain" class="%doctrine_phpcr.logger.chain.class%" public="false" abstract="true">
+        <service id="doctrine_phpcr.logger.chain"
+                 class="Jackalope\Transport\Logging\LoggerChain" public="false" abstract="true">
             <call method="addLogger">
                 <argument type="service" id="doctrine_phpcr.logger" />
             </call>
         </service>
 
-        <service id="doctrine_phpcr.logger.profiling" class="%doctrine_phpcr.logger.profiling.class%" public="false" abstract="true" />
+        <service id="doctrine_phpcr.logger.profiling"
+                 class="Jackalope\Transport\Logging\DebugStack"
+                 public="false"
+                 abstract="true"
+        />
 
-        <service id="doctrine_phpcr.logger.stop_watch" class="%doctrine_phpcr.logger.stop_watch.class%" public="false" abstract="true">
+        <service id="doctrine_phpcr.logger.stop_watch"
+                 class="Doctrine\Bundle\PHPCRBundle\DataCollector\StopWatchLogger"
+                 public="false"
+                 abstract="true">
             <argument type="service" id="debug.stopwatch" on-invalid="null" />
         </service>
 
-        <service id="doctrine_phpcr.logger" class="%doctrine_phpcr.logger.class%" public="false">
+        <service id="doctrine_phpcr.logger"
+                 class="Jackalope\Transport\Logging\Psr3Logger"
+                 public="false">
             <tag name="monolog.logger" channel="doctrine_phpcr" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
 
-        <service id="doctrine_phpcr.data_collector" class="%doctrine_phpcr.data_collector.class%" public="false">
+        <service id="doctrine_phpcr.data_collector"
+                 class="Doctrine\Bundle\PHPCRBundle\DataCollector\PHPCRDataCollector"
+                 public="false">
             <tag name="data_collector" template="DoctrinePHPCRBundle:Collector:phpcr" id="phpcr" priority="247" />
             <argument type="service" id="doctrine_phpcr" />
         </service>
 
-        <service id="doctrine_phpcr.credentials" class="%doctrine_phpcr.credentials.class%" public="false">
+        <service id="doctrine_phpcr.credentials"
+                 class="PHPCR\SimpleCredentials"
+                 public="false">
             <argument /><!-- username string (0) -->
             <argument /><!-- password string (1) -->
         </service>
 
-        <service id="doctrine_phpcr" class="%doctrine_phpcr.class%">
+        <service id="doctrine_phpcr"
+                 class="Doctrine\Bundle\PHPCRBundle\ManagerRegistry">
             <argument>PHPCR</argument>
             <argument>%doctrine_phpcr.sessions%</argument>
             <argument>%doctrine_phpcr.odm.document_managers%</argument>
             <argument>%doctrine_phpcr.default_session%</argument>
             <argument>%doctrine_phpcr.odm.default_document_manager%</argument>
-            <argument>%doctrine_phpcr.proxy.class%</argument>
+            <argument>Doctrine\Common\Proxy\Proxy</argument>
             <call method="setContainer">
                 <argument type="service" id="service_container" />
             </call>
         </service>
 
-        <service id="form.type.phpcr.reference" class="%doctrine_phpcr.form.type.phpcr_reference.class%">
+        <service id="form.type.phpcr.reference"
+                 class="Doctrine\Bundle\PHPCRBundle\Form\Type\PHPCRReferenceType">
             <tag name="form.type" alias="phpcr_reference"/>
             <argument type="service" id="doctrine_phpcr.session"/>
         </service>
 
-        <service id="doctrine_phpcr.console_dumper" class="%doctrine_phpcr.console_dumper.class%">
-        </service>
+        <service id="doctrine_phpcr.console_dumper"
+                 class="PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper"/>
 
-        <service id="doctrine_phpcr.initializer_manager" class="%doctrine_phpcr.initializer_manager.class%">
+        <service id="doctrine_phpcr.initializer_manager"
+                 class="Doctrine\Bundle\PHPCRBundle\Initializer\InitializerManager">
             <argument type="service" id="doctrine_phpcr"/>
         </service>
 
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"
         }
     }
 }