Symfony 4.x compatibility for Propel1

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: PHP Composer
+
+on:
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.2', '7.3', '7.4' ]
+        composer: [ '', '--prefer-lowest' ]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: sqlite3, zip
+          coverage: xdebug
+          tools: composer:v1
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-dir)"
+        working-directory: ./
+
+      - name: cache dependencies
+        id: angular-dependencies
+        uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+        working-directory: ./
+
+      - name: Install dependencies
+        env:
+          COMPOSER_FLAGS: ${{ matrix.composer }}
+        run: composer update ${COMPOSER_FLAGS} --prefer-source
+        working-directory: ./
+
+      - name: Run Tests
+        run: composer run-script ci-test
+        working-directory: ./
+        env:
+          SYMFONY_DEPRECATIONS_HELPER: weak

Command/AbstractCommand.php

@@ -392,6 +392,7 @@ protected function createBuildTimeFile($file)
       <datasource id="%name%">
         <adapter>%adapter%</adapter>
         <connection>
+          <classname>%classname%</classname>
           <dsn>%dsn%</dsn>
           <user>%username%</user>
           <password>%password%</password>
@@ -402,6 +403,7 @@ protected function createBuildTimeFile($file)
             , array(
                 '%name%'     => $name,
                 '%adapter%'  => $datasource['adapter'],
+                '%classname%'=> $datasource['connection']['classname'],
                 '%dsn%'      => $datasource['connection']['dsn'],
                 '%username%' => $datasource['connection']['user'],
                 '%password%' => isset($datasource['connection']['password']) ? $datasource['connection']['password'] : '',
@@ -468,7 +470,7 @@ protected function getCacheDir()
      */
     protected function getFileLocator()
     {
-        return $this->getContainer()->get('file_locator');
+        return $this->getContainer()->get('propel.file_locator');
     }
 
     /**

DataCollector/PropelDataCollector.php

@@ -49,6 +49,11 @@ public function __construct(PropelLogger $logger, \PropelConfiguration $propelCo
         $this->propelConfiguration = $propelConfiguration;
     }
 
+    public function reset()
+    {
+        $this->logger->reset();
+    }
+
     /**
      * {@inheritdoc}
      */

DataFixtures/Dumper/YamlDataDumper.php

@@ -27,8 +27,7 @@ protected function transformArrayToData($data)
             $data,
             $inline = 3,
             $indent = 4,
-            $exceptionOnInvalidType = false,
-            $objectSupport = true
+            $flags = Yaml::DUMP_OBJECT
         );
     }
 }

DependencyInjection/PropelExtension.php

@@ -35,7 +35,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $processor->processConfiguration($configuration, $configs);
 
         // Composer
