Fix deprecated factory definition, bump Symfony to 2.8

mautic · Sep 17, 2018 · 0c576e4 · 0c576e4
1 parent d4d2e94
commit 0c576e4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 1,872 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /Propel/om/
 /Propel/map/
 /vendor/
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,9 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
 
 before_script:
   - composer self-update

diff --git a/Resources/config/couchdb.xml b/Resources/config/couchdb.xml
@@ -20,7 +20,8 @@
             <argument>%bazinga.oauth.model.access_token.class%</argument>
         </service>
 
-        <service id="bazinga.oauth.document_manager" factory-service="doctrine_couchdb" factory-method="getManager" class="Doctrine\ODM\CouchDB\DocumentManager" public="false">
+        <service id="bazinga.oauth.document_manager" class="Doctrine\ODM\CouchDB\DocumentManager" public="false">
+            <factory service="doctrine_couchdb" method="getManager" />
             <argument>%bazinga.oauth.model_manager_name%</argument>
         </service>
     </services>

diff --git a/Resources/config/mongodb.xml b/Resources/config/mongodb.xml
@@ -20,7 +20,8 @@
             <argument>%bazinga.oauth.model.access_token.class%</argument>
         </service>
 
-        <service id="bazinga.oauth.document_manager" factory-service="doctrine_mongodb" factory-method="getManager" class="Doctrine\ODM\MongoDB\DocumentManager" public="false">
+        <service id="bazinga.oauth.document_manager" class="Doctrine\ODM\MongoDB\DocumentManager" public="false">
+            <factory service="doctrine_mongodb" method="getManager" />
             <argument>%bazinga.oauth.model_manager_name%</argument>
         </service>
     </services>

diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
@@ -20,7 +20,8 @@
             <argument>%bazinga.oauth.model.access_token.class%</argument>
         </service>
 
-        <service id="bazinga.oauth.entity_manager" factory-service="doctrine" factory-method="getManager" class="Doctrine\ORM\EntityManager" public="false">
+        <service id="bazinga.oauth.entity_manager" class="Doctrine\ORM\EntityManager" public="false">
+            <factory service="doctrine" method="getManager" />
             <argument>%bazinga.oauth.model_manager_name%</argument>
         </service>
     </services>

diff --git a/composer.json b/composer.json
@@ -12,9 +12,9 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/console": "~2.3",
-        "symfony/framework-bundle": "~2.3",
-        "symfony/security-bundle": "~2.3"
+        "symfony/console": "~2.8",
+        "symfony/framework-bundle": "~2.8",
+        "symfony/security-bundle": "~2.8"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "1.3.*@dev",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,9 @@ php: @@
         - 5.4
         - 5.5
         - 5.6
+        - 7.0
+        - 7.1
+        - 7.2
     before_script:
       - composer self-update
@@ Expand Down @@