-        if (file_exists($propelPath = $container->getParameter('kernel.root_dir') . '/../vendor/propel/propel1')) {
+        if (file_exists($propelPath = $container->getParameter('kernel.root_dir') . '/../vendor/dayspring-tech/propel1')) {
             $container->setParameter('propel.path', $propelPath);
         }
         if (file_exists($phingPath = $container->getParameter('kernel.root_dir') . '/../vendor/phing/phing/classes')) {
@@ -67,6 +67,7 @@ public function load(array $configs, ContainerBuilder $container)
             $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
             $loader->load('propel.xml');
             $loader->load('converters.xml');
+            $loader->load('console.xml');
         }
 
         // build properties

DependencyInjection/Security/UserProvider/PropelFactory.php

@@ -14,7 +14,7 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 
 /**
  * PropelFactory creates services for Propel user provider.
@@ -41,7 +41,7 @@ public function __construct($key, $providerId)
     public function create(ContainerBuilder $container, $id, $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator($this->providerId))
+            ->setDefinition($id, new ChildDefinition($this->providerId))
             ->addArgument($config['class'])
             ->addArgument($config['property'])
         ;

Logger/PropelLogger.php

@@ -54,6 +54,11 @@ public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch
         $this->stopwatch = $stopwatch;
     }
 
+    public function reset()
+    {
+        $this->queries = array();
+    }
+
     /**
      * {@inheritdoc}
      */

README.markdown

@@ -14,6 +14,7 @@ The two major branches being supported are:
 
 * The `1.5` branch contains Propel *1.6+* integration for Symfony *2.8 LTS*.
 * The `1.6` branch contains Propel *1.6+* integration for Symfony *3.0*.
+* The `1.7` branch contains Propel *1.7+* integration for Symfony *4.0*.
 
 If you are running on an older version, you may require one of the following versions of this bundle.
 

Resources/config/console.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           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">
+
+    <services>
+        <service id="propel.file_locator" alias="file_locator" public="true">
+        </service>
+
+        <service class="Propel\Bundle\PropelBundle\Command\AbstractCommand"
+                 id="propel_bundle_propel.command.abstract_command"
+                 abstract="true">
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\BuildCommand"
+                 id="propel_bundle_propel.command.build_command">
+            <tag name="console.command" command="propel:build" />
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\DatabaseCreateCommand"
+                 id="propel_bundle_propel.command.database_create_command">
+            <tag name="console.command" command="propel:database:create" />
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\DatabaseDropCommand"
+                 id="propel_bundle_propel.command.database_drop_command">
+            <tag name="console.command" command="propel:database:drop"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\FixturesDumpCommand"
+                 id="propel_bundle_propel.command.fixtures_dump_command">
+            <tag name="console.command" command="propel:fixtures:dump"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\FixturesLoadCommand"
+                 id="propel_bundle_propel.command.fixtures_load_command">
+            <tag name="console.command" command="propel:fixtures:load"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\FormGenerateCommand"
+                 id="propel_bundle_propel.command.form_generate_command">
+            <tag name="console.command" command="propel:form:generate"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\GraphvizGenerateCommand"
+                 id="propel_bundle_propel.command.graphviz_generate_command">
+            <tag name="console.command" command="propel:graphviz:generate"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\MigrationGenerateDiffCommand"
+                 id="propel_bundle_propel.command.migration_generate_diff_command">
+            <tag name="console.command" command="propel:migration:generate-diff"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\MigrationMigrateCommand"
+                 id="propel_bundle_propel.command.migration_migrate_command">
+            <tag name="console.command" command="propel:migration:migrate"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\MigrationStatusCommand"
+                 id="propel_bundle_propel.command.migration_status_command">
+            <tag name="console.command" command="propel:migration:status"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\ModelBuildCommand"
+                 id="propel_bundle_propel.command.model_build_command">
+            <tag name="console.command" command="propel:model:build"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\ReverseCommand"
+                 id="propel_bundle_propel.command.reverse">
+            <tag name="console.command" command="propel:reverse"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\SqlBuildCommand"
+                 id="propel_bundle_propel.command.sql_build_command">
+            <tag name="console.command" command="propel:sql:build"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\SqlInsertCommand"
+                 id="propel_bundle_propel.command.sql_insert_command">
+            <tag name="console.command" command="propel:sql:insert"/>
+        </service>
+        <service class="Propel\Bundle\PropelBundle\Command\TableDropCommand"
+                 id="propel_bundle_propel.command.table_drop_command">
+            <tag name="console.command" command="propel:table:drop"/>
+        </service>
+    </services>
+
+</container>

Resources/config/propel.xml

@@ -17,18 +17,18 @@
     </parameters>
 
     <services>
-        <service id="propel.configuration" class="%propel.configuration.class%" />
+        <service id="propel.configuration" class="%propel.configuration.class%" public="true"/>
 
-        <service id="propel.build_properties" class="%propel.build_properties.class%" />
+        <service id="propel.build_properties" class="%propel.build_properties.class%" public="true" />
 
-        <service id="propel.logger" class="%propel.logger.class%">
+        <service id="propel.logger" class="%propel.logger.class%" public="true">
             <tag name="monolog.logger" channel="propel" />
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="service" id="debug.stopwatch" on-invalid="null" />
         </service>
 
         <service id="propel.data_collector" class="%propel.data_collector.class%" public="false">
-            <tag name="data_collector" template="PropelBundle:Collector:propel" id="propel" />
+            <tag name="data_collector" template="@Propel/Collector/propel" id="propel" />
             <argument type="service" id="propel.logger" />
             <argument type="service" id="propel.configuration" />
         </service>

Resources/views/Collector/propel.html.twig

@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
 {% if collector.querycount %}

Resources/views/Panel/configuration.html.twig

@@ -36,42 +36,44 @@
         </tr>
     </thead>
     <tbody>
-        {% for name, config in configuration.datasources if config is iterable %}
-        <tr>
-            <th rowspan="5" style="vertical-align: top;">
-                {{ name }}
-            </th>
-            <th>Adapter</th>
-            <td>{{ config.adapter }}</td>
-        </tr>
-        <tr>
-            <th>DSN</th>
-            <td>{{ config.connection.dsn }}</td>
-        </tr>
-        <tr>
-            <th>Class</th>
-            <td>{{ config.connection.classname }}</td>
-        </tr>
-        <tr>
-            <th>Options</th>
-            <td>
-                <ul>
-                    {% for key, value in config.connection.options %}
-                    <li>{{ key }} : {{ value }}</li>
-                    {% endfor %}
-                </ul>
-            </td>
-        </tr>
-        <tr>
-            <th>Attributes</th>
-            <td>
-                <ul>
-                    {% for key, value in config.connection.attributes %}
-                    <li>{{ key }} : {{ value }}</li>
-                    {% endfor %}
-                </ul>
-            </td>
-        </tr>
+        {% for name, config in configuration.datasources %}
+            {% if config is iterable %}
+            <tr>
+                <th rowspan="5" style="vertical-align: top;">
+                    {{ name }}
+                </th>
+                <th>Adapter</th>
+                <td>{{ config.adapter }}</td>
+            </tr>
+            <tr>
+                <th>DSN</th>
+                <td>{{ config.connection.dsn }}</td>
+            </tr>
+            <tr>
+                <th>Class</th>
+                <td>{{ config.connection.classname }}</td>
+            </tr>
+            <tr>
+                <th>Options</th>
+                <td>
+                    <ul>
+                        {% for key, value in config.connection.options %}
+                        <li>{{ key }} : {{ value }}</li>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+            <tr>
+                <th>Attributes</th>
+                <td>
+                    <ul>
+                        {% for key, value in config.connection.attributes %}
+                        <li>{{ key }} : {{ value }}</li>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+            {% endif %}
         {% endfor %}
     </tbody>
 </table>

Tests/AutoloadAliasTest.php

@@ -2,7 +2,9 @@
 
 namespace Propel\Bundle\PropelBundle\Tests;
 
-class AutoloadAliasTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase as PHPUnit_Framework_TestCase;
+
+class AutoloadAliasTest extends PHPUnit_Framework_TestCase
 {
     public function testOldNamespaceWorks()
     